diff --git a/Android.mk b/Android.mk
index 8888800..81f04f7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,6 +19,8 @@
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include frameworks/opt/setupwizard/navigationbar/common.mk
+include frameworks/opt/setupwizard/library/common.mk
+include frameworks/base/packages/SettingsLib/common.mk
 
 include $(BUILD_PACKAGE)
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e49c6a2..6e7b19e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
         package="com.android.settings"
         coreApp="true"
         android:sharedUserId="android.uid.system">
@@ -61,6 +62,7 @@
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
     <uses-permission android:name="android.permission.COPY_PROTECTED_DATA" />
     <uses-permission android:name="android.permission.MANAGE_USERS" />
+    <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
     <uses-permission android:name="android.permission.SET_TIME" />
@@ -70,6 +72,9 @@
     <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
     <uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />
     <uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
+    <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+    <uses-permission android:name="android.permission.MANAGE_FINGERPRINT" />
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
@@ -78,7 +83,8 @@
             android:hardwareAccelerated="true"
             android:requiredForAllUsers="true"
             android:supportsRtl="true"
-            android:allowBackup="false">
+            android:allowBackup="false"
+            android:usesCleartextTraffic="false">
 
         <!-- Settings -->
 
@@ -86,7 +92,7 @@
                 android:taskAffinity="com.android.settings"
                 android:label="@string/settings_label_launcher"
                 android:launchMode="singleTask">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -133,12 +139,15 @@
                 android:taskAffinity="com.android.settings"
                 android:label="@string/wireless_networks_settings_title"
                 android:parentActivityName="Settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
                 <action android:name="android.settings.AIRPLANE_MODE_SETTINGS" />
                 <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>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -150,15 +159,29 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name="AirplaneModeVoiceActivity"
+                android:label="@string/wireless_networks_settings_title"
+                android:theme="@android:style/Theme.Material.Light.Voice"
+                android:exported="true">
+            <intent-filter>
+                <action android:name="android.settings.VOICE_CONTROL_AIRPLANE_MODE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+        </activity>
+
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
                 android:taskAffinity=""
                 android:label="@string/wifi_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.WIFI_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.WIFI_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
@@ -185,9 +208,12 @@
         <activity android:name=".wifi.WifiPickerActivity"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -199,28 +225,23 @@
                 android:icon="@drawable/empty_icon"
                 android:clearTaskOnLaunch="true"
                 android:windowSoftInputMode="adjustNothing">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".wifi.WifiSettingsForSetupWizardXL"
-                android:theme="@android:style/Theme.Material.Light.NoActionBar"
-                android:screenOrientation="behind"
-                android:clearTaskOnLaunch="true"
-                android:windowSoftInputMode="adjustResize"
-                android:exported="true" />
-
         <activity android:name="Settings$AdvancedWifiSettingsActivity"
                 android:taskAffinity="com.android.settings"
                 android:label="@string/wifi_advanced_settings_label"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:parentActivityName="Settings$WifiSettingsActivity">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.WIFI_IP_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.WIFI_IP_SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -235,9 +256,12 @@
                 android:label="@string/wifi_saved_access_points_label"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:parentActivityName="Settings$WifiSettingsActivity">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.WIFI_IF_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.WIFI_IF_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -286,6 +310,19 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".wifi.WifiNoInternetDialog"
+                  android:clearTaskOnLaunch="true"
+                  android:excludeFromRecents="true"
+                  android:exported="true"
+                  android:permission="android.permission.CONNECTIVITY_INTERNAL"
+                  android:taskAffinity=""
+                  android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
+            <intent-filter>
+                <action android:name="android.net.conn.PROMPT_UNVALIDATED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <!-- Suspect activity alias: targetActivity is Settings itself, does not define a name. Remove? -->
         <activity-alias android:name=".wifi.WifiApSettings"
                 android:targetActivity="Settings">
@@ -302,9 +339,12 @@
                 android:taskAffinity="com.android.settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:parentActivityName="Settings$WirelessSettingsActivity">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.APN_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.APN_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
@@ -317,9 +357,12 @@
         <activity android:name="Settings$BluetoothSettingsActivity"
                 android:label="@string/bluetooth_settings_title"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.BLUETOOTH_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.BLUETOOTH_SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -407,9 +450,12 @@
         <activity android:name="Settings$VpnSettingsActivity"
                 android:label="@string/vpn_settings_title"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.net.vpn.SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.net.vpn.SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
@@ -425,9 +471,12 @@
         <activity android:name="Settings$DateTimeSettingsActivity"
                 android:label="@string/date_and_time"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.DATE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.DATE_SETTINGS" />
                 <action android:name="android.intent.action.QUICK_CLOCK" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -453,9 +502,12 @@
                 android:label="@string/language_picker_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.LOCALE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.LOCALE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
@@ -471,9 +523,12 @@
                 android:label="@string/language_keyboard_settings_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -489,9 +544,12 @@
                 android:label="@string/voice_input_settings_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.VOICE_INPUT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.VOICE_INPUT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -543,9 +601,12 @@
         <activity android:name=".inputmethod.InputMethodAndSubtypeEnablerActivity"
                 android:label=""
                 android:clearTaskOnLaunch="true">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.INPUT_METHOD_SUBTYPE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.INPUT_METHOD_SUBTYPE_SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -567,9 +628,12 @@
                 android:label="@string/user_dict_settings_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
@@ -587,11 +651,10 @@
                   android:windowSoftInputMode="stateVisible"
                   android:noHistory="true"
                   android:excludeFromRecents="true">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="com.android.settings.USER_DICTIONARY_INSERT" />
                 <action android:name="com.android.settings.USER_DICTIONARY_EDIT" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
@@ -612,9 +675,12 @@
                 android:label="@string/zen_mode_settings_title"
                 android:exported="true"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ZEN_MODE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.ZEN_MODE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
@@ -626,12 +692,101 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name="Settings$ZenModePrioritySettingsActivity"
+                android:label="@string/zen_mode_priority_settings_title"
+                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>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.notification.ZenModePrioritySettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/notification_settings" />
+            <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: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" />
+            </intent-filter>
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ACTION_CONDITION_PROVIDER_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="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.notification.ZenModeAutomationSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/notification_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
+        <activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"
+                android:exported="true"
+                android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ZEN_MODE_SCHEDULE_RULE_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="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.notification.ZenModeScheduleRuleSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/notification_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
+        <activity android:name="Settings$ZenModeExternalRuleSettingsActivity"
+                android:exported="true"
+                android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ZEN_MODE_EXTERNAL_RULE_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="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.notification.ZenModeExternalRuleSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/notification_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
         <activity android:name="Settings$HomeSettingsActivity"
                 android:label="@string/home_settings"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.HOME_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.HOME_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
@@ -646,11 +801,14 @@
         <activity android:name="Settings$DisplaySettingsActivity"
                 android:label="@string/display_settings"
                 android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="com.android.settings.DISPLAY_SETTINGS" />
                 <action android:name="android.settings.DISPLAY_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" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
@@ -678,9 +836,12 @@
                 android:label="@string/device_info_settings"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
@@ -696,7 +857,7 @@
                 android:label="@string/settings_license_activity_title"
                 android:theme="@android:style/Theme.Material.Light.Panel"
                 android:configChanges="orientation|screenSize">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.LICENSE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -707,11 +868,13 @@
         <activity android:name="Settings$ManageApplicationsActivity"
                 android:label="@string/applications_settings"
                 android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <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>
+                <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
@@ -720,6 +883,23 @@
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </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.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/application_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -779,7 +959,7 @@
                 android:label="@string/application_info_label"
                 android:exported="true"
                 android:targetActivity=".applications.InstalledAppDetailsTop">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="package" />
@@ -801,6 +981,8 @@
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
         <!-- Provide direct entry into manage apps showing storage usage of apps. -->
@@ -808,10 +990,13 @@
                 android:label="@string/storageuse_settings_title"
                 android:taskAffinity=""
                 android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" />
+                <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" />
-                <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" />
                 <category android:name="android.intent.category.MONKEY" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
@@ -819,6 +1004,8 @@
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
         <activity android:name="Settings$NotificationStationActivity"
@@ -834,6 +1021,16 @@
                 android:value="com.android.settings.notification.NotificationStation" />
         </activity>
 
+        <activity android:name=".notification.ZenModeVoiceActivity"
+                android:theme="@android:style/Theme.Material.Light"
+                android:label="@string/zen_mode_interruptions_voice_title">
+            <intent-filter>
+                <action android:name="android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+        </activity>
+
         <!--
         <activity android:name="Settings$AppOpsSummaryActivity"
                 android:label="@string/app_ops_settings"
@@ -857,9 +1054,12 @@
                 android:label="@string/location_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
@@ -877,11 +1077,14 @@
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity=""
                 android:parentActivityName="Settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.SECURITY_SETTINGS" />
                 <action android:name="android.credentials.UNLOCK" />
                 <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>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -896,9 +1099,12 @@
                 android:label="@string/ssl_ca_cert_dialog_title"
                 android:theme="@style/Transparent"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.MONITORING_CERT_INFO" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="com.android.settings.MONITORING_CERT_INFO" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -906,11 +1112,14 @@
         <activity android:name="Settings$TrustedCredentialsSettingsActivity"
                 android:label="@string/trusted_credentials"
                 android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="com.android.settings.TRUSTED_CREDENTIALS" />
                 <action android:name="com.android.settings.TRUSTED_CREDENTIALS_USER" />
                 <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="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -936,11 +1145,14 @@
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.PRIVACY_SETTINGS" />
                 <action android:name="android.settings.BACKUP_AND_RESET_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>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -960,7 +1172,7 @@
                 android:theme="@style/Transparent"
                 android:launchMode="singleTop"
                 android:configChanges="orientation|keyboardHidden|screenSize">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="com.android.credentials.UNLOCK" />
                 <action android:name="com.android.credentials.INSTALL" />
                 <action android:name="com.android.credentials.RESET" />
@@ -1008,13 +1220,16 @@
                 android:label="@string/usage_access_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$SecuritySettingsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.USAGE_ACCESS_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.UsageAccessSettings" />
+                android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/security_settings" />
         </activity>
@@ -1043,9 +1258,12 @@
                 android:label="@string/accessibility_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
@@ -1062,9 +1280,12 @@
                 android:label="@string/accessibility_display_daltonizer_preference_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$AccessibilitySettingsActivity">
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.ACCESSIBILITY_COLOR_SPACE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="com.android.settings.ACCESSIBILITY_COLOR_SPACE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1079,9 +1300,12 @@
                 android:label="@string/accessibility_captioning_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$AccessibilitySettingsActivity">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.CAPTIONING_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.CAPTIONING_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1096,8 +1320,7 @@
                 android:label="@string/tts_settings"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="com.android.settings.TTS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1115,7 +1338,7 @@
         <activity android:name="ConfirmDeviceCredentialActivity"
             android:exported="true"
             android:theme="@style/Transparent">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1129,31 +1352,38 @@
 
         <activity android:name=".notification.RedactionSettingsStandalone"
                   android:exported="true">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.ACTION_APP_NOTIFICATION_REDACTION" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name="ConfirmLockPattern"/>
+        <activity android:name="ConfirmLockPattern"
+            android:theme="@style/Theme.ConfirmDeviceCredentials"/>
 
         <activity android:name="ConfirmLockPassword"
-            android:windowSoftInputMode="stateVisible|adjustResize"/>
+            android:windowSoftInputMode="stateVisible|adjustResize"
+            android:theme="@style/Theme.ConfirmDeviceCredentials"/>
+
+        <activity android:name="FingerprintSettings" android:exported="false"/>
+        <activity android:name="FingerprintEnroll" android:exported="false"/>
 
         <!-- Note this must not be exported since it returns the password in the intent -->
         <activity android:name="ConfirmLockPattern$InternalActivity"
-            android:exported="false"/>
+            android:exported="false"
+            android:theme="@style/Theme.ConfirmDeviceCredentials"/>
 
         <!-- Note this must not be exported since it returns the password in the intent -->
         <activity android:name="ConfirmLockPassword$InternalActivity"
             android:exported="false"
-            android:windowSoftInputMode="stateVisible|adjustResize"/>
+            android:windowSoftInputMode="stateVisible|adjustResize"
+            android:theme="@style/Theme.ConfirmDeviceCredentials"/>
 
         <activity android:name="SetupChooseLockGeneric"
             android:taskAffinity="com.android.wizard"
             android:theme="@style/SetupWizardDisableAppStartingTheme"
             android:label="@string/lock_settings_picker_title">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1162,7 +1392,7 @@
         <activity android:name="ChooseLockGeneric"
             android:label="@string/lockpassword_choose_lock_generic_header"
             android:excludeFromRecents="true" >
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.app.action.SET_NEW_PASSWORD" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1237,23 +1467,79 @@
                 android:label="@string/storage_settings_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
                 <action android:name="android.settings.MEMORY_CARD_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>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.deviceinfo.Memory" />
+                android:value="com.android.settings.deviceinfo.StorageSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/storage_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
-        <activity android:name=".deviceinfo.MiscFilesHandler"
-                android:theme="@style/Theme.SubSettingsDialogWhenLarge"/>
+        <activity
+                android:name="Settings$StorageVolumeSettingsActivity"
+                android:label="@string/storage_settings_title"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings$StorageSettingsActivity">
+            <intent-filter>
+                <action android:name="android.provider.action.DOCUMENT_ROOT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data
+                    android:scheme="content"
+                    android:host="com.android.externalstorage.documents"
+                    android:mimeType="vnd.android.document/root" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.deviceinfo.PublicVolumeSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/storage_settings" />
+        </activity>
+
+        <!-- Exported for SystemUI to launch into -->
+        <activity android:name=".deviceinfo.StorageWizardInit"
+                android:theme="@style/SuwThemeMaterial.Light"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="true"
+                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+        <activity android:name=".deviceinfo.StorageWizardFormatConfirm"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardFormatProgress"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardMigrate"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardMigrateConfirm"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardMigrateProgress"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardReady"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+
+        <activity android:name=".deviceinfo.StorageWizardMoveConfirm"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+        <activity android:name=".deviceinfo.StorageWizardMoveProgress"
+                android:taskAffinity="com.android.settings.storage_wizard"
+                android:exported="false" />
+
+        <!-- Exported for SystemUI to trigger -->
+        <receiver android:name=".deviceinfo.StorageUnmountReceiver"
+                android:exported="true"
+                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 
         <activity android:name="ApnEditor"
                 android:label="@string/apn_edit">
@@ -1277,37 +1563,11 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$QuickLaunchSettingsActivity"
-                android:label="@string/quick_launch_title"
-                android:theme="@style/Theme.SubSettingsDialogWhenLarge">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.QUICK_LAUNCH_SETTINGS" />
-                <action android:name="com.android.settings.QUICK_LAUNCH_SETTINGS" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.quicklaunch.QuickLaunchSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity>
-
-        <activity android:name=".quicklaunch.BookmarkPicker"
-                  android:label="@string/quick_launch_title"
-                  android:theme="@style/Theme.SubSettingsDialogWhenLarge">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-        </activity>
-
         <activity android:name="Settings$DevelopmentSettingsActivity"
                 android:label="@string/development_settings_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                 <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1324,9 +1584,12 @@
                 android:label="@string/print_settings"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
@@ -1340,7 +1603,7 @@
                 android:label="@string/print_print_job"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$PrintSettingsActivity">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="printjob" android:pathPattern="*" />
@@ -1369,12 +1632,15 @@
                 android:label="@string/storage_title_usb"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$StorageSettingsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.STORAGE_USB_SETTINGS" />
                 <action android:name="com.android.settings.STORAGE_USB_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.deviceinfo.UsbSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
@@ -1400,7 +1666,7 @@
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1433,7 +1699,7 @@
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
                   android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
                 <action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1443,7 +1709,7 @@
         <activity android:name=".wifi.WifiScanModeActivity"
                   android:excludeFromRecents="true"
                   android:theme="@style/Transparent">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1477,7 +1743,7 @@
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH_ADMIN"
                   android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
                 <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1488,7 +1754,7 @@
                 android:label="@string/activity_picker_label"
                 android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"
                 android:finishOnCloseSystemDialogs="true">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.intent.action.PICK_ACTIVITY" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1499,9 +1765,12 @@
                 android:label="@string/android_beam_settings_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WirelessSettingsActivity">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.NFCSHARING_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.NFCSHARING_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1513,12 +1782,15 @@
         <activity android:name="Settings$WifiDisplaySettingsActivity"
                 android:label="@string/wifi_display_settings_title"
                 android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.WIFI_DISPLAY_SETTINGS" />
                 <action android:name="android.settings.CAST_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.wfd.WifiDisplaySettings" />
         </activity>
@@ -1602,7 +1874,7 @@
                 android:label="@string/widget_picker_title"
                 android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"
                 android:finishOnCloseSystemDialogs="true">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.appwidget.action.APPWIDGET_PICK" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1612,7 +1884,7 @@
                 android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"
                 android:finishOnCloseSystemDialogs="true"
                 android:excludeFromRecents="true">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.appwidget.action.APPWIDGET_BIND" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1630,9 +1902,12 @@
         <activity android:name="Settings$PowerUsageSummaryActivity"
                 android:label="@string/power_usage_summary_title"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
@@ -1656,9 +1931,12 @@
         <activity android:name="Settings$BatterySaverSettingsActivity"
                 android:label="@string/battery_saver"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.BATTERY_SAVER_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.BATTERY_SAVER_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
@@ -1670,13 +1948,27 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name=".fuelgauge.BatterySaverModeVoiceActivity"
+                android:label="@string/power_usage_summary_title"
+                android:theme="@android:style/Theme.Material.Light.Voice"
+                android:exported="true">
+            <intent-filter>
+                <action android:name="android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="Settings$AccountSettingsActivity"
             android:label="@string/account_settings_title"
             android:taskAffinity=""
             android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.SYNC_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.SYNC_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1689,9 +1981,12 @@
             android:label="@string/account_sync_settings_title"
             android:taskAffinity=""
             android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1708,9 +2003,12 @@
             android:label="@string/header_add_an_account"
             android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings$ManageAccountsSettingsActivity">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1723,6 +2021,7 @@
             android:theme="@style/Theme.SubSettingsDialogWhenLarge"/>
 
         <activity android:name=".CryptKeeper"
+                  androidprv:primaryUserOnly="true"
                   android:immersive="true"
                   android:launchMode="singleTop"
                   android:excludeFromRecents="true"
@@ -1752,9 +2051,12 @@
         <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
         <activity android:name="Settings$CryptKeeperSettingsActivity"
                 android:label="@string/crypt_keeper_encrypt_title">
+            <intent-filter android:priority="1">
+                <action android:name="android.app.action.START_ENCRYPTION" />
+                <category android:name="android.intent.category.DEFAULT" /> />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.app.action.START_ENCRYPTION" />
                 <category android:name="android.intent.category.DEFAULT" /> />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1780,9 +2082,12 @@
         <activity android:name="Settings$DreamSettingsActivity"
                 android:label="@string/screensaver_settings_title"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.DREAM_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.DREAM_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
@@ -1797,9 +2102,12 @@
         <activity android:name="Settings$UserSettingsActivity"
                 android:label="@string/user_settings_title"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.USER_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.USER_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1813,9 +2121,12 @@
         <activity android:name="Settings$PaymentSettingsActivity"
                 android:label="@string/nfc_payment_settings_title"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1830,7 +2141,7 @@
                   android:label="@string/nfc_payment_set_default_label"
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1842,7 +2153,7 @@
                   android:label="@string/sms_application_title"
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.provider.Telephony.ACTION_CHANGE_DEFAULT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1852,7 +2163,7 @@
                   android:label="@string/wifi_assistant_title"
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.net.scoring.CHANGE_ACTIVE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1861,9 +2172,12 @@
         <activity android:name="Settings$NotificationAccessSettingsActivity"
                   android:label="@string/manage_notification_access_title"
                   android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1872,27 +2186,16 @@
                        android:resource="@id/security_settings" />
         </activity>
 
-        <activity android:name="Settings$ConditionProviderSettingsActivity"
-                  android:label="@string/manage_condition_providers"
-                  android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.ACTION_CONDITION_PROVIDER_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.ConditionProviderSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                       android:resource="@id/notification_settings" />
-        </activity>
-
         <activity android:name="Settings$NotificationSettingsActivity"
                 android:label="@string/notification_settings"
                 android:exported="true"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.NOTIFICATION_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.NOTIFICATION_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
@@ -1909,11 +2212,14 @@
                 android:label="@string/notification_settings"
                 android:taskAffinity=""
                 android:targetActivity="Settings$NotificationSettingsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
                 <action android:name="com.android.settings.SOUND_SETTINGS" />
                 <action android:name="android.settings.SOUND_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>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1939,9 +2245,12 @@
                 android:label="@string/other_sound_settings"
                 android:exported="true"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ACTION_OTHER_SOUND_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.ACTION_OTHER_SOUND_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1956,7 +2265,7 @@
                 android:exported="true"
                 android:taskAffinity="">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.NotificationAppList" />
+                android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/notification_settings" />
         </activity>
@@ -1965,9 +2274,12 @@
         <activity android:name="Settings$AppNotificationSettingsActivity"
                 android:label="@string/app_notifications_title"
                 android:exported="true">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.APP_NOTIFICATION_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.APP_NOTIFICATION_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -2038,9 +2350,12 @@
         <activity android:name="Settings$SimSettingsActivity"
                 android:label="@string/sim_settings_title"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index be2e221..6ead46e 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -45,6 +45,7 @@
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Settings_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Settings_intermediates)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/proguard.flags b/proguard.flags
index 694ab29..578ff4d 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -7,6 +7,8 @@
 -keep class com.android.settings.bluetooth.*
 -keep class com.android.settings.applications.*
 -keep class com.android.settings.inputmethod.*
+-keep class com.android.settings.ResetNetwork
+-keep class com.android.settings.ResetNetworkConfirm
 -keep class com.android.settings.MasterClear
 -keep class com.android.settings.MasterClearConfirm
 -keep class com.android.settings.accounts.*
diff --git a/res/anim-ldrtl/slide_back_in.xml b/res/anim-ldrtl/slide_back_in.xml
deleted file mode 100644
index e5ab3e5..0000000
--- a/res/anim-ldrtl/slide_back_in.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/setup_wizard_transition_duration"
-    android:fromXDelta="100%"
-    android:toXDelta="0%"
-    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim-ldrtl/slide_back_out.xml b/res/anim-ldrtl/slide_back_out.xml
deleted file mode 100644
index 8717f6a..0000000
--- a/res/anim-ldrtl/slide_back_out.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/setup_wizard_transition_duration"
-    android:fromXDelta="0%"
-    android:toXDelta="-100%"
-    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim-ldrtl/slide_next_in.xml b/res/anim-ldrtl/slide_next_in.xml
deleted file mode 100644
index 009ea9f..0000000
--- a/res/anim-ldrtl/slide_next_in.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/setup_wizard_transition_duration"
-    android:fromXDelta="-100%"
-    android:toXDelta="0%"
-    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim-ldrtl/slide_next_out.xml b/res/anim-ldrtl/slide_next_out.xml
deleted file mode 100644
index b7ab2b6..0000000
--- a/res/anim-ldrtl/slide_next_out.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/setup_wizard_transition_duration"
-    android:fromXDelta="0%"
-    android:toXDelta="100%"
-    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/fab_elevation.xml b/res/anim/fab_elevation.xml
new file mode 100644
index 0000000..af75db0
--- /dev/null
+++ b/res/anim/fab_elevation.xml
@@ -0,0 +1,35 @@
+<?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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:state_pressed="true">
+        <set>
+            <objectAnimator
+                android:duration="@android:integer/config_shortAnimTime"
+                android:propertyName="translationZ"
+                android:valueTo="@dimen/fab_press_translation_z"
+                android:valueType="floatType" />
+        </set>
+    </item>
+    <item>
+        <set>
+            <objectAnimator
+                android:duration="@android:integer/config_shortAnimTime"
+                android:propertyName="translationZ"
+                android:valueTo="0"
+                android:valueType="floatType" />
+        </set>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/res/anim/slide_back_in.xml b/res/anim/slide_back_in.xml
deleted file mode 100644
index 009ea9f..0000000
--- a/res/anim/slide_back_in.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/setup_wizard_transition_duration"
-    android:fromXDelta="-100%"
-    android:toXDelta="0%"
-    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/slide_back_out.xml b/res/anim/slide_back_out.xml
deleted file mode 100644
index b7ab2b6..0000000
--- a/res/anim/slide_back_out.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/setup_wizard_transition_duration"
-    android:fromXDelta="0%"
-    android:toXDelta="100%"
-    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/slide_next_in.xml b/res/anim/slide_next_in.xml
deleted file mode 100644
index e5ab3e5..0000000
--- a/res/anim/slide_next_in.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/setup_wizard_transition_duration"
-    android:fromXDelta="100%"
-    android:toXDelta="0%"
-    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/slide_next_out.xml b/res/anim/slide_next_out.xml
deleted file mode 100644
index 8717f6a..0000000
--- a/res/anim/slide_next_out.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/setup_wizard_transition_duration"
-    android:fromXDelta="0%"
-    android:toXDelta="-100%"
-    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/drawable/setup_illustration_bg.xml b/res/color/lock_pattern_view_success_color.xml
similarity index 73%
copy from res/drawable/setup_illustration_bg.xml
copy to res/color/lock_pattern_view_success_color.xml
index 0a229c7..075e919 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/color/lock_pattern_view_success_color.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -15,6 +14,6 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?android:attr/colorAccent" />
+</selector>
diff --git a/res/drawable/setup_illustration_bg.xml b/res/color/unlock_pattern_view_success_color.xml
similarity index 73%
copy from res/drawable/setup_illustration_bg.xml
copy to res/color/unlock_pattern_view_success_color.xml
index 0a229c7..075e919 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/color/unlock_pattern_view_success_color.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -15,6 +14,6 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?android:attr/colorAccent" />
+</selector>
diff --git a/res/drawable-hdpi/ic_bt_cellphone.png b/res/drawable-hdpi/ic_bt_cellphone.png
deleted file mode 100644
index 6e29d23..0000000
--- a/res/drawable-hdpi/ic_bt_cellphone.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_headphones_a2dp.png b/res/drawable-hdpi/ic_bt_headphones_a2dp.png
deleted file mode 100644
index 6110e9e..0000000
--- a/res/drawable-hdpi/ic_bt_headphones_a2dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_headset_hfp.png b/res/drawable-hdpi/ic_bt_headset_hfp.png
deleted file mode 100644
index 6cca225..0000000
--- a/res/drawable-hdpi/ic_bt_headset_hfp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_misc_hid.png b/res/drawable-hdpi/ic_bt_misc_hid.png
deleted file mode 100644
index 6445f2a..0000000
--- a/res/drawable-hdpi/ic_bt_misc_hid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_network_pan.png b/res/drawable-hdpi/ic_bt_network_pan.png
deleted file mode 100644
index 78c0294..0000000
--- a/res/drawable-hdpi/ic_bt_network_pan.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_pointing_hid.png b/res/drawable-hdpi/ic_bt_pointing_hid.png
deleted file mode 100644
index 2fcc3b0..0000000
--- a/res/drawable-hdpi/ic_bt_pointing_hid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_about.png b/res/drawable-hdpi/ic_settings_about.png
deleted file mode 100644
index f4596ed..0000000
--- a/res/drawable-hdpi/ic_settings_about.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_about_alpha.png b/res/drawable-hdpi/ic_settings_about_alpha.png
new file mode 100644
index 0000000..1e38ba5
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_about_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_accessibility.png b/res/drawable-hdpi/ic_settings_accessibility.png
deleted file mode 100644
index 202ec9d..0000000
--- a/res/drawable-hdpi/ic_settings_accessibility.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_accessibility_alpha.png b/res/drawable-hdpi/ic_settings_accessibility_alpha.png
new file mode 100644
index 0000000..74ca88e
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_accessibility_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_accounts.png b/res/drawable-hdpi/ic_settings_accounts.png
deleted file mode 100644
index cdeb8b0..0000000
--- a/res/drawable-hdpi/ic_settings_accounts.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_accounts_alpha.png b/res/drawable-hdpi/ic_settings_accounts_alpha.png
new file mode 100644
index 0000000..c36216c
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_accounts_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_applications.png b/res/drawable-hdpi/ic_settings_applications.png
deleted file mode 100644
index 627b7cb..0000000
--- a/res/drawable-hdpi/ic_settings_applications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_applications_alpha.png b/res/drawable-hdpi/ic_settings_applications_alpha.png
new file mode 100644
index 0000000..1c46133
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_applications_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_backup.png b/res/drawable-hdpi/ic_settings_backup.png
deleted file mode 100644
index 701b6cf..0000000
--- a/res/drawable-hdpi/ic_settings_backup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_backup_alpha.png b/res/drawable-hdpi/ic_settings_backup_alpha.png
new file mode 100644
index 0000000..ef8acea
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_backup_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_battery.png b/res/drawable-hdpi/ic_settings_battery.png
deleted file mode 100644
index 75a2af9..0000000
--- a/res/drawable-hdpi/ic_settings_battery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_battery_alpha.png b/res/drawable-hdpi/ic_settings_battery_alpha.png
new file mode 100644
index 0000000..89013cf
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_battery_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_bluetooth.png b/res/drawable-hdpi/ic_settings_bluetooth.png
deleted file mode 100644
index 3d9015f..0000000
--- a/res/drawable-hdpi/ic_settings_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_bluetooth2.png b/res/drawable-hdpi/ic_settings_bluetooth2.png
deleted file mode 100644
index 9afe435..0000000
--- a/res/drawable-hdpi/ic_settings_bluetooth2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-hdpi/ic_settings_bluetooth2_alpha.png
new file mode 100644
index 0000000..9dbc509
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_bluetooth2_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_bluetooth_alpha.png b/res/drawable-hdpi/ic_settings_bluetooth_alpha.png
new file mode 100644
index 0000000..a21982e
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_bluetooth_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_data_usage.png b/res/drawable-hdpi/ic_settings_data_usage.png
deleted file mode 100644
index b274f4f..0000000
--- a/res/drawable-hdpi/ic_settings_data_usage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_data_usage_alpha.png b/res/drawable-hdpi/ic_settings_data_usage_alpha.png
new file mode 100644
index 0000000..68e0d8a
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_data_usage_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_date_time.png b/res/drawable-hdpi/ic_settings_date_time.png
deleted file mode 100644
index 5a84c33..0000000
--- a/res/drawable-hdpi/ic_settings_date_time.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_date_time_alpha.png b/res/drawable-hdpi/ic_settings_date_time_alpha.png
new file mode 100644
index 0000000..edea4ac
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_date_time_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_development.png b/res/drawable-hdpi/ic_settings_development.png
deleted file mode 100644
index 7f38de0..0000000
--- a/res/drawable-hdpi/ic_settings_development.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_development_alpha.png b/res/drawable-hdpi/ic_settings_development_alpha.png
new file mode 100644
index 0000000..44cfb57
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_development_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_display_am.png b/res/drawable-hdpi/ic_settings_display_am.png
deleted file mode 100644
index 24719b1..0000000
--- a/res/drawable-hdpi/ic_settings_display_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_display_am_alpha.png b/res/drawable-hdpi/ic_settings_display_am_alpha.png
new file mode 100644
index 0000000..7b8f909
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_display_am_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_dock.png b/res/drawable-hdpi/ic_settings_dock.png
deleted file mode 100644
index bdeaee7..0000000
--- a/res/drawable-hdpi/ic_settings_dock.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_dock_alpha.png b/res/drawable-hdpi/ic_settings_dock_alpha.png
new file mode 100644
index 0000000..98ef4e8
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_dock_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_home.png b/res/drawable-hdpi/ic_settings_home.png
deleted file mode 100644
index 6a0564a..0000000
--- a/res/drawable-hdpi/ic_settings_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_home_alpha.png b/res/drawable-hdpi/ic_settings_home_alpha.png
new file mode 100644
index 0000000..4ab9ae0
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_home_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_language.png b/res/drawable-hdpi/ic_settings_language.png
deleted file mode 100644
index e27035a..0000000
--- a/res/drawable-hdpi/ic_settings_language.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_language_alpha.png b/res/drawable-hdpi/ic_settings_language_alpha.png
new file mode 100644
index 0000000..5a65a5b
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_language_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_location.png b/res/drawable-hdpi/ic_settings_location.png
deleted file mode 100644
index 968253c..0000000
--- a/res/drawable-hdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_location_alpha.png b/res/drawable-hdpi/ic_settings_location_alpha.png
new file mode 100644
index 0000000..f90ce84
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_location_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_more.png b/res/drawable-hdpi/ic_settings_more.png
deleted file mode 100644
index 61bb00c..0000000
--- a/res/drawable-hdpi/ic_settings_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_more_alpha.png b/res/drawable-hdpi/ic_settings_more_alpha.png
new file mode 100644
index 0000000..38255a2
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_more_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_multiuser.png b/res/drawable-hdpi/ic_settings_multiuser.png
deleted file mode 100644
index c1a6e63..0000000
--- a/res/drawable-hdpi/ic_settings_multiuser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_multiuser_alpha.png b/res/drawable-hdpi/ic_settings_multiuser_alpha.png
new file mode 100644
index 0000000..c2efeba
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_multiuser_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_nfc_payment_am.png b/res/drawable-hdpi/ic_settings_nfc_payment_am.png
deleted file mode 100644
index 7431cb0..0000000
--- a/res/drawable-hdpi/ic_settings_nfc_payment_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png
new file mode 100644
index 0000000..0a71416
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_notifications.png b/res/drawable-hdpi/ic_settings_notifications.png
deleted file mode 100644
index 6dd91bb..0000000
--- a/res/drawable-hdpi/ic_settings_notifications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_notifications_alpha.png b/res/drawable-hdpi/ic_settings_notifications_alpha.png
new file mode 100644
index 0000000..fd6df67
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_notifications_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_print.png b/res/drawable-hdpi/ic_settings_print.png
deleted file mode 100644
index 62624ee..0000000
--- a/res/drawable-hdpi/ic_settings_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_print_alpha.png b/res/drawable-hdpi/ic_settings_print_alpha.png
new file mode 100644
index 0000000..06f8dac
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_print_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_security.png b/res/drawable-hdpi/ic_settings_security.png
deleted file mode 100644
index abbf3fa..0000000
--- a/res/drawable-hdpi/ic_settings_security.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_security_alpha.png b/res/drawable-hdpi/ic_settings_security_alpha.png
new file mode 100644
index 0000000..33c9505
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_security_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_sound.png b/res/drawable-hdpi/ic_settings_sound.png
deleted file mode 100644
index dec290a..0000000
--- a/res/drawable-hdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_sound_alpha.png b/res/drawable-hdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..beac382
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_storage.png b/res/drawable-hdpi/ic_settings_storage.png
deleted file mode 100644
index 5444eeb..0000000
--- a/res/drawable-hdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_storage_alpha.png b/res/drawable-hdpi/ic_settings_storage_alpha.png
new file mode 100644
index 0000000..a25da20
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_storage_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_sync.png b/res/drawable-hdpi/ic_settings_sync.png
deleted file mode 100644
index 96254d6..0000000
--- a/res/drawable-hdpi/ic_settings_sync.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_sync_alpha.png b/res/drawable-hdpi/ic_settings_sync_alpha.png
new file mode 100644
index 0000000..f7c0cc2
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_sync_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wifi.png b/res/drawable-hdpi/ic_settings_wifi.png
deleted file mode 100644
index b8c3eaa..0000000
--- a/res/drawable-hdpi/ic_settings_wifi.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wifi_alpha.png b/res/drawable-hdpi/ic_settings_wifi_alpha.png
new file mode 100644
index 0000000..a21982e
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_wifi_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wireless.png b/res/drawable-hdpi/ic_settings_wireless.png
deleted file mode 100644
index 5c82e8b..0000000
--- a/res/drawable-hdpi/ic_settings_wireless.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wireless_alpha.png b/res/drawable-hdpi/ic_settings_wireless_alpha.png
new file mode 100644
index 0000000..e5ad5ba
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_wireless_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_emptystate.png b/res/drawable-hdpi/ic_wifi_emptystate.png
deleted file mode 100644
index 0192537..0000000
--- a/res/drawable-hdpi/ic_wifi_emptystate.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png
deleted file mode 100644
index d0c9b30..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_teal.png
deleted file mode 100644
index 0bef891..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_1_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_teal.png
deleted file mode 100644
index 9252d90..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_2_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_teal.png
deleted file mode 100644
index a758ad4..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_3_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_teal.png
deleted file mode 100644
index 8378399..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_4_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_0_teal.png b/res/drawable-hdpi/ic_wifi_signal_0_teal.png
deleted file mode 100644
index 3030279..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_0_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_teal.png b/res/drawable-hdpi/ic_wifi_signal_1_teal.png
deleted file mode 100644
index 3340d95..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_1_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_teal.png b/res/drawable-hdpi/ic_wifi_signal_2_teal.png
deleted file mode 100644
index 180f7b1..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_2_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_teal.png b/res/drawable-hdpi/ic_wifi_signal_3_teal.png
deleted file mode 100644
index af27fb0..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_3_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_teal.png b/res/drawable-hdpi/ic_wifi_signal_4_teal.png
deleted file mode 100644
index 5c82e8b..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_4_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/illustration_horizontal.jpg b/res/drawable-hdpi/illustration_horizontal.jpg
new file mode 100644
index 0000000..428b2f4
--- /dev/null
+++ b/res/drawable-hdpi/illustration_horizontal.jpg
Binary files differ
diff --git a/res/drawable-hdpi/illustration_tile.jpg b/res/drawable-hdpi/illustration_tile.jpg
new file mode 100644
index 0000000..9931a23
--- /dev/null
+++ b/res/drawable-hdpi/illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-hdpi/setup_illustration_horizontal_tile.jpg b/res/drawable-hdpi/setup_illustration_horizontal_tile.jpg
index 428b2f4..8d330ce 100644
--- a/res/drawable-hdpi/setup_illustration_horizontal_tile.jpg
+++ b/res/drawable-hdpi/setup_illustration_horizontal_tile.jpg
Binary files differ
diff --git a/res/drawable-hdpi/setup_illustration_lock_screen.jpg b/res/drawable-hdpi/setup_illustration_lock_screen.jpg
index db697a0..0bf53fc 100644
--- a/res/drawable-hdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-hdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-hdpi/setup_illustration_tile.jpg b/res/drawable-hdpi/setup_illustration_tile.jpg
index 9931a23..d518abd 100644
--- a/res/drawable-hdpi/setup_illustration_tile.jpg
+++ b/res/drawable-hdpi/setup_illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-hdpi/setup_illustration_wifi.jpg b/res/drawable-hdpi/setup_illustration_wifi.jpg
index d38551e..f2b9c6a 100644
--- a/res/drawable-hdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-hdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_bt_cellphone.png b/res/drawable-ldrtl-hdpi/ic_bt_cellphone.png
deleted file mode 100644
index 2d9b75e..0000000
--- a/res/drawable-ldrtl-hdpi/ic_bt_cellphone.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_settings_sound.png b/res/drawable-ldrtl-hdpi/ic_settings_sound.png
deleted file mode 100755
index b703b4e..0000000
--- a/res/drawable-ldrtl-hdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_settings_sound_alpha.png b/res/drawable-ldrtl-hdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..cebb01f
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_bt_cellphone.png b/res/drawable-ldrtl-mdpi/ic_bt_cellphone.png
deleted file mode 100644
index b6ebe34..0000000
--- a/res/drawable-ldrtl-mdpi/ic_bt_cellphone.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_settings_sound.png b/res/drawable-ldrtl-mdpi/ic_settings_sound.png
deleted file mode 100644
index 419868f..0000000
--- a/res/drawable-ldrtl-mdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_settings_sound_alpha.png b/res/drawable-ldrtl-mdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..c7fe326
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_bt_cellphone.png b/res/drawable-ldrtl-xhdpi/ic_bt_cellphone.png
deleted file mode 100644
index 8b67b91..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_bt_cellphone.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_settings_sound.png b/res/drawable-ldrtl-xhdpi/ic_settings_sound.png
deleted file mode 100644
index 8d04d42..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_settings_sound_alpha.png b/res/drawable-ldrtl-xhdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..7503f50
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_cellphone.png b/res/drawable-mdpi/ic_bt_cellphone.png
deleted file mode 100644
index 1fa0a3d..0000000
--- a/res/drawable-mdpi/ic_bt_cellphone.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_headphones_a2dp.png b/res/drawable-mdpi/ic_bt_headphones_a2dp.png
deleted file mode 100644
index 175bd78..0000000
--- a/res/drawable-mdpi/ic_bt_headphones_a2dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_headset_hfp.png b/res/drawable-mdpi/ic_bt_headset_hfp.png
deleted file mode 100644
index 05b27e8..0000000
--- a/res/drawable-mdpi/ic_bt_headset_hfp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_misc_hid.png b/res/drawable-mdpi/ic_bt_misc_hid.png
deleted file mode 100644
index 6e9f8ae..0000000
--- a/res/drawable-mdpi/ic_bt_misc_hid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_network_pan.png b/res/drawable-mdpi/ic_bt_network_pan.png
deleted file mode 100644
index 5f3371f..0000000
--- a/res/drawable-mdpi/ic_bt_network_pan.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_pointing_hid.png b/res/drawable-mdpi/ic_bt_pointing_hid.png
deleted file mode 100644
index 539d77f..0000000
--- a/res/drawable-mdpi/ic_bt_pointing_hid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_about.png b/res/drawable-mdpi/ic_settings_about.png
deleted file mode 100644
index 8c5206e..0000000
--- a/res/drawable-mdpi/ic_settings_about.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_about_alpha.png b/res/drawable-mdpi/ic_settings_about_alpha.png
new file mode 100644
index 0000000..4065701
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_about_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_accessibility.png b/res/drawable-mdpi/ic_settings_accessibility.png
deleted file mode 100644
index d0229f6..0000000
--- a/res/drawable-mdpi/ic_settings_accessibility.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_accessibility_alpha.png b/res/drawable-mdpi/ic_settings_accessibility_alpha.png
new file mode 100644
index 0000000..c040ba0
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_accessibility_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_accounts.png b/res/drawable-mdpi/ic_settings_accounts.png
deleted file mode 100644
index 65008ce..0000000
--- a/res/drawable-mdpi/ic_settings_accounts.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_accounts_alpha.png b/res/drawable-mdpi/ic_settings_accounts_alpha.png
new file mode 100644
index 0000000..769b46a
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_accounts_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_applications.png b/res/drawable-mdpi/ic_settings_applications.png
deleted file mode 100644
index 60ebf38..0000000
--- a/res/drawable-mdpi/ic_settings_applications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_applications_alpha.png b/res/drawable-mdpi/ic_settings_applications_alpha.png
new file mode 100644
index 0000000..f2ea795
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_applications_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_backup.png b/res/drawable-mdpi/ic_settings_backup.png
deleted file mode 100644
index 4595bda..0000000
--- a/res/drawable-mdpi/ic_settings_backup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_backup_alpha.png b/res/drawable-mdpi/ic_settings_backup_alpha.png
new file mode 100644
index 0000000..932d354
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_backup_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_battery.png b/res/drawable-mdpi/ic_settings_battery.png
deleted file mode 100644
index 7a001fc..0000000
--- a/res/drawable-mdpi/ic_settings_battery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_battery_alpha.png b/res/drawable-mdpi/ic_settings_battery_alpha.png
new file mode 100644
index 0000000..970e6ed
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_battery_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_bluetooth.png b/res/drawable-mdpi/ic_settings_bluetooth.png
deleted file mode 100644
index 8cf80c0..0000000
--- a/res/drawable-mdpi/ic_settings_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_bluetooth2.png b/res/drawable-mdpi/ic_settings_bluetooth2.png
deleted file mode 100644
index f556bb4..0000000
--- a/res/drawable-mdpi/ic_settings_bluetooth2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-mdpi/ic_settings_bluetooth2_alpha.png
new file mode 100644
index 0000000..f51e5ca
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_bluetooth2_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_bluetooth_alpha.png b/res/drawable-mdpi/ic_settings_bluetooth_alpha.png
new file mode 100644
index 0000000..31be004
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_bluetooth_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_data_usage.png b/res/drawable-mdpi/ic_settings_data_usage.png
deleted file mode 100644
index e5d464d..0000000
--- a/res/drawable-mdpi/ic_settings_data_usage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_data_usage_alpha.png b/res/drawable-mdpi/ic_settings_data_usage_alpha.png
new file mode 100644
index 0000000..a368371
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_data_usage_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_date_time.png b/res/drawable-mdpi/ic_settings_date_time.png
deleted file mode 100644
index 80be678..0000000
--- a/res/drawable-mdpi/ic_settings_date_time.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_date_time_alpha.png b/res/drawable-mdpi/ic_settings_date_time_alpha.png
new file mode 100644
index 0000000..6837c11
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_date_time_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_development.png b/res/drawable-mdpi/ic_settings_development.png
deleted file mode 100644
index 44aaa29..0000000
--- a/res/drawable-mdpi/ic_settings_development.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_development_alpha.png b/res/drawable-mdpi/ic_settings_development_alpha.png
new file mode 100644
index 0000000..cdc3ffe
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_development_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_display_am.png b/res/drawable-mdpi/ic_settings_display_am.png
deleted file mode 100644
index c794f76..0000000
--- a/res/drawable-mdpi/ic_settings_display_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_display_am_alpha.png b/res/drawable-mdpi/ic_settings_display_am_alpha.png
new file mode 100644
index 0000000..f894832
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_display_am_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_dock.png b/res/drawable-mdpi/ic_settings_dock.png
deleted file mode 100644
index 62ccb3c..0000000
--- a/res/drawable-mdpi/ic_settings_dock.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_dock_alpha.png b/res/drawable-mdpi/ic_settings_dock_alpha.png
new file mode 100644
index 0000000..3ef7ab2
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_dock_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_home.png b/res/drawable-mdpi/ic_settings_home.png
deleted file mode 100644
index b18ca3e..0000000
--- a/res/drawable-mdpi/ic_settings_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_home_alpha.png b/res/drawable-mdpi/ic_settings_home_alpha.png
new file mode 100644
index 0000000..ad90fb8
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_home_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_language.png b/res/drawable-mdpi/ic_settings_language.png
deleted file mode 100644
index 604a710..0000000
--- a/res/drawable-mdpi/ic_settings_language.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_language_alpha.png b/res/drawable-mdpi/ic_settings_language_alpha.png
new file mode 100644
index 0000000..9149bb1
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_language_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_location.png b/res/drawable-mdpi/ic_settings_location.png
deleted file mode 100644
index de70e6f..0000000
--- a/res/drawable-mdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_location_alpha.png b/res/drawable-mdpi/ic_settings_location_alpha.png
new file mode 100644
index 0000000..0b42099
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_location_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_more.png b/res/drawable-mdpi/ic_settings_more.png
deleted file mode 100644
index bad02c8..0000000
--- a/res/drawable-mdpi/ic_settings_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_more_alpha.png b/res/drawable-mdpi/ic_settings_more_alpha.png
new file mode 100644
index 0000000..809bf53
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_more_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_multiuser.png b/res/drawable-mdpi/ic_settings_multiuser.png
deleted file mode 100644
index d6f8501..0000000
--- a/res/drawable-mdpi/ic_settings_multiuser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_multiuser_alpha.png b/res/drawable-mdpi/ic_settings_multiuser_alpha.png
new file mode 100644
index 0000000..4a90287
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_multiuser_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_nfc_payment_am.png b/res/drawable-mdpi/ic_settings_nfc_payment_am.png
deleted file mode 100644
index 1cf5e86..0000000
--- a/res/drawable-mdpi/ic_settings_nfc_payment_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png
new file mode 100644
index 0000000..1a66a30
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_notifications.png b/res/drawable-mdpi/ic_settings_notifications.png
deleted file mode 100644
index 407ec8c..0000000
--- a/res/drawable-mdpi/ic_settings_notifications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_notifications_alpha.png b/res/drawable-mdpi/ic_settings_notifications_alpha.png
new file mode 100644
index 0000000..8e255ae
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_notifications_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_print.png b/res/drawable-mdpi/ic_settings_print.png
deleted file mode 100644
index 76234a6..0000000
--- a/res/drawable-mdpi/ic_settings_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_print_alpha.png b/res/drawable-mdpi/ic_settings_print_alpha.png
new file mode 100644
index 0000000..e65113d
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_print_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_security.png b/res/drawable-mdpi/ic_settings_security.png
deleted file mode 100644
index cd65dd2..0000000
--- a/res/drawable-mdpi/ic_settings_security.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_security_alpha.png b/res/drawable-mdpi/ic_settings_security_alpha.png
new file mode 100644
index 0000000..b1a7cd0
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_security_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_sound.png b/res/drawable-mdpi/ic_settings_sound.png
deleted file mode 100644
index 17b2cc4..0000000
--- a/res/drawable-mdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_sound_alpha.png b/res/drawable-mdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..4a292ee
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_storage.png b/res/drawable-mdpi/ic_settings_storage.png
deleted file mode 100644
index ff6af99..0000000
--- a/res/drawable-mdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_storage_alpha.png b/res/drawable-mdpi/ic_settings_storage_alpha.png
new file mode 100644
index 0000000..ddbde7c
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_storage_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_sync.png b/res/drawable-mdpi/ic_settings_sync.png
deleted file mode 100644
index fbd03ba..0000000
--- a/res/drawable-mdpi/ic_settings_sync.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_sync_alpha.png b/res/drawable-mdpi/ic_settings_sync_alpha.png
new file mode 100644
index 0000000..850e594
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_sync_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wifi.png b/res/drawable-mdpi/ic_settings_wifi.png
deleted file mode 100644
index e8f3129..0000000
--- a/res/drawable-mdpi/ic_settings_wifi.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wifi_alpha.png b/res/drawable-mdpi/ic_settings_wifi_alpha.png
new file mode 100644
index 0000000..31be004
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_wifi_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wireless.png b/res/drawable-mdpi/ic_settings_wireless.png
deleted file mode 100644
index 6b81932f..0000000
--- a/res/drawable-mdpi/ic_settings_wireless.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wireless_alpha.png b/res/drawable-mdpi/ic_settings_wireless_alpha.png
new file mode 100644
index 0000000..7bb2dfb
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_wireless_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_emptystate.png b/res/drawable-mdpi/ic_wifi_emptystate.png
deleted file mode 100644
index 15f8df8..0000000
--- a/res/drawable-mdpi/ic_wifi_emptystate.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_0_teal.png
deleted file mode 100644
index d746c1e..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_0_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_teal.png
deleted file mode 100644
index 01f6f87..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_1_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_teal.png
deleted file mode 100644
index 230b1a3..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_2_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_teal.png
deleted file mode 100644
index 20fe9a5..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_3_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_teal.png
deleted file mode 100644
index 938a203..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_4_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_0_teal.png b/res/drawable-mdpi/ic_wifi_signal_0_teal.png
deleted file mode 100644
index 9dcdf91..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_0_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_teal.png b/res/drawable-mdpi/ic_wifi_signal_1_teal.png
deleted file mode 100644
index b58d5f4..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_1_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_teal.png b/res/drawable-mdpi/ic_wifi_signal_2_teal.png
deleted file mode 100644
index 5cbb5a3..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_2_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_teal.png b/res/drawable-mdpi/ic_wifi_signal_3_teal.png
deleted file mode 100644
index cec46b0..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_3_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_teal.png b/res/drawable-mdpi/ic_wifi_signal_4_teal.png
deleted file mode 100644
index 6b81932f..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_4_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/illustration_horizontal.jpg b/res/drawable-mdpi/illustration_horizontal.jpg
new file mode 100644
index 0000000..52e7993
--- /dev/null
+++ b/res/drawable-mdpi/illustration_horizontal.jpg
Binary files differ
diff --git a/res/drawable-mdpi/illustration_tile.jpg b/res/drawable-mdpi/illustration_tile.jpg
new file mode 100644
index 0000000..7923fb4
--- /dev/null
+++ b/res/drawable-mdpi/illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_horizontal_tile.jpg b/res/drawable-mdpi/setup_illustration_horizontal_tile.jpg
index 52e7993..2b9b04b 100644
--- a/res/drawable-mdpi/setup_illustration_horizontal_tile.jpg
+++ b/res/drawable-mdpi/setup_illustration_horizontal_tile.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_lock_screen.jpg b/res/drawable-mdpi/setup_illustration_lock_screen.jpg
index 95e2b8c..9ab9117 100644
--- a/res/drawable-mdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-mdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_tile.jpg b/res/drawable-mdpi/setup_illustration_tile.jpg
index 7923fb4..f2e1bcb 100644
--- a/res/drawable-mdpi/setup_illustration_tile.jpg
+++ b/res/drawable-mdpi/setup_illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_wifi.jpg b/res/drawable-mdpi/setup_illustration_wifi.jpg
index a497bf5..7f5e788 100644
--- a/res/drawable-mdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-mdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-nodpi/illustration_generic.jpg b/res/drawable-nodpi/illustration_generic.jpg
new file mode 100644
index 0000000..f37eaf4
--- /dev/null
+++ b/res/drawable-nodpi/illustration_generic.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/illustration_generic.jpg b/res/drawable-sw600dp-hdpi/illustration_generic.jpg
new file mode 100644
index 0000000..7aac7f9
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/illustration_generic.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg
index 03cd9d9..26cff1d 100644
--- a/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg b/res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg
index fccea72..7359f56 100644
--- a/res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/illustration_generic.jpg b/res/drawable-sw600dp-mdpi/illustration_generic.jpg
new file mode 100644
index 0000000..34d0f33
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/illustration_generic.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg
index 4a7ab38..386fc8d 100644
--- a/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg b/res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg
index f21dffb..9b13e51 100644
--- a/res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/illustration_generic.jpg b/res/drawable-sw600dp-xhdpi/illustration_generic.jpg
new file mode 100644
index 0000000..4fe849f
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/illustration_generic.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg
index 05f7725..54362e7 100644
--- a/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg b/res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg
index 3d1b3f3..dc9e385 100644
--- a/res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxhdpi/illustration_generic.jpg b/res/drawable-sw600dp-xxhdpi/illustration_generic.jpg
new file mode 100644
index 0000000..48bca97
--- /dev/null
+++ b/res/drawable-sw600dp-xxhdpi/illustration_generic.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg
index da3f7d9..4f62b84 100644
--- a/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg b/res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg
index 6a590b7..b57bc17 100644
--- a/res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg
index fd5da99..2c6b57e 100644
--- a/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg b/res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg
index d6f2f82..b940a9b 100644
--- a/res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp/setup_illustration.xml b/res/drawable-sw600dp/setup_illustration.xml
deleted file mode 100644
index c0e54e2..0000000
--- a/res/drawable-sw600dp/setup_illustration.xml
+++ /dev/null
@@ -1,33 +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.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true">
-
-    <item>
-        <bitmap android:src="@drawable/setup_illustration_horizontal_tile"
-            android:gravity="top"
-            android:tileModeX="repeat"
-            android:tileModeY="disabled" />
-    </item>
-
-    <item android:id="@+id/illustration_image">
-        <bitmap android:src="@drawable/setup_illustration_wifi"
-            android:gravity="top|start" />
-    </item>
-
-</layer-list>
diff --git a/res/drawable-xhdpi/ic_bt_cellphone.png b/res/drawable-xhdpi/ic_bt_cellphone.png
deleted file mode 100644
index 4f381ba..0000000
--- a/res/drawable-xhdpi/ic_bt_cellphone.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_headphones_a2dp.png b/res/drawable-xhdpi/ic_bt_headphones_a2dp.png
deleted file mode 100644
index c67127d..0000000
--- a/res/drawable-xhdpi/ic_bt_headphones_a2dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_headset_hfp.png b/res/drawable-xhdpi/ic_bt_headset_hfp.png
deleted file mode 100644
index d3b356b..0000000
--- a/res/drawable-xhdpi/ic_bt_headset_hfp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_misc_hid.png b/res/drawable-xhdpi/ic_bt_misc_hid.png
deleted file mode 100644
index 2d38129..0000000
--- a/res/drawable-xhdpi/ic_bt_misc_hid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_network_pan.png b/res/drawable-xhdpi/ic_bt_network_pan.png
deleted file mode 100644
index fb76575..0000000
--- a/res/drawable-xhdpi/ic_bt_network_pan.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_pointing_hid.png b/res/drawable-xhdpi/ic_bt_pointing_hid.png
deleted file mode 100644
index d8b68eb..0000000
--- a/res/drawable-xhdpi/ic_bt_pointing_hid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_about.png b/res/drawable-xhdpi/ic_settings_about.png
deleted file mode 100644
index 188b362..0000000
--- a/res/drawable-xhdpi/ic_settings_about.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_about_alpha.png b/res/drawable-xhdpi/ic_settings_about_alpha.png
new file mode 100644
index 0000000..c64616f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_about_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_accessibility.png b/res/drawable-xhdpi/ic_settings_accessibility.png
deleted file mode 100644
index 297a08b..0000000
--- a/res/drawable-xhdpi/ic_settings_accessibility.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_accessibility_alpha.png b/res/drawable-xhdpi/ic_settings_accessibility_alpha.png
new file mode 100644
index 0000000..d7f5c4d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_accessibility_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_accounts.png b/res/drawable-xhdpi/ic_settings_accounts.png
deleted file mode 100644
index 8538036..0000000
--- a/res/drawable-xhdpi/ic_settings_accounts.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_accounts_alpha.png b/res/drawable-xhdpi/ic_settings_accounts_alpha.png
new file mode 100644
index 0000000..6937eb1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_accounts_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_applications.png b/res/drawable-xhdpi/ic_settings_applications.png
deleted file mode 100644
index f8122ba..0000000
--- a/res/drawable-xhdpi/ic_settings_applications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_applications_alpha.png b/res/drawable-xhdpi/ic_settings_applications_alpha.png
new file mode 100644
index 0000000..1d022e6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_applications_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_backup.png b/res/drawable-xhdpi/ic_settings_backup.png
deleted file mode 100644
index 73d718b..0000000
--- a/res/drawable-xhdpi/ic_settings_backup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_backup_alpha.png b/res/drawable-xhdpi/ic_settings_backup_alpha.png
new file mode 100644
index 0000000..93e7399
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_backup_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_battery.png b/res/drawable-xhdpi/ic_settings_battery.png
deleted file mode 100644
index 6825b71..0000000
--- a/res/drawable-xhdpi/ic_settings_battery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_battery_alpha.png b/res/drawable-xhdpi/ic_settings_battery_alpha.png
new file mode 100644
index 0000000..16d290d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_battery_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth.png b/res/drawable-xhdpi/ic_settings_bluetooth.png
deleted file mode 100644
index a75b550..0000000
--- a/res/drawable-xhdpi/ic_settings_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth2.png b/res/drawable-xhdpi/ic_settings_bluetooth2.png
deleted file mode 100644
index 3767382..0000000
--- a/res/drawable-xhdpi/ic_settings_bluetooth2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-xhdpi/ic_settings_bluetooth2_alpha.png
new file mode 100644
index 0000000..a3e09db
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_bluetooth2_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth_alpha.png b/res/drawable-xhdpi/ic_settings_bluetooth_alpha.png
new file mode 100644
index 0000000..cee4e67
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_bluetooth_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_data_usage.png b/res/drawable-xhdpi/ic_settings_data_usage.png
deleted file mode 100644
index 57cf2b1..0000000
--- a/res/drawable-xhdpi/ic_settings_data_usage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_data_usage_alpha.png b/res/drawable-xhdpi/ic_settings_data_usage_alpha.png
new file mode 100644
index 0000000..8ef9d09
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_data_usage_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_date_time.png b/res/drawable-xhdpi/ic_settings_date_time.png
deleted file mode 100644
index 8a40de8..0000000
--- a/res/drawable-xhdpi/ic_settings_date_time.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_date_time_alpha.png b/res/drawable-xhdpi/ic_settings_date_time_alpha.png
new file mode 100644
index 0000000..ad45114
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_date_time_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_development.png b/res/drawable-xhdpi/ic_settings_development.png
deleted file mode 100644
index 22050369..0000000
--- a/res/drawable-xhdpi/ic_settings_development.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_development_alpha.png b/res/drawable-xhdpi/ic_settings_development_alpha.png
new file mode 100644
index 0000000..3a4b3d9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_development_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_display_am.png b/res/drawable-xhdpi/ic_settings_display_am.png
deleted file mode 100644
index be367f3..0000000
--- a/res/drawable-xhdpi/ic_settings_display_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_display_am_alpha.png b/res/drawable-xhdpi/ic_settings_display_am_alpha.png
new file mode 100644
index 0000000..05e82fb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_display_am_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_dock.png b/res/drawable-xhdpi/ic_settings_dock.png
deleted file mode 100644
index e7eb120..0000000
--- a/res/drawable-xhdpi/ic_settings_dock.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_dock_alpha.png b/res/drawable-xhdpi/ic_settings_dock_alpha.png
new file mode 100644
index 0000000..eb01a66
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_dock_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_home.png b/res/drawable-xhdpi/ic_settings_home.png
deleted file mode 100644
index 3cb118d..0000000
--- a/res/drawable-xhdpi/ic_settings_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_home_alpha.png b/res/drawable-xhdpi/ic_settings_home_alpha.png
new file mode 100644
index 0000000..7098fbf
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_home_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_language.png b/res/drawable-xhdpi/ic_settings_language.png
deleted file mode 100644
index 4e44c01..0000000
--- a/res/drawable-xhdpi/ic_settings_language.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_language_alpha.png b/res/drawable-xhdpi/ic_settings_language_alpha.png
new file mode 100644
index 0000000..9b922e3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_language_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_location.png b/res/drawable-xhdpi/ic_settings_location.png
deleted file mode 100644
index cd2e7b5..0000000
--- a/res/drawable-xhdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_location_alpha.png b/res/drawable-xhdpi/ic_settings_location_alpha.png
new file mode 100644
index 0000000..fca5cf2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_location_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_more.png b/res/drawable-xhdpi/ic_settings_more.png
deleted file mode 100644
index 8b9fe07..0000000
--- a/res/drawable-xhdpi/ic_settings_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_more_alpha.png b/res/drawable-xhdpi/ic_settings_more_alpha.png
new file mode 100644
index 0000000..0747c87
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_more_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_multiuser.png b/res/drawable-xhdpi/ic_settings_multiuser.png
deleted file mode 100644
index e1b3932..0000000
--- a/res/drawable-xhdpi/ic_settings_multiuser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_multiuser_alpha.png b/res/drawable-xhdpi/ic_settings_multiuser_alpha.png
new file mode 100644
index 0000000..b51072e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_multiuser_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_nfc_payment_am.png b/res/drawable-xhdpi/ic_settings_nfc_payment_am.png
deleted file mode 100644
index 4cf007d..0000000
--- a/res/drawable-xhdpi/ic_settings_nfc_payment_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png
new file mode 100644
index 0000000..9aa2fd2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_notifications.png b/res/drawable-xhdpi/ic_settings_notifications.png
deleted file mode 100644
index a67930e..0000000
--- a/res/drawable-xhdpi/ic_settings_notifications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_notifications_alpha.png b/res/drawable-xhdpi/ic_settings_notifications_alpha.png
new file mode 100644
index 0000000..a5fd6ae
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_notifications_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_print.png b/res/drawable-xhdpi/ic_settings_print.png
deleted file mode 100644
index 9ea3b85..0000000
--- a/res/drawable-xhdpi/ic_settings_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_print_alpha.png b/res/drawable-xhdpi/ic_settings_print_alpha.png
new file mode 100644
index 0000000..9afa8d2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_print_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_security.png b/res/drawable-xhdpi/ic_settings_security.png
deleted file mode 100644
index 5ead24e..0000000
--- a/res/drawable-xhdpi/ic_settings_security.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_security_alpha.png b/res/drawable-xhdpi/ic_settings_security_alpha.png
new file mode 100644
index 0000000..cc79239
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_security_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sound.png b/res/drawable-xhdpi/ic_settings_sound.png
deleted file mode 100644
index 644e593..0000000
--- a/res/drawable-xhdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sound_alpha.png b/res/drawable-xhdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..603bc71
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_storage.png b/res/drawable-xhdpi/ic_settings_storage.png
deleted file mode 100644
index 51ded7e..0000000
--- a/res/drawable-xhdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_storage_alpha.png b/res/drawable-xhdpi/ic_settings_storage_alpha.png
new file mode 100644
index 0000000..556abdf
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_storage_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sync.png b/res/drawable-xhdpi/ic_settings_sync.png
deleted file mode 100644
index 50f3bf8..0000000
--- a/res/drawable-xhdpi/ic_settings_sync.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sync_alpha.png b/res/drawable-xhdpi/ic_settings_sync_alpha.png
new file mode 100644
index 0000000..87e01fb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_sync_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wifi.png b/res/drawable-xhdpi/ic_settings_wifi.png
deleted file mode 100644
index 2bd4648..0000000
--- a/res/drawable-xhdpi/ic_settings_wifi.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wifi_alpha.png b/res/drawable-xhdpi/ic_settings_wifi_alpha.png
new file mode 100644
index 0000000..cee4e67
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_wifi_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wireless.png b/res/drawable-xhdpi/ic_settings_wireless.png
deleted file mode 100644
index ad6a98e..0000000
--- a/res/drawable-xhdpi/ic_settings_wireless.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wireless_alpha.png b/res/drawable-xhdpi/ic_settings_wireless_alpha.png
new file mode 100644
index 0000000..cd7c175
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_wireless_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_emptystate.png b/res/drawable-xhdpi/ic_wifi_emptystate.png
deleted file mode 100644
index 7853cb0..0000000
--- a/res/drawable-xhdpi/ic_wifi_emptystate.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_0_teal.png
deleted file mode 100644
index 8d99e31..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_0_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_teal.png
deleted file mode 100644
index da282b6..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_1_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_teal.png
deleted file mode 100644
index b6a378f..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_2_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_teal.png
deleted file mode 100644
index 7227b08..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_3_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_teal.png
deleted file mode 100644
index 92257c3..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_4_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xhdpi/ic_wifi_signal_0_teal.png
deleted file mode 100644
index 08aba96..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_0_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xhdpi/ic_wifi_signal_1_teal.png
deleted file mode 100644
index 8d282c9..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_1_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xhdpi/ic_wifi_signal_2_teal.png
deleted file mode 100644
index 6caedf9..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_2_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xhdpi/ic_wifi_signal_3_teal.png
deleted file mode 100644
index 799c9e3..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_3_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xhdpi/ic_wifi_signal_4_teal.png
deleted file mode 100644
index ad6a98e..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_4_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/illustration_horizontal.jpg b/res/drawable-xhdpi/illustration_horizontal.jpg
new file mode 100644
index 0000000..2733f8e
--- /dev/null
+++ b/res/drawable-xhdpi/illustration_horizontal.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/illustration_tile.jpg b/res/drawable-xhdpi/illustration_tile.jpg
new file mode 100644
index 0000000..57bccca
--- /dev/null
+++ b/res/drawable-xhdpi/illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_horizontal_tile.jpg b/res/drawable-xhdpi/setup_illustration_horizontal_tile.jpg
index 2733f8e..ae67f38 100644
--- a/res/drawable-xhdpi/setup_illustration_horizontal_tile.jpg
+++ b/res/drawable-xhdpi/setup_illustration_horizontal_tile.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xhdpi/setup_illustration_lock_screen.jpg
index b6b856e..ddad6d5 100644
--- a/res/drawable-xhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-xhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_tile.jpg b/res/drawable-xhdpi/setup_illustration_tile.jpg
index 57bccca..8beeda8 100644
--- a/res/drawable-xhdpi/setup_illustration_tile.jpg
+++ b/res/drawable-xhdpi/setup_illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_wifi.jpg b/res/drawable-xhdpi/setup_illustration_wifi.jpg
index a399c19..19478aa 100644
--- a/res/drawable-xhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-xhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/fingerprint_in_app_indicator.png b/res/drawable-xxhdpi/fingerprint_in_app_indicator.png
new file mode 100644
index 0000000..fc56a9a
--- /dev/null
+++ b/res/drawable-xxhdpi/fingerprint_in_app_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/fingerprint_indicator.png b/res/drawable-xxhdpi/fingerprint_indicator.png
new file mode 100644
index 0000000..fc5ef0f
--- /dev/null
+++ b/res/drawable-xxhdpi/fingerprint_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/fingerprint_sensor_location.png b/res/drawable-xxhdpi/fingerprint_sensor_location.png
new file mode 100644
index 0000000..b95816f
--- /dev/null
+++ b/res/drawable-xxhdpi/fingerprint_sensor_location.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bt_cellphone.png b/res/drawable-xxhdpi/ic_bt_cellphone.png
deleted file mode 100644
index 7805b7a..0000000
--- a/res/drawable-xxhdpi/ic_bt_cellphone.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bt_headphones_a2dp.png b/res/drawable-xxhdpi/ic_bt_headphones_a2dp.png
deleted file mode 100644
index 8127774..0000000
--- a/res/drawable-xxhdpi/ic_bt_headphones_a2dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bt_headset_hfp.png b/res/drawable-xxhdpi/ic_bt_headset_hfp.png
deleted file mode 100644
index 84b8085..0000000
--- a/res/drawable-xxhdpi/ic_bt_headset_hfp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bt_misc_hid.png b/res/drawable-xxhdpi/ic_bt_misc_hid.png
deleted file mode 100644
index 289d6ac..0000000
--- a/res/drawable-xxhdpi/ic_bt_misc_hid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bt_network_pan.png b/res/drawable-xxhdpi/ic_bt_network_pan.png
deleted file mode 100644
index 72bc804..0000000
--- a/res/drawable-xxhdpi/ic_bt_network_pan.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bt_pointing_hid.png b/res/drawable-xxhdpi/ic_bt_pointing_hid.png
deleted file mode 100644
index e31ce2b..0000000
--- a/res/drawable-xxhdpi/ic_bt_pointing_hid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_about.png b/res/drawable-xxhdpi/ic_settings_about.png
deleted file mode 100644
index ae91bad..0000000
--- a/res/drawable-xxhdpi/ic_settings_about.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_about_alpha.png b/res/drawable-xxhdpi/ic_settings_about_alpha.png
new file mode 100644
index 0000000..f4cbde6
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_about_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_accessibility.png b/res/drawable-xxhdpi/ic_settings_accessibility.png
deleted file mode 100644
index 08ee9c4..0000000
--- a/res/drawable-xxhdpi/ic_settings_accessibility.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_accessibility_alpha.png b/res/drawable-xxhdpi/ic_settings_accessibility_alpha.png
new file mode 100644
index 0000000..b3dbab6
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_accessibility_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_accounts.png b/res/drawable-xxhdpi/ic_settings_accounts.png
deleted file mode 100644
index 6371c62..0000000
--- a/res/drawable-xxhdpi/ic_settings_accounts.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_accounts_alpha.png b/res/drawable-xxhdpi/ic_settings_accounts_alpha.png
new file mode 100644
index 0000000..b7ebc4b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_accounts_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_applications.png b/res/drawable-xxhdpi/ic_settings_applications.png
deleted file mode 100644
index db8c9c4..0000000
--- a/res/drawable-xxhdpi/ic_settings_applications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_applications_alpha.png b/res/drawable-xxhdpi/ic_settings_applications_alpha.png
new file mode 100644
index 0000000..cb1caf9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_applications_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_backup.png b/res/drawable-xxhdpi/ic_settings_backup.png
deleted file mode 100644
index d7add84..0000000
--- a/res/drawable-xxhdpi/ic_settings_backup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_backup_alpha.png b/res/drawable-xxhdpi/ic_settings_backup_alpha.png
new file mode 100644
index 0000000..762095d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_backup_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_battery.png b/res/drawable-xxhdpi/ic_settings_battery.png
deleted file mode 100644
index 1648ee4..0000000
--- a/res/drawable-xxhdpi/ic_settings_battery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_battery_alpha.png b/res/drawable-xxhdpi/ic_settings_battery_alpha.png
new file mode 100644
index 0000000..733a787
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_battery_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_bluetooth2.png b/res/drawable-xxhdpi/ic_settings_bluetooth2.png
deleted file mode 100644
index ad5e802..0000000
--- a/res/drawable-xxhdpi/ic_settings_bluetooth2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-xxhdpi/ic_settings_bluetooth2_alpha.png
new file mode 100644
index 0000000..2cc0577
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_bluetooth2_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_data_usage.png b/res/drawable-xxhdpi/ic_settings_data_usage.png
deleted file mode 100644
index 4460509..0000000
--- a/res/drawable-xxhdpi/ic_settings_data_usage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_data_usage_alpha.png b/res/drawable-xxhdpi/ic_settings_data_usage_alpha.png
new file mode 100644
index 0000000..6586a5c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_data_usage_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_date_time.png b/res/drawable-xxhdpi/ic_settings_date_time.png
deleted file mode 100644
index dd13084..0000000
--- a/res/drawable-xxhdpi/ic_settings_date_time.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_date_time_alpha.png b/res/drawable-xxhdpi/ic_settings_date_time_alpha.png
new file mode 100644
index 0000000..875e1dd
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_date_time_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_development.png b/res/drawable-xxhdpi/ic_settings_development.png
deleted file mode 100644
index 35555d4..0000000
--- a/res/drawable-xxhdpi/ic_settings_development.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_development_alpha.png b/res/drawable-xxhdpi/ic_settings_development_alpha.png
new file mode 100644
index 0000000..fc23084
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_development_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_display_am.png b/res/drawable-xxhdpi/ic_settings_display_am.png
deleted file mode 100644
index a16ee17..0000000
--- a/res/drawable-xxhdpi/ic_settings_display_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_display_am_alpha.png b/res/drawable-xxhdpi/ic_settings_display_am_alpha.png
new file mode 100644
index 0000000..9dd90a1
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_display_am_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_dock.png b/res/drawable-xxhdpi/ic_settings_dock.png
deleted file mode 100644
index 24f2351..0000000
--- a/res/drawable-xxhdpi/ic_settings_dock.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_dock_alpha.png b/res/drawable-xxhdpi/ic_settings_dock_alpha.png
new file mode 100644
index 0000000..f8550be
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_dock_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_home.png b/res/drawable-xxhdpi/ic_settings_home.png
deleted file mode 100644
index 5a7e813..0000000
--- a/res/drawable-xxhdpi/ic_settings_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_home_alpha.png b/res/drawable-xxhdpi/ic_settings_home_alpha.png
new file mode 100644
index 0000000..653c08c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_home_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_language.png b/res/drawable-xxhdpi/ic_settings_language.png
deleted file mode 100644
index 3d6559d..0000000
--- a/res/drawable-xxhdpi/ic_settings_language.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_language_alpha.png b/res/drawable-xxhdpi/ic_settings_language_alpha.png
new file mode 100644
index 0000000..9db2b5d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_language_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_location.png b/res/drawable-xxhdpi/ic_settings_location.png
deleted file mode 100644
index 3fe4b9d..0000000
--- a/res/drawable-xxhdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_location_alpha.png b/res/drawable-xxhdpi/ic_settings_location_alpha.png
new file mode 100644
index 0000000..b7c2776
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_location_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_more.png b/res/drawable-xxhdpi/ic_settings_more.png
deleted file mode 100644
index 0e0ba13..0000000
--- a/res/drawable-xxhdpi/ic_settings_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_more_alpha.png b/res/drawable-xxhdpi/ic_settings_more_alpha.png
new file mode 100644
index 0000000..7b44cac
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_more_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_multiuser.png b/res/drawable-xxhdpi/ic_settings_multiuser.png
deleted file mode 100644
index b5155d7..0000000
--- a/res/drawable-xxhdpi/ic_settings_multiuser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_multiuser_alpha.png b/res/drawable-xxhdpi/ic_settings_multiuser_alpha.png
new file mode 100644
index 0000000..25ba926
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_multiuser_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_nfc_payment_am.png b/res/drawable-xxhdpi/ic_settings_nfc_payment_am.png
deleted file mode 100644
index 0b9e41e..0000000
--- a/res/drawable-xxhdpi/ic_settings_nfc_payment_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png
new file mode 100644
index 0000000..6e09248
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_notifications.png b/res/drawable-xxhdpi/ic_settings_notifications.png
deleted file mode 100644
index 3f0e063..0000000
--- a/res/drawable-xxhdpi/ic_settings_notifications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_notifications_alpha.png b/res/drawable-xxhdpi/ic_settings_notifications_alpha.png
new file mode 100644
index 0000000..946c31a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_notifications_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_print.png b/res/drawable-xxhdpi/ic_settings_print.png
deleted file mode 100644
index a0058dc..0000000
--- a/res/drawable-xxhdpi/ic_settings_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_print_alpha.png b/res/drawable-xxhdpi/ic_settings_print_alpha.png
new file mode 100644
index 0000000..4fe082e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_print_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_security.png b/res/drawable-xxhdpi/ic_settings_security.png
deleted file mode 100644
index 0c317aa..0000000
--- a/res/drawable-xxhdpi/ic_settings_security.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_security_alpha.png b/res/drawable-xxhdpi/ic_settings_security_alpha.png
new file mode 100644
index 0000000..c815e43
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_security_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_sound.png b/res/drawable-xxhdpi/ic_settings_sound.png
deleted file mode 100644
index 5283caf..0000000
--- a/res/drawable-xxhdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_sound_alpha.png b/res/drawable-xxhdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..4461c1f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_storage.png b/res/drawable-xxhdpi/ic_settings_storage.png
deleted file mode 100644
index 45c42a7..0000000
--- a/res/drawable-xxhdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_storage_alpha.png b/res/drawable-xxhdpi/ic_settings_storage_alpha.png
new file mode 100644
index 0000000..ec53b8a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_storage_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_sync.png b/res/drawable-xxhdpi/ic_settings_sync.png
deleted file mode 100644
index 2a09495..0000000
--- a/res/drawable-xxhdpi/ic_settings_sync.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_sync_alpha.png b/res/drawable-xxhdpi/ic_settings_sync_alpha.png
new file mode 100644
index 0000000..3a36ef3
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_sync_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_wireless.png b/res/drawable-xxhdpi/ic_settings_wireless.png
deleted file mode 100644
index 3058e98..0000000
--- a/res/drawable-xxhdpi/ic_settings_wireless.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_wireless_alpha.png b/res/drawable-xxhdpi/ic_settings_wireless_alpha.png
new file mode 100644
index 0000000..3640551
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_wireless_alpha.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_emptystate.png b/res/drawable-xxhdpi/ic_wifi_emptystate.png
deleted file mode 100644
index 6f47efb..0000000
--- a/res/drawable-xxhdpi/ic_wifi_emptystate.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_0_teal.png
deleted file mode 100644
index 544c041..0000000
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_0_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_teal.png
deleted file mode 100644
index ac0cb62..0000000
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_teal.png
deleted file mode 100644
index beb6e12..0000000
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_teal.png
deleted file mode 100644
index 3eaaf39..0000000
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_teal.png
deleted file mode 100644
index 8b6bfb1..0000000
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png
deleted file mode 100644
index f28f0ad..0000000
--- a/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png
deleted file mode 100644
index 1728dc7..0000000
--- a/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png
deleted file mode 100644
index e7e4788..0000000
--- a/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png
deleted file mode 100644
index c2967ed..0000000
--- a/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png
deleted file mode 100644
index 3058e98..0000000
--- a/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/illustration_horizontal.jpg b/res/drawable-xxhdpi/illustration_horizontal.jpg
new file mode 100644
index 0000000..aec8d0f
--- /dev/null
+++ b/res/drawable-xxhdpi/illustration_horizontal.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/illustration_tile.jpg b/res/drawable-xxhdpi/illustration_tile.jpg
new file mode 100644
index 0000000..2ba33fa
--- /dev/null
+++ b/res/drawable-xxhdpi/illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_horizontal_tile.jpg b/res/drawable-xxhdpi/setup_illustration_horizontal_tile.jpg
index aec8d0f..18b885d 100644
--- a/res/drawable-xxhdpi/setup_illustration_horizontal_tile.jpg
+++ b/res/drawable-xxhdpi/setup_illustration_horizontal_tile.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg
index 4cb0c63..5b0a7a7 100644
--- a/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_tile.jpg b/res/drawable-xxhdpi/setup_illustration_tile.jpg
index 2ba33fa..05d4804 100644
--- a/res/drawable-xxhdpi/setup_illustration_tile.jpg
+++ b/res/drawable-xxhdpi/setup_illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_wifi.jpg b/res/drawable-xxhdpi/setup_illustration_wifi.jpg
index a27c93e..a28052b 100644
--- a/res/drawable-xxhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-xxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_bt_cellphone.png b/res/drawable-xxxhdpi/ic_bt_cellphone.png
deleted file mode 100644
index 1e12f96..0000000
--- a/res/drawable-xxxhdpi/ic_bt_cellphone.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_bt_headphones_a2dp.png b/res/drawable-xxxhdpi/ic_bt_headphones_a2dp.png
deleted file mode 100644
index 8b547d9..0000000
--- a/res/drawable-xxxhdpi/ic_bt_headphones_a2dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_bt_headset_hfp.png b/res/drawable-xxxhdpi/ic_bt_headset_hfp.png
deleted file mode 100644
index 03c5033..0000000
--- a/res/drawable-xxxhdpi/ic_bt_headset_hfp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_bt_misc_hid.png b/res/drawable-xxxhdpi/ic_bt_misc_hid.png
deleted file mode 100644
index b9a9923..0000000
--- a/res/drawable-xxxhdpi/ic_bt_misc_hid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_bt_network_pan.png b/res/drawable-xxxhdpi/ic_bt_network_pan.png
deleted file mode 100644
index 989e1ab..0000000
--- a/res/drawable-xxxhdpi/ic_bt_network_pan.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_bt_pointing_hid.png b/res/drawable-xxxhdpi/ic_bt_pointing_hid.png
deleted file mode 100644
index de8c389..0000000
--- a/res/drawable-xxxhdpi/ic_bt_pointing_hid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_about.png b/res/drawable-xxxhdpi/ic_settings_about.png
deleted file mode 100644
index b39842f..0000000
--- a/res/drawable-xxxhdpi/ic_settings_about.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_about_alpha.png b/res/drawable-xxxhdpi/ic_settings_about_alpha.png
new file mode 100644
index 0000000..746900d
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_about_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_accessibility.png b/res/drawable-xxxhdpi/ic_settings_accessibility.png
deleted file mode 100644
index d289f02..0000000
--- a/res/drawable-xxxhdpi/ic_settings_accessibility.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_accessibility_alpha.png b/res/drawable-xxxhdpi/ic_settings_accessibility_alpha.png
new file mode 100644
index 0000000..1da61c9
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_accessibility_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_accounts.png b/res/drawable-xxxhdpi/ic_settings_accounts.png
deleted file mode 100644
index d1c389b..0000000
--- a/res/drawable-xxxhdpi/ic_settings_accounts.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_accounts_alpha.png b/res/drawable-xxxhdpi/ic_settings_accounts_alpha.png
new file mode 100644
index 0000000..c479acc
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_accounts_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_applications.png b/res/drawable-xxxhdpi/ic_settings_applications.png
deleted file mode 100644
index 07f5785..0000000
--- a/res/drawable-xxxhdpi/ic_settings_applications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_applications_alpha.png b/res/drawable-xxxhdpi/ic_settings_applications_alpha.png
new file mode 100644
index 0000000..133f363
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_applications_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_backup.png b/res/drawable-xxxhdpi/ic_settings_backup.png
deleted file mode 100644
index 2a3f313..0000000
--- a/res/drawable-xxxhdpi/ic_settings_backup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_backup_alpha.png b/res/drawable-xxxhdpi/ic_settings_backup_alpha.png
new file mode 100644
index 0000000..01efd94
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_backup_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_battery.png b/res/drawable-xxxhdpi/ic_settings_battery.png
deleted file mode 100644
index d45c6ef..0000000
--- a/res/drawable-xxxhdpi/ic_settings_battery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_battery_alpha.png b/res/drawable-xxxhdpi/ic_settings_battery_alpha.png
new file mode 100644
index 0000000..6a060c7
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_battery_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_bluetooth2.png b/res/drawable-xxxhdpi/ic_settings_bluetooth2.png
deleted file mode 100644
index d354eb6..0000000
--- a/res/drawable-xxxhdpi/ic_settings_bluetooth2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-xxxhdpi/ic_settings_bluetooth2_alpha.png
new file mode 100644
index 0000000..284c94e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_bluetooth2_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_data_usage.png b/res/drawable-xxxhdpi/ic_settings_data_usage.png
deleted file mode 100644
index 54d464b..0000000
--- a/res/drawable-xxxhdpi/ic_settings_data_usage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_data_usage_alpha.png b/res/drawable-xxxhdpi/ic_settings_data_usage_alpha.png
new file mode 100644
index 0000000..55941d4
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_data_usage_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_date_time.png b/res/drawable-xxxhdpi/ic_settings_date_time.png
deleted file mode 100644
index 736bb3f..0000000
--- a/res/drawable-xxxhdpi/ic_settings_date_time.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_date_time_alpha.png b/res/drawable-xxxhdpi/ic_settings_date_time_alpha.png
new file mode 100644
index 0000000..4a5d491
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_date_time_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_development.png b/res/drawable-xxxhdpi/ic_settings_development.png
deleted file mode 100644
index eaf1f2c..0000000
--- a/res/drawable-xxxhdpi/ic_settings_development.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_development_alpha.png b/res/drawable-xxxhdpi/ic_settings_development_alpha.png
new file mode 100644
index 0000000..47f4547
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_development_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_display_am.png b/res/drawable-xxxhdpi/ic_settings_display_am.png
deleted file mode 100644
index 4f6933d..0000000
--- a/res/drawable-xxxhdpi/ic_settings_display_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_display_am_alpha.png b/res/drawable-xxxhdpi/ic_settings_display_am_alpha.png
new file mode 100644
index 0000000..ba90acc
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_display_am_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_dock.png b/res/drawable-xxxhdpi/ic_settings_dock.png
deleted file mode 100644
index 56aac4b..0000000
--- a/res/drawable-xxxhdpi/ic_settings_dock.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_dock_alpha.png b/res/drawable-xxxhdpi/ic_settings_dock_alpha.png
new file mode 100644
index 0000000..d5e4855
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_dock_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_home.png b/res/drawable-xxxhdpi/ic_settings_home.png
deleted file mode 100644
index 5d37a94..0000000
--- a/res/drawable-xxxhdpi/ic_settings_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_home_alpha.png b/res/drawable-xxxhdpi/ic_settings_home_alpha.png
new file mode 100644
index 0000000..2242f5e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_home_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_language.png b/res/drawable-xxxhdpi/ic_settings_language.png
deleted file mode 100644
index c9447bd..0000000
--- a/res/drawable-xxxhdpi/ic_settings_language.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_language_alpha.png b/res/drawable-xxxhdpi/ic_settings_language_alpha.png
new file mode 100644
index 0000000..b5135c8
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_language_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_location.png b/res/drawable-xxxhdpi/ic_settings_location.png
deleted file mode 100644
index 67f5bad..0000000
--- a/res/drawable-xxxhdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_location_alpha.png b/res/drawable-xxxhdpi/ic_settings_location_alpha.png
new file mode 100644
index 0000000..5ff19aa
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_location_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_more.png b/res/drawable-xxxhdpi/ic_settings_more.png
deleted file mode 100644
index b2083ba..0000000
--- a/res/drawable-xxxhdpi/ic_settings_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_more_alpha.png b/res/drawable-xxxhdpi/ic_settings_more_alpha.png
new file mode 100644
index 0000000..36384be
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_more_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_multiuser.png b/res/drawable-xxxhdpi/ic_settings_multiuser.png
deleted file mode 100644
index aad5c64..0000000
--- a/res/drawable-xxxhdpi/ic_settings_multiuser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_multiuser_alpha.png b/res/drawable-xxxhdpi/ic_settings_multiuser_alpha.png
new file mode 100644
index 0000000..51fb328
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_multiuser_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am.png b/res/drawable-xxxhdpi/ic_settings_nfc_payment_am.png
deleted file mode 100644
index 01e1e0b..0000000
--- a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png
new file mode 100644
index 0000000..6c29a53
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_notifications.png b/res/drawable-xxxhdpi/ic_settings_notifications.png
deleted file mode 100644
index 1619240..0000000
--- a/res/drawable-xxxhdpi/ic_settings_notifications.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_notifications_alpha.png b/res/drawable-xxxhdpi/ic_settings_notifications_alpha.png
new file mode 100644
index 0000000..bd3bebe
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_notifications_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_print.png b/res/drawable-xxxhdpi/ic_settings_print.png
deleted file mode 100644
index f0ffb52..0000000
--- a/res/drawable-xxxhdpi/ic_settings_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_print_alpha.png b/res/drawable-xxxhdpi/ic_settings_print_alpha.png
new file mode 100644
index 0000000..8634ca1
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_print_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_security.png b/res/drawable-xxxhdpi/ic_settings_security.png
deleted file mode 100644
index 9a3959b..0000000
--- a/res/drawable-xxxhdpi/ic_settings_security.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_security_alpha.png b/res/drawable-xxxhdpi/ic_settings_security_alpha.png
new file mode 100644
index 0000000..6abec60
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_security_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_sound.png b/res/drawable-xxxhdpi/ic_settings_sound.png
deleted file mode 100644
index 15352de..0000000
--- a/res/drawable-xxxhdpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_sound_alpha.png b/res/drawable-xxxhdpi/ic_settings_sound_alpha.png
new file mode 100644
index 0000000..3292db8
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_sound_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_storage.png b/res/drawable-xxxhdpi/ic_settings_storage.png
deleted file mode 100644
index be02ffb..0000000
--- a/res/drawable-xxxhdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_storage_alpha.png b/res/drawable-xxxhdpi/ic_settings_storage_alpha.png
new file mode 100644
index 0000000..48581a6
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_storage_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_sync.png b/res/drawable-xxxhdpi/ic_settings_sync.png
deleted file mode 100644
index 7a741a7..0000000
--- a/res/drawable-xxxhdpi/ic_settings_sync.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_sync_alpha.png b/res/drawable-xxxhdpi/ic_settings_sync_alpha.png
new file mode 100644
index 0000000..450647a
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_sync_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_wireless.png b/res/drawable-xxxhdpi/ic_settings_wireless.png
deleted file mode 100644
index bcc4233..0000000
--- a/res/drawable-xxxhdpi/ic_settings_wireless.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_wireless_alpha.png b/res/drawable-xxxhdpi/ic_settings_wireless_alpha.png
new file mode 100644
index 0000000..a5d14b3
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_wireless_alpha.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_emptystate.png b/res/drawable-xxxhdpi/ic_wifi_emptystate.png
deleted file mode 100644
index 9975f68..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_emptystate.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_teal.png
deleted file mode 100644
index 74c9c31..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_teal.png
deleted file mode 100644
index dab15c4..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_teal.png
deleted file mode 100644
index 66a7736..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_teal.png
deleted file mode 100644
index d23cf22..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_teal.png
deleted file mode 100644
index 83e4988..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png
deleted file mode 100644
index 3dc5cbe..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png
deleted file mode 100644
index d80ac48..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png
deleted file mode 100644
index 4fdd825..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png
deleted file mode 100644
index e1cbcb8..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png
deleted file mode 100644
index bcc4233..0000000
--- a/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_horizontal_tile.jpg b/res/drawable-xxxhdpi/setup_illustration_horizontal_tile.jpg
index 448a651..6d97626 100644
--- a/res/drawable-xxxhdpi/setup_illustration_horizontal_tile.jpg
+++ b/res/drawable-xxxhdpi/setup_illustration_horizontal_tile.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg
index 13821f3..5be34fd 100644
--- a/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg
+++ b/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_tile.jpg b/res/drawable-xxxhdpi/setup_illustration_tile.jpg
index 4e67026..9d5c4c9 100644
--- a/res/drawable-xxxhdpi/setup_illustration_tile.jpg
+++ b/res/drawable-xxxhdpi/setup_illustration_tile.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_wifi.jpg b/res/drawable-xxxhdpi/setup_illustration_wifi.jpg
index 56c19b6..f2187cb 100644
--- a/res/drawable-xxxhdpi/setup_illustration_wifi.jpg
+++ b/res/drawable-xxxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable/bg_voice_position.xml b/res/drawable/bg_voice_position.xml
new file mode 100644
index 0000000..2fb29c2
--- /dev/null
+++ b/res/drawable/bg_voice_position.xml
@@ -0,0 +1,21 @@
+<?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.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/voice_interaction_highlight" />
+</shape>
diff --git a/res/drawable/data_usage_bar.xml b/res/drawable/data_usage_bar.xml
deleted file mode 100644
index ec6bd90..0000000
--- a/res/drawable/data_usage_bar.xml
+++ /dev/null
@@ -1,35 +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.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background">
-        <nine-patch android:src="@*android:drawable/progress_mtrl_alpha"
-            android:tint="@color/material_empty_color_light" />
-    </item>
-    <item android:id="@android:id/secondaryProgress">
-        <scale android:scaleWidth="100%">
-            <nine-patch android:src="@*android:drawable/progress_mtrl_alpha"
-                android:tint="?android:attr/colorControlActivated"
-                android:alpha="0.5" />
-        </scale>
-    </item>
-    <item android:id="@android:id/progress">
-        <scale android:scaleWidth="100%">
-            <nine-patch android:src="@*android:drawable/progress_mtrl_alpha"
-                android:tint="?android:attr/colorControlActivated" />
-        </scale>
-    </item>
-</layer-list>
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/fab_background.xml
similarity index 68%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/fab_background.xml
index 0a229c7..a692a2a 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/fab_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -14,7 +13,11 @@
      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="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/fab_ripple">
+    <item>
+        <shape>
+            <solid android:color="@color/fab_shape" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/fingerprint_progress_ring.xml b/res/drawable/fingerprint_progress_ring.xml
new file mode 100644
index 0000000..04578cd
--- /dev/null
+++ b/res/drawable/fingerprint_progress_ring.xml
@@ -0,0 +1,39 @@
+<?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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape
+            android:innerRadius="@dimen/fingerprint_ring_radius"
+            android:shape="ring"
+            android:thickness="@dimen/fingerprint_ring_thickness"
+            android:useLevel="false">
+            <solid android:color="@color/fingerprint_progress_ring_bg" />
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <shape
+            android:innerRadius="@dimen/fingerprint_ring_radius"
+            android:shape="ring"
+            android:thickness="@dimen/fingerprint_ring_thickness">
+            <gradient
+                android:startColor="@color/fingerprint_progress_ring"
+                android:endColor="@color/fingerprint_progress_ring"
+                android:angle="0"
+            />
+        </shape>
+    </item>
+</layer-list>
diff --git a/res/drawable/ic_delete.xml b/res/drawable/ic_delete.xml
new file mode 100644
index 0000000..d4f79e3
--- /dev/null
+++ b/res/drawable/ic_delete.xml
@@ -0,0 +1,25 @@
+<!--
+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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:tint="?android:attr/colorControlNormal"
+        android:viewportWidth="48.0"
+        android:viewportHeight="48.0">
+    <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"/>
+</vector>
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_expand.xml
similarity index 68%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_expand.xml
index 0a229c7..72da2b9 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_expand.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -15,6 +15,10 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="true" android:drawable="@drawable/ic_expand_less" />
+
+    <item android:drawable="@drawable/ic_expand_more" />
+
+</selector>
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_expand_less.xml
similarity index 60%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_expand_less.xml
index 0a229c7..3a00faf 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_expand_less.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -15,6 +15,14 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M12.0,8.0l-6.0,6.0 1.41,1.41L12.0,10.83l4.59,4.58L18.0,14.0z"/>
+
+</vector>
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_expand_more.xml
similarity index 60%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_expand_more.xml
index 0a229c7..64d2242 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_expand_more.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -15,6 +15,14 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M16.59,8.59L12.0,13.17 7.41,8.59 6.0,10.0l6.0,6.0 6.0,-6.0z"/>
+
+</vector>
diff --git a/res/drawable/ic_fingerprint.xml b/res/drawable/ic_fingerprint.xml
new file mode 100644
index 0000000..2f27753
--- /dev/null
+++ b/res/drawable/ic_fingerprint.xml
@@ -0,0 +1,36 @@
+<!--
+  ~ 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
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="32.0"
+        android:viewportHeight="32.0">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M23.7,5.9c-0.1,0.0 -0.2,0.0 -0.3,-0.1C21.0,4.5 18.6,3.9 16.0,3.9c-2.5,0.0 -4.6,0.6 -6.9,1.9C8.8,6.0 8.3,5.9 8.1,5.5C7.9,5.2 8.0,4.7 8.4,4.5c2.5,-1.4 4.9,-2.1 7.7,-2.1c2.8,0.0 5.4,0.7 8.0,2.1c0.4,0.2 0.5,0.6 0.3,1.0C24.2,5.7 24.0,5.9 23.7,5.9z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M5.3,13.2c-0.1,0.0 -0.3,0.0 -0.4,-0.1c-0.3,-0.2 -0.4,-0.7 -0.2,-1.0c1.3,-1.9 2.9,-3.4 4.9,-4.5c4.1,-2.2 9.3,-2.2 13.4,0.0c1.9,1.1 3.6,2.5 4.9,4.4c0.2,0.3 0.1,0.8 -0.2,1.0c-0.3,0.2 -0.8,0.1 -1.0,-0.2c-1.2,-1.7 -2.6,-3.0 -4.3,-4.0c-3.7,-2.0 -8.3,-2.0 -12.0,0.0c-1.7,0.9 -3.2,2.3 -4.3,4.0C5.7,13.1 5.5,13.2 5.3,13.2z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M13.3,29.6c-0.2,0.0 -0.4,-0.1 -0.5,-0.2c-1.1,-1.2 -1.7,-2.0 -2.6,-3.6c-0.9,-1.7 -1.4,-3.7 -1.4,-5.9c0.0,-4.1 3.3,-7.4 7.4,-7.4c4.1,0.0 7.4,3.3 7.4,7.4c0.0,0.4 -0.3,0.7 -0.7,0.7s-0.7,-0.3 -0.7,-0.7c0.0,-3.3 -2.7,-5.9 -5.9,-5.9c-3.3,0.0 -5.9,2.7 -5.9,5.9c0.0,2.0 0.4,3.8 1.2,5.2c0.8,1.6 1.4,2.2 2.4,3.3c0.3,0.3 0.3,0.8 0.0,1.0C13.7,29.5 13.5,29.6 13.3,29.6z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M22.6,27.1c-1.6,0.0 -2.9,-0.4 -4.1,-1.2c-1.9,-1.4 -3.1,-3.6 -3.1,-6.0c0.0,-0.4 0.3,-0.7 0.7,-0.7s0.7,0.3 0.7,0.7c0.0,1.9 0.9,3.7 2.5,4.8c0.9,0.6 1.9,1.0 3.2,1.0c0.3,0.0 0.8,0.0 1.3,-0.1c0.4,-0.1 0.8,0.2 0.8,0.6c0.1,0.4 -0.2,0.8 -0.6,0.8C23.4,27.1 22.8,27.1 22.6,27.1z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M20.0,29.9c-0.1,0.0 -0.1,0.0 -0.2,0.0c-2.1,-0.6 -3.4,-1.4 -4.8,-2.9c-1.8,-1.9 -2.8,-4.4 -2.8,-7.1c0.0,-2.2 1.8,-4.1 4.1,-4.1c2.2,0.0 4.1,1.8 4.1,4.1c0.0,1.4 1.2,2.6 2.6,2.6c1.4,0.0 2.6,-1.2 2.6,-2.6c0.0,-5.1 -4.2,-9.3 -9.3,-9.3c-3.6,0.0 -6.9,2.1 -8.4,5.4C7.3,17.1 7.0,18.4 7.0,19.8c0.0,1.1 0.1,2.7 0.9,4.9c0.1,0.4 -0.1,0.8 -0.4,0.9c-0.4,0.1 -0.8,-0.1 -0.9,-0.4c-0.6,-1.8 -0.9,-3.6 -0.9,-5.4c0.0,-1.6 0.3,-3.1 0.9,-4.4c1.7,-3.8 5.6,-6.3 9.8,-6.3c5.9,0.0 10.7,4.8 10.7,10.7c0.0,2.2 -1.8,4.1 -4.1,4.1s-4.0,-1.8 -4.0,-4.1c0.0,-1.4 -1.2,-2.6 -2.6,-2.6c-1.4,0.0 -2.6,1.2 -2.6,2.6c0.0,2.3 0.9,4.5 2.4,6.1c1.2,1.3 2.4,2.0 4.2,2.5c0.4,0.1 0.6,0.5 0.5,0.9C20.6,29.7 20.3,29.9 20.0,29.9z"/>
+</vector>
diff --git a/res/drawable/ic_fingerprint_error.xml b/res/drawable/ic_fingerprint_error.xml
new file mode 100644
index 0000000..d00280d
--- /dev/null
+++ b/res/drawable/ic_fingerprint_error.xml
@@ -0,0 +1,30 @@
+<!--
+  ~ 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
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="32.0"
+        android:viewportHeight="32.0">
+    <path
+        android:fillColor="@color/warning"
+        android:pathData="M15.99,2.5C8.53,2.5 2.5,8.54 2.5,16.0s6.03,13.5 13.49,13.5S29.5,23.46 29.5,16.0S23.45,2.5 15.99,2.5zM16.0,26.8c-5.97,0.0 -10.8,-4.83 -10.8,-10.8S10.03,5.2 16.0,5.2S26.8,10.03 26.8,16.0S21.97,26.8 16.0,26.8z"/>
+    <path
+        android:fillColor="@color/warning"
+        android:pathData="M14.65,20.05l2.7,0.0l0.0,2.7l-2.7,0.0z"/>
+    <path
+        android:fillColor="@color/warning"
+        android:pathData="M14.65,9.25l2.7,0.0l0.0,8.1l-2.7,0.0z"/>
+</vector>
diff --git a/res/drawable/ic_settings_24dp.xml b/res/drawable/ic_settings_24dp.xml
new file mode 100644
index 0000000..545bc2d
--- /dev/null
+++ b/res/drawable/ic_settings_24dp.xml
@@ -0,0 +1,25 @@
+<!--
+     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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M19.4,13.0c0.0,-0.3 0.1,-0.6 0.1,-1.0s0.0,-0.7 -0.1,-1.0l2.1,-1.7c0.2,-0.2 0.2,-0.4 0.1,-0.6l-2.0,-3.5C19.5,5.1 19.3,5.0 19.0,5.1l-2.5,1.0c-0.5,-0.4 -1.1,-0.7 -1.7,-1.0l-0.4,-2.6C14.5,2.2 14.2,2.0 14.0,2.0l-4.0,0.0C9.8,2.0 9.5,2.2 9.5,2.4L9.1,5.1C8.5,5.3 8.0,5.7 7.4,6.1L5.0,5.1C4.7,5.0 4.5,5.1 4.3,5.3l-2.0,3.5C2.2,8.9 2.3,9.2 2.5,9.4L4.6,11.0c0.0,0.3 -0.1,0.6 -0.1,1.0s0.0,0.7 0.1,1.0l-2.1,1.7c-0.2,0.2 -0.2,0.4 -0.1,0.6l2.0,3.5C4.5,18.9 4.7,19.0 5.0,18.9l2.5,-1.0c0.5,0.4 1.1,0.7 1.7,1.0l0.4,2.6c0.0,0.2 0.2,0.4 0.5,0.4l4.0,0.0c0.2,0.0 0.5,-0.2 0.5,-0.4l0.4,-2.6c0.6,-0.3 1.2,-0.6 1.7,-1.0l2.5,1.0c0.2,0.1 0.5,0.0 0.6,-0.2l2.0,-3.5c0.1,-0.2 0.1,-0.5 -0.1,-0.6L19.4,13.0zM12.0,15.5c-1.9,0.0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5s3.5,1.6 3.5,3.5S13.9,15.5 12.0,15.5z"
+        android:fillColor="#ffffffff" />
+</vector>
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_about.xml
similarity index 81%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_about.xml
index 0a229c7..8266b90 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_about.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_about_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_accessibility.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_accessibility.xml
index 0a229c7..63a8f77 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_accessibility.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_accessibility_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_accounts.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_accounts.xml
index 0a229c7..bdd569d 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_accounts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_accounts_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_applications.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_applications.xml
index 0a229c7..e56fe7e 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_applications.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_applications_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_backup.xml
similarity index 81%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_backup.xml
index 0a229c7..23f8081 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_backup.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_backup_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_battery.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_battery.xml
index 0a229c7..a983b69 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_battery.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_battery_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_bluetooth.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_bluetooth.xml
index 0a229c7..a76cd2c 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_bluetooth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_bluetooth_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_bluetooth2.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_bluetooth2.xml
index 0a229c7..df0f866 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_bluetooth2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_bluetooth2_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_data_usage.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_data_usage.xml
index 0a229c7..16da024 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_data_usage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_data_usage_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_date_time.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_date_time.xml
index 0a229c7..c722fce 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_date_time.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_date_time_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_development.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_development.xml
index 0a229c7..42d043e 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_development.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_development_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_display.xml b/res/drawable/ic_settings_display.xml
index 29cc3e4..ad846ce 100644
--- a/res/drawable/ic_settings_display.xml
+++ b/res/drawable/ic_settings_display.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
- * Copyright 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.
- */
+     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.
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/ic_settings_display_am"
-        android:autoMirrored="true"
-        />
+    android:src="@drawable/ic_settings_display_am_alpha"
+    android:tint="?android:attr/colorAccent"
+    android:autoMirrored="true" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_dock.xml
similarity index 81%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_dock.xml
index 0a229c7..c6d6571 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_dock.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_dock_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_home.xml
similarity index 81%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_home.xml
index 0a229c7..86e108f 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_home.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_home_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_language.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_language.xml
index 0a229c7..0130baa 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_language.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_language_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_location.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_location.xml
index 0a229c7..da64367 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_location.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_location_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_more.xml
similarity index 81%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_more.xml
index 0a229c7..7df6e1d 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_more.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_more_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_multiuser.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_multiuser.xml
index 0a229c7..b793360 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_multiuser.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_multiuser_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_settings_nfc_payment.xml b/res/drawable/ic_settings_nfc_payment.xml
index 10672a9..897cd8b 100644
--- a/res/drawable/ic_settings_nfc_payment.xml
+++ b/res/drawable/ic_settings_nfc_payment.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
- * Copyright 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.
- */
+     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.
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/ic_settings_nfc_payment_am"
-        android:autoMirrored="true"
-        />
+    android:src="@drawable/ic_settings_nfc_payment_am_alpha"
+    android:tint="?android:attr/colorAccent"
+    android:autoMirrored="true" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_notifications.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_notifications.xml
index 0a229c7..da5aa38 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_notifications.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_notifications_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_print.xml
similarity index 81%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_print.xml
index 0a229c7..4f30edf 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_print.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_print_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_security.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_security.xml
index 0a229c7..fd23658 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_security_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_sound.xml
similarity index 81%
rename from res/drawable/setup_illustration_bg.xml
rename to res/drawable/ic_settings_sound.xml
index 0a229c7..b84c224 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_sound.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_sound_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_storage.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_storage.xml
index 0a229c7..b6714a9 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_storage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_storage_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_sync.xml
similarity index 81%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_sync.xml
index 0a229c7..2d30dac 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_sync.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_sync_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_wifi.xml
similarity index 81%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_wifi.xml
index 0a229c7..9b58909 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_wifi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_wifi_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/setup_illustration_bg.xml b/res/drawable/ic_settings_wireless.xml
similarity index 80%
copy from res/drawable/setup_illustration_bg.xml
copy to res/drawable/ic_settings_wireless.xml
index 0a229c7..f663599 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/drawable/ic_settings_wireless.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -16,5 +16,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+    android:src="@drawable/ic_settings_wireless_alpha"
+    android:tint="?android:attr/colorAccent" />
+
diff --git a/res/drawable/ic_wifi_signal_0.xml b/res/drawable/ic_wifi_signal_0.xml
new file mode 100644
index 0000000..3888161
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_0.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
diff --git a/res/drawable/ic_wifi_signal_1.xml b/res/drawable/ic_wifi_signal_1.xml
new file mode 100644
index 0000000..e0a2072
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_1.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.1,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.5,6.5L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0z"/>
+    <path
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.1,22.0l5.5,-6.8c-0.2,-0.2 -2.3,-1.9 -5.5,-1.9s-5.3,1.8 -5.5,1.9L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0z"/>
+</vector>
diff --git a/res/drawable/ic_wifi_signal_2.xml b/res/drawable/ic_wifi_signal_2.xml
new file mode 100644
index 0000000..d0daa60
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_2.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+    <path
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0l7.6,-9.4C20.3,12.4 17.4,10.0 13.0,10.0s-7.3,2.4 -7.6,2.7L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
diff --git a/res/drawable/ic_wifi_signal_3.xml b/res/drawable/ic_wifi_signal_3.xml
new file mode 100644
index 0000000..c542c69
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_3.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+    <path
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0l9.2,-11.4c-0.4,-0.3 -3.9,-3.2 -9.2,-3.2s-8.9,3.0 -9.2,3.2L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
diff --git a/res/drawable/ic_wifi_signal_4.xml b/res/drawable/ic_wifi_signal_4.xml
new file mode 100644
index 0000000..bb7dbd0
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_4.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
diff --git a/res/drawable/ic_wifi_signal_lock.xml b/res/drawable/ic_wifi_signal_lock.xml
new file mode 100644
index 0000000..b94f06c
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_lock.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+    <group
+        android:translateX="52.0"
+        android:translateY="42.0">
+        <path
+            android:fillColor="?attr/wifi_signal_color"
+            android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/preference_background.xml b/res/drawable/preference_background.xml
index 7f7b560..12bdea8 100644
--- a/res/drawable/preference_background.xml
+++ b/res/drawable/preference_background.xml
@@ -14,9 +14,5 @@
      limitations under the License.
 -->
 
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:inset="0dip">
-
-    <color android:color="?android:attr/colorBackground" />
-
-</inset>
+<color xmlns:android="http://schemas.android.com/apk/res/android"
+       android:color="?android:attr/colorBackground" />
diff --git a/res/drawable/setup_illustration.xml b/res/drawable/setup_illustration.xml
deleted file mode 100644
index f8d96d5..0000000
--- a/res/drawable/setup_illustration.xml
+++ /dev/null
@@ -1,26 +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.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true">
-
-    <item android:id="@+id/illustration_image">
-        <bitmap android:src="@drawable/setup_illustration_wifi"
-            android:gravity="fill" />
-    </item>
-
-</layer-list>
diff --git a/res/drawable/setup_wizard_card_bg.xml b/res/drawable/setup_wizard_card_bg.xml
deleted file mode 100644
index 8621437..0000000
--- a/res/drawable/setup_wizard_card_bg.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners
-        android:topLeftRadius="@dimen/setup_wizard_card_corner_radius"
-        android:topRightRadius="@dimen/setup_wizard_card_corner_radius" />
-
-    <solid android:color="?android:attr/colorBackground" />
-
-</shape>
-
diff --git a/res/drawable/wifi_signal.xml b/res/drawable/wifi_signal.xml
new file mode 100644
index 0000000..7854075
--- /dev/null
+++ b/res/drawable/wifi_signal.xml
@@ -0,0 +1,41 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+    <item settings:state_encrypted="true">
+        <layer-list>
+            <item>
+                <level-list>
+                    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1" />
+                    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2" />
+                    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3" />
+                    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4" />
+                </level-list>
+            </item>
+            <item android:drawable="@drawable/ic_wifi_signal_lock" />
+        </layer-list>
+    </item>
+    <item settings:state_encrypted="false">
+        <level-list>
+            <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1" />
+            <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2" />
+            <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3" />
+            <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4" />
+        </level-list>
+    </item>
+</selector>
+
diff --git a/res/drawable/wifi_signal_colored.xml b/res/drawable/wifi_signal_colored.xml
deleted file mode 100644
index 4eb41c0..0000000
--- a/res/drawable/wifi_signal_colored.xml
+++ /dev/null
@@ -1,68 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true">
-        <level-list>
-            <item android:maxLevel="0">
-                <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_1_light"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="1">
-                <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_2_light"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="2">
-                <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_3_light"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="3">
-                <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_4_light"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-        </level-list>
-    </item>
-    <item settings:state_encrypted="false">
-        <level-list>
-            <item android:maxLevel="0">
-                <bitmap
-                    android:src="@drawable/ic_wifi_signal_1_light"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="1">
-                <bitmap
-                    android:src="@drawable/ic_wifi_signal_2_light"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="2">
-                <bitmap
-                    android:src="@drawable/ic_wifi_signal_3_light"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="3">
-                <bitmap
-                    android:src="@drawable/ic_wifi_signal_4_light"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-        </level-list>
-    </item>
-</selector>
-
diff --git a/res/drawable/wifi_signal_lock_teal.xml b/res/drawable/wifi_signal_lock_teal.xml
deleted file mode 100644
index 2e79274..0000000
--- a/res/drawable/wifi_signal_lock_teal.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_teal" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_teal" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_teal" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_teal" />
-</level-list>
-
diff --git a/res/drawable/wifi_signal_open_teal.xml b/res/drawable/wifi_signal_open_teal.xml
deleted file mode 100644
index eb4ba8a..0000000
--- a/res/drawable/wifi_signal_open_teal.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_teal" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_teal" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_teal" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_teal" />
-</level-list>
-
diff --git a/res/drawable/wifi_signal_teal.xml b/res/drawable/wifi_signal_teal.xml
deleted file mode 100644
index 637336f..0000000
--- a/res/drawable/wifi_signal_teal.xml
+++ /dev/null
@@ -1,21 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_teal" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_teal" />
-</selector>
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index 8575fa6..f79de61 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -16,78 +16,85 @@
 ** limitations under the License.
 */
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:gravity="center_horizontal">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <!-- "Enter PIN(Password) to unlock" -->
-        <TextView android:id="@+id/headerText"
-            android:layout_width="0dip"
+        android:orientation="vertical"
+        android:gravity="center_horizontal">
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="horizontal"
-            android:layout_marginEnd="6dip"
-            android:layout_marginStart="6dip"
-            android:layout_marginTop="10dip"
-            android:layout_marginBottom="10dip"
-            android:gravity="start"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:orientation="horizontal">
+            <!-- "Enter PIN(Password) to unlock" -->
+            <TextView android:id="@+id/headerText"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal"
+                android:layout_marginEnd="6dip"
+                android:layout_marginStart="6dip"
+                android:layout_marginTop="10dip"
+                android:layout_marginBottom="10dip"
+                android:gravity="start"
+                android:ellipsize="marquee"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+            />
+
+            <!-- Password entry field -->
+            <EditText android:id="@+id/password_entry"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dip"
+                android:layout_marginBottom="5dip"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:inputType="textPassword"
+                android:imeOptions="actionNext|flagNoExtractUi"
+                android:gravity="center"
+                android:textSize="24sp"
+                style="@style/TextAppearance.PasswordEntry"
+            />
+        </LinearLayout>
+
+        <!-- Alphanumeric keyboard -->
+        <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+            android:layout_alignParentBottom="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#00000000"
+            android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+            android:visibility="gone"
         />
 
-        <!-- Password entry field -->
-        <EditText android:id="@+id/password_entry"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext"
-            android:gravity="center"
-            android:textSize="24sp"
-            style="@style/TextAppearance.PasswordEntry"
-        />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1">
+            <LinearLayout
+                style="@style/SecurityPreferenceButtonContainer"
+                android:orientation="horizontal"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentBottom="true">
+
+                <!-- left : cancel -->
+                <Button android:id="@+id/cancel_button"
+                    style="@style/SecurityPreferenceButton"
+                    android:text="@string/lockpassword_cancel_label"/>
+
+                <!-- right : continue -->
+                <Button android:id="@+id/next_button"
+                    style="@style/SecurityPreferenceButton"
+                    android:text="@string/lockpassword_continue_label"/>
+
+            </LinearLayout>
+        </RelativeLayout>
+
     </LinearLayout>
 
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1">
-        <LinearLayout
-            style="@style/SecurityPreferenceButtonContainer"
-            android:orientation="horizontal"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true">
-
-            <!-- left : cancel -->
-            <Button android:id="@+id/cancel_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpassword_cancel_label"/>
-
-            <!-- right : continue -->
-            <Button android:id="@+id/next_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpassword_continue_label"/>
-
-        </LinearLayout>
-    </RelativeLayout>
-
-</LinearLayout>
+</ScrollView>
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 4158c88..d8da8fe 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -1,104 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 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.
-*/
+<!-- 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.
 -->
-<!-- This is basically the same layout as choose_lock_password. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
     android:orientation="vertical"
-    android:gravity="center_horizontal">
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="match_parent"
+    <TextView
+        style="@android:style/TextAppearance.Material.Title"
+        android:id="@+id/headerText"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="12dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <!-- "Enter PIN(Password) to unlock" -->
-        <TextView android:id="@+id/headerText"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="horizontal"
-            android:layout_marginEnd="6dip"
-            android:layout_marginStart="6dip"
-            android:layout_marginTop="10dip"
-            android:layout_marginBottom="10dip"
-            android:gravity="start"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:attr/colorAccent"/>
+
+    <TextView
+        style="@android:style/TextAppearance.Material.Body1"
+        android:id="@+id/detailsText"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         />
 
-        <!-- Password entry field -->
-        <EditText android:id="@+id/password_entry"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext"
-            android:gravity="center"
-            android:textSize="24sp"
-            style="@style/TextAppearance.PasswordEntry"
-        />
-    </LinearLayout>
-
-    <!-- Spacer between password entry and keyboard -->
     <View
         android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
 
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-    <RelativeLayout
+    <FrameLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:background="@android:drawable/bottom_bar"
-        android:visibility="gone">
+        android:orientation="horizontal">
 
-        <Button android:id="@+id/cancel_button"
-            android:layout_width="150dip"
+        <Button
+            style="@android:style/Widget.Material.Button.Borderless"
+            android:id="@+id/cancelButton"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentStart="true"
-            android:text="@string/lockpassword_cancel_label"
-        />
+            android:layout_gravity="start|bottom"
+            android:text="@string/cancel"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="14dp"/>
 
-        <Button android:id="@+id/next_button"
-            android:layout_width="150dip"
+        <EditText android:id="@+id/password_entry"
+            android:layout_width="208dp"
             android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentEnd="true"
-            android:drawableEnd="@drawable/ic_btn_next"
-            android:drawablePadding="10dip"
-            android:text="@string/lockpassword_continue_label"
-        />
+            android:layout_gravity="center_horizontal|bottom"
+            android:layout_marginBottom="26dp"
+            android:inputType="textPassword"
+            android:imeOptions="actionNext|flagNoFullscreen"
+            android:gravity="center"
+            android:textSize="16sp"
+            style="@style/TextAppearance.PasswordEntry"/>
 
-    </RelativeLayout>
+        <TextView style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+            android:id="@+id/errorText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:layout_marginBottom="10dp"/>
 
-</LinearLayout>
+        <ImageView
+            android:id="@+id/fingerprintIcon"
+            android:layout_gravity="end|bottom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="28dp"
+            android:layout_marginEnd="20dp"
+            android:visibility="gone"/>
+    </FrameLayout>
 
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index b58b46f..0567fad 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -13,56 +13,102 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/topLayout"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
 
-    <!-- left side: instructions and messages -->
     <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1.0"
-            >
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
-        <!-- header message -->
-        <TextView android:id="@+id/headerText"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginTop="16dp"
-                  android:gravity="center"
-                  android:textSize="18sp"/>
+        <TextView
+            style="@android:style/TextAppearance.Material.Headline"
+            android:id="@+id/headerText"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/colorAccent"/>
 
-        <!-- fill space between header and button below -->
-        <View
-            android:layout_weight="1.0"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            />
+        <TextView
+            style="@android:style/TextAppearance.Material.Body1"
+            android:id="@+id/detailsText"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginTop="12dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
-        <!-- footer message -->
-        <TextView android:id="@+id/footerText"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:gravity="center"
-                  android:textSize="14sp"/>
+        <Button
+            style="@android:style/Widget.Material.Button.Borderless"
+            android:id="@+id/cancelButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/cancel"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginTop="16dp"/>
     </LinearLayout>
 
-    <View
-         android:background="@*android:drawable/code_lock_left"
-         android:layout_width="2dip"
-         android:layout_height="match_parent" />
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        android:clipChildren="false"
+        android:clipToPadding="false">
 
-    <!-- right side: lock pattern -->
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
-         android:background="@color/lock_pattern_background" />
+        <View
+            android:id="@+id/leftSpacer"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.4"/>
 
+        <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:clipChildren="false"
+            android:clipToPadding="false">
+
+            <com.android.internal.widget.LockPatternView
+                android:id="@+id/lockPattern"
+                android:layout_width="288dp"
+                android:layout_height="288dp"
+                android:layout_marginStart="-42dp"
+                android:layout_marginEnd="-42dp"
+                android:layout_gravity="center_vertical"/>
+
+            <TextView
+                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                android:id="@+id/errorText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|center_horizontal"
+                android:layout_marginBottom="24dp"/>
+        </FrameLayout>
+
+        <View
+            android:id="@+id/rightSpacer"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <ImageView
+            android:id="@+id/fingerprintIcon"
+            android:layout_gravity="center_vertical"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:visibility="gone"/>
+    </LinearLayout>
 
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
 
diff --git a/res/layout-land/fingerprint_enroll.xml b/res/layout-land/fingerprint_enroll.xml
new file mode 100644
index 0000000..7bd41d1
--- /dev/null
+++ b/res/layout-land/fingerprint_enroll.xml
@@ -0,0 +1,140 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical">
+
+    <!-- Left area -->
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="0dip"
+            android:layout_weight="0.4"
+            android:background="@color/fingerprint_title_area_bg"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/fingerprint_enroll_title"
+                android:background="@color/fingerprint_title_area_bg"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="20dip"
+                android:layout_marginStart="40dip"
+                android:layout_marginEnd="40dip"
+                style="@style/TextAppearance.FingerprintTitle"
+                android:layout_alignParentBottom="true"/>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/fingerprint_enroll_message"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="0.6"
+            android:layout_marginTop="24dip"
+            android:layout_marginStart="40dip"
+            android:layout_marginEnd="40dip"
+            android:layout_marginBottom="36dip"
+            style="@style/TextAppearance.FingerprintMessage"/>
+
+    </LinearLayout>
+
+    <!-- Right area -->
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/fingerprint_view_selector"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:layout_gravity="center"
+            android:gravity="center">
+
+            <!-- Only one of the following views will show for any given mode -->
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true">
+
+                <ImageView
+                    android:id="@+id/fingerprint_animator"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:src="@drawable/fingerprint_indicator" />
+
+                <ProgressBar
+                    android:id="@+id/fingerprint_progress_bar"
+                    android:layout_width="200dip"
+                    android:layout_height="200dip"
+                    android:layout_centerInParent="true"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:max="10000"
+                    android:progress="0"
+                    android:indeterminate="false"
+                    android:progressDrawable="@drawable/fingerprint_progress_ring" />
+
+            </RelativeLayout>
+
+            <ImageView
+                android:id="@+id/fingerprint_sensor_location"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/fingerprint_sensor_location" />
+
+            <ImageView
+                android:id="@+id/fingerprint_in_app_indicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/fingerprint_in_app_indicator" />
+        </RelativeLayout>
+
+        <!-- Button area -->
+        <LinearLayout
+            android:id="@+id/fingerprint_enroll_button_area"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/fingerprint_enroll_button_add"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/fingerprint_enroll_button_add" />
+
+            <Button
+                android:id="@+id/fingerprint_enroll_button_next"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/fingerprint_enroll_button_next" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout-land/setup_preference.xml b/res/layout-land/setup_preference.xml
deleted file mode 100644
index b525b68..0000000
--- a/res/layout-land/setup_preference.xml
+++ /dev/null
@@ -1,65 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <FrameLayout
-        android:id="@+id/title_area"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/setup_illustration_bg"
-        android:elevation="@dimen/setup_wizard_title_area_elevation">
-
-        <TextView
-            android:id="@+id/title"
-            style="@style/SetupTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/wifi_setup_wizard_title" />
-
-    </FrameLayout>
-
-    <TextView
-        android:id="@+id/wifi_required_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="6dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/wifi_required_info_text"
-        android:visibility="gone" />
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:cacheColorHint="@android:color/transparent"
-        android:clipToPadding="false"
-        android:drawSelectorOnTop="false"
-        android:headerDividersEnabled="false"
-        android:scrollbarAlwaysDrawVerticalTrack="true" />
-
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
-        android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
-
-</LinearLayout>
-
diff --git a/res/layout-land/setup_template.xml b/res/layout-land/setup_template.xml
deleted file mode 100644
index cc3402f..0000000
--- a/res/layout-land/setup_template.xml
+++ /dev/null
@@ -1,68 +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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:layout_weight="1"
-        android:layout_width="match_parent"
-        android:layout_height="0dp">
-
-        <FrameLayout
-            android:id="@+id/title_area"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:background="@drawable/setup_illustration_bg"
-            android:elevation="@dimen/setup_wizard_title_area_elevation">
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/wifi_setup_title"
-                style="@style/SetupTitle"/>
-        </FrameLayout>
-
-        <ScrollView
-            android:id="@+id/bottom_scroll_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/title_area"
-            android:layout_alignParentBottom="true"
-            android:fillViewport="true">
-
-            <FrameLayout android:id="@+id/setup_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clipChildren="false"/>
-
-        </ScrollView>
-
-    </RelativeLayout>
-
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
-        android:id="@+id/navigation_bar"
-        android:layout_width="match_parent"
-        android:layout_height="56dip"
-        style="@style/setup_wizard_navbar_style"/>
-</LinearLayout>
-
diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml
deleted file mode 100644
index cbaad7a..0000000
--- a/res/layout-sw600dp-land/confirm_lock_password.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 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 is the same layout as choose_lock_password. TODO: find out why merge tag fails -->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dip"
-        android:orientation="horizontal">
-
-        <!-- "Enter PIN(Password) to unlock" -->
-        <TextView android:id="@+id/headerText"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="horizontal"
-            android:layout_marginEnd="6dip"
-            android:layout_marginStart="6dip"
-            android:layout_marginTop="10dip"
-            android:layout_marginBottom="10dip"
-            android:gravity="start"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-        />
-
-        <!-- Password entry field -->
-        <EditText android:id="@+id/password_entry"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext"
-            android:gravity="center"
-            android:textSize="24sp"
-            style="@style/TextAppearance.PasswordEntry"
-        />
-    </LinearLayout>
-
-    <!-- confirm / restart buttons -->
-    <LinearLayout
-        style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
-
-        <!-- left / top button: skip, or re-try -->
-        <Button android:id="@+id/cancel_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpassword_cancel_label"/>
-
-        <!-- right / bottom button: confirm or ok -->
-        <Button android:id="@+id/next_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpassword_continue_label"/>
-
-    </LinearLayout>
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml
deleted file mode 100644
index a090a6f..0000000
--- a/res/layout-sw600dp-land/confirm_lock_pattern.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.
--->
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal">
-
-    <!-- header message -->
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginTop="40dip">
-
-        <TextView android:id="@+id/headerText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    </ScrollView>
-
-    <!-- footer message -->
-    <TextView android:id="@+id/footerText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="0.6"/>
-
-    <!-- lock pattern widget -->
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-        android:layout_width="354dip"
-        android:layout_height="354dip"
-        android:background="@color/lock_pattern_background"
-        aspect="square"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"/>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
diff --git a/res/layout-sw600dp-land/setup_preference.xml b/res/layout-sw600dp-land/setup_preference.xml
deleted file mode 100644
index 814bc91..0000000
--- a/res/layout-sw600dp-land/setup_preference.xml
+++ /dev/null
@@ -1,87 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.android.settings.widget.SetupWizardIllustration
-        android:id="@+id/setup_illustration"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:foreground="@drawable/setup_illustration"
-        android:background="@drawable/setup_illustration_bg">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="start|top"
-            android:weightSum="16">
-
-            <TextView
-                android:id="@+id/title"
-                style="@style/SetupCardTitle"
-                android:layout_width="1dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height"
-                android:layout_weight="6"
-                android:text="@string/wifi_setup_wizard_title"/>
-
-            <LinearLayout
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/setup_wizard_card_land_margin_top"
-                android:layout_weight="8"
-                android:background="@drawable/setup_wizard_card_bg"
-                android:elevation="@dimen/setup_wizard_card_elevation"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/wifi_required_info"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="6dp"
-                    android:text="@string/wifi_required_info_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:visibility="gone" />
-
-                <ListView
-                    android:id="@android:id/list"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:cacheColorHint="@android:color/transparent"
-                    android:clipToPadding="false"
-                    android:drawSelectorOnTop="false"
-                    android:headerDividersEnabled="false"
-                    android:scrollbarAlwaysDrawVerticalTrack="true" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </com.android.settings.widget.SetupWizardIllustration>
-
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
-        android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
-
-</LinearLayout>
-
diff --git a/res/layout-sw600dp-land/setup_template.xml b/res/layout-sw600dp-land/setup_template.xml
deleted file mode 100644
index a58dd3d..0000000
--- a/res/layout-sw600dp-land/setup_template.xml
+++ /dev/null
@@ -1,74 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.android.settings.widget.SetupWizardIllustration
-        android:id="@+id/setup_illustration"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@drawable/setup_illustration_bg"
-        android:foreground="@drawable/setup_illustration">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="start|top"
-            android:weightSum="16">
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height"
-                android:layout_weight="6"
-                android:text="@string/wifi_setup_title"
-                style="@style/SetupCardTitle"/>
-
-            <ScrollView
-                android:id="@+id/bottom_scroll_view"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/setup_wizard_card_land_margin_top"
-                android:layout_weight="8"
-                android:background="@drawable/setup_wizard_card_bg"
-                android:elevation="@dimen/setup_wizard_card_elevation"
-                android:fillViewport="true">
-
-                <FrameLayout android:id="@+id/setup_content"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:clipChildren="false"/>
-
-            </ScrollView>
-
-        </LinearLayout>
-
-    </com.android.settings.widget.SetupWizardIllustration>
-
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
-        android:id="@+id/navigation_bar"
-        android:layout_width="match_parent"
-        android:layout_height="56dip"
-        style="@style/setup_wizard_navbar_style"/>
-
-</LinearLayout>
-
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index 12b6ab2..1649aaa 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -1,103 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-**
-** Copyright 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.
-*/
--->
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="48dp">
 
-<!-- This is the same layout as choose_lock_password -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:gravity="center_horizontal">
-
-    <!-- header text ('Enter Pin') -->
-    <TextView android:id="@+id/headerText"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <!-- spacer above text entry field -->
-    <View
-        android:id="@+id/spacerBottom"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:layout_marginTop="6dip"
-        android:background="@android:drawable/divider_horizontal_dark"
-    />
-
-    <!-- Password entry field -->
-    <EditText android:id="@+id/password_entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="15dip"
-        android:layout_marginStart="30dip"
-        android:layout_marginEnd="30dip"
-        android:layout_gravity="center"
-        android:inputType="textPassword"
-        android:imeOptions="actionNext"
-        android:gravity="center"
-        android:textSize="32sp"
-        style="@style/TextAppearance.PasswordEntry"
-    />
-
-    <!-- Spacer between password entry and keyboard -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:layout_marginBottom="30dip"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-    />
-
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent">
-
-        <LinearLayout
-            style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentEnd="true"
-            android:orientation="horizontal">
-
-            <Button android:id="@+id/cancel_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpassword_cancel_label"/>
-
-            <Button android:id="@+id/next_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpassword_continue_label"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</LinearLayout>
-
+    <include layout="@layout/confirm_lock_password_base"
+        android:layout_width="328dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"/>
+</FrameLayout>
diff --git a/res/layout-sw600dp/confirm_lock_pattern.xml b/res/layout-sw600dp/confirm_lock_pattern.xml
index 12e2b86..55e4fa1 100644
--- a/res/layout-sw600dp/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp/confirm_lock_pattern.xml
@@ -13,48 +13,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-        xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal">
+    android:layout_height="match_parent">
 
-    <!-- top: instructions and buttons -->
-    <!-- header message -->
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginTop="96dip">
-
-        <TextView android:id="@+id/headerText"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    </ScrollView>
-
-    <!-- footer message -->
-    <TextView android:id="@+id/footerText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <!-- bottom: lock pattern -->
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="354dip"
-         android:layout_height="354dip"
-         android:layout_marginTop="80dip"
-         android:background="@color/lock_pattern_background"
-         aspect="square"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"/>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
+    <include layout="@layout/confirm_lock_pattern_base"
+        android:layout_width="328dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"/>
+</FrameLayout>
diff --git a/res/layout-sw600dp/setup_preference.xml b/res/layout-sw600dp/setup_preference.xml
deleted file mode 100644
index ec6d2ac..0000000
--- a/res/layout-sw600dp/setup_preference.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014 Google Inc.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.android.settings.widget.SetupWizardIllustration
-        android:id="@+id/setup_illustration"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@drawable/setup_illustration_bg"
-        android:foreground="@drawable/setup_illustration">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height"
-            android:orientation="vertical"
-            android:paddingLeft="@dimen/setup_wizard_card_port_margin_sides"
-            android:paddingRight="@dimen/setup_wizard_card_port_margin_sides">
-
-            <TextView
-                android:id="@+id/title"
-                style="@style/SetupCardTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/wifi_setup_wizard_title" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:background="@drawable/setup_wizard_card_bg"
-                android:elevation="@dimen/setup_wizard_card_elevation"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/wifi_required_info"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="6dp"
-                    android:text="@string/wifi_required_info_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:visibility="gone" />
-
-                <ListView
-                    android:id="@android:id/list"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:cacheColorHint="@android:color/transparent"
-                    android:clipToPadding="false"
-                    android:drawSelectorOnTop="false"
-                    android:headerDividersEnabled="false"
-                    android:scrollbarAlwaysDrawVerticalTrack="true" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </com.android.settings.widget.SetupWizardIllustration>
-
-    <fragment
-        android:id="@+id/navigation_bar"
-        android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
-        style="@style/setup_wizard_navbar_style" />
-
-</LinearLayout>
-
diff --git a/res/layout-sw600dp/setup_template.xml b/res/layout-sw600dp/setup_template.xml
deleted file mode 100644
index 297e9fb..0000000
--- a/res/layout-sw600dp/setup_template.xml
+++ /dev/null
@@ -1,74 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.android.settings.widget.SetupWizardIllustration
-        android:id="@+id/setup_illustration"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@drawable/setup_illustration_bg"
-        android:foreground="@drawable/setup_illustration">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height"
-            android:orientation="vertical"
-            android:paddingStart="@dimen/setup_wizard_card_port_margin_sides"
-            android:paddingEnd="@dimen/setup_wizard_card_port_margin_sides">
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/wifi_setup_title"
-                style="@style/SetupCardTitle"/>
-
-            <ScrollView
-                android:id="@+id/bottom_scroll_view"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:background="@drawable/setup_wizard_card_bg"
-                android:elevation="@dimen/setup_wizard_card_elevation"
-                android:fillViewport="true">
-
-                <FrameLayout
-                    android:id="@+id/setup_content"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:clipChildren="false"/>
-
-            </ScrollView>
-
-        </LinearLayout>
-
-    </com.android.settings.widget.SetupWizardIllustration>
-
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
-        android:id="@+id/navigation_bar"
-        android:layout_width="match_parent"
-        android:layout_height="56dip"
-        style="@style/setup_wizard_navbar_style"/>
-
-</LinearLayout>
-
diff --git a/res/layout/app_cache_settings.xml b/res/layout/app_cache_settings.xml
new file mode 100644
index 0000000..bb57433
--- /dev/null
+++ b/res/layout/app_cache_settings.xml
@@ -0,0 +1,58 @@
+<?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.
+-->
+
+<!-- Clear cache section -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/all_details"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:id="@+id/cache_size"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dip">
+        <TextView
+            android:text="@string/cache_size_label"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:maxLines="1"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:textColorPrimary"
+            android:gravity="center_vertical" />
+        <TextView
+            android:id="@+id/cache_size_text"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:gravity="right"
+            android:maxLines="1" />
+    </FrameLayout>
+
+    <include
+        android:id="@+id/clear_cache_button"
+        layout="@layout/single_button_panel" />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="10dp" />
+
+</LinearLayout>
diff --git a/res/layout/app_domains_dialog.xml b/res/layout/app_domains_dialog.xml
new file mode 100644
index 0000000..c00bff0
--- /dev/null
+++ b/res/layout/app_domains_dialog.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:paddingStart="24dp"
+             android:paddingTop="16dp"
+             android:paddingEnd="24dp">
+
+    <ListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollbarStyle="insideOverlay" />
+
+</FrameLayout>
diff --git a/res/layout/zen_downtime_day.xml b/res/layout/app_domains_item.xml
old mode 100755
new mode 100644
similarity index 66%
copy from res/layout/zen_downtime_day.xml
copy to res/layout/app_domains_item.xml
index 8d2fa73..90fc0e4
--- a/res/layout/zen_downtime_day.xml
+++ b/res/layout/app_domains_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     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.
@@ -14,10 +15,11 @@
      limitations under the License.
 -->
 
-<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/domain_name"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:gravity="center_vertical"
-    android:paddingStart="@dimen/zen_downtime_checkbox_padding" />
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp"
+    android:paddingTop="16dp"
+    />
diff --git a/res/layout/app_notification_header.xml b/res/layout/app_header.xml
similarity index 97%
rename from res/layout/app_notification_header.xml
rename to res/layout/app_header.xml
index 8c3ca4b..d9453f4 100644
--- a/res/layout/app_notification_header.xml
+++ b/res/layout/app_header.xml
@@ -36,7 +36,7 @@
         android:layout_alignWithParentIfMissing="true"
         android:layout_centerVertical="true"
         android:textAppearance="@style/TextAppearance.Switch"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@android:color/white"
         android:textAlignment="viewStart" />
 
     <ImageView
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index 83d88e0..64146d9 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -57,7 +57,7 @@
         android:layout_gravity="fill_horizontal|top"
         android:layout_marginTop="4dip"
         android:max="100"
-        android:progressDrawable="@drawable/data_usage_bar"
+        android:progressBackgroundTint="@android:color/transparent"
         style="?android:attr/progressBarStyleHorizontal" />
 
     <TextView
diff --git a/res/layout/app_preference_item.xml b/res/layout/app_preference_item.xml
index 22ee37e..b02f835 100755
--- a/res/layout/app_preference_item.xml
+++ b/res/layout/app_preference_item.xml
@@ -24,18 +24,29 @@
         android:id="@+id/app_image"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:adjustViewBounds="true"
         android:padding="6dip"
     />
-    <CheckedTextView
+    <TextView
         android:id="@+id/app_label"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
-        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="?android:attr/textColorAlertDialogListItem"
         android:gravity="center_vertical"
         android:paddingEnd="7dip"
-        android:checkMark="?android:attr/listChoiceIndicatorSingle"
         android:ellipsize="marquee"
     />
+    <TextView
+        android:id="@+id/default_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:gravity="center_vertical"
+        android:text="@string/default_app"
+        android:visibility="gone"
+        android:paddingEnd="7dip"
+    />
 </LinearLayout>
diff --git a/res/layout/app_preferred_settings.xml b/res/layout/app_preferred_settings.xml
new file mode 100644
index 0000000..2e54068
--- /dev/null
+++ b/res/layout/app_preferred_settings.xml
@@ -0,0 +1,49 @@
+<?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.
+-->
+
+<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:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingBottom="5dip"
+        android:orientation="vertical">
+
+        <TextView android:id="@+id/auto_launch"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:layout_alignParentStart="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="6dip" />
+
+        <Button
+            android:id="@+id/clear_activities_button"
+            android:layout_marginStart="-4dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/clear_activities" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/app_storage_settings.xml b/res/layout/app_storage_settings.xml
new file mode 100644
index 0000000..82493f7
--- /dev/null
+++ b/res/layout/app_storage_settings.xml
@@ -0,0 +1,151 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/all_details"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:orientation="vertical">
+
+    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/category_title"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dashboard_category_title_height"
+        android:singleLine="true"
+        android:gravity="center_vertical"
+        android:textAppearance="@style/TextAppearance.CategoryTitle"
+        android:textAlignment="viewStart"
+        android:text="@string/storage_label"
+        />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="0dip">
+        <TextView
+            android:id="@+id/total_size_prefix"
+            android:text="@string/total_size_label"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:textColor="?android:textColorPrimary"
+            android:maxLines="1" />
+        <TextView
+            android:id="@+id/total_size_text"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:gravity="right"
+            android:maxLines="1" />
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="3dip">
+        <TextView
+            android:id="@+id/application_size_prefix"
+            android:text="@string/application_size_label"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:textColor="?android:textColorPrimary"
+            android:maxLines="1" />
+        <TextView
+            android:id="@+id/application_size_text"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:gravity="right"
+            android:maxLines="1" />
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="3dip">
+        <TextView
+            android:id="@+id/external_code_size_prefix"
+            android:text="@string/external_code_size_label"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:textColor="?android:textColorPrimary"
+            android:maxLines="1" />
+        <TextView
+            android:id="@+id/external_code_size_text"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:gravity="right"
+            android:maxLines="1" />
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="3dip">
+        <TextView
+            android:id="@+id/data_size_prefix"
+            android:text="@string/data_size_label"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:textColor="?android:textColorPrimary"
+            android:maxLines="1" />
+        <TextView
+            android:id="@+id/data_size_text"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:gravity="right"
+            android:maxLines="1" />
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="3dip">
+        <TextView
+            android:id="@+id/external_data_size_prefix"
+            android:text="@string/external_data_size_label"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:textColor="?android:textColorPrimary"
+            android:maxLines="1" />
+        <TextView
+            android:id="@+id/external_data_size_text"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:gravity="right"
+            android:maxLines="1" />
+    </FrameLayout>
+
+    <include
+        android:id="@+id/clear_data_button"
+        layout="@layout/single_button_panel" />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="10dp" />
+
+</LinearLayout>
diff --git a/res/layout/apps_filter_spinner.xml b/res/layout/apps_filter_spinner.xml
new file mode 100644
index 0000000..f72d7ee
--- /dev/null
+++ b/res/layout/apps_filter_spinner.xml
@@ -0,0 +1,41 @@
+<?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.
+-->
+
+<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" >
+
+    <Spinner
+        android:id="@+id/filter_spinner"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginStart="@dimen/switchbar_subsettings_margin_start"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_centerVertical="true"
+        android:textAlignment="viewStart" />
+
+    <View
+        android:id="@+id/row_divider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/listDivider" />
+
+</RelativeLayout>
+
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
deleted file mode 100644
index c9a0bbe..0000000
--- a/res/layout/confirm_lock_password.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 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 is the same layout as choose_lock_password -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:gravity="center_horizontal">
-
-    <!-- header text ('Enter Pin') -->
-    <TextView android:id="@+id/headerText"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <!-- Password entry field -->
-    <EditText android:id="@+id/password_entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="30dip"
-        android:layout_marginEnd="30dip"
-        android:layout_gravity="center"
-        android:inputType="textPassword"
-        android:imeOptions="actionNext"
-        android:gravity="center"
-        android:textSize="24sp"
-        style="@style/TextAppearance.PasswordEntry"
-    />
-
-    <!-- Spacer between password entry and keyboard -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"
-    />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-    />
-
-    <LinearLayout
-        style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
-
-        <!-- left / top button: skip, or re-try -->
-        <Button android:id="@+id/cancel_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_cancel_label"/>
-
-        <!-- right / bottom button: confirm or ok -->
-        <Button android:id="@+id/next_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_continue_label"/>
-
-    </LinearLayout>
-
-</LinearLayout>
-
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
new file mode 100644
index 0000000..af4ffe8
--- /dev/null
+++ b/res/layout/confirm_lock_password_base.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <TextView
+        style="@android:style/TextAppearance.Material.Headline"
+        android:id="@+id/headerText"
+        android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginTop="?attr/confirmDeviceCredentialsTopMargin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?android:attr/colorAccent"/>
+
+    <TextView
+        style="@android:style/TextAppearance.Material.Body1"
+        android:id="@+id/detailsText"
+        android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginTop="12dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+
+    <Button
+        style="@android:style/Widget.Material.Button.Borderless"
+        android:id="@+id/cancelButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cancel"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"/>
+
+    <View android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <EditText
+        android:id="@+id/password_entry"
+        android:layout_width="208dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-40dp"
+        android:inputType="textPassword"
+        android:imeOptions="actionNext"
+        android:gravity="center"
+        android:textSize="16sp"
+        style="@style/TextAppearance.PasswordEntry"/>
+
+    <TextView
+        style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+        android:id="@+id/errorText"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:gravity="center_vertical"/>
+
+    <ImageView
+        android:id="@+id/fingerprintIcon"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="24dp"
+        android:visibility="gone"/>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
\ No newline at end of file
diff --git a/res/layout/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml
deleted file mode 100644
index 4426242..0000000
--- a/res/layout/confirm_lock_pattern.xml
+++ /dev/null
@@ -1,42 +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.
--->
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-        xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent">
-
-    <TextView android:id="@+id/headerText"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0"
-        android:gravity="center"
-        android:textSize="18sp"/>
-
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
-         android:background="@color/lock_pattern_background" />
-
-    <TextView android:id="@+id/footerText"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0"
-        android:gravity="center"
-        android:textSize="14sp"/>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
new file mode 100644
index 0000000..029b856
--- /dev/null
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <TextView
+        style="@android:style/TextAppearance.Material.Headline"
+        android:id="@+id/headerText"
+        android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginTop="?attr/confirmDeviceCredentialsTopMargin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?android:attr/colorAccent"/>
+
+    <TextView
+        style="@android:style/TextAppearance.Material.Body1"
+        android:id="@+id/detailsText"
+        android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
+        android:layout_marginTop="12dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+
+    <Button
+        style="@android:style/Widget.Material.Button.Borderless"
+        android:id="@+id/cancelButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cancel"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"/>
+
+    <View android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.5"/>
+
+    <com.android.internal.widget.LockPatternView
+        android:id="@+id/lockPattern"
+        android:layout_width="312dp"
+        android:layout_height="312dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-46dp"
+        android:layout_marginBottom="-46dp"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+            android:id="@+id/errorText"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:gravity="center_vertical"/>
+
+        <ImageView
+            android:id="@+id/fingerprintIcon"
+            android:layout_gravity="center_horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="24dp"
+            android:visibility="gone"/>
+    </LinearLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
\ No newline at end of file
diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
index 2d98b25..34c7f64 100644
--- a/res/layout/crypt_keeper_password_field.xml
+++ b/res/layout/crypt_keeper_password_field.xml
@@ -26,17 +26,10 @@
         android:layout_width="0dip"
         android:layout_weight="1"
         android:inputType="textPassword"
+        android:textSize="16sp"
+        android:padding="10sp"
         style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
 
-   <ImageView android:id="@+id/switch_ime_button"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"
-       android:src="@drawable/ic_lockscreen_ime"
-       android:clickable="true"
-       android:contentDescription="@string/crypt_keeper_switch_input_method"
-       android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
-       android:layout_gravity="center"
-       android:background="?android:attr/selectableItemBackground"
-       android:visibility="gone" />
+   <include layout="@layout/crypt_keeper_switch_input_method" />
 
 </merge>
diff --git a/res/layout/crypt_keeper_pattern_field.xml b/res/layout/crypt_keeper_pattern_field.xml
index cf6a29f..e12f77b 100644
--- a/res/layout/crypt_keeper_pattern_field.xml
+++ b/res/layout/crypt_keeper_pattern_field.xml
@@ -26,15 +26,6 @@
        android:layout_height="match_parent"
        android:background="@color/lock_pattern_background" />
 
-   <ImageView android:id="@+id/switch_ime_button"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"
-       android:src="@drawable/ic_lockscreen_ime"
-       android:clickable="true"
-       android:contentDescription="@string/crypt_keeper_switch_input_method"
-       android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
-       android:layout_gravity="center"
-       android:background="?android:attr/selectableItemBackground"
-       android:visibility="gone" />
+   <include layout="@layout/crypt_keeper_switch_input_method" />
 
 </merge>
diff --git a/res/layout/crypt_keeper_pin_field.xml b/res/layout/crypt_keeper_pin_field.xml
index 2fc1e81..56b4978 100644
--- a/res/layout/crypt_keeper_pin_field.xml
+++ b/res/layout/crypt_keeper_pin_field.xml
@@ -26,17 +26,10 @@
         android:layout_width="0dip"
         android:layout_weight="1"
         android:inputType="numberPassword"
+        android:textSize="28sp"
+        android:padding="4sp"
         style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
 
-   <ImageView android:id="@+id/switch_ime_button"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"
-       android:src="@drawable/ic_lockscreen_ime"
-       android:clickable="true"
-       android:contentDescription="@string/crypt_keeper_switch_input_method"
-       android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
-       android:layout_gravity="center"
-       android:background="?android:attr/selectableItemBackground"
-       android:visibility="gone" />
+   <include layout="@layout/crypt_keeper_switch_input_method" />
 
 </merge>
diff --git a/res/layout/crypt_keeper_switch_input_method.xml b/res/layout/crypt_keeper_switch_input_method.xml
new file mode 100644
index 0000000..b55db22
--- /dev/null
+++ b/res/layout/crypt_keeper_switch_input_method.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.
+*/
+-->
+
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switch_ime_button"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:src="@drawable/ic_lockscreen_ime"
+    android:clickable="true"
+    android:contentDescription="@string/crypt_keeper_switch_input_method"
+    android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
+    android:layout_gravity="center"
+    android:background="?android:attr/selectableItemBackground"
+    android:visibility="gone" />
diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
index 01afa5d..bee063e 100644
--- a/res/layout/dashboard_category.xml
+++ b/res/layout/dashboard_category.xml
@@ -21,7 +21,7 @@
         android:paddingStart="@dimen/dashboard_category_padding_start"
         android:paddingEnd="@dimen/dashboard_category_padding_end"
         android:orientation="vertical"
-        android:background="@android:color/white"
+        android:background="@color/card_background"
         android:layout_marginBottom="8dip"
         android:elevation="@dimen/dashboard_category_elevation">
 
diff --git a/res/layout/default_apps_view.xml b/res/layout/default_apps_view.xml
new file mode 100644
index 0000000..3c8cc29
--- /dev/null
+++ b/res/layout/default_apps_view.xml
@@ -0,0 +1,45 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1">
+
+        <ListView android:id="@android:id/list"
+                style="@style/PreferenceFragmentListSinglePane"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:drawSelectorOnTop="false"
+                android:scrollbarStyle="outsideOverlay"
+                android:fastScrollEnabled="true" />
+
+        <TextView android:id="@android:id/empty"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="@string/no_default_apps"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/res/layout/default_apps_view_item.xml b/res/layout/default_apps_view_item.xml
new file mode 100644
index 0000000..2ded826
--- /dev/null
+++ b/res/layout/default_apps_view_item.xml
@@ -0,0 +1,57 @@
+<?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.
+-->
+
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+            android:paddingTop="8dip"
+            android:paddingBottom="8dip"
+            android:columnCount="4">
+
+    <ImageView
+            android:id="@+id/app_icon"
+            android:layout_width="@android:dimen/app_icon_size"
+            android:layout_height="@android:dimen/app_icon_size"
+            android:layout_rowSpan="2"
+            android:layout_marginEnd="8dip"
+            android:scaleType="centerInside"
+            android:contentDescription="@null" />
+
+    <TextView
+            android:id="@+id/app_name"
+            android:layout_width="0dip"
+            android:layout_columnSpan="2"
+            android:layout_gravity="fill_horizontal"
+            android:layout_marginTop="2dip"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textAlignment="viewStart"/>
+
+    <TextView
+            android:id="@+id/app_domains"
+            android:layout_column="1"
+            android:layout_row="1"
+            android:layout_gravity="fill_horizontal|top"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textAlignment="viewStart" />
+
+</GridLayout>
diff --git a/res/layout/zen_downtime_day.xml b/res/layout/filter_spinner_item.xml
old mode 100755
new mode 100644
similarity index 63%
copy from res/layout/zen_downtime_day.xml
copy to res/layout/filter_spinner_item.xml
index 8d2fa73..e83dd80
--- a/res/layout/zen_downtime_day.xml
+++ b/res/layout/filter_spinner_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     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.
@@ -14,10 +15,13 @@
      limitations under the License.
 -->
 
-<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerItemStyle"
+    android:singleLine="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:gravity="center_vertical"
-    android:paddingStart="@dimen/zen_downtime_checkbox_padding" />
+    android:ellipsize="marquee"
+    android:textAppearance="@style/TextAppearance.Switch"
+    android:textColor="@android:color/white"
+    android:textAlignment="inherit"/>
diff --git a/res/layout/fingerprint_enroll.xml b/res/layout/fingerprint_enroll.xml
new file mode 100644
index 0000000..5a0b24b
--- /dev/null
+++ b/res/layout/fingerprint_enroll.xml
@@ -0,0 +1,133 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal">
+
+    <!-- Upper title area -->
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="0.25"
+        android:background="@color/fingerprint_title_area_bg">
+
+        <TextView
+            android:id="@+id/fingerprint_enroll_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dip"
+            android:layout_marginStart="40dip"
+            android:layout_marginEnd="40dip"
+            style="@style/TextAppearance.FingerprintTitle"
+            android:layout_alignParentBottom="true"/>
+
+    </RelativeLayout>
+
+    <!-- Lower message area -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="0.75"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/fingerprint_enroll_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dip"
+            android:layout_marginStart="40dip"
+            android:layout_marginEnd="40dip"
+            android:layout_marginBottom="36dip"
+            style="@style/TextAppearance.FingerprintMessage"/>
+
+        <RelativeLayout
+            android:id="@+id/fingerprint_view_selector"
+            android:layout_width="wrap_content"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:layout_gravity="center"
+            android:gravity="center">
+
+            <!-- Only one of the following views will show for any given mode -->
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true">
+
+                <ImageView
+                    android:id="@+id/fingerprint_animator"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:src="@drawable/fingerprint_indicator" />
+
+                <ProgressBar
+                    android:id="@+id/fingerprint_progress_bar"
+                    android:layout_width="200dip"
+                    android:layout_height="200dip"
+                    android:layout_centerInParent="true"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:max="10000"
+                    android:progress="0"
+                    android:indeterminate="false"
+                    android:progressDrawable="@drawable/fingerprint_progress_ring" />
+
+            </RelativeLayout>
+
+            <ImageView
+                android:id="@+id/fingerprint_sensor_location"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/fingerprint_sensor_location" />
+
+            <ImageView
+                android:id="@+id/fingerprint_in_app_indicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/fingerprint_in_app_indicator" />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <!-- Button area -->
+    <LinearLayout
+        android:id="@+id/fingerprint_enroll_button_area"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Button
+            android:id="@+id/fingerprint_enroll_button_add"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/fingerprint_enroll_button_add"
+            android:layout_margin="10dip" />
+
+        <Button
+            android:id="@+id/fingerprint_enroll_button_next"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/fingerprint_enroll_button_next"
+            android:layout_margin="10dip" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/fingerprint_rename_dialog.xml b/res/layout/fingerprint_rename_dialog.xml
new file mode 100644
index 0000000..38b6ff2
--- /dev/null
+++ b/res/layout/fingerprint_rename_dialog.xml
@@ -0,0 +1,36 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|start"
+        android:layout_margin="10dip"
+        android:text="@string/security_settings_fingerprint_enroll_dialog_name_label"/>
+
+    <EditText
+        android:id="@+id/fingerprint_rename_field"
+        android:layout_width="160dip"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index 5b923fc..b703ec0 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -16,448 +16,39 @@
 ** 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
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/all_details"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:orientation="vertical">
+
+    <!-- App snippet with buttons -->
     <LinearLayout
-        android:id="@+id/all_details"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:paddingBottom="5dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:paddingTop="5dip"
+        android:paddingBottom="10dip"
         android:orientation="vertical">
 
-        <!-- App snippet with buttons -->
-        <LinearLayout
+        <!-- Application snippet label, version and icon -->
+        <include
+            layout="@layout/manage_applications_item"
+            android:id="@+id/app_snippet" />
+
+        <Space
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:orientation="vertical">
+            android:layout_height="5dp" />
 
-            <!-- Application snippet label, version and icon -->
-            <include
-                layout="@layout/manage_applications_item"
-                android:id="@+id/app_snippet" />
+        <!-- Force stop and uninstall buttons -->
+        <include
+            layout="@layout/two_buttons_panel"
+            android:id="@+id/control_buttons_panel"/>
 
-            <!-- Force stop and uninstall buttons -->
-            <include
-                layout="@layout/two_buttons_panel"
-                android:id="@+id/control_buttons_panel"/>
-
-            <!-- Force stop and uninstall buttons -->
-            <include
-                layout="@layout/two_buttons_panel"
-                android:id="@+id/more_control_buttons_panel"/>
-
-            <!-- Ban notifications for this package -->
-            <CheckBox android:id="@+id/notification_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start"
-                android:layout_marginTop="4dip"
-                android:text="@string/app_notifications_switch_label" />
-
-        </LinearLayout>
-
-        <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
-            android:layout_marginTop="8dip"
-            android:text="@string/storage_label" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:id="@+id/total_size_prefix"
-                    android:text="@string/total_size_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:paddingTop="6dip" />
-                <ImageView
-                    android:id="@+id/info_size_dots"
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/total_size_text"
-                    android:paddingTop="6dip"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:id="@+id/application_size_prefix"
-                    android:text="@string/application_size_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:paddingTop="6dip" />
-                <ImageView
-                    android:id="@+id/info_size_dots"
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/application_size_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:id="@+id/external_code_size_prefix"
-                    android:text="@string/external_code_size_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:paddingTop="6dip" />
-                <ImageView
-                    android:id="@+id/info_size_dots"
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/external_code_size_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/info_size"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:id="@+id/data_size_prefix"
-                    android:text="@string/data_size_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:paddingTop="6dip" />
-                <ImageView
-                    android:id="@+id/info_size_dots"
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/data_size_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:id="@+id/external_data_size_prefix"
-                    android:text="@string/external_data_size_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:paddingTop="6dip" />
-                <ImageView
-                    android:id="@+id/info_size_dots"
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/external_data_size_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <!-- Clear data and install location buttons  -->
-            <include
-                layout="@layout/two_buttons_panel"
-                android:id="@+id/data_buttons_panel"/>
-
-        </LinearLayout>
-
-        <!-- Clear cache section -->
-        <RelativeLayout
-            android:id="@+id/cache_panel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <TextView
-                android:id="@+id/cache_header"
-                style="?android:attr/listSeparatorTextViewStyle"
-                android:layout_marginTop="8dip"
-                android:text="@string/cache_header_label" />
-            <LinearLayout
-                android:id="@+id/cache_size"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:layout_below="@id/cache_header"
-                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:text="@string/cache_size_label"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:gravity="center_vertical" />
-                <ImageView
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/cache_size_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/cache_size"
-                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                android:paddingTop="4dip"
-                android:orientation="horizontal">
-                <View
-                    android:layout_width="120dip"
-                    android:layout_height="0dip"
-                    android:layout_weight="0.4" />
-                <View
-                    android:layout_width="0dip"
-                    android:layout_height="0dip"
-                    android:visibility="invisible"
-                    android:layout_weight="0.2" />
-                <Button
-                    android:id="@+id/clear_cache_button"
-                    android:layout_width="120dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.4"
-                    android:text="@string/clear_cache_btn_text" />
-            </LinearLayout>
-
-        </RelativeLayout>
-
-        <!-- Prefered activities section -->
-        <TextView android:id="@+id/auto_launch_title"
-            style="?android:attr/listSeparatorTextViewStyle"
-            android:layout_marginTop="8dip"
-            android:text="@string/auto_launch_label" />
-
-        <RelativeLayout 
-            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">
-            <TextView android:id="@+id/auto_launch"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_alignParentStart="true"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="6dip" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/auto_launch"
-                android:paddingTop="4dip"
-                android:orientation="horizontal">
-                <View
-                    android:layout_width="120dip"
-                    android:layout_height="0dip"
-                    android:layout_weight="0.4" />
-                <View
-                    android:layout_width="0dip"
-                    android:layout_height="0dip"
-                    android:visibility="invisible"
-                    android:layout_weight="0.2" />
-                <Button
-                    android:id="@+id/clear_activities_button"
-                    android:layout_width="120dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.4"
-                    android:text="@string/clear_activities" />
-            </LinearLayout>
-        </RelativeLayout>
-
-        <!-- Screen compatibility section -->
-        <LinearLayout android:id="@+id/screen_compatibility_section"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-            <TextView
-                style="?android:attr/listSeparatorTextViewStyle"
-                android:layout_marginTop="8dip"
-                android:text="@string/screen_compatibility_label" />
-
-            <TextView android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_alignParentStart="true"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="6dip"
-                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                android:text="@string/screen_compatibility_text"/>
-            <CheckBox android:id="@+id/ask_compatibility_cb"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dip"
-                android:layout_gravity="start"
-                android:text="@string/ask_compatibility" />
-            <CheckBox android:id="@+id/enable_compatibility_cb"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dip"
-                android:layout_gravity="start"
-                android:text="@string/enable_compatibility" />
-        </LinearLayout>
-
-        <!-- Permissions section -->
-        <LinearLayout
-            android:id="@+id/permissions_section"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <TextView
-                style="?android:attr/listSeparatorTextViewStyle"
-                android:layout_marginTop="8dip"
-                android:text="@string/permissions_label" />
-            <TextView android:id="@+id/security_settings_billing_desc"
-                android:text="@string/security_settings_billing_desc"
-                android:textColor="#ffffb060"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:paddingTop="6dip"
-                android:paddingBottom="6dip"
-                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <LinearLayout
-                android:id="@+id/security_settings_billing_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/security_settings_premium_sms_desc" />
-                <Spinner
-                    android:id="@+id/security_settings_premium_sms_list"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:spinnerMode="dropdown" />
-            </LinearLayout>
-            <TextView android:id="@+id/security_settings_desc"
-                android:text="@string/security_settings_desc"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:paddingTop="6dip"
-                android:paddingBottom="6dip"
-                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <LinearLayout
-                android:id="@+id/security_settings_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"/>
-        </LinearLayout>
     </LinearLayout>
-</ScrollView>
+</LinearLayout>
 
diff --git a/res/layout/loading_container.xml b/res/layout/loading_container.xml
new file mode 100644
index 0000000..eb67044
--- /dev/null
+++ b/res/layout/loading_container.xml
@@ -0,0 +1,36 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/loading_container"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    android:gravity="center">
+
+    <ProgressBar style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="@string/settings_safetylegal_activity_loading"
+        android:paddingTop="4dip"
+        android:singleLine="true" />
+
+</LinearLayout>
diff --git a/res/layout/mac_preference.xml b/res/layout/mac_preference.xml
deleted file mode 100644
index f096b07..0000000
--- a/res/layout/mac_preference.xml
+++ /dev/null
@@ -1,79 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
-    android:orientation="vertical"
-    android:background="?android:attr/selectableItemBackground">
-
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="@dimen/wifi_divider_height"
-        android:background="@color/wifi_divider" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?android:attr/listPreferredItemHeightSmall"
-        android:gravity="center_vertical"
-        android:background="?android:attr/selectableItemBackground">
-
-        <RelativeLayout
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingTop="6dip"
-            android:paddingBottom="6dip">
-
-            <TextView
-                android:id="@+android:id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingStart="16dip"
-                android:paddingEnd="16dip"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal" />
-
-            <TextView
-                android:id="@android:id/summary"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@android:id/title"
-                android:layout_alignStart="@android:id/title"
-                android:paddingStart="16dip"
-                android:layout_marginEnd="16dip"
-                android:visibility="gone"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:maxLines="4" />
-
-        </RelativeLayout>
-
-        <LinearLayout
-            android:id="@android:id/widget_frame"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="vertical" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 1e0518d..044cdb4 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -52,25 +52,7 @@
 
         </LinearLayout>
 
-        <LinearLayout android:id="@+id/loading_container"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                android:gravity="center">
-
-            <ProgressBar style="?android:attr/progressBarStyleLarge"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            <TextView android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="@string/settings_safetylegal_activity_loading"
-                    android:paddingTop="4dip"
-                    android:singleLine="true" />
-
-        </LinearLayout>
+        <include layout="@layout/loading_container" />
 
     </FrameLayout>
 
diff --git a/res/layout/manage_applications_content.xml b/res/layout/manage_applications_content.xml
deleted file mode 100644
index db22529..0000000
--- a/res/layout/manage_applications_content.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@drawable/default_preference_background">
-
-    <FrameLayout android:id="@+id/pinned_header"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-
-    <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:padding="0dp">
-        </android.support.v4.view.PagerTabStrip>
-    </android.support.v4.view.ViewPager>
-
-</LinearLayout>
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index 5471aa9..042d518 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -34,7 +34,8 @@
         android:layout_rowSpan="2"
         android:layout_marginEnd="8dip"
         android:scaleType="centerInside"
-        android:contentDescription="@null" />
+        android:contentDescription="@null"
+        android:duplicateParentState="true" />
 
     <TextView
         android:id="@+id/app_name"
@@ -45,7 +46,8 @@
         android:singleLine="true"
         android:ellipsize="marquee"
         android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        android:textAlignment="viewStart"/>
+        android:textAlignment="viewStart"
+        android:duplicateParentState="true" />
 
     <CheckBox android:id="@+id/app_on_sdcard"
         android:layout_marginStart="8dip"
@@ -53,7 +55,8 @@
         android:layout_rowSpan="2"
         android:visibility="gone"
         android:clickable="false"
-        android:focusable="false" />
+        android:focusable="false"
+        android:duplicateParentState="true" />
 
     <TextView
         android:id="@+id/app_size"
@@ -62,7 +65,8 @@
         android:layout_gravity="fill_horizontal|top"
         android:textAppearance="@android:style/TextAppearance.Material.Body1"
         android:textColor="?android:attr/textColorSecondary"
-        android:textAlignment="viewStart" />
+        android:textAlignment="viewStart"
+        android:duplicateParentState="true" />
 
     <TextView
         android:id="@+id/app_disabled"
@@ -73,6 +77,7 @@
         android:textColor="?android:attr/textColorSecondary"
         android:textAlignment="viewEnd"
         android:singleLine="true"
-        android:ellipsize="marquee" />
+        android:ellipsize="marquee"
+        android:duplicateParentState="true" />
 
 </GridLayout>
diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index 485523a..6a9d4e5 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -29,25 +29,7 @@
                 android:layout_height="match_parent"
                 android:visibility="gone" />
 
-        <LinearLayout android:id="@+id/loading_container"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                android:gravity="center">
-
-            <ProgressBar style="?android:attr/progressBarStyleLarge"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            <TextView android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="@string/settings_safetylegal_activity_loading"
-                    android:paddingTop="4dip"
-                    android:singleLine="true" />
-
-        </LinearLayout>
+        <include layout="@layout/loading_container" />
 
     </FrameLayout>
 
diff --git a/res/layout/notification_app_list.xml b/res/layout/notification_app_list.xml
deleted file mode 100644
index 2eac287..0000000
--- a/res/layout/notification_app_list.xml
+++ /dev/null
@@ -1,43 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingStart="@dimen/settings_side_margin"
-        android:paddingEnd="@dimen/settings_side_margin"
-        android:divider="#0000"
-        android:dividerHeight="0px"
-        android:fastScrollEnabled="true"
-        android:listSelector="#0000"
-        android:scrollbarStyle="outsideInset" />
-
-    <TextView
-        android:id="@android:id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/loading_notification_apps"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml
index 6adec7d..80f0192 100644
--- a/res/layout/ownerinfo.xml
+++ b/res/layout/ownerinfo.xml
@@ -16,70 +16,29 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingStart="20dip"
+    android:paddingEnd="20dip"
+    android:paddingTop="20dip"
     android:orientation="vertical"
-    android:scrollbars="vertical"
     android:background="@android:color/white">
 
-    <ScrollView
+    <EditText
+        android:id="@+id/owner_info_edit_text"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbarStyle="outsideOverlay"
-        android:fillViewport="true">
+        android:layout_height="wrap_content"
+        android:gravity="top"
+        android:hint="@string/owner_info_settings_edit_text_hint"
+        android:maxLength="100"
+        android:inputType="textMultiLine|textCapSentences"
+        />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
-            <View
-                android:paddingTop="53dip"
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="#ff404040"
-                />
-
-            <EditText android:id="@+id/owner_info_nickname"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:gravity="top"
-                android:hint="@string/user_nickname"
-                android:inputType="textCapWords"
-            />
-
-            <CheckBox android:id="@+id/show_owner_info_on_lockscreen_checkbox"
-                android:layout_width="match_parent"
-                android:layout_height="64dip"
-                android:gravity="center_vertical"
-                android:layout_marginTop="8dip"
-                android:text="@string/show_owner_info_on_lockscreen_label"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorSecondary"
-            />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="#ff404040"
-                />
-
-            <EditText android:id="@+id/owner_info_edit_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="62dip"
-                android:layout_marginTop="40dip"
-                android:gravity="top"
-                android:hint="@string/owner_info_settings_edit_text_hint"
-                android:lines="8"
-                android:maxLines="8"
-                android:inputType="textMultiLine|textCapSentences"
-            />
-
-        </LinearLayout>
-
-    </ScrollView>
+    <TextView
+        android:id="@+id/owner_info_status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        />
 
 </LinearLayout>
 
diff --git a/res/layout/permission_settings.xml b/res/layout/permission_settings.xml
new file mode 100644
index 0000000..f08b9d6
--- /dev/null
+++ b/res/layout/permission_settings.xml
@@ -0,0 +1,87 @@
+<?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.
+-->
+
+<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:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingBottom="5dip"
+        android:orientation="vertical">
+
+        <!-- Permissions section -->
+        <LinearLayout
+            android:id="@+id/permissions_section"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <TextView
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="8dip"
+                android:text="@string/permissions_label" />
+            <TextView android:id="@+id/security_settings_billing_desc"
+                android:text="@string/security_settings_billing_desc"
+                android:textColor="#ffffb060"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:paddingTop="6dip"
+                android:paddingBottom="6dip"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+            <LinearLayout
+                android:id="@+id/security_settings_billing_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_premium_sms_desc" />
+                <Spinner
+                    android:id="@+id/security_settings_premium_sms_list"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown" />
+            </LinearLayout>
+            <TextView android:id="@+id/security_settings_desc"
+                android:text="@string/security_settings_desc"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:paddingTop="6dip"
+                android:paddingBottom="6dip"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+            <LinearLayout
+                android:id="@+id/security_settings_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"/>
+        </LinearLayout>
+
+
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index b47e175..1412381 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -29,20 +29,39 @@
                  android:layout_height="wrap_content"
                  android:visibility="gone" />
 
-    <ListView android:id="@android:id/list"
-              style="@style/PreferenceFragmentListSinglePane"
-              android:layout_width="match_parent"
-              android:layout_height="0px"
-              android:layout_weight="1"
-              android:paddingStart="@dimen/settings_side_margin"
-              android:paddingEnd="@dimen/settings_side_margin"
-              android:paddingTop="@dimen/dashboard_padding_top"
-              android:paddingBottom="@dimen/dashboard_padding_bottom"
-              android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"
-              android:clipToPadding="false"
-              android:drawSelectorOnTop="false"
-              android:elevation="@dimen/dashboard_category_elevation"
-              android:scrollbarAlwaysDrawVerticalTrack="true" />
+    <FrameLayout android:layout_height="0px"
+                 android:layout_weight="1"
+                 android:layout_width="match_parent">
+
+        <ListView android:id="@android:id/list"
+                  style="@style/PreferenceFragmentListSinglePane"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:paddingStart="@dimen/settings_side_margin"
+                  android:paddingEnd="@dimen/settings_side_margin"
+                  android:paddingTop="@dimen/dashboard_padding_top"
+                  android:paddingBottom="@dimen/dashboard_padding_bottom"
+                  android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"
+                  android:clipToPadding="false"
+                  android:drawSelectorOnTop="false"
+                  android:elevation="@dimen/dashboard_category_elevation"
+                  android:scrollbarAlwaysDrawVerticalTrack="true" />
+
+        <include layout="@layout/loading_container" />
+
+        <com.android.settings.widget.FloatingActionButton
+                  android:id="@+id/fab"
+                  android:visibility="gone"
+                  android:clickable="true"
+                  android:layout_width="@dimen/fab_size"
+                  android:layout_height="@dimen/fab_size"
+                  android:layout_gravity="bottom|end"
+                  android:layout_marginEnd="@dimen/fab_margin"
+                  android:layout_marginBottom="@dimen/fab_margin"
+                  android:elevation="@dimen/fab_elevation"
+                  android:background="@drawable/fab_background" />
+
+    </FrameLayout>
 
     <TextView android:id="@android:id/empty"
               android:layout_width="match_parent"
diff --git a/res/layout/preference_storage_action.xml b/res/layout/preference_storage_action.xml
new file mode 100644
index 0000000..10f138b
--- /dev/null
+++ b/res/layout/preference_storage_action.xml
@@ -0,0 +1,47 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/unmount"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
+        android:contentDescription="@string/storage_menu_unmount"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textSize="30sp"
+        android:background="?android:attr/selectableItemBackground" />
+
+    <!--
+    <ImageView
+        android:id="@+id/eject"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
+        android:src="@drawable/ic_sync_green_holo"
+        android:contentDescription="@string/storage_menu_eject"
+        android:layout_gravity="center"
+        android:background="?android:attr/selectableItemBackground" />
+    -->
+</LinearLayout>
diff --git a/res/layout/preference_vpn.xml b/res/layout/preference_vpn.xml
new file mode 100644
index 0000000..95d3253
--- /dev/null
+++ b/res/layout/preference_vpn.xml
@@ -0,0 +1,39 @@
+<?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.
+-->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+    <View
+        android:id="@+id/divider_manage"
+        android:layout_width="2dip"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
+    <ImageView
+        android:id="@+id/manage"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
+        android:src="@drawable/ic_sysbar_quicksettings"
+        android:contentDescription="@string/settings_label"
+        android:layout_gravity="center"
+        android:background="?android:attr/selectableItemBackground" />
+</LinearLayout>
diff --git a/res/layout/process_stats_details.xml b/res/layout/process_stats_details.xml
index fac9e97..738805a 100644
--- a/res/layout/process_stats_details.xml
+++ b/res/layout/process_stats_details.xml
@@ -49,21 +49,18 @@
                 <include layout="@layout/two_buttons_panel"/>
             </LinearLayout>
 
-            <TextView
-                    style="?android:attr/listSeparatorTextViewStyle"
-                    android:text="@string/details_subtitle" />
-
             <LinearLayout
-                    android:id="@+id/details"
+                    android:id="@+id/processes"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
-                <!-- Insert detail items here -->
+                <!-- Insert process items here -->
 
             </LinearLayout>
 
             <TextView
+                    android:id="@+id/services_label"
                     style="?android:attr/listSeparatorTextViewStyle"
                     android:text="@string/services_subtitle" />
 
diff --git a/res/layout/process_stats_proc_details.xml b/res/layout/process_stats_proc_details.xml
new file mode 100644
index 0000000..ff1192d
--- /dev/null
+++ b/res/layout/process_stats_proc_details.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/processes"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+    <TextView
+            android:id="@+id/processes_name"
+            style="?android:attr/listSeparatorTextViewStyle" />
+
+</LinearLayout>
diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index c56db11..6f0ba2e 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -26,7 +26,7 @@
     <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/redaction_vertical_margins"
             android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
             android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
             android:text="@string/lock_screen_notifications_interstitial_message"
@@ -35,7 +35,7 @@
     <RadioGroup
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/redaction_vertical_margins"
             android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
             android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
             android:checkedButton="@+id/redact_sensitive">
@@ -44,21 +44,21 @@
                 android:id="@+id/show_all"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/redaction_vertical_margins"
                 android:text="@string/lock_screen_notifications_summary_show" />
 
         <RadioButton
                 android:id="@+id/redact_sensitive"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/redaction_vertical_margins"
                 android:text="@string/lock_screen_notifications_summary_hide" />
 
         <RadioButton
                 android:id="@+id/hide_all"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/redaction_vertical_margins"
                 android:text="@string/lock_screen_notifications_summary_disable" />
 
     </RadioGroup>
diff --git a/res/layout/reset_network.xml b/res/layout/reset_network.xml
new file mode 100644
index 0000000..ab96ea7
--- /dev/null
+++ b/res/layout/reset_network.xml
@@ -0,0 +1,60 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginTop="12dp"
+        android:layout_weight="1">
+
+        <LinearLayout android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:text="@string/reset_network_desc" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <Spinner android:id="@+id/reset_network_subscription"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:id="@+id/initiate_reset_network"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dip"
+        android:layout_marginBottom="12dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/reset_network_button_text"
+        android:gravity="center" />
+
+</LinearLayout>
diff --git a/res/layout/reset_network_confirm.xml b/res/layout/reset_network_confirm.xml
new file mode 100644
index 0000000..ffaafb3
--- /dev/null
+++ b/res/layout/reset_network_confirm.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginTop="12dp"
+        android:textSize="20sp"
+        android:text="@string/reset_network_final_desc" />
+
+    <Button android:id="@+id/execute_reset_network"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="40dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/reset_network_final_button_text"
+        android:gravity="center" />
+
+</LinearLayout>
diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml
index 56f2737..36c8aa2 100644
--- a/res/layout/settings_main_dashboard.xml
+++ b/res/layout/settings_main_dashboard.xml
@@ -21,5 +21,5 @@
              android:id="@+id/main_content"
              android:layout_height="match_parent"
              android:layout_width="match_parent"
-             android:background="@color/dashboard_background_color"
+             android:background="?android:attr/colorBackground"
              />
diff --git a/res/layout/settings_storage_miscfiles.xml b/res/layout/settings_storage_miscfiles.xml
deleted file mode 100644
index 0360cde..0000000
--- a/res/layout/settings_storage_miscfiles.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-
-<com.android.settings.deviceinfo.FileItemInfoLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:background="?android:attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:focusable="true">
-
-    <CheckBox android:id="@+id/misc_checkbox"
-              android:layout_width="wrap_content"
-              android:layout_height="match_parent"
-              android:layout_alignParentStart="true"
-              android:paddingStart="16dip"
-              android:scaleType="fitCenter"
-              android:layout_centerVertical="true"/>
-
-    <TextView android:id="@+id/misc_filename"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_toEndOf="@id/misc_checkbox"
-              android:maxLines="1"
-              android:paddingStart="16dip"
-              android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-    <TextView android:id="@+id/misc_filesize"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_toEndOf="@id/misc_checkbox"
-              android:layout_below="@id/misc_filename"
-              android:maxLines="1"
-              android:paddingStart="16dip"
-              android:textStyle="bold"
-              android:textAppearance="?android:attr/textAppearanceSmall" />
-</com.android.settings.deviceinfo.FileItemInfoLayout>
-
diff --git a/res/layout/settings_storage_miscfiles_list.xml b/res/layout/settings_storage_miscfiles_list.xml
deleted file mode 100644
index b712073..0000000
--- a/res/layout/settings_storage_miscfiles_list.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingEnd="16dip"
-    android:paddingStart="16dip">
-
-    <ListView android:id="@android:id/list"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"/>
-
-</FrameLayout>
-
diff --git a/res/layout/setup_choose_lock_generic.xml b/res/layout/setup_choose_lock_generic.xml
new file mode 100644
index 0000000..3b3b5e7
--- /dev/null
+++ b/res/layout/setup_choose_lock_generic.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2015, The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardListLayout
+    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"
+    settings:suwBackgroundTile="@drawable/setup_illustration_tile"
+    settings:suwHeaderText="@string/wifi_setup_wizard_title"
+    settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
+    settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen" />
diff --git a/res/layout/setup_choose_lock_password.xml b/res/layout/setup_choose_lock_password.xml
index 59fa523..164233c 100644
--- a/res/layout/setup_choose_lock_password.xml
+++ b/res/layout/setup_choose_lock_password.xml
@@ -15,70 +15,83 @@
     limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.setupwizardlib.SetupWizardLayout
+    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:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <!-- header text ('Enter Pin') -->
-    <TextView android:id="@+id/headerText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:lines="2"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <!-- Password entry field -->
-    <EditText android:id="@+id/password_entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginStart="30dip"
-        android:layout_marginEnd="30dip"
-        android:gravity="center"
-        android:inputType="textPassword"
-        android:imeOptions="actionNext|flagNoExtractUi"
-        android:textSize="24sp"
-        style="@style/TextAppearance.PasswordEntry"/>
-
-    <!-- Spacer between password entry and keyboard -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"/>
+    settings:suwBackgroundTile="@drawable/setup_illustration_tile"
+    settings:suwHeaderText="@string/wifi_setup_wizard_title"
+    settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
+    settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">
 
     <LinearLayout
+        style="@style/SuwContentFrame"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:visibility="gone"
-        style="@style/SecurityPreferenceButtonContainer">
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
 
-        <!-- left : cancel -->
-        <Button android:id="@+id/cancel_button"
-            android:layout_width="0dip"
+        <!-- header text ('Enter Pin') -->
+        <TextView android:id="@+id/headerText"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/lockpassword_cancel_label"
-            style="@style/SecurityPreferenceButton"/>
+            android:gravity="center"
+            android:lines="2"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-        <!-- right : continue -->
-        <Button android:id="@+id/next_button"
-            android:layout_width="0dip"
+        <!-- Password entry field -->
+        <EditText android:id="@+id/password_entry"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/lockpassword_continue_label"
-            style="@style/SecurityPreferenceButton"/>
+            android:layout_gravity="center"
+            android:layout_marginStart="30dip"
+            android:layout_marginEnd="30dip"
+            android:gravity="center"
+            android:inputType="textPassword"
+            android:imeOptions="actionNext|flagNoExtractUi"
+            android:textSize="24sp"
+            style="@style/TextAppearance.PasswordEntry"/>
+
+        <!-- Spacer between password entry and keyboard -->
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            style="@style/SecurityPreferenceButtonContainer">
+
+            <!-- left : cancel -->
+            <Button android:id="@+id/cancel_button"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/lockpassword_cancel_label"
+                style="@style/SecurityPreferenceButton"/>
+
+            <!-- right : continue -->
+            <Button android:id="@+id/next_button"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/lockpassword_continue_label"
+                style="@style/SecurityPreferenceButton"/>
+
+        </LinearLayout>
+
+        <!-- Alphanumeric keyboard -->
+        <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#00000000"
+            android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+            android:visibility="gone"/>
 
     </LinearLayout>
 
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="gone"/>
-
-</LinearLayout>
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/setup_choose_lock_pattern.xml b/res/layout/setup_choose_lock_pattern.xml
index a906826..6ab0d47 100644
--- a/res/layout/setup_choose_lock_pattern.xml
+++ b/res/layout/setup_choose_lock_pattern.xml
@@ -15,80 +15,92 @@
     limitations under the License.
 -->
 
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+<com.android.setupwizardlib.SetupWizardLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    settings:suwBackgroundTile="@drawable/setup_illustration_tile"
+    settings:suwHeaderText="@string/wifi_setup_wizard_title"
+    settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
+    settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">
 
-    <!-- takes up all space above button bar at bottom -->
-    <LinearLayout
+    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+        android:id="@+id/topLayout"
+        style="@style/SuwContentFrame"
         android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:gravity="center"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <TextView android:id="@+id/headerText"
+        <!-- takes up all space above button bar at bottom -->
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
             android:gravity="center"
-            android:minHeight="50dp"
-            android:textSize="18sp"/>
+            android:orientation="vertical">
 
-        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+            <TextView android:id="@+id/headerText"
+                android:layout_width="match_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:minHeight="50dip"
+                android:textSize="18sp"/>
+
+            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+                android:layout_width="match_parent"
+                android:layout_height="0dip"
+                android:layout_weight="4"
+                android:background="@color/lock_pattern_background"/>
+
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="4"
-            android:background="@color/lock_pattern_background"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/retryButton"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/lockpattern_retry_button_text"/>
+            android:gravity="center_horizontal"
+            android:orientation="horizontal">
 
-        <TextView android:id="@+id/footerText"
-            android:layout_width="wrap_content"
+            <Button android:id="@+id/retryButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lockpattern_retry_button_text"/>
+
+            <TextView android:id="@+id/footerText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minHeight="50dip"
+                android:textSize="14sp"/>
+
+        </LinearLayout>
+
+        <!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="50dp"
-            android:textSize="14sp"/>
+            android:orientation="horizontal"
+            android:visibility="gone"
+            style="@style/SecurityPreferenceButtonContainer">
 
-    </LinearLayout>
+            <!-- left : cancel, or re-try -->
+            <Button android:id="@+id/footerLeftButton"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/lockpattern_tutorial_cancel_label"
+                style="@style/SecurityPreferenceButton"/>
 
-    <!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:visibility="gone"
-        style="@style/SecurityPreferenceButtonContainer">
+            <!-- right : confirm or ok -->
+            <Button android:id="@+id/footerRightButton"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/lockpattern_tutorial_continue_label"
+                style="@style/SecurityPreferenceButton"/>
 
-        <!-- left : cancel, or re-try -->
-        <Button android:id="@+id/footerLeftButton"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/lockpattern_tutorial_cancel_label"
-            style="@style/SecurityPreferenceButton"/>
+        </LinearLayout>
 
-        <!-- right : confirm or ok -->
-        <Button android:id="@+id/footerRightButton"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/lockpattern_tutorial_continue_label"
-            style="@style/SecurityPreferenceButton"/>
+    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
 
-    </LinearLayout>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
deleted file mode 100644
index 46829c0..0000000
--- a/res/layout/setup_preference.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/wifi_required_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="6dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/wifi_required_info_text"
-        android:visibility="gone" />
-
-    <com.android.settings.widget.StickyHeaderListView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:cacheColorHint="@android:color/transparent"
-        android:clipToPadding="false"
-        android:drawSelectorOnTop="false"
-        android:headerDividersEnabled="false"
-        android:scrollbarAlwaysDrawVerticalTrack="true" />
-
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
-        android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
-
-</LinearLayout>
diff --git a/res/layout/zen_downtime_day.xml b/res/layout/setup_screen_lock_fingerprint_details.xml
old mode 100755
new mode 100644
similarity index 65%
copy from res/layout/zen_downtime_day.xml
copy to res/layout/setup_screen_lock_fingerprint_details.xml
index 8d2fa73..06ca778
--- a/res/layout/zen_downtime_day.xml
+++ b/res/layout/setup_screen_lock_fingerprint_details.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     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.
@@ -14,10 +15,11 @@
      limitations under the License.
 -->
 
-<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:gravity="center_vertical"
-    android:paddingStart="@dimen/zen_downtime_checkbox_padding" />
+    android:paddingTop="6dip"
+    android:paddingBottom="6dip"
+    android:paddingStart="@dimen/suw_layout_margin_sides"
+    android:paddingEnd="@dimen/suw_layout_margin_sides"
+    android:text="@string/unlock_setup_wizard_fingerprint_details" />
diff --git a/res/layout/setup_template.xml b/res/layout/setup_template.xml
deleted file mode 100644
index 0623e25..0000000
--- a/res/layout/setup_template.xml
+++ /dev/null
@@ -1,75 +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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ScrollView
-        android:id="@+id/bottom_scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:fillViewport="true">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clipChildren="false">
-
-            <com.android.settings.widget.SetupWizardIllustration
-                android:id="@+id/setup_illustration"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:elevation="@dimen/setup_wizard_title_area_elevation"
-                android:background="@drawable/setup_illustration_bg"
-                android:foreground="@drawable/setup_illustration"
-                android:tag="stickyContainer"
-                settings:aspectRatio="2.22">
-
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:tag="sticky"
-                    android:text="@string/wifi_setup_title"
-                    style="@style/SetupTitle"/>
-
-            </com.android.settings.widget.SetupWizardIllustration>
-
-            <FrameLayout
-                android:id="@+id/setup_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/setup_illustration"
-                android:clipChildren="false"/>
-
-        </RelativeLayout>
-
-    </ScrollView>
-
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
-        android:id="@+id/navigation_bar"
-        android:layout_width="match_parent"
-        android:layout_height="56dip"
-        style="@style/setup_wizard_navbar_style"/>
-
-</LinearLayout>
-
diff --git a/res/layout/zen_downtime_day.xml b/res/layout/setup_wifi_empty.xml
old mode 100755
new mode 100644
similarity index 65%
copy from res/layout/zen_downtime_day.xml
copy to res/layout/setup_wifi_empty.xml
index 8d2fa73..b1659d7
--- a/res/layout/zen_downtime_day.xml
+++ b/res/layout/setup_wifi_empty.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     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.
@@ -14,10 +15,10 @@
      limitations under the License.
 -->
 
-<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:gravity="center_vertical"
-    android:paddingStart="@dimen/zen_downtime_checkbox_padding" />
+    android:paddingTop="@dimen/setup_wizard_margin_top"
+    android:paddingStart="@dimen/suw_layout_margin_sides"
+    android:paddingEnd="@dimen/suw_layout_margin_sides"
+    android:textAppearance="@style/TextAppearance.SetupWizardDescription" />
diff --git a/res/layout/setup_wifi_layout.xml b/res/layout/setup_wifi_layout.xml
new file mode 100644
index 0000000..62bb6a1
--- /dev/null
+++ b/res/layout/setup_wifi_layout.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2015, The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardListLayout
+    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"
+    settings:suwBackgroundTile="@drawable/setup_illustration_tile"
+    settings:suwHeaderText="@string/wifi_setup_wizard_title"
+    settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
+    settings:suwIllustrationImage="@drawable/setup_illustration_wifi" />
diff --git a/res/layout/setup_wizard_header.xml b/res/layout/setup_wizard_header.xml
deleted file mode 100644
index b030ad1..0000000
--- a/res/layout/setup_wizard_header.xml
+++ /dev/null
@@ -1,38 +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.
--->
-
-<com.android.settings.widget.SetupWizardIllustration
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:id="@+id/setup_illustration"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/setup_illustration_bg"
-    android:elevation="@dimen/setup_wizard_title_area_elevation"
-    android:foreground="@drawable/setup_illustration"
-    android:tag="stickyContainer"
-    settings:aspectRatio="2.22">
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/SetupTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:tag="sticky"
-        android:text="@string/wifi_setup_wizard_title"/>
-
-</com.android.settings.widget.SetupWizardIllustration>
diff --git a/res/layout/single_button_panel.xml b/res/layout/single_button_panel.xml
new file mode 100755
index 0000000..5f1fee9
--- /dev/null
+++ b/res/layout/single_button_panel.xml
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<!--
+  Defines a panel with one button in the same layout as the two button layout.
+-->
+
+<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="4dip"
+        android:orientation="horizontal">
+        <Button
+            android:id="@+id/button"
+            android:layout_width="120dip"
+            android:layout_weight="0.4"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical" />
+        <Space
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.2" />
+        <Space
+            android:layout_width="120dip"
+            android:layout_weight="0.4"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"/>
+</LinearLayout>
diff --git a/res/layout/storage_internal_format.xml b/res/layout/storage_internal_format.xml
new file mode 100644
index 0000000..b7a36ca
--- /dev/null
+++ b/res/layout/storage_internal_format.xml
@@ -0,0 +1,51 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+        <TextView
+            android:id="@+id/body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/suw_description_margin_top"
+            android:paddingBottom="@dimen/suw_description_margin_bottom"
+            android:paddingStart="@dimen/suw_layout_margin_sides"
+            android:paddingEnd="@dimen/suw_layout_margin_sides"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+    </ScrollView>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp">
+        <Button
+            android:id="@+id/confirm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/storage_menu_format" />
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/res/layout/storage_internal_unmount.xml b/res/layout/storage_internal_unmount.xml
new file mode 100644
index 0000000..4779829
--- /dev/null
+++ b/res/layout/storage_internal_unmount.xml
@@ -0,0 +1,56 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+        <TextView
+            android:id="@+id/body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/suw_description_margin_top"
+            android:paddingBottom="@dimen/suw_description_margin_bottom"
+            android:paddingStart="@dimen/suw_layout_margin_sides"
+            android:paddingEnd="@dimen/suw_layout_margin_sides"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+    </ScrollView>
+
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp">
+        <Button
+            android:id="@+id/confirm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/storage_menu_unmount" />
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/res/layout/storage_wizard_generic.xml b/res/layout/storage_wizard_generic.xml
new file mode 100644
index 0000000..4f0cef9
--- /dev/null
+++ b/res/layout/storage_wizard_generic.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:suwBackgroundTile="@drawable/illustration_tile"
+    app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal"
+    app:suwIllustrationImage="@drawable/illustration_generic">
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/storage_wizard_body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <TextView
+            android:id="@+id/storage_wizard_second_body"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/storage_wizard_init.xml b/res/layout/storage_wizard_init.xml
new file mode 100644
index 0000000..421477c
--- /dev/null
+++ b/res/layout/storage_wizard_init.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:suwBackgroundTile="@drawable/illustration_tile"
+    app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal"
+    app:suwIllustrationImage="@drawable/illustration_generic">
+
+    <!-- android:layout="@layout/suw_template_short" -->
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RadioButton
+            android:id="@+id/storage_wizard_init_external_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:text="@string/storage_wizard_init_external_title" />
+        <TextView
+            android:id="@+id/storage_wizard_init_external_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorSecondary"
+            android:text="@string/storage_wizard_init_external_summary" />
+
+        <RadioButton
+            android:id="@+id/storage_wizard_init_internal_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:text="@string/storage_wizard_init_internal_title" />
+        <TextView
+            android:id="@+id/storage_wizard_init_internal_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorSecondary"
+            android:text="@string/storage_wizard_init_internal_summary" />
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/storage_wizard_migrate.xml b/res/layout/storage_wizard_migrate.xml
new file mode 100644
index 0000000..827a5d2
--- /dev/null
+++ b/res/layout/storage_wizard_migrate.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:suwBackgroundTile="@drawable/illustration_tile"
+    app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal"
+    app:suwIllustrationImage="@drawable/illustration_generic">
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/storage_wizard_body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <RadioButton
+            android:id="@+id/storage_wizard_migrate_now"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:text="@string/storage_wizard_migrate_now" />
+        <RadioButton
+            android:id="@+id/storage_wizard_migrate_later"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:text="@string/storage_wizard_migrate_later" />
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/storage_wizard_progress.xml b/res/layout/storage_wizard_progress.xml
new file mode 100644
index 0000000..52fd203
--- /dev/null
+++ b/res/layout/storage_wizard_progress.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:suwBackgroundTile="@drawable/illustration_tile"
+    app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal"
+    app:suwIllustrationImage="@drawable/illustration_generic">
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ProgressBar
+            android:id="@+id/storage_wizard_progress"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:indeterminate="false"
+            style="?android:attr/progressBarStyleHorizontal" />
+        <TextView
+            android:id="@+id/storage_wizard_progress_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorSecondary" />
+
+        <TextView
+            android:id="@+id/storage_wizard_body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/storage_wizard_ready.xml b/res/layout/storage_wizard_ready.xml
new file mode 100644
index 0000000..5cb2e33
--- /dev/null
+++ b/res/layout/storage_wizard_ready.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:suwBackgroundTile="@drawable/illustration_tile"
+    app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal"
+    app:suwIllustrationImage="@drawable/illustration_generic">
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/storage_wizard_ready_body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/suw_description_margin_top"
+            android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorPrimary" />
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index 4d33518..7136624 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -24,6 +24,8 @@
               android:layout_width="0dp"
               android:layout_weight="1"
               android:layout_gravity="center_vertical"
+              android:maxLines="2"
+              android:ellipsize="end"
               android:textAppearance="@style/TextAppearance.Switch"
               android:textColor="?android:attr/textColorPrimary"
               android:textAlignment="viewStart" />
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
index 35cc466..d6ab6d2 100644
--- a/res/layout/user_info_header.xml
+++ b/res/layout/user_info_header.xml
@@ -31,8 +31,8 @@
         android:layout_weight="1"
         android:id="@+id/app_restrictions_pref"
         android:gravity="center_vertical"
-        android:paddingStart="@*android:dimen/preference_item_padding_side"
-        android:paddingEnd="?android:attr/scrollbarSize"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:background="?android:attr/selectableItemBackground" >
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/res/layout/user_preference.xml b/res/layout/user_preference.xml
index 91db846..8e81fec 100644
--- a/res/layout/user_preference.xml
+++ b/res/layout/user_preference.xml
@@ -18,6 +18,8 @@
         android:id="@android:id/widget_frame"
         android:layout_width="match_parent"
         android:layout_height="@dimen/user_spinner_item_height"
+        android:paddingStart="@dimen/user_spinner_padding_sides"
+        android:paddingEnd="@dimen/user_spinner_padding_sides"
         android:orientation="horizontal" >
 
     <ImageView
@@ -42,4 +44,4 @@
             android:paddingEnd="@dimen/user_spinner_padding"
             style="@style/TextAppearance.Medium" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/voice_interaction.xml b/res/layout/voice_interaction.xml
new file mode 100644
index 0000000..ed0cd1a
--- /dev/null
+++ b/res/layout/voice_interaction.xml
@@ -0,0 +1,33 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:padding="8dp"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/voice_interaction_highlight"
+        android:id="@+id/voice_fragment_header" />
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/voice_fragment_root"
+        android:padding="8dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/res/layout/voice_item_row.xml b/res/layout/voice_item_row.xml
new file mode 100644
index 0000000..eca5ac9
--- /dev/null
+++ b/res/layout/voice_item_row.xml
@@ -0,0 +1,44 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+    <LinearLayout
+        android:id="@+id/row_one"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp">
+
+        <TextView
+            android:layout_width="0px"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:id="@+id/voice_item_label" />
+
+        <TextView
+            android:layout_width="80px"
+            android:layout_height="80px"
+            android:gravity="center_horizontal|center_vertical"
+            android:background="@drawable/bg_voice_position"
+            android:textAppearance="?android:attr/textAppearanceMediumInverse"
+            android:textStyle="bold"
+            android:id="@+id/voice_item_position" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml
index 034b6bf..d7e7f95 100644
--- a/res/layout/vpn_dialog.xml
+++ b/res/layout/vpn_dialog.xml
@@ -20,7 +20,7 @@
     <LinearLayout android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="3mm">
+            android:padding="8dp">
 
         <LinearLayout android:id="@+id/editor"
                 android:layout_width="match_parent"
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
deleted file mode 100644
index 143d9ee..0000000
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ /dev/null
@@ -1,430 +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.
--->
-<!-- All ids in this layout must be in wifi_dialog.xml -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <!-- UI components that should be shown appropriately -->
-    <FrameLayout
-        android:id="@+id/eap_not_supported"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="360dip"
-        android:orientation="vertical"
-        android:visibility="gone">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:lineSpacingExtra="12dip"
-            android:text="@string/wifi_setup_eap_not_supported"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="20sp" />
-    </FrameLayout>
-    <!-- In "add network" flow, we have security type field (@id/security below) below
-         this View, so need a bit different layout than the other flow, in which we'll use
-         @id/eap_not_supported. -->
-    <FrameLayout
-        android:id="@+id/eap_not_supported_for_add_network"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:lineSpacingExtra="12dip"
-            android:text="@string/wifi_setup_eap_not_supported"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="20sp" />
-    </FrameLayout>
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dip">
-        <!-- To accomodate @id/type into TableLayout, we splitted the layout into two:
-             @id/type_ssid and @id/type_security. -->
-        <TableRow
-            android:id="@+id/type_ssid"
-            android:minHeight="56dip"
-            android:visibility="gone">
-            <TextView
-                android:id="@+id/ssid_text"
-                android:layout_width="wrap_content"
-                android:minWidth="128dip"
-                android:layout_height="wrap_content"
-                android:minHeight="56dip"
-                android:paddingEnd="16dip"
-                android:layout_alignParentStart="true"
-                android:text="@string/wifi_ssid"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="20sp"
-                android:gravity="start|center_vertical" />
-
-            <FrameLayout
-                android:id="@+id/ssid_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBottom="@id/ssid_text"
-                android:layout_toEndOf="@id/ssid_text">
-                <EditText
-                    android:id="@+id/ssid"
-                    android:layout_width="368dip"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:hint="@string/wifi_ssid_hint"
-                    android:inputType="textNoSuggestions"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textSize="20sp" />
-            </FrameLayout>
-        </TableRow>
-
-        <TableRow
-            android:id="@+id/security_fields"
-            android:minHeight="56dip"
-            android:visibility="gone">
-            <TextView
-                android:id="@+id/password_text"
-                android:layout_width="wrap_content"
-                android:minWidth="128dip"
-                android:layout_height="wrap_content"
-                android:minHeight="56dip"
-                android:text="@string/wifi_password"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="20sp"
-                android:gravity="start|center_vertical" />
-
-            <LinearLayout
-                android:id="@+id/password_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="bottom">
-                <EditText
-                    android:id="@+id/password"
-                    android:layout_width="368dip"
-                    android:layout_height="wrap_content"
-                    android:minHeight="56dip"
-                    android:singleLine="true"
-                    android:password="true"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textSize="20sp" />
-            </LinearLayout>
-
-            <!-- It looks CheckBox isn't aligned well with TableRow -->
-            <FrameLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-                <CheckBox
-                    android:id="@+id/show_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:minHeight="56dip"
-                    android:text="@string/wifi_show_password"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textSize="20sp" />
-            </FrameLayout>
-        </TableRow>
-
-        <TableRow
-            android:id="@+id/type_security"
-            android:minHeight="56dip"
-            android:visibility="gone">
-            <TextView
-                android:id="@+id/security_text"
-                android:layout_width="wrap_content"
-                android:minWidth="128dip"
-                android:layout_height="wrap_content"
-                android:minHeight="56dip"
-                android:text="@string/wifi_security"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="20sp"
-                android:gravity="bottom"/>
-
-            <FrameLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="bottom">
-                <Spinner
-                    android:id="@+id/security"
-                    android:layout_width="368dip"
-                    android:layout_height="wrap_content"
-                    android:minHeight="56dip"
-                    android:paddingStart="4dip"/>
-            </FrameLayout>
-        </TableRow>
-    </TableLayout>
-
-    <!-- All the views below are "gone".
-         We want them as data storage, not as UI components. -->
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone">
-
-    <LinearLayout android:id="@+id/info"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"/>
-
-    <!--  android:id="@+id/security_fields" -->
-    <LinearLayout
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-
-        <LinearLayout android:id="@+id/eap"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:orientation="vertical"
-                      android:visibility="gone">
-
-            <TextView
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:text="@string/wifi_eap_method" />
-
-            <Spinner android:id="@+id/method"
-                     android:layout_width="match_parent"
-                     android:layout_height="wrap_content"
-                     android:prompt="@string/wifi_eap_method"
-                     android:entries="@array/wifi_eap_method" />
-
-            <TextView
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:text="@string/please_select_phase2" />
-
-            <Spinner android:id="@+id/phase2"
-                     android:layout_width="match_parent"
-                     android:layout_height="wrap_content"
-                     android:prompt="@string/please_select_phase2"
-                     android:entries="@array/wifi_phase2_entries" />
-
-            <TextView
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:text="@string/wifi_eap_ca_cert" />
-
-            <Spinner android:id="@+id/ca_cert"
-                     android:layout_width="match_parent"
-                     android:layout_height="wrap_content"
-                     android:prompt="@string/wifi_eap_ca_cert" />
-
-            <TextView
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:text="@string/wifi_eap_user_cert" />
-
-            <Spinner android:id="@+id/user_cert"
-                     android:layout_width="match_parent"
-                     android:layout_height="wrap_content"
-                     android:prompt="@string/wifi_eap_user_cert" />
-
-            <TextView
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:text="@string/wifi_eap_identity" />
-
-            <EditText android:id="@+id/identity"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:singleLine="true"
-                      android:inputType="textNoSuggestions" />
-
-            <TextView
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:text="@string/wifi_eap_anonymous" />
-
-            <EditText android:id="@+id/anonymous"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:singleLine="true"
-                      android:inputType="textNoSuggestions" />
-        </LinearLayout> <!-- android:id="@+id/eap" -->
-
-        <!-- <TextView android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:text="@string/wifi_password" />
-
-        <EditText android:id="@+id/password"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:password="true" />
-
-        <CheckBox android:id="@+id/show_password"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:text="@string/wifi_show_password" /> -->
-    </LinearLayout>  <!-- android:id="@+id/security_fields" -->
-
-        <LinearLayout android:id="@+id/proxy_settings_fields"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
-
-            <TextView android:id="@+id/proxy_settings_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/proxy_settings_title" />
-
-            <Spinner android:id="@+id/proxy_settings"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:prompt="@string/proxy_settings_title"
-                    android:entries="@array/wifi_proxy_settings" />
-        </LinearLayout>
-
-        <LinearLayout android:id="@+id/proxy_warning_limited_support"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-
-                <!--  Dummy to enable right-justification of warning -->
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/proxy_warning_limited_support" />
-        </LinearLayout>
-
-        <LinearLayout android:id="@+id/proxy_fields"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
-            <TextView android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/proxy_hostname_label" />
-
-            <EditText android:id="@+id/proxy_hostname"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="textNoSuggestions" />
-
-            <TextView android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/proxy_port_label" />
-
-            <EditText android:id="@+id/proxy_port"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="textNoSuggestions" />
-
-            <TextView android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/proxy_exclusionlist_label" />
-
-            <EditText android:id="@+id/proxy_exclusionlist"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="textNoSuggestions" />
-
-        </LinearLayout>
-
-        <LinearLayout android:id="@+id/ip_fields"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/wifi_ip_settings" />
-
-            <Spinner android:id="@+id/ip_settings"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:prompt="@string/wifi_ip_settings"
-                android:entries="@array/wifi_ip_settings" />
-        </LinearLayout>
-
-        <LinearLayout android:id="@+id/staticip"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/wifi_ip_address" />
-
-            <EditText android:id="@+id/ipaddress"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:inputType="textNoSuggestions" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/wifi_gateway" />
-
-            <EditText android:id="@+id/gateway"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:inputType="textNoSuggestions" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/wifi_network_prefix_length" />
-
-            <EditText android:id="@+id/network_prefix_length"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:inputType="textNoSuggestions" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/wifi_dns1" />
-
-            <EditText android:id="@+id/dns1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:inputType="textNoSuggestions" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/wifi_dns2" />
-
-            <EditText android:id="@+id/dns2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:inputType="textNoSuggestions" />
-
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index c1d6124..84d98da 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -247,8 +247,7 @@
             <CheckBox android:id="@+id/wifi_advanced_togglebox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/wifi_item_content"
-                    android:textSize="14sp"
+                    style="@style/wifi_advanced_toggle"
                     android:text="@string/wifi_show_advanced" />
         </LinearLayout>
 
diff --git a/res/layout/zen_rule_name.xml b/res/layout/zen_rule_name.xml
new file mode 100755
index 0000000..a192c83
--- /dev/null
+++ b/res/layout/zen_rule_name.xml
@@ -0,0 +1,63 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" >
+
+    <EditText
+        android:id="@+id/rule_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:layout_marginLeft="22dp"
+        android:layout_marginRight="22dp" >
+
+        <requestFocus />
+
+    </EditText>
+
+    <RadioGroup
+        android:id="@+id/rule_types"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="22dp"
+        android:layout_marginRight="22dp"
+        android:layout_marginTop="16dp"
+        android:orientation="vertical"
+        android:checkedButton="@+id/rule_type_schedule" >
+
+        <RadioButton android:id="@+id/rule_type_schedule"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/zen_schedule_rule_type_name" />
+
+        <RadioButton android:id="@+id/rule_type_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <RadioButton android:id="@+id/rule_type_3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <RadioButton android:id="@+id/rule_type_4"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </RadioGroup>
+
+</LinearLayout>
diff --git a/res/layout/zen_downtime_day.xml b/res/layout/zen_schedule_rule_day.xml
similarity index 92%
rename from res/layout/zen_downtime_day.xml
rename to res/layout/zen_schedule_rule_day.xml
index 8d2fa73..1d300d2 100755
--- a/res/layout/zen_downtime_day.xml
+++ b/res/layout/zen_schedule_rule_day.xml
@@ -20,4 +20,4 @@
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:gravity="center_vertical"
-    android:paddingStart="@dimen/zen_downtime_checkbox_padding" />
+    android:paddingStart="@dimen/zen_schedule_rule_checkbox_padding" />
diff --git a/res/menu/manage_apps.xml b/res/menu/manage_apps.xml
new file mode 100644
index 0000000..225f974
--- /dev/null
+++ b/res/menu/manage_apps.xml
@@ -0,0 +1,42 @@
+<?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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/advanced"
+        android:title="@string/advanced_apps"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/show_system"
+        android:title="@string/menu_show_system"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/hide_system"
+        android:title="@string/menu_hide_system"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/sort_order_alpha"
+        android:title="@string/sort_order_alpha"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/sort_order_size"
+        android:title="@string/sort_order_size"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/reset_app_preferences"
+        android:title="@string/reset_app_preferences"
+        android:showAsAction="never" />
+</menu>
diff --git a/res/menu/storage_volume.xml b/res/menu/storage_volume.xml
new file mode 100644
index 0000000..093a4bb
--- /dev/null
+++ b/res/menu/storage_volume.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/storage_rename"
+        android:title="@string/storage_menu_rename" />
+    <item
+        android:id="@+id/storage_mount"
+        android:title="@string/storage_menu_mount" />
+    <item
+        android:id="@+id/storage_unmount"
+        android:title="@string/storage_menu_unmount" />
+    <item
+        android:id="@+id/storage_format"
+        android:title="@string/storage_menu_format" />
+    <item
+        android:id="@+id/storage_usb"
+        android:title="@string/storage_menu_usb" />
+</menu>
diff --git a/res/drawable/setup_illustration_bg.xml b/res/menu/zen_mode_rule.xml
similarity index 62%
copy from res/drawable/setup_illustration_bg.xml
copy to res/menu/zen_mode_rule.xml
index 0a229c7..eea30a8 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/menu/zen_mode_rule.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -15,6 +14,11 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/delete"
+        android:title="@string/zen_mode_delete_rule"
+        android:icon="@drawable/ic_delete"
+        android:visible="true"
+        android:showAsAction="collapseActionView|ifRoom" />
+</menu>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 862babe..b86fc70 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Druk knoppie"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"demp of ontdemp mikrofoon"</item>
     <item msgid="1148142988678569310">"projekmedia"</item>
     <item msgid="9130014005474445273">"aktiveer VPN"</item>
+    <item msgid="1165192162975045562">"skryf muurpapier"</item>
+    <item msgid="7129487923652967258">"bystandstruktuur"</item>
+    <item msgid="1069023208100114540">"bystandskermkiekie"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ligging"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Demp of ontdemp mikrofoon"</item>
     <item msgid="5906017727368097853">"Projekmedia"</item>
     <item msgid="2486614710846178542">"Aktiveer VPN"</item>
+    <item msgid="5586547561693629602">"Skryf muurpapier"</item>
+    <item msgid="32794179825485062">"Bystandstruktuur"</item>
+    <item msgid="7872852746938272552">"Bystandskermkiekie"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"laag"</item>
     <item msgid="4212263919458209842">"kritiek"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Af"</item>
-    <item msgid="5656544177755411222">"Beperkte onderbrekings"</item>
-    <item msgid="8735337502532332056">"Geen onderbrekings nie"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normaal"</item>
     <item msgid="866544120205026771">"Matig"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Pienk"</item>
     <item msgid="6131821495505931173">"Rooi"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media-oordrag-protokol)"</item>
+    <item msgid="8856820259201251036">"PTP (Prentoordrag-protokol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Oudiobron"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 30cd8b4..1418aae 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Laat toe"</string>
     <string name="deny" msgid="6947806159746484865">"Weier"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Jy het nou <xliff:g id="STEP_COUNT">%1$d</xliff:g> stap oor voor jy \'n ontwikkelaar is."</item>
-    <item quantity="other" msgid="6722953419953594148">"Jy het nou <xliff:g id="STEP_COUNT">%1$d</xliff:g> stappe oor voor jy \'n ontwikkelaar is."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Nog net <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> stappe oor voordat jy \'n ontwikkelaar is.</item>
+      <item quantity="one">Nog net <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> stap oor voordat jy \'n ontwikkelaar is.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Jy is nou \'n ontwikkelaar!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Toemaar, jy is reeds \'n ontwikkelaar."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Draadloos en netwerke"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Skakel SMS oor IMS af"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Skakel vereiste IMS-registrasie aan"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Skakel vereiste IMS-registrasie af"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Skakel VoLTE-voorbereide vlag aan"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Skakel VoLTE-voorbereide vlag af"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Skakel lte ram dump aan"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Skakel lte ram dump af"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Kyk na SIM-adresboek"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitsaai"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dekativeer profiel?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dit deaktiveer:&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_connected" msgid="6038755206916626419">"Gekoppel"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Gekoppel (geen foon nie)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Gekoppel (geen media nie)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Gekoppel (geen boodskaptoegang nie)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Gekoppel (geen foon of media nie)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ontkoppel"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Ontkoppel tans…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Verbind tans…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Verbind tans…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Onbenoemde Bluetooth-toestel"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Soek"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Geen Bluetooth-toestelle is naby gevind nie."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Wys ontvangde lêers"</string>
     <string name="device_picker" msgid="4978696506172252813">"Kies Bluetooth-toestel"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-toestemmingsversoek"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"\'n Program wil Bluetooth aanskakel."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"\'n Program wil Bluetooth vir hierdie toestel AANSKAKEL."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"\'n Program wil jou tablet sigbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"\'n Program wil jou foon sigbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"\'n Program wil jou tablet sigbaar maak vir ander Bluetooth-toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kaart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Instaan-instellings"</string>
     <string name="cancel" msgid="6859253417269739139">"Kanselleer"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"KANSELLEER"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"GAAN VOORT"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEE"</string>
-    <string name="forget" msgid="7267115980248732932">"VERGEET"</string>
+    <string name="forget" msgid="1400428660472591263">"Vergeet"</string>
+    <string name="save" msgid="879993180139353333">"Stoor"</string>
+    <string name="done" msgid="6942539184162713160">"Klaar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Instellings"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Instellings"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Instellingskortpad"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rangskik volgens tydsone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Tyd"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Verbeter gesigpassing"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Lewendigheidstoets"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Vereis oogknip tydens ontsluiting"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Sluit outomaties"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> na sluimer"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> na sluimer, behalwe as <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> dit ontsluit hou"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stel my ligging, skermontsluiting, eiebewysbergingslot"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wagwoorde"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vingerafdruk"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Bestuur vingerafdrukke"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gebruik vingerafdruk vir"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Voeg by"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"skermslot"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> vingerafdrukke ingeskryf</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> vingerafdruk ingeskryf</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Vingerafdrukopstelling"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Om jou vingerafdruk te gebruik om jou skerm te ontsluit of aankope te bevestig, moet ons: \n\n✓ Jou rugsteunskermsluitmetode opstel \n\n✓ Jou vingerafdruk byvoeg"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Vind die sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Vind die vingerafdruksensor op die agterkant van jou foon."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naam"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Goed"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Vee uit"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Kom ons begin!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Plaas jou vinger op die vingerafdruksensor. Lig dit nadat jy \'n vibrasie gevoel het."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Mooi! Doen dit weer."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Plaas dieselfde vinger op die vingerafdruksensor en lig dit nadat jy \'n vibrasie gevoel het."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Vingerafdruk bygevoeg!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer jy hierdie ikoon sien, kan jy jou vingerafdruk gebruik vir identifisering of om \'n aankoop te magtig."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Voeg by"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Volgende"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkripteer tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkripteer foon"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Prop jou laaier in en probeer weer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen skermslot-PIN of -wagwoord nie"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Jy moet \'n PIN of wagwoord vir die skermslot stel, voordat jy met enkripsie kan begin."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Jy moet jou ontsluitpatroon teken om die enkriptering van jou toestel te bevestig."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Enkripteer?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Die enkripsiehandeling is onomkeerbaar en as jy dit onderbreek, sal jy data verloor. Enkripsie neem \'n uur of langer en in daardie tyd sal die tablet \'n paar keer herbegin."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Die enkripsiehandeling is onomkeerbaar en as jy dit onderbreek, sal jy data verloor. Enkripsie neem \'n uur of langer en in daardie tyd sal die foon \'n paar keer herbegin."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Swiep"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Geen sekuriteit nie"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face-ontsluit"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Lae sekuriteit, eksperimenteel"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patroon"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Medium sekuriteit"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium tot hoë sekuriteit"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wagwoord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hoë sekuriteit"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Huidige skermslot"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Kenmerke vir toestelbeskerming sal nie meer werk nie."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Gedeaktiveer deur administrateur, enkripsiebeleid of eiebewysberging"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Swiep"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face-ontsluit"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patroon"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Wagwoord"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Nadat jy \'n skermslot opgestel het, kan jy ook jou vingerafdruk in Instellings &gt; Sekuriteit opstel."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Skakel skermslot af"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Verwyder ontsluitpatroon"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Verwyder ontsluit-PIN"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Wagwoord moet ten minste een letter bevat."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Wagwoord moet ten minste een syfer bevat."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Wagwoord moet ten minste een simbool bevat."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Wagwoord moet ten minste 1 letter bevat."</item>
-    <item quantity="other" msgid="8186027808415585970">"Wagwoord moet ten minste %d letters bevat."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Wagwoord moet ten minste 1 onderkas-letter bevat."</item>
-    <item quantity="other" msgid="2693910942679679225">"Wagwoord moet ten minste %d onderkas-letters bevat."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Wagwoord moet ten minste 1 bokas-letter bevat."</item>
-    <item quantity="other" msgid="3030801209112209245">"Wagwoord moet ten minste %d bokas-letters bevat."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Wagwoord moet ten minste 1 syfer bevat."</item>
-    <item quantity="other" msgid="4703982391407595924">"Wagwoord moet ten minste %d syfers bevat."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Wagwoord moet ten minste 1 spesiale simbool bevat."</item>
-    <item quantity="other" msgid="1221290525051187757">"Wagwoord moet ten minste %d spesiale simbole bevat."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Wagwoord moet ten minste 1 nieletter-karakter bevat."</item>
-    <item quantity="other" msgid="3952508584649046404">"Wagwoord moet ten minste %d nieletter-karakters bevat."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Wagwoord moet minstens %d letters bevat.</item>
+      <item quantity="one">Wagwoord moet minstens 1 letter bevat.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Wagwoord moet minstens %d kleinletters bevat.</item>
+      <item quantity="one">Wagwoord moet minstens 1 kleinletter bevat.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Wagwoord moet minstens %d hoofletters bevat.</item>
+      <item quantity="one">Wagwoord moet minstens 1 hoofletter bevat.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Wagwoord moet minstens %d syfers bevat.</item>
+      <item quantity="one">Wagwoord moet minstens 1 syfer bevat.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Wagwoord moet minstens %d spesiale simbole bevat.</item>
+      <item quantity="one">Wagwoord moet minstens 1 spesiale simbool bevat.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Wagwoord moet minstens %d nieletter-karakters bevat.</item>
+      <item quantity="one">Wagwoord moet minstens 1 nieletter-karakter bevat.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Toesteladministrateur laat nie toe dat jy \'n onlangse wagwoord gebruik nie."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"\'n Stygende, dalende of herhalende volgorde van syfers is verbode"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Om saam te bind met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;maak seker dit wys hierdie geheimsleutel:&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">"Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bind met hierdie toestel saam?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Om saam te bind met:<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>Voer daarop in:<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>, druk dan Return of Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Bind saam"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"BIND SAAM"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Kanselleer"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Saambinding bied toegang tot jou kontakte en oproepgeskiedenis wanneer dit gekoppel is."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Kon nie saambind met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nie."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Kon nie met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> saambind nie weens \'n verkeerde PIN of wagwoordsleutel."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kan nie met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kommunikeer nie."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Saambinding verwerp deur <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Kon nie aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koppel nie."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Soek vir toestelle"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Herlaai"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Gevorderd"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Gevorderde Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Wanneer Bluetooth aangeskakel is, kan jou toestel met ander nabygeleë Bluetooth-toestelle kommunikeer."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Om liggingakkuraatheid te verbeter, sal programme en dienste Bluetooth-toestelle soek, selfs as Bluetooth af is. Jy kan dit in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>soekinstellings<xliff:g id="LINK_END_1">LINK_END</xliff:g> verander."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Koppel aan…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media-oudio"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Foonoudio"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Lêeroordrag"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Invoertoestel"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internettoegang"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontakdeling"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Gebruik vir kontakdeling"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling van internetverbinding"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Boodskaptoegang"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal van mediaoudio ontkoppel word."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>sal van vryhandse oudio ontkoppel word."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal van invoertoestel ontkoppel word."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Gebruik vir"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Hernoem"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Laat inkomende lêeroordragte toe"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Gekoppel aan media-oudio"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Gekoppel aan foonoudio"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Gekoppel aan lêeroordragbediener"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Gekoppel aan kaart"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nie gekoppel aan lêeroordragbediener nie"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Gekoppel aan invoertoestel"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Aan toestel gekoppel vir internettoegang"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Deel plaaslike internetverbinding met toestel"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gebruik vir media-oudio"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gebruik vir foonoudio"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gebruik vir lêeroordrag"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gebruik vir invoer"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gebruik vir internettoegang"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gebruik vir kaart"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dok-instellings"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gebruik dok vir oudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As luidsprekerfoon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Vir musiek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Onthou instellings"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi-assistent"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Gekoppel via Wi-Fi-assistent"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Uitsaaiskerm"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Saai uit"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktiveer draadlose skermdeling"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Geen nabygeleë toestelle is gekry nie."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Koppel tans"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Vergeet"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Klaar"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Naam"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Laat dataruiling toe wanneer die tablet aan \'n ander toestel raak"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Laat data-ruilprogram toe wanneer die foon aan \'n ander toestel raak"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Skakel tans Wi-Fi af…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fout"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In vliegtuigmodus"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan nie skandeer vir netwerke nie"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netwerkkennisgewing"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Stel in kennis altyd as \'n publieke netwerk beskikbaar is"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vermy swak verbindings"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Moenie \'n Wi-Fi-netwerk gebruik tensy dit \'n goeie internetverbinding het nie"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Gebruik net netwerke wat \'n goeie internetverbinding het"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skandering altyd beskikbaar"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Laat skandering altyd toe"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Laat Google se liggingdiens en ander programme skandeer vir netwerke, selfs wanneer Wi-Fi af is"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Gebruik outomaties oop Wi-Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Laat \'n Wi‑Fi-assistent outomaties aan oop netwerke van hoë gehalte koppel"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Kies assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installeer sertifikate"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Om akkuraatheid te verbeter en vir ander doeleindes, kan Google en ander programme dalk skandeer vir nabygeleë netwerke, selfs wanneer Wi-Fi af is. As jy nie wil hê dat dit gebeur nie, gaan na Gevorderd &gt; Skandering altyd beskikbaar."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programme kan dalk skandeer vir nabygeleë netwerke, selfs wanneer Wi-Fi af is. As jy nie wil hê dat dit gebeur nie, gaan na Gevorderd &gt; Skandering altyd beskikbaar."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Om liggingakkuraatheid te verbeter, sal programme en dienste Wi-Fi-netwerke soek, selfs as Wi-Fi af is. Jy kan dit in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>soekinstellings<xliff:g id="LINK_END_1">LINK_END</xliff:g> verander."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Moenie weer wys nie"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hou Wi-Fi aan tydens sluimer"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi aan tydens slaap"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Voeg nog \'n netwerk by"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Nog"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Outomatiese opstelling (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Om opstelling te voltooi, moet jou tablet toegang hê tot Wi-Fi. Na opstelling kan jy wissel tussen sellulêre data en Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Gevorderde opsies"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi-beskermde-opstelling"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS begin..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Druk die Wi-Fi-beskermdeopstellingknoppie op jou roeteerder. Dit word moontlik \"WPS\" genoem of bevat hierdie simbool:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Druk die Wi-Fi-beskermde-opstellingknoppie op jou roeteerder. Dit word moontlik \"WPS\" genoem of is dalk met hierdie simbool gemerk:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Voer die pin <xliff:g id="NUMBER">%1$s</xliff:g> op jou Wi-Fi-roeteerder in. Die opstelling kan tot twee minute neem om voltooi te word."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS suksesvol. Koppel tans aan die netwerk..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Gekoppel aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonieme identiteit"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Wagwoord"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Wys wagwoord"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Stel AP-band op"</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-instellings"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(onveranderd)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ongespesifiseer)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Gestoor"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Gedeaktiveer"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-opstelling het misluk"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi-verbinding het misluk"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Stawingsprobleem"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Nie binne ontvangs nie"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Geen internettoegang bespeur nie, sal nie outomaties herkoppel nie."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beskikbaar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beskikbaar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Voer jou netwerkwagwoord in"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Meld aan om te koppel?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> eis dat jy voor netwerkkoppeling aanlyn aanmeld."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KOPPEL"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Hierdie netwerk het nie internettoegang nie. Moet hierdie netwerk in elk geval gebruik word?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Moenie weer vir hierdie netwerk vra nie"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Drabare AndroidAP WPA2 PSK-Wi-Fi-warmkol"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> draagbare Wi-Fi-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_mode_title" msgid="2164073796253284289">"Oproepvoorkeur"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-oproepmodus"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Verkieslik Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Verkieslik sellulêr"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Tuis"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Verstel die helderheid van die skerm"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Aanpasbare helderheid"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimaliseer helderheidsvlak vir die beskikbare lig"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Lig"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Donker"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Outomaties"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Slaap"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skerm skakel af"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Verander voorkeur-SIM-kaart?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is die enigste SIM in jou toestel. Wil jy hierdie SIM vir sellulêre data, oproepe en SMS-boodskappe gebruik?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Verkeerde SIM PIN-kode, jy sal nou jou diensverskaffer moet kontak om jou toestel te ontsluit."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Verkeerde SIM PIN-kode, jy het <xliff:g id="NUMBER">%d</xliff:g> oorblywende poging voordat jy jou diensverskaffer sal moet kontak om jou toestel te ontsluit."</item>
-    <item quantity="other" msgid="77103619544346451">"Verkeerde SIM PIN-kode, jy het <xliff:g id="NUMBER">%d</xliff:g> oorblywende pogings."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Verkeerde SIM-PIN-kode. Jy het <xliff:g id="NUMBER_1">%d</xliff:g> pogings oor.</item>
+      <item quantity="one">Verkeerde SIM-PIN. <xliff:g id="NUMBER_0">%d</xliff:g> poging oor voor jy jou diensverskaffer moet kontak om jou toestel te ontsluit.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN-bewerking het misluk!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletstatus"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Foonstatus"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Beskikbaar (leesalleen)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totale spasie"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Bereken tans…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Programme (programdata en media-inhoud)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Programme en programdata"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Aflaaisels"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Prente, video\'s"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Oudio (musiek, luitone, podsendings ens.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Ander lêers"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Gekasseerde data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Ontheg gedeelde berging"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Ontheg SD-kaart"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Onthegting besig"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Bergingspasie is besig om min te raak"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Sommige stelselfunksies, soos sinkronisasie, werk moontlik nie korrek nie. Probeer om ruimte te skep deur items, soos programme of media-inhoud, uit te vee of los te speld."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Hernoem"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Monteer"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Demonteer"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Vee uit en formateer"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Vee uit en formateer as intern"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-rekenaaraansluiting"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-rekenaaraansluiting"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Koppel as"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Laat jou medialêers op Windows oordra, of met Android File Transfer op Mac (sien www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Laat jou foto\'s met kamerasagteware deel, en enige lêers oordra op rekenaars wat nie MTP ondersteun nie"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installeer lêeroordrag-hulpmiddels"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Laat MIDI-geaktiveerde programme deur USB met MIDI-sagteware op jou rekenaar werk."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Ander gebruikers"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Toestelberging"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Verwyderbare berging"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> beskikbaar (Totaal <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> is gemonteer"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Kon <xliff:g id="NAME">%1$s</xliff:g> nie monteer nie"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> is veilig gedemonteer"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Kon <xliff:g id="NAME">%1$s</xliff:g> nie veilig demonteer nie"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> is geformateer"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Kon <xliff:g id="NAME">%1$s</xliff:g> nie formateer nie"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Hernoem berging"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Nadat dit geformateer is, kan jy hierdie <xliff:g id="NAME_0">^1</xliff:g> in ander toestelle gebruik. \n\nAlle data op hierdie <xliff:g id="NAME_1">^1</xliff:g> sal uitgevee word. Oorweeg dit om dit eers te rugsteun. \n\n"<b>"Rugsteun foto\'s en ander media"</b>" \nSkuif jou medialêers na alternatiewe berging in hierdie toestel, of dra hulle met gebruik van \'n USB-kabel na \'n rekenaar oor. \n\n"<b>"Rugsteun programme"</b>" \nAlle programme wat op hierdie <xliff:g id="NAME_6">^1</xliff:g> geberg is, sal gedeïnstalleer word, en hul data sal uitgevee word. Skuif hierdie programme na alternatiewe berging in hierdie toestel om hulle te hou."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"As jy hierdie <xliff:g id="NAME_0">^1</xliff:g> uithaal, sal programme daarop ophou werk, en medialêers wat daarop geberg is, sal nie beskikbaar wees voordat dit weer ingesit word nie."</b>" \n\nHierdie <xliff:g id="NAME_1">^1</xliff:g> is geformateer om net in hierdie toestel te werk. Dit sal nie in enige ander toestelle werk nie."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Stel jou <xliff:g id="NAME">^1</xliff:g> op"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gebruik as draagbare berging"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Om foto\'s en ander media tussen toestelle te skuif."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Gebruik as interne berging"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Om enigiets, insluitend programme en foto\'s, net in hierdie toestel te berg. Daarvoor word formatering vereis wat keer dat dit in ander toestelle werk."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formateer as interne berging"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Dit vereis dat die <xliff:g id="NAME_0">^1</xliff:g> geformateer word om dit veilig te maak. \n\nNadat dit geformateer is, sal hierdie <xliff:g id="NAME_1">^1</xliff:g> net in hierdie toestel werk. \n\n"<b>"Formatering vee alle data uit wat tans op die <xliff:g id="NAME_2">^1</xliff:g> geberg is."</b>" Oorweeg dit om die data te rugsteun om te keer dat jy dit verloor."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Vee uit en formateer"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formateer tans <xliff:g id="NAME">^1</xliff:g> …"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Moenie die <xliff:g id="NAME">^1</xliff:g> verwyder terwyl dit geformateer word nie."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Skuif data na nuwe berging"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Jy kan jou foto\'s, lêers en programdata na hierdie nuwe <xliff:g id="NAME">^1</xliff:g> skuif. \n\nDit sal sowat <xliff:g id="TIME">^2</xliff:g> neem om te skuif en sal <xliff:g id="SIZE">^3</xliff:g> interne berging beskikbaar stel. Sommige programme sal nie werk terwyl dit besig is nie."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Skuif nou"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Skuif later"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Skuif data nou"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Dit neem sowat <xliff:g id="TIME">^1</xliff:g> om te skuif. Dit sal <xliff:g id="SIZE">^2</xliff:g> interne berging beskikbaar stel."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Skuif"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Skuif tans data …"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Terwyl daar geskuif word: \n• Moenie die <xliff:g id="NAME">^1</xliff:g> verwyder nie. \n• Sommige programme sal nie reg werk nie. \n• Hou die toestel gelaai."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> is gereed"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Jou <xliff:g id="NAME">^1</xliff:g> is gereed om saam met foto\'s en ander media te gebruik."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Jou nuwe <xliff:g id="NAME">^1</xliff:g> werk nou. \n\nOm foto\'s, lêers en programdata na hierdie toestel te skuif, gaan na Instellings &gt; Berging."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Skuif <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Dit sal \'n kort rukkie vat om <xliff:g id="APP">^1</xliff:g> en sy data na <xliff:g id="NAME_0">^2</xliff:g> te skuif. Jy sal nie die program kan gebruik voordat dit klaar geskuif is nie. \n\nMoenie die <xliff:g id="NAME_1">^2</xliff:g> verwyder terwyl daar geskuif word nie."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Skuif tans <xliff:g id="APP">^1</xliff:g> …"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Moenie die <xliff:g id="NAME">^1</xliff:g> verwyder terwyl daar geskuif word nie. \n\nDie <xliff:g id="APP">^2</xliff:g>-program in hierdie toestel sal nie beskikbaar wees voordat dit klaar geskuif is nie."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Kanselleer skuif"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batterystatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batteryvlak"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Toegangspuntname"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Laai verstek APN-instellings terug"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Stel terug na verstek"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Terugstel van verstek APN-instellings voltooi"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Terugstelling van netwerkinstellings"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Dit sal alle netwerkinstellings terugstel, insluitend:\n\n"<li>"Wi‑Fi"</li>\n<li>"Sellulêre data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Stel instellings terug"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Stel alle netwerkinstellings terug? Jy kan nie hierdie handeling ontdoen nie!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Stel instellings terug"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Stel terug?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Netwerkinstellings is teruggestel"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Stel toestel terug"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksterugstelling"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vee alle data op tablet uit"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vee al die data op foon uit"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Vee al die data op die SD-kaart uit, soos musiek of foto\'s."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Stel tablet terug"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Stel foon terug"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Vee al jou persoonlike inligting en afgelaaide programme uit? Jy kan nie hierdie handeling ongedaan maak nie!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Vee al jou persoonlike inligting en afgelaaide programme uit? Jy kan nie hierdie handeling ontdoen nie!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Vee alles uit"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Jy moet jou ontsluitpatroon teken om \'n fabrieksterugstelling te bevestig."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Omdat die Stelsel Skoonmaak-diens nie beskikbaar was nie, is geen terugstel gedoen nie."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Stel terug?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Fabriekterugstelling is nie vir hierdie gebruiker beskikbaar nie"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vee USB-berging uit, wat alle lêers wat daar gestoor word, sal uitvee? Jy kan nie hierdie handeling ongedaan maak nie!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vee SD-kaart uit, wat alle lêers wat daar gestoor word, sal uitvee? Handeling kan nie ontdoen word nie."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Vee alles uit"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die USB-berging wil uitvee."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die SD-kaart wil uitvee."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Oproepinstellings"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Stel stemboodskapdiens, oproepaanstuur, oproep wag, beller-ID op"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-verbinding"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hulp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Sellulêre netwerke"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiele plan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Verstel SMS-program"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-program"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Verander SMS-program?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gebruik <xliff:g id="NEW_APP">%1$s</xliff:g> in plaas van <xliff:g id="CURRENT_APP">%2$s</xliff:g> as jou SMS-program?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gebruik <xliff:g id="NEW_APP">%s</xliff:g> as jou SMS-program?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Liggingmodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gebruik GPS, Wi‑Fi en sellulêre netwerke om ligging te bepaal"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gebruik Wi‑Fi en sellulêre netwerke om ligging te bepaal"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gebruik GPS om jou ligging te bepaal"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gebruik GPS om ligging te bepaal"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skandeer"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skandeer"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi soek tans"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Verbeter ligging deur programme en dienste toe te laat om Wi-Fi-netwerke te soek selfs as Wi-Fi af is"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth soek tans"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Verbeter ligging deur stelseldienste toe te laat om Bluetooth-toestelle te soek, selfs as Bluetooth af is"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi- en selnetwerkligging"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Laat programme Google se liggingsdiens gebruik om jou ligging vinniger te beraam. Anonieme liggingsdata sal ingesamel word en aan Google gestuur word."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ligging deur Wi-Fi vasgestel"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Wagwoord is gestel"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN is gestel"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Patroon is ingestel"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Skermsekuriteit"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Gebruik jou toestelpatroon om voort te gaan."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Voer jou toestel-PIN in om voort te gaan."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Voer jou toestelwagwoord in om voort te gaan."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Toestelsekuriteit"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Verander ontsluitpatroon"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Verander ontsluit-PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bevestig gestoorde patroon"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Probeer weer:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Teken \'n ontsluitpatroon"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Druk Kieslys vir hulp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lig vinger op wanneer jy klaar is"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Stel ontsluitpatroon"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Verander ontsluitpatroon"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hoe om \'n ontsluitpatroon te teken"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Te veel verkeerde pogings!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Probeer weer oor <xliff:g id="NUMBER">%d</xliff:g> sekondes."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Te veel verkeerde pogings. Probeer oor <xliff:g id="NUMBER">%d</xliff:g> sekondes weer."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Die program is nie op jou foon geïnstalleer nie."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Bestuur programme"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Bestuur en verwyder geïnstalleerde programme"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Rangskik volgens grootte"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Wys lopende dienste"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Wys gekaste prosesse"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Noodprogram"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Stel programvoorkeure terug"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Stel programvoorkeure terug?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dit sal al die voorkeure terugstel vir:\n\n "<li>"Gedeaktiveerde programme"</li>\n" "<li>"Gedeaktiveerde programkennisgewings"</li>\n" "<li>"Verstek programme vir handelinge"</li>\n" "<li>"Agtergronddatabeperkings vir programme"</li>\n" "<li>"Enige toestemmingbeperkings"</li>\n\n" Jy sal nie enige programdata verloor nie."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Programwerkinge"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Loop tans"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nooit gebruik nie)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Geen verstekprogramme nie."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Geheuegebruik"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Sien berging wat deur programme gebruik word"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Lopende dienste"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tabletinligting"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Fooninligting"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Batteryinligting"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Kitsloods"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Stel sleutelbordkortpaaie om programme te loods"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Ken program toe"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Geen kortpad nie"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Soek + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Maak skoon"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Jou kortpad vir <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) sal uitgevee word."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Kanselleer"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Programme"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Kortpaaie"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Teksinvoer"</string>
     <string name="input_method" msgid="5434026103176856164">"Invoermetode"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Huidige sleutelbord"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Vang alle Bluetooth HCI-pakette in \'n lêer vas"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-ontsluit"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Laat toe dat die selflaaiprogram ontsluit word"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Voer jou PIN in"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Voer jou PIN in om OEM-ontsluit te aktiveer"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Laat OEM-ontsluit toe?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WAARSKUWING: Toestelbeskermingkenmerke sal nie op hierdie toestel werk terwyl hierdie instelling aangeskakel is nie."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Loggerbuffer se groottes"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Kies loggergroottes per logbuffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Aktiveer aansigkenmerkinspeksie"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Inligtingruiling"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Draadlose skermsertifisering"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktiveer Wi-Fi-woordryke aanmelding"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiewe Wi-Fi na selfoon-oordrag"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Laat altyd Wi-Fi-swerfskanderings toe"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Gebruik vorige DHCP-kliënt"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Wys opsies vir draadlose skermsertifisering"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Verhoog Wi-Fi-aantekeningvlak, wys per SSID RSSI in Wi‑Fi-kieser"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Wanneer dit geaktiveer is, sal Wi-Fi meer aggressief wees om die dataverbinding na selfoon oor te dra wanneer die Wi-Fi-sein swak is"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Laat toe of verbied Wi-Fi-swerfskanderings op grond van die hoeveelheid dataverkeer wat op die koppelvlak teenwoordig is"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Loggerbuffer se groottes"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Kies loggergroottes per logbuffer"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Kies USB-opstelling"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Kies USB-opstelling"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Aktiveer aansigkenmerkinspeksie"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gebruik eerder die DHCP-kliënt van Lollipop af as die nuwe Android DHCP-kliënt."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Laat USB-ontfouting toe?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-ontfouting is net vir ontwikkelingsdoeleindes bedoel. Gebruik dit om data te kopieer tussen jou rekenaar en jou toestel, programme op jou toestel te installeer sonder kennisgewing en om loglêerdata te lees."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Herroep toegang tot USB-ontfouting vanaf alle rekenaars wat jy voorheen gemagtig het?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> moet:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Instellings kan nie jou antwoord verifieer nie omdat \'n program \'n toestemmingversoek verberg."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"As jy <xliff:g id="SERVICE">%1$s</xliff:g> aanskakel, sal jou toestel nie jou skermslot gebruik om data-enkripsie te verbeter nie."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Omdat jy \'n toeganklikheiddiens aangeskakel het, sal jou toestel nie jou skermslot gebruik om data-enkripsie te verbeter nie."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Jy moet jou patroon bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Proses-statistieke"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Bleeksiel-statistieke vir lopende prosesse"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Berginggebruik"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> programme oor <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> van <xliff:g id="TOTALRAM">%2$s</xliff:g> oor <xliff:g id="TIMEDURATION">%3$s</xliff:g> gebruik"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Agtergrond"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Voorgrond"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Gekas"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Toestelberging is tans <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Gemiddelde geheuegebruik"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimum geheuegebruik"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android-bedryfstelsel"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Oorspronklik"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kern"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Kaste"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM-gebruik"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM-gebruik (agtergrond)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Looptyd"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Prosesse"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Dienste"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tydsduur"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Geheuebesonderhede"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 uur"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Wys stelsel"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Versteek stelsel"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gebruik Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiektipe"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Agtergrond"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Verstekinstellings hieronder oorheers programinstellings"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Verstek instellings"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Verstekenjin"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Stel die spraaksintese-enjin wat vir gesproke teks gebruik word"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Stel die spraaksintese-enjin om vir gesproke teks gebruik te word"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Spraaktempo"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Spoed waarteen die teks gepraat word"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Toonhoogte"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardeware-geondersteun"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Net sagteware"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Eiebewyse is nie vir hierdie gebruiker beskikbaar nie"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Jy moet jou ontsluitpatroon teken om eiebewysinstallasie te bevestig."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Voer die wagwoord in vir eiebewysberging."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidige wagwoord:"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Rugsteun my data"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Rugsteun programdata, Wi-Fi-wagwoorde en ander instellings na Google-bedieners"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Rugsteunrekening"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Geen rekening stoor tans gerugsteunde data nie"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Sluit programdata in"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Outomatiese teruglaai"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wanneer \'n program weer geïnstalleer word, herstel gerugsteunde instellings en data"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Rugsteundiens in onaktief."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dit word deur jou toestelbeleid gestel."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Werkskerm-rugsteunwagwoord"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Volle rekenaarrugsteune word nie tans beskerm nie"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Raak om die wagwoord vir volledige rekenaarrugsteune te verander of te verwyder"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Oorganganimasieskaal"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator-tydsduurskaal"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuleer sekondêre uitstallings"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Multi-venster-modus"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Veelvuldige aktiwiteite op die skerm op dieselfde tyd."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Aktiveer multi-venster-modus?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"WAARSKUWING: Dit is \'n hoogs eksperimentele kenmerk wat veelvuldige aktiwiteite op die skerm op dieselfde tyd toelaat deur die Onlangse programme-UI. Sommige programme kan dalk omval of nie behoorlik werk nie wanneer dit saam met hierdie kenmerk gebruik word."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Programme"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Moenie aktiwiteite behou nie"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Vernietig elke aktiwiteit sodra die gebruiker dit verlaat"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Gebruiker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Beperkte profiel"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Voeg nuwe gebruiker by?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Jy kan hierdie toestel met ander mense deel deur bykomende gebruikers te skep. Elke gebruiker het sy eie spasie wat hulle kan pasmaak met hul eie programme, muurpapier, en so aan. Gebruikers kan ook hul toestelinstellings, soos Wi‑Fi wat almal raak, aanpas.\n\nWanneer jy \'n nuwe gebruiker byvoeg, moet daardie persoon hul spasie opstel.\n\nEnige gebruiker kan programme vir al die ander gebruikers opdateer."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Jy kan hierdie toestel met ander mense deel deur bykomende gebruikers te skep. Elke gebruiker het sy eie area wat hy kan pasmaak met programme, muurpapier en so meer. Gebruikers kan ook toestelinstellings wat almal raak, soos Wi-Fi, aanpas.\n\nWanneer jy \'n nuwe gebruiker byvoeg, moet daardie persoon sy eie area opstel.\n\nEnige gebruiker kan programme vir alle ander gebruikers opdateer."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Wanneer jy \'n nuwe gebruiker byvoeg, moet daardie persoon hul spasie opstel.\n\nEnige gebruiker kan programme vir al die ander gebruikers opdateer."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Moet die gebruiker nou opgestel word?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Maak seker die persoon is beskikbaar om die toestel te vat en hul spasie op te stel"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Verwyder gas?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Alle programme en data in hierdie sessie sal uitgevee word."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Verwyder"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Laat foonoproepe toe"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Laat foonoproepe en SMS toe"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Skakel foonoproepe aan"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Skakel foonoproepe en SMS aan"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Verwyder gebruiker"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Laat foonoproepe toe?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Skakel foonoproepe aan?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Oproepgeskiedenis sal met hierdie gebruiker gedeel word."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Laat foonoproepe en SMS toe?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Oproep- en SMS-geskiedenis sal met hierdie gebruiker gedeel word."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Skakel foonoproepe en SMS aan?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Oproep- en SMS-geskiedenis sal met hierdie gebruiker gedeel word."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Laat programme en inhoud toe"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programme met beperkings"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Brei instellings vir program uit"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"HERNOEM"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Stel program-beperkings"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Beheer deur <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Hierdie program word nie in beperkte profiele ondersteun nie"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Hierdie program kan toegang tot jou rekeninge kry"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Hierdie program het toegang tot jou rekeninge. Word beheer deur <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi en selfoon"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Laat die wysiging van Wi‑Fi en mobiele instellings toe"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi netwerk verbinding"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS stuur SMS boodskappe boodskapdiens"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"sellulêr selfoondiensverskaffer draadloos data 4 g 3 g 2 g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi oproep bel"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanseerder"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skerm raakskerm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dempskerm raakskerm battery"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dempskerm raakskerm battery"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"agtergrond personaliseer pasmaak skem"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"donker tema nagmodus verdof skerm draai helderheid om"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"agtergrond personaliseer pasmaak skerm"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksgrootte"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projek"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projekuitsending"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"spasie skyf hardeskyf toestel gebruik"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"kragverbruikheffing"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling woordeboek speltoetser outo-regmaak"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"rekening"</string>
     <string name="keywords_users" msgid="4673901601478559100">"beperking beperk is beperk"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teks regstelling korrek klank vibreer outomaties taal gebaar stel voor voorstel tema aanstootlik woord emosiekoon internasionaal"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"terugstel voorkeure verstek"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"nood in-geval-van-nood-program verstek"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"programme aflaai programme stelsel"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"programme toestemmings sekuriteit"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"programme verstek"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"gly wagwoord patroon pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Stel Wi-Fi-NFC-merker op"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skryf"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Wekkervolume"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Luivolume"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Kennisgewingvolume"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Onderbrekings"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Wanneer oproepe en kennisgewings opdaag"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Onderbreek altyd"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Laat net prioriteitonderbrekings toe"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Moenie onderbreek nie"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"\'Net prioriteit\' laat toe"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Outomatiese reëls"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Net prioriteit"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Net wekkers"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Geen onderbrekings nie"</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="ringtone_title" msgid="5379026328015343686">"Foon-luitoon"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Verstekkennisgewingluitoon"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreer ook vir oproepe"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreer"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Kennisgewingtoegang"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programme kan nie kennisgewings lees nie"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d program kan kennisgewings lees"</item>
-    <item quantity="other" msgid="980049191810249052">"%d programme kan kennisgewings lees"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d programme kan kennisgewings lees</item>
+      <item quantity="one">%d program kan kennisgewings lees</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Geen kennisgewingluisteraars is geïnstalleer nie."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Aktiveer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> sal alle kennisgewings kan lees wat deur die stelsel of deur enige geïnstalleerde program geplaas is, wat dalk persoonlike inligting soos kontakname en die teks van boodskappe wat na jou gestuur is, kan insluit. Dit sal ook hierdie kennisgewings kan verwerp of handelingknoppies daarbinne kan aanraak."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Voorwaardesverskaffers"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Geen programme voorsien voorwaardes nie"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d program voorsien voorwaardes"</item>
-    <item quantity="other" msgid="358057362115673258">"%d programme voorsien voorwaardes"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Geen voorwaardeverskaffers is geïnstalleer nie."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Aktiveer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> sal uitgaanvoorwaardes by die Moenie steur nie-modus kan voeg."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laai tans programme …"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blokkeer"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkeer almal"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Moet nooit kennisgewings van hierdie program af wys nie"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioriteit"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Wys kennisgewings boaan die lys en laat hulle aanhou kom wanneer die toestel gestel is om net prioriteit onderbrekings toe te laat"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensitief"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Versteek enige sensitiewe inhoud van hierdie program se kennisgewings af wanneer die toestel gesluit is"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Behandel as prioriteit"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Laat hierdie program se kennisgewings gehoor word wanneer Moenie steur nie na Net prioriteit gestel is"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Laat loer toe"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Laat hierdie program sekere kennisgewings beklemtoon deur hulle vir \'n kort tyd op die huidige skerm te wys"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Versteek sensitiewe inhoud"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Wanneer die toestel gesluit is, versteek inhoud in hierdie program se kennisgewings wat private inligting kan onthul."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Geblokkeer"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioriteit"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitief"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Klaar"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Totdat jy dit afskakel"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriteitonderbrekings"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Aftyd"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dae"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Geen"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Onderbrekings toegelaat"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Net prioriteit"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Geen"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Outomatisering"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Skakel outomaties aan"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Reëlnaam"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Voeg reël by"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Vee reël uit"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vee \"<xliff:g id="RULE">%1$s</xliff:g>\"-reël uit?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Vee uit"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Reëltipe"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Onbekend"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Stel reël op"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Skeduleer reël"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Reël is nie gevind nie."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dae"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Geen"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Elke dag"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nooit"</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> tot <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Oproepe"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Boodskappe"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Oproepe/boodskappe vanaf"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Enigiemand"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Net kontakte"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Net gesterde kontakte"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Geleenthede en onthounotas"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Wekkers is altyd prioriteitonderbrekings"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Wekkers"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Onthounotas"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Geleenthede"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Uitgesoekte bellers"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Herhaalbellers"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"As dieselfde persoon binne \'n tydperk van <xliff:g id="MINUTES">%d</xliff:g> minuut \'n tweede keer bel, laat dit toe"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Sit outomaties aan"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nooit"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Elke nag"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Weekaande"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Begintyd"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Eindigtyd"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> of enige wekker voor dit"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag of enige wekker voor dit"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Onderbrekings"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Wanneer oproepe en kennisgewings opdaag"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Wanneer sal jy onderbreek wil word?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Vir hoe lank?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Onderbreek altyd"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"af,alle,alles"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Laat net prioriteitonderbrekings toe"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Laat net wekkers toe"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Moenie onderbreek nie"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Onbepaald"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> uur</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> uur</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Verander onbepaald na net prioriteitkennisgewings"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Verander na net prioriteitkennisgewings vir <xliff:g id="DURATION">%1$d</xliff:g> minute tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Verander na net prioriteitkennisgewings vir een minuut tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Verander na net prioriteitkennisgewings vir <xliff:g id="DURATION">%1$d</xliff:g> uur (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Verander na net prioriteitkennisgewings vir een uur tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Verander onbepaald na net wekkers"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Verander na net wekkers vir <xliff:g id="DURATION">%1$d</xliff:g> minute (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Verander na net wekkers vir een minuut tot <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">Verander na net wekkers vir <xliff:g id="DURATION">%1$d</xliff:g> uur tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Verander na net wekkers vir een uur tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Verander onbepaald na moenie onderbreek nie"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Verander na moenie onderbreek nie vir <xliff:g id="DURATION">%1$d</xliff:g> minute (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Verander na moenie onderbreek nie vir een minuut tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Verander na moenie onderbreek nie vir <xliff:g id="DURATION">%1$d</xliff:g> uur tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Verander na moenie onderbreek nie vir een uur tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Verander na onderbreek altyd"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"vir altyd"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programkennisgewings"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Stuur terugvoer oor hierdie toestel"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-inligting"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI se relatiewe inligting"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Gleuf<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Begin by verstek"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> gebruik in <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Domeinskakels"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Maak domein-URL\'e oop"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Laat program toe om domein-URL\'e direk oop te maak"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL\'e vir gesteunde domeine"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Ander verstekke"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> gebruik in <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"interne geheue"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"eksterne geheue"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Interne berging"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Eksterne berging"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Programdatagebruik"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> gebruik sedert <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Berging gebruik"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Aan"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blokkeer"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensitief"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioriteit"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioriteit en sensitief"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> toestemmings verleen</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> toestemming verleen</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> van <xliff:g id="COUNT_3">%d</xliff:g> toestemmings verleen</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> toestemming verleen</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Sommige verstekke gestel"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Geen verstekke gestel nie"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Alle programme"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Geaktiveer"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Persoonlik"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Werk"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Geblokkeer"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioriteit"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitief"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Met domein-URL\'e"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Gedeaktiveer deur administrateur"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Gevorderd"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Onbekende program"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Kies profiel"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Programtoestemmings"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> programme mag bykomende toegang hê"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> programme toegelaat"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domein-URL\'e"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Moenie enige domein-URL oopmaak nie"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Maak \'<xliff:g id="DOMAIN">%s</xliff:g>\' oop"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Maak \'<xliff:g id="DOMAIN">%s</xliff:g>\' en verwante URL\'e oop"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> programme kan hul domein-URL\'e oopmaak</item>
+      <item quantity="one">Een program kan sy domein-URL\'e oopmaak</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nie herken nie"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Verstekprogramme"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Blaaierprogram"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Geen verstekblaaier nie"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Verstek)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Programberging"</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 28f1e1d..e44c822 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"ሲም"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"አዝራር ተጫን"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"ማይክሮፎን ድምፅ-ከል አድርግ/አንሳ"</item>
     <item msgid="1148142988678569310">"ፕሮጀክት ሚዲያ"</item>
     <item msgid="9130014005474445273">"VPN አግብር"</item>
+    <item msgid="1165192162975045562">"ልጣፍ ይጻፉ"</item>
+    <item msgid="7129487923652967258">"የረዳት መዋቅር"</item>
+    <item msgid="1069023208100114540">"የረዳት ቅጽበታዊ ገጽ እይታ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"አካባቢ"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"ማይክሮፎን ድምፅ-ከል አድርግ/አንሳ"</item>
     <item msgid="5906017727368097853">"ፕሮጀክት ሚዲያ"</item>
     <item msgid="2486614710846178542">"VPN አግብር"</item>
+    <item msgid="5586547561693629602">"ልጣፍ ይጻፉ"</item>
+    <item msgid="32794179825485062">"የረዳት መዋቅር"</item>
+    <item msgid="7872852746938272552">"የረዳት ቅጽበታዊ ገጽ እይታ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"አጭር"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"ዝቅተኛ"</item>
     <item msgid="4212263919458209842">"አሳሳቢ"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ጠፍቷል"</item>
-    <item msgid="5656544177755411222">"የተገደቡ ማቋረጦች"</item>
-    <item msgid="8735337502532332056">"ዜሮ ማቋረጦች"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"መደበኛ"</item>
     <item msgid="866544120205026771">"መጠነኛ"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"ሮዝ"</item>
     <item msgid="6131821495505931173">"ቀይ"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (የሚዲያ ማስተላለፍ ፕሮቶኮል)"</item>
+    <item msgid="8856820259201251036">"PTP (የምስል ማስተላለፍ ፕሮቶኮል)"</item>
+    <item msgid="216135047298423770">"RNDIS (ዩኤስቢ ኢተርኔት)"</item>
+    <item msgid="2686051673589572111">"የድምጽ ምንጭ"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index dc13334..7192e24 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"ይፍቀዱ"</string>
     <string name="deny" msgid="6947806159746484865">"ይከልክሉ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ያልታወቀ"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT">%1$d</xliff:g> ደረጃ ይቀርዎታል።"</item>
-    <item quantity="other" msgid="6722953419953594148">"አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT">%1$d</xliff:g> ደረጃዎች ይቀርዎታል።"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ደረጃዎች ይቀርዎታል።</item>
+      <item quantity="other">አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ደረጃዎች ይቀርዎታል።</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"አሁን ገንቢ ሆነዋል!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"አያስፈልግም፣ አስቀድሞ ገንቢ ሆነዋል።"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"የገመድ አልባና አውታረ መረቦች"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"SMS በ IMS ላይ አጥፋ"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"የሚያስፈልገውን የ IMS ምዝገባ አብራ"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"የሚያስፈልገውን የIMS ምዝገባ አጥፋ"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"በVoLTE የተያዘ ጠቁምን አብራ"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"በVoLTE የተያዘ ጠቁምን አጥፋ"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"የlte ram ማከማከቻ አብራ"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"የlte ram ማከማከቻ አጥፋ"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"የSIM ማስታወሻ ደብተር ዕይ"</string>
@@ -135,16 +137,7 @@
     <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;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt; ያቦዝናል"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"ተገናኝቷል"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ተያይዟል (ምንም ስልክ የለም)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ተያይዟል (ምንም ማህደረ መረጃ የለም)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"ተገናኝቷል (ምንም የመልዕክት መዳረሻ የለም)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ተያይዟል (ምንም ስልክ ወይም ማህደረ መረጃ የለም)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ተለያይቷል"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"በመለያየት ላይ..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"በማገናኘት ላይ…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"በማገናኘት ላይ..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"ስም አልባ የብሉቱዝ መሣሪያ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"በመፈለግ ላይ"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"በአቅራቢያው ምንም የብሉቱዝ መሳሪያዎች አልተገኙም::"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"የደረሱ ፋይሎችን አሳይ"</string>
     <string name="device_picker" msgid="4978696506172252813">"የብሉቱዝ መሣሪያ ምረጥ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"የብሉቱዝ ፈቃድ ጥየቃ"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"አንድ መተግበሪያ ብሉቱዝን ማብራት ይፈልጋል።"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"አንድ መተግበሪያ ለዚህ መሣሪያ ብሉቱዝን ማብራት ይፈልጋል።"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"አንድ መተግበሪያ ጡባዊዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"አንድ መተግበሪያ ስልክዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"አንድ መተግበሪያ ጡባዊዎን ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ይቅር"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ቀጥል"</string>
     <string name="okay" msgid="1997666393121016642">"እሺ"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"አዎ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"አይ"</string>
-    <string name="forget" msgid="7267115980248732932">"እርሳ"</string>
+    <string name="forget" msgid="1400428660472591263">"እርሳ"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"የፊት ማመሳሰልን አሻሽል"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"የህያውነት ማረጋገጫ"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"መክፈት ላይ የአይን መጥቀስ ፈልግ"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"የእኔን ስፍራ፣ማያ ክፈት፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"የይለፍ ቃሎች"</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="3453670509485083962">"አክል"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ማያ ገጽ መቆለፊያ"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"የጣት አሻራ ቅንብር"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"የጣት አሻራዎን ተጠቅመው ማያ ገጽዎን ለመክፈት ወይም ግዢዎችን ለማረጋገጥ እነዚህን ማድረግ አለብን፦ \n\n✓ የምትኬ ማያ ገጽ ቁልፍ ስልትዎን ያዘጋጁ \n\n✓ የጣት አሻራዎን ያክሉ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ዳሳሹን ያግኙት"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"በስልክዎ ጀርባ ላይ ያለውን የጣት አሻራ ዳሳሹን ያግኙት።"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"እንጀምር!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"ተመሳሳይ ጣት በጣት አሻራ አነፍናፊው ላይ ያስቀምጡት። ንዝረት ከተሰማዎት በኋላ ያንሱት።"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"ድንቅ ነው! አሁን ይድገሙት።"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"ተመሳሳይ ጣት በጣት አሻራ አነፍናፊው ላይ ያስቀምጡ እና ንዝረት ከተሰማዎት በኋላ ያንሱት።"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"የጣት አሻራ ታክሏል!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ይህን አዶ ባዩ ቁጥር፣ ማንነትን ለይቶ ለማወቅ ወይም ግዢን ፈቃድ ለመስጠት የእርስዎን የጣት አሻራ መጠቀም ይችላሉ።"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"አክል"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ቀጣይ"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"መሳሪያዎን መመስጠርን ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትዎን መሳል አለብዎ።"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"ይመስጠር?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጡት፤ ውሂብ ያጣሉ።ምስጠራ 1 ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጡት፤ ውሂብ ያጣሉ።ምስጠራ 1 ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"በፊት ገጽ መክፈቻ"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"ዝቅተኛ ጥበቃ፣ ሙከራ"</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>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">" የይለፍ ቃል፡"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ከፍተኛ ጥበቃ"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"አሁን ያለ ማያ ገጽ መቆለፊያ"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"የመሣሪያ ጥበቃ ባህሪዎች ከእንግዲህ አይሰሩም።"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"የምስጠራ መመሪያ ወይም ማስረጃ ማከማቻ በአስተዳዳሪ ቦዝኗል"</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_biometric_weak" msgid="3008473624490350142">"በፊት ገጽ መክፈቻ"</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="7579210814842056547">"አንድ ጊዜ የማያ ገጽ መቆለፊያን ካቀናበሩ በኋላ፣ በቅንብሮች እና ደህንነት ውስጥ የጣት አሻራን ማቀናበር ይችላሉ።"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"የማያ መዝጊያ አጥፋ"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"የመክፈቻ ስርዓተ ጥለት አስወግድ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"መክፈቻ ፒን  አስወግድ"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"የይለፍ ቃል ቢያንስ አንድ ፊደል መያዝ አለበት።"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"የይለፍ ቃል ቢያንስ አንድ አሀዝ መያዝ አለበት።"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"የይለፍ ቃል ቢያንስ አንድ ምልክት መያዝ አለበት።"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"የይለፍ ቃል ቢያንስ 1 ፊደል መያዝ አለበት።"</item>
-    <item quantity="other" msgid="8186027808415585970">"የይለፍ ቃል ቢያንስ %d ፊደሎች መያዝ አለበት።"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"የይለፍ ቃል ቢያንስ 1 ንዑስ ፊደል መያዝ አለበት።"</item>
-    <item quantity="other" msgid="2693910942679679225">"የይለፍ ቃል ቢያንስ %d ንዑስ ፊደሎች መያዝ አለበት።"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"የይለፍ ቃል ቢያንስ 1 አቢይ ፊደል መያዝ አለበት።"</item>
-    <item quantity="other" msgid="3030801209112209245">"የይለፍ ቃል ቢያንስ %d ከፍ ያሉ ፊደሎች መያዝ አለበት።"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"የይለፍ ቃል ቢያንስ 1 ቁጥር አሀዝ መያዝ አለበት።"</item>
-    <item quantity="other" msgid="4703982391407595924">"የይለፍ ቃል ቢያንስ %d ቁጥር አሀዞች መያዝ አለበት።"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"የይለፍ ቃል ቢያንስ 1 ልዩ ምልክት መያዝ አለበት።"</item>
-    <item quantity="other" msgid="1221290525051187757">"የይለፍ ቃል ቢያንስ %d ልዩ ምልክቶችን መያዝ አለበት።"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"የይለፍ ቃል ቢያንስ 1 ፊደል ያልሆነ ቁምፊ መያዝ አለበት።"</item>
-    <item quantity="other" msgid="3952508584649046404">"የይለፍ ቃል ቢያንስ %d ፊደል ያልሆኑ ቁምፊዎች መያዝ አለበት።"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">የይለፍ ቃል ቢያንስ %d ፊደሎች መያዝ አለበት።</item>
+      <item quantity="other">የይለፍ ቃል ቢያንስ %d ፊደሎች መያዝ አለበት።</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">የይለፍ ቃል ቢያንስ %d ንዑስ ፊደሎች መያዝ አለበት።</item>
+      <item quantity="other">የይለፍ ቃል ቢያንስ %d ንዑስ ፊደሎች መያዝ አለበት።</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">የይለፍ ቃል ቢያንስ %d አቢይ ፊደሎች መያዝ አለበት።</item>
+      <item quantity="other">የይለፍ ቃል ቢያንስ %d አቢይ ፊደሎች መያዝ አለበት።</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">የይለፍ ቃል ቢያንስ %d ቁጥር አሀዞች መያዝ አለበት።</item>
+      <item quantity="other">የይለፍ ቃል ቢያንስ %d ቁጥር አሀዞች መያዝ አለበት።</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">የይለፍ ቃል ቢያንስ %d ልዩ ምልክቶች መያዝ አለበት።</item>
+      <item quantity="other">የይለፍ ቃል ቢያንስ %d ልዩ ምልክቶች መያዝ አለበት።</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">የይለፍ ቃል ቢያንስ %d ፊደል ያልሆኑ ቁምፊዎች መያዝ አለበት።</item>
+      <item quantity="other">የይለፍ ቃል ቢያንስ %d ፊደል ያልሆኑ ቁምፊዎች መያዝ አለበት።</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"የቅርብ ጊዜ የይለፍ ቃል መጠቀም የመሳሪያ አስተዳዳሪ አይፈቅድም።"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ከላይ ወደታች የተዘረዘሩ፣ ከታች ወደላይ የተዘረዘሩ ወይም የተደራረቡ የአሃዞች አደራደር የተከለከለ ነው"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"እሺ"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"አጣምር"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"አጣምር"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ይቅር"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"ማጣመር በግንኙነት ጊዜ የእርስዎ የእውቂያዎች እና የጥሪ ታሪክ መዳረሻን ይሰጣል።"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"ከ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ማጣመር አልተቻለም::"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ከ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር ትክክለኛ ባልሆነ ፒን ወይም የይለፍቁልፍ ምክንያት ማጣመር አልተቻለም::"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር ግንኙነት መመስረት አልተቻለም።"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ማጣመር በ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ተገፍቷል።"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"ወደ <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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"የመገኛ አካባቢነት ትክክለኛነት ለማሻሻል፣ ምንም እንኳን Bluetooth የጠፋ እንኳ ቢሆን Bluetoothን መሣሪያዎችን ለመፈለግ መተግበሪያዎች እና አገልግሎቶች ይቃኛሉ። ይህን ለውጥ በ<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ቅንጅቶችን መቃኘት<xliff:g id="LINK_END_1">LINK_END</xliff:g> ላይ ሊለውጡት ይችላሉ።"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ወደ..... አያይዝ"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"የማህደረ መረጃ ኦዲዮ"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"የስልክ ኦዲዮ"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ፋይል ማስተላለፍ"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ግቤት መሣሪያ"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"የበይነመረብ ድረስ"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"እውቂያ ማጋራት"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"እውቂያን ለማጋራት ተጠቀም"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"የበይነ መረብ ተያያዥ ማጋሪያ"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"የመልዕክት መዳረሻ"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"ወደ ማህደረ  መረጃ  አውዲዮ ተያይዟል"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ወደ ስልክ አውዲዮ ተያይዟል"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ወደ ፋይል ዝውውር አገልጋይ ተያይዟል"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"ከካርታ ጋር ተገናኝቷል"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ከፋይል ዝውውር አገልጋይ ጋር አልተያያዘም"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ወደ ግቤት መሣሪያ ተያይዟል"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ለማህደረመረጃ ድምፅተጠቀም"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ለስልክ ድምፅ ተጠቀም"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ለፋይል ዝውውር ተጠቀም"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ለውፅአት ተጠቀም"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ለበይነ መረብ ድረስ ተጠቀም"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ለካርታ ይጠቀሙ"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi ረዳት"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"በWi‑Fi ረዳት አማካኝነት ተገናኝቷል"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"ማያ ገጽ ውሰድ"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi በማጥፋት ላይ..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"ስህተት"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"አውሮፕላን ሁኔታ"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ለአውታረመረቦች መቃኘት አይቻልም"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"የአውታረ መረብ ማሳወቂያ"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"ይፋዊ አውታረ መረብ በተገኘ ጊዜ አሳውቅ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ደካማ ግንኙነቶችን አስወግድ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"ጥሩ የበይነመረብ ግንኙነት ከሌለው በስተቀር የWi-Fi አውታረ መረብ አይጠቀሙ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ጥሩ የበይነመረብ ግንኙነት ያላቸው አውታረ መረቦችን ብቻ ተጠቀም"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"መቃኘት ሁልጊዜ ይገኛል"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"ሁልጊዜ መቃኘትን ፍቀድ"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"የGoogle የአካባቢ አገልግሎትን እና ሌሎች መተግበሪያዎች አውታረ መረቦችን ለማግኘት እንዲቃኙ ያድርጓቸው፣ Wi-Fi ጠፍቶም ቢሆን እንኳን"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ክፍት Wi‑Fi ራስ-ሰርን ይጠቀሙ"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"ከፍተኛ ጥራት እንዳላቸው ለተረጋገጠላቸው ክፍት አውታረ መረቦች Wi-Fi ረዳት በራስ-ሰር እንዲያገናኝ ይተውት"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"ረዳት ይምረጡ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"የእውቅና ማረጋገጫዎችን ይጫኑ"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"የአካባቢ ትክክለኛነትን ለማሻሻል እና ለሌሎች ዓላማዎች Google እና ሌሎች መተግበሪያዎች አጠገብ ያሉ አውታረ መረቦችን ሊቃኙ ይችላሉ፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ። ይሄ እንዲከሰት ካልፈለጉ ወደ የላቀ &gt; መቃኘት ይሂዱ፣ ሁልጊዜ ይገኛል።"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"መተግበሪያዎች አጠገብ ያሉ አውታረ መረቦችን ሊቃኙ ይችላሉ፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ። ይሄ እንዲከሰት ካልፈለጉ ወደ የላቀ &gt; መቃኘት ይሂዱ፣ ሁልጊዜ ይገኛል።"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"የመገኛ አካባቢነት ትክክለኛነት ለማሻሻል፣ ምንም እንኳን Wi‑Fi የጠፋ እንኳ ቢሆን 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="5340097010842405981">"ዳግመኛ አታሳይ"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"ሌላ አውታረ መረብ ያክሉ"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ተጨማሪ"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"በራስ ሰር ማወቀር (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"መዋቀሩን ለማጠናቀቅ ጡባዊዎ የWi-Fi መዳረሻ ያስፈልገዋል። ከተዋቀረ በኋላ በተንቀሳቃሽ ስልክ ውሂብ እና Wi-Fi መካከል መቀያየር ይችላሉ።"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"የላቁ አማራጮች"</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="5940801028985255304">"በራውተርዎ ላይ ያለውን በWi-Fi የሚጠበቀው የማወቀሪያ አዝራርን ይጫኑ። «WPS» ሊባል ይችላል ወይም ይሄንን ምልክት ሊያካትት ይችላል፦"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"በራውተርዎ ላይ ያለውን በ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_complete" msgid="2388138550456729134">"WPS ተሳክቷል። ከአውታረ መረቡ ጋር በመገናኘት ላይ…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"ከWi-Fi አውታረ መረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> ጋር ተገናኝቷል"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"የኤፒ ባንድን አዋቅር"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 ጊሄዝ ባንድ"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 ጊሄዝ ባንድ"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP ቅንብሮች"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ያልተለወጠ)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">" (ያልተገለፀ)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"ተቀምጧል"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"ተሰነክሏል"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"የአይ.ፒ. ውቅረት መሰናከል"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"የWiFi ግንኙነት መሰናከል"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"የማረጋገጫ ችግር"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"በክልል ውስጥ የለም"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"ምንም የበይነ መረብ መዳረሻ ተፈልጎ አልተገኘም፣ በራስ-ሰር እንደገና እንዲገናኝ አይደረግም።"</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_security_none" msgid="7985461072596594400">"የለም"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"ይህ አውታረመረብ ምንም የበይነመረብ ግንኙነት የለውም። የሆነ ሆኖ ይህን አውታረመረብ ይጠቀም?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ለዚህ አውታረመረብ ዳግመኛ አትጠይቅ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"አያይዝ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ከአውታረ መረቡ ጋር መገናኘት አልተሳካም"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"እርሳ"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"የAndroidAP WPA2 PSK ተንቀሳቃሽ የWi‑Fi መገናኛ ነጥብ"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ተንቀሳቃሽ የWi‑Fi መገናኛ ነጥብ"</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_mode_title" msgid="2164073796253284289">"የጥሪ ምርጫ"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi ጥሪ ሁነታ"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi ተመራጭ"</item>
+    <item msgid="5267397515594230396">"የተንቀሳቃሽ ስልክ ተመራጭ"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"የWi-Fi ጥሪ ሲበራ የእርስዎ ስልክ በምርጫዎ እና በየትኛው ይበልጥ ጠንካራ እንደሆነ የሚወሰን ሆኖ ጥሪዎችን በWi-Fi አውታረ መረቦች ወይም በአገልግሎት አቅራቢዎ አውታረ መረብ በኩል ሊያዞር ይችላል። ይህን ባህሪ ከማብራትዎ በፊት ክፍያዎችን እና ሌሎች ዝርዝሮችን በተመለከተ አገልግሎት አቅራቢዎን ያነጋግሩ።"</string>
     <string name="home_settings" msgid="212375129455718176">"መነሻ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ድምፅ"</string>
@@ -774,7 +761,7 @@
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"ማያ ቆልፍ ድምፆች"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"ሲነካ ንዘር"</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">"የጥሪ ድምፅ እና ማሳወቂያዎች"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"ማሳወቂያዎች"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"ማንቂያ ደወሎች"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"ገጽታ"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"ቀላል"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"ጨለማ"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"ራስ-ሰር"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"ተመራጩ ሲም ይዘመን?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> በመሣሪያዎ ውስጥ ያለው ብቸኛ ሲም ነው። ይህን ሲም ለተንቀሳቃሽ ስልክ ውሂብ፣ ጥሪዎች እና የኤስኤምኤስ መልዕክቶች መጠቀም ይፈልጋሉ?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ልክ ያልሆነ የሲም ኮድ። አሁን መሳሪያዎን ለማስከፈት ድምጸ ተያያዥ ሞደምዎን ማግኘት አለብዎ።"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"ልክ ያልሆነ የሲም ፒን ኮድ፣ መሳሪያዎን ለማስከፈት ድምጸ ተያያዥ ሞደምዎን ማግኘት ግዴታዎ ሊሆን <xliff:g id="NUMBER">%d</xliff:g> ሙከራ ይቀርዎታል።"</item>
-    <item quantity="other" msgid="77103619544346451">"ልክ ያልሆነ የሲም ፒን ኮድ፣ <xliff:g id="NUMBER">%d</xliff:g> ሙከራዎች ይቀሩዎታል።"</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">ልክ ያልሆነ የሲም ፒን ኮድ፣ <xliff:g id="NUMBER_1">%d</xliff:g> ሙከራዎች ይቀርዎታል።</item>
+      <item quantity="other">ልክ ያልሆነ የሲም ፒን ኮድ፣ <xliff:g id="NUMBER_1">%d</xliff:g> ሙከራዎች ይቀርዎታል።</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"የሲም ፒን ክወና አልተሳካም!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"የጡባዊ ኹነታ"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"የስልክ ሁኔታዎች"</string>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"መተግበሪያዎች (የመተግበሪያ ውሂብ እና የሚዲያ ይዘት)"</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_dcim_usage" msgid="558887013613822577">"ፎቶዎች፣ ቪዲዮዎች"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"ኦዲዮ (ሙዚቃ፣ የስልክ ጥሪ ድምፅ፣ ፖድካስቶች ወዘተ)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"ልዩ ልዩ"</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="default" msgid="6915293408836853020">" SD ካርድ ንቀል"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"አፈናጥ"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"አስወጣ"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"ደምስስ እና ቅረጽ"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ደምስስ እና እንደ ውስጣዊ ማከማቻ ቅረጽ"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"የUSB ኮምፒዩተር ትይይዝ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"የUSB ኮምፒዩተር ትይይዝ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"እንደ.... ያግኙን"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"በዊንዶውስ ላይ የማህደረ መረጃ ፋይሎችን እንዲያስተላልፉ፣ ወይም የAndroid ፋይል ሰደዳን Mac ላይ (www.android.com/filetransfer ይዩ) መጠቀም ይፈቅዳል"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"ካሜራ(PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"የካሜራ ሶፍትዌርን በመጠቀም ፎቶዎችን እንዲያስተላልፉ እና በኮምፒዩተር ላይ የሚገኙ ማንኛውም የMTP ፋይልን የማይደግፉ ያስተላልፉ"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"የፋይል አስተላልፍ መሣሪያዎች ጫን"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"በMIDI የነቁ መተግበሪያዎች በዩኤስቢ ላይ ከMIDI ሶፍትዌር ጋር በእርስዎ ኮምፒውተር ላይ እንዲሰሩ ያስችላቸዋል።"</string>
     <string name="storage_other_users" msgid="808708845102611856">"ሌሎች ተጠቃሚዎች"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"የመሣሪያ ማከማቻ"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"መወገድ የሚችል ማከማቻ"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ነጻ (በድምሩ <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ተፈናጧል"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"ደህንነቱ እንደተጠበቀ <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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> መቅረጽ አልተቻለም"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ማከማቻ ዳግም ሰይም"</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የማህደረመረጃ ፋይሎችዎን በዚህ መሣሪያ ላይ ወዳለ ተለዋጭ ማከማቻ ይውሰዱ ወይም የዩኤስቢ ገመድ ተጠቅመው ወደ አንድ ኮምፒውትወር ያስተላልፏቸው። \n\n"<b>"የመተግበሪያዎች ምትኬን ያስቀምጡ"</b>" \nበዚህ <xliff:g id="NAME_6">^1</xliff:g> ላይ የተቀመጡ መተግበሪያዎች ሁሉ ይራገፉና ውሂባቸው ይሰረዛል። እነዚህን መተግበሪያዎች ለማቆየት በዚህ መሣሪያ ላይ ወዳለ ተለዋጭ ማከማቻ ይውሰዷቸው።"</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"ይህን <xliff:g id="NAME_0">^1</xliff:g> ሲያስወጡት በእሱ ላይ የተከማቹ መተግበሪያዎች መስራት ያቆማሉ፣ እና ዳግም እስኪገባ ድረስ በእሱ ላይ የተከማቹ የማህደረመረጃ ፋይሎች አይገኙም።"</b>" \n\nይህ <xliff:g id="NAME_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_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_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="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> ቅርጸት እየተሰራለት ሳለ አያስወግዱት።"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ውሂብን ወደ አዲስ ማከማቻ ውሰድ"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"የእርስዎን ፎቶዎች፣ ፋይሎች እና የመተግበሪያ ውሂብ ወደዚህ አዲስ <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="5035719146373359329"><b>"መውሰዱ <xliff:g id="TIME">^1</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="8641916179067596592">"በሚወሰድበት ጊዜ፦ \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ን ይውሰዱ"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"በሚወሰድበት ጊዜ <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="battery_status_title" msgid="9159414319574976203">"የባትሪሁኔታ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"የባትሪደረጃ፡"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -998,7 +1035,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="8418502878620394756">"የስም መስክ ባዶ ሊሆን አይችልም"</string>
     <string name="error_apn_empty" msgid="6056233831214537267">"APN ባዶ መሆን አይችልም።"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"የአውታረ መረብ ቅንብሮች ዳግም ማቀናበር"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"የሚከተሉትን ጨምሮ ይህ ሁሉንም የአውታረ መረብ ቅንብሮች ዳግም ያስጀምራል፦\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="4874737348054213767">"ሁሉም አውታረ መረብ ቅንብሮች ዳግም ይጀምሩ? ይህን እርምጃ መቀልበስ አይችሉም!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ቅንብሮችን ዳግም ያቀናብሩ"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ዳግም ይቀናበር?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"የአውታረ መረብ ቅንብሮች ዳግም ጀምረዋል።"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"መሣሪያ ዳግም አስጀመር"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"የፋብሪካ ውሂብ ዳግም አስጀምር"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"በስልኩ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"በስልኩ ላይ ያለውን ውሂብ ሁሉ አጥፋ"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ይህ ከእርስዎ ጡባዊ "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"እንደ ሙዚቃ እና ፎቶዎች፣ ሁሉንም ውሂብ በSD ካርድ ላይ አጥፋ።"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ጡባዊ ዳግም አስጀምር"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ስልክ ድጋሚ አስጀምር"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"ሁሉም የእርስዎ የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዙ? ይህን እርማጃ መቀልበስ አይችሉም!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"ሁሉም የእርስዎ የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዙ? ይህን እርምጃ መቀልበስ አይችሉም!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ሁሉንም አጥፋ"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"የፋብሪካ ውሂብ ዳግም ለማስጀምር መፈለግዎን ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል ያስፈልግዎታል።"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"የስርዓቱ አገልግሎት አጽዳ ስላልተገኘ ዳግም ለማስጀመር ምንም አልተከናወነም።"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ዳግም ይቀናበር?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"የፋብሪካ ዳግም ማስጀመር ለዚህ ተጠቃሚ አይገኝም"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB ማከማቻ አጥፋ፣ እዚያ የተከማቹ ፋይሎች ሁሉ ይሰረዙ? እርምጃውን መመለስ አትችልም!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD ካርድ አጥፋ፣ እዚያ የተከማቹ ፋይሎች ሁሉ ይሰረዙ? እርምጃውን መመለስ አትችልም!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ሁሉንም አጥፋ"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"የ USB ካርዱን ማከማቻ ለማጥፋት መፈለግዎን ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል አለብዎ።"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"የ SD ካርዱን ለማጥፋት መፈለግህን ለማረጋገጥ የአንተን መክፈቻ ስርዓተ ጥለት መሳል አለብህ።"</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"እገዛ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"የተንቀሳቃሽ ስልክ አውታረ መረቦች"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"የሞባይል እቅድ"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"ነባሪ የኤስ ኤም ኤስ መተግበሪያ"</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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"የአካባቢ ሁነታ"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"አካባቢ ለማወቅ ጂፒኤስ፣ Wi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረቦችን ተጠቀም"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"አካባቢ ለማወቅ Wi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረቦችን ተጠቀም"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"የእርስዎን አካባቢ ለማወቅ ጂ ፒ ኤስ ይጠቀሙ"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"አካባቢን ለማወቅ ጂ ፒ ኤስ ተጠቀም"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"በመቃኘት ላይ"</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="2070686681074461301">"ምንም እንኳን Wi‑Fi የጠፋ ቢሆንም የWi‑Fi አውታረመረቦችን እንዲቃኙ የስርዓት አገልግሎቶችን በመፍቀድ የመገኛ አካባቢን ያሻሽሉ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"የBluetooth ቅኝት"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ምንም እንኳን Bluetooth መሣሪያዎች የጠፉ ቢሆንም የBluetooth መሣሪያዎችን እንዲቃኙ የስርዓት አገልግሎቶችን በመፍቀድ የመገኛ አካባቢን ያሻሽሉ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"የWi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረብ አካባቢ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"መተግበሪያዎች አካባቢዎትን በበለጠ ፍጥነት እንዲገምቱ የGoogle የአካባቢ አገልግሎትን ይጠቀሙ። ስም አልባ የአካባቢ ውሂብ ተሰብስቦ ወደ Google ይላካል።"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"አካባቢ በWi-Fi ይታወቃል"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"ማሳያ ደህንነት"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ለመቀጠል የእርስዎን መሣሪያ ስርዓተ ጥለት ይጠቀሙ።"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ለመቀጠል የእርስዎን መሣሪያ ፒን ያስገቡ።"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ለመቀጠል የእርስዎ መሣሪያ የይለፍ ቃል ያስገቡ።"</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_need_to_unlock" msgid="757935356911054465">"የተቀመጠ ስርዓተ ጥለት አረጋግጥ"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"በድጋሚ ሞክር::"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"በጣም ብዙ የተሳሳቱ ሙከራዎች!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"በ<xliff:g id="NUMBER">%d</xliff:g>ሰከንዶች ውስጥ እንደገና ሞክር።"</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="manageapplications_settings_title" msgid="7041951105633616745">"መተግበሪያዎች አስተዳድር"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"የተጫኑ መተግበራያዎች አስተዳድር እና አስወግድ"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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="runningservices_settings_title" msgid="8097287939865165213">"አሂድ አገልግሎቶች"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"የጡባዊ መረጃ"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"የስልክ መረጃ"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"የባትሪመረጃ"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"ፈጣን ማስነሻ"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"መተግበሪያዎችን ለማስጀመር የቁልፍ ሰሌዳ አቋራጭ አዘጋጅ"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"መተግበሪያ መድብ"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"ምንም አቋራጮች የሉም"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"+ <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> ፈልግ"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"አጽዳ"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"የ<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) አቋራጭዎ ይጠራል።"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"እሺ"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ይቅር"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"መተግበሪያዎች"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"አቋራጮች"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"በአንድ ፋይል ውስጥ ያሉትን የብሉቱዝ HCI እሽጎች ይቅረጹ"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM መክፈቻ"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"የማስነሻ ተሸካሚ እንዲከፈት ፍቀድ"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"የእርስዎን ፒን ያስገቡ"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM መክፈቻን ለማንቃት የእርስዎን መሣሪያ ፒን ይስገቡ"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"የOEM መክፈቻ ይፈቀድ?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ማስጠንቀቂያ፦ ይህ ቅንብር በሚበራበት ጊዜ የመሣሪያ ጥበቃ ባህሪዎች በዚህ መሣሪያ ላይ አይሰሩም።"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"የምዝግብ ማስታወሻ ያዥ መጠኖች"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"በአንድ ምዝግብ ማስታወሻ ቋጥ የሚኖረው የምዝግብ ማስታወሻ ያዥ መጠኖች ይምረጡ"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"የእይታ አይነታ ምርመራን አንቃ"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"አውታረ መረብ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"የገመድ አልባ ማሳያ እውቅና ማረጋገጫ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"የWi‑Fi ተጨማሪ ቃላት ምዝግብ ማስታወሻ መያዝ"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"አስገዳጅ የWi‑Fi ወደ ተንቀሳቃሽ ርክክብ"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"ሁልጊዜ የWi‑Fi ማንቀሳቀስ ቅኝቶችን ይፍቀዱ"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"የቆየ የDHCP ደንበኛ ይጠቀሙ"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"የገመድ አልባ ማሳያ እውቅና ማረጋገጫ አማራጮችን አሳይ"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"የWi‑Fi ምዝግብ ማስታወሻ አያያዝ ደረጃ ጨምር፣ በWi‑Fi መምረጫ ውስጥ በአንድ SSID RSSI አሳይ"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ሲነቃ የWi‑Fi ምልክት ዝቅተኛ ሲሆን Wi‑Fi የውሂብ ግንኙነት ለተንቀሳቃሽ ማስረከብ ላይ ይበልጥ አስገዳጅ ይሆናል"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"በበይነገጹ ላይ ባለው የውሂብ ትራፊክ መጠን ላይ ተመስርተው የWi‑Fi ማንቀሳቀስ ቅኝቶችን ይፍቀዱ/ይከልክሉ"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"የምዝግብ ማስታወሻ ያዥ መጠኖች"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"በአንድ ምዝግብ ማስታወሻ ቋጥ የሚኖረው የምዝግብ ማስታወሻ ያዥ መጠኖች ይምረጡ"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"የዩኤስቢ መዋቅር ይምረጡ"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"የዩኤስቢ መዋቅር ይምረጡ"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"የእይታ አይነታ ምርመራን አንቃ"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ከአዲሱ የAndroid DHCP ደንበኛ ይልቅ የLollipop DHCP ደንበኛውን ይጠቀሙ።"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"የUSB ማረሚያ ይፈቀድ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"የUSB አድስ ለግንባታ አላማ ብቻ የታሰበ ነው። ከኮምፒዩተርህ ወደ መሳሪያህ ውሂብ ለመገልበጥ፣ መሣሪያህ ላይ ያለ ማሳወቂያ መተግበሪያዎችን መጫን፣ እና ማስታወሻ ውሂብ ማንበብ ለመጠቀም ይቻላል።"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"የዩ ኤስ ቢ ማረም መዳረሻ ከዚህ ቀደም ፍቃድ ከሰጧቸው ኮምፒውተሮች ላይ ይሻሩ?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"ማጀንታ"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጠቀሙ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ይህን ማድረግ አለበት፦"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"አንድ መተግበሪያ የፍቃድ ጥያቄ እያገደ ስለሆነ ቅንብሮች ጥያቄዎን ማረጋገጥ አይችሉም።"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ካበሩት፣ መሳሪያዎ የውሂብ ምስጠራን ለማላቅ የማያ ገጽ መቆለፊያዎን አይጠቀምም።"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"አንድ የተደራሽነት አገልግሎትን ስላበሩ፣ መሳሪያዎ የውሂብ ምስጠራን ለማላቅ የማያ ገጽ መቆለፊያዎን አይጠቀምም።"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ማብራት የውሂብ ምስጠራ ላይ ተጽዕኖ ስለሚያሳርፍ፣ የእርስዎን ስርዓተ-ጥለት ማረጋገጥ ያስፈልግዎታል።"</string>
@@ -1655,7 +1703,7 @@
     <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_video" msgid="4295357792078579944">"ቪዲዮ"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"ቪድዮ"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"በሰዓቱ"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"ጊዜ ያለሲግናል"</string>
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"አጠቃላይ የባትሪ አቅም"</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> መተግበሪያዎች ከ<xliff:g id="TIME">%2$s</xliff:g> በላይ"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> ከ<xliff:g id="TOTALRAM">%2$s</xliff:g> ጥቅም ላይ በ<xliff:g id="TIMEDURATION">%3$s</xliff:g> ላይ ውሏል"</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_memory_status" msgid="4251599550196193093">"የመሣሪያው ማህደረ ትውስታ በአሁኑ ጊዜ <xliff:g id="MEMSTATE">%1$s</xliff:g> ነው"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"አማካይ የራም አጠቃቀም"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ከፍተኛ የራም አጠቃቀም"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android ስርዓተ ክወና"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"ሂደቶች"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"አገልግሎቶች"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"የቆይታ ጊዜ"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"የማህደረ ትውስታ ዝርዝሮች"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"የመደበቂያ ስርዓት"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"ዩ ኤስ ኤስ ይጠቀሙ"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"የስታቲስቲክስ አይነት"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"በስተጀርባ"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ከስር ያሉ ነባሪ ቅንብሮች የመተግበሪያ  ቅንብሮችን ያግዳሉ"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"ነባሪ ቅንብሮች"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"ነባሪ አንቀሳቃሽ"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"የንግግር ልምምድ አንቀሳቃሹን ለሚነገር ፅሁፍ ለመጠቀም ያዘጋጃል።"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"የንግግር አስተጻምሮ ፕሮግራሙ ለሚነገር ጽሑፍ ጥቅም ላይ እንዲውል ያዋቅሩት"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">" የንግግር ደረጃ"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"የተነገረበትን ፅሁፍ አፍጥን"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ቅላፄ"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"የአሳማኝ መታውቂያ ጭነትን ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትህን መሳል አለብህ።"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ለምስክርነት ማረጋገጫ ማከማቻ የይለፍ ቃልን ይተይቡ።"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"የአሁኑ ይለፍ ቃል፡"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"በአሁኑ ጊዜ ምንም መለያ ተተኪ አኑር ውሂብ እያከማቸ አይደለም።"</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="5355557151569037197">"የምትኬ አገልግሎት ቦዝኗል።"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"ይህ በእርስዎ መሣሪያ መመሪያ የተዘጋጀ ነው።"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"የዴስክቶፕ መጠባበቂያ ይለፍ ቃል"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ዴስክቶፕ ሙሉ ምትኬዎች በአሁኑ ሰዓት አልተጠበቁም"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ለዴስክቶፕ ሙሉ ምትኬዎች የይለፍ ቃል ለመለወጥ ወይም ለማስወገድ ንካ"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"የእነማ ልኬት ለውጥ ሽግግር"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"እነማ አድራጊ ቆይታ መለኪያ"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"ሁለተኛ ማሳያዎችን አስመስለህ ስራ"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"የበርካታ መስኮት ሁነታ"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"በርካታ እንቅስቃሴዎች በማያ ገጽ ላይ በተመሳሳይ ጊዜ።"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"የበርካታ መስኮት ሁነታ ይንቃ?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ማስጠንቀቂያ፦ ይህ በርካታ እንቅስቃሴዎችን በማያ ገጽ ላይ በተመሳሳይ ጊዜ በቅርብ ጊዜ መተግበሪያ UI አማካይነት የሚፈቅድ የሙከራ ባህሪ ነው። አንዳንድ መተግበሪያዎች ከዚህ ባህሪ ጋር ጥቅም ላይ በሚውሉበት ጊዜ ሊበላሹ ወይም በአግባቡ ላይሰሩ ይችሉ ይሆናል።"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"መተግበሪያዎች"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"እንቅስቃሴዎችን አትጠብቅ"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ተጠቃሚው እስኪተወው ድረስ እያንዳንዱን እንቅስቃሴ አስወግድ"</string>
@@ -2195,7 +2251,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="718192651887726259">"ተጨማሪ ተጠቃሚዎችን በመፍጠር ይህን መሣሪያ ከሌሎች ሰዎች ጋር መጋራት ይችላሉ። እያንዳንዱ ተጠቃሚ በራሱ መተግበሪያዎች፣ ልጣፍ  እና በመሳሰሉ ነገሮች ሊያበጀው የሚችል የእራሱ ቦታ አለው። ተጠቃሚዎችም እንዲሁ እንደ 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"የስልክ ጥሪዎችን ይፍቀዱ"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"የስልክ ጥሪዎችን እና ኤስኤምኤስ ይፍቀዱ"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"የስልክ ጥሪዎችን አብራ"</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="440218975766968124">"የስልክ ጥሪዎች ይፈቀዱ?"</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_sms_confirm_title" msgid="188164598768941316">"የስልክ ጥሪዎች እና ኤስኤምኤስ ይፈቀዱ?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"የጥሪ እና የኤስኤምኤስ ታሪክ ለዚህ ተጠቃሚ ይጋራል።"</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="application_restrictions" msgid="8207332020898004394">"መተግበሪያዎችን እና ይዘትን ይፍቀዱ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ገደቦች ያሏቸው መተግበሪያዎች"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"የመተግበሪያዎች ቅንብሮችን ዘርጋ"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"ይህ መተግበሪያ በተገደቡ መገለጫዎች ውስጥ አይደገፍም"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"የwifi wi-fi አውታረ መረብ ግንኙነት"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ጽሑፍ መልዕክት መላክ መልዕክቶች መልዕክት አላላክ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"የተንቀሳቃሽ ስልክ ድምጸ ተያያዥ ሞደም ውሂብ 4ጂ 3ጂ 2ጂ lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi ጥሪ መደወል"</string>
     <string name="keywords_home" msgid="3626170808219458848">"አስጀማሪ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ማያ ገጽ ተነኪ ማያ ገጽ"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"አጨልም ማያንካ ባትሪ"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"አጨልም ማያንካ ባትሪ"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"በስተጀርባ ማሳያ ግላዊነት ያላብሱ ያበጁ"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ጨለማ ገጽታ የለሊት ሁነታ የጨለመ ማያ ገጽ ግልብጥ ብሩህነት"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"በስተጀርባ ግላዊነት ማላበስ ብጁ ማድረግ ማሳያ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"የጽሁፍ መጠን"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ፕሮጀክት"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"ፕሮጀክት cast"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ክፍት ቦታ ዲስክ ደረቅ አንጻፊ መሣሪያ አጠቃቀም"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"ኃይል አጠቃቀም አከፋፈል"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"የፊደል አጻጻፍ መዝገበ-ቃላት ፊደል ማረሚያ ራስ-እርማት"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"መለያ"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ገደብ ገድብ የተገደበ"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"የጽሑፍ እርማት ትክክል ድምፅ ንዝረት ራስ-ሰር ቋንቋ የእጅ ምልክት ጠቁም ጥቆማ ገጽታ ጸያፍ ቃል ተይብ ስሜት ገላጭ ምስል አለምአቀፍ"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"የምርጫዎች ነባሪን ዳግም አስጀምር"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"የአስቸኳይ በረዶ መተግበሪያ ነባሪ"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"መተግበሪያዎች ውርድ መተግበሪያዎች ስርዓት"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"የመተግበሪያዎች ፈቃዶች ደህንነት"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"መተግበሪያዎች ነባሪ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ማንሸራተት የይለፍ ቃል ስርዓተ-ጥለት ፒን"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"የWi-Fi NFC መለያ ያዋቅሩ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ጻፍ"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"ማቋረጦች"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"ጥሪዎች እና ማሳወቂያዎች ሲመጡ"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"ሁልጊዜ አቋርጥ"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ቅድሚያ የሚሰጣቸው ማቋረጦችን ብቻ ፍቀድ"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"አታቋርጥ"</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_option_important_interruptions" msgid="3903928008177972500">"ቅድሚያ የሚሰጠው ብቻ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ማንቂያዎች ብቻ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ምንም ማቋረጦች የሉም"</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="ringtone_title" msgid="5379026328015343686">"የስልክ ጥሪ ድምፅ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"ነባሪ የማሳወቂያ ጥሪ ቅላጼ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"እንዲሁም ለጥሪዎችም ንዘር"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ንዘር"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"የማሳወቂያ መዳረሻ"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"መተግበሪያዎች ማሳወቂያዎችን ማንበብ አይችሉም"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"የ%d መተግበሪያ ማሳወቂያዎችን ማንበብ ይችላል"</item>
-    <item quantity="other" msgid="980049191810249052">"የ%d መተግበሪያዎች ማሳወቂያዎችን ማንበብ ይችላሉ"</item>
-  </plurals>
+    <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="2767405417723149879">"ምንም የማሳወቂያ አዳማጮች አልተጫኑም።"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> ይንቃ?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> በስርዓቱ ወይም በማንኛውም የተጫነ መተግበሪያ የተለጠፉ ማሳወቂያዎችን ማንበብ ይችላል፣ ይህን እንደ የእውቂያ ስሞች እና ለእርስዎ የተላኩ የመልዕክቶች ጽሑፍ ያለ የግል መረጃ ሊያካትት ይችላል። እንዲሁም እነዚህ ማሳወቂያዎችን ወይም በእነሱ ውስጥ ያሉ የነክቶ እርምጃ አዝራሮችን  ሊያሰናብት ይችላል።"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"የሁኔታ አቅራቢዎች"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ምንም መተግበሪያዎች ሁኔታዎችን አያቀርቡም"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d መተግበሪያ ሁኔታዎችን ያቀርባል"</item>
-    <item quantity="other" msgid="358057362115673258">"%d መተግበሪያዎች ሁኔታዎችን ያቀርባል"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"ምንም ሁኔታ አቅራቢዎች አልተጫኑም።"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> ይንቃ?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> በአይረብሹ ሁነታ ላይ የመውጫ ሁኔታዎችን ማከል ይችላል።"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"መተግበሪያዎችን በመጫን ላይ..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"አግድ"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"ሁሉንም አግድ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ከዚህ መተግበሪያዎች ማሳወቂያዎችን በፍጹም አታሳይ"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"ቅድሚያ"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"ማሳወቂያዎችን በዚህ ዝርዝር አናት ላይ ያሳዩና መሳሪያው በተቀዳሚ መቋረጦች ብቻ ሲዘጋጅ መምጣታቸውን እንዲቀጥሉ ያድርጉ"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"ልዩ ጥንቃቄ የሚፈልገው"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"መሳሪያው ሲቆለፍ ማንኛቸውንም ልዩ ጥንቃቄ የሚያስፈልጋቸው ይዘቶችን ከዚህ መተግበሪያ ማሳወቂያዎች ይደብቁ"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"እንደ ቅድሚያ ተሰጪ አስተናግድ"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"አትረብሽ የሚለው ወደ ቅድሚያ የሚሰጠው ብቻ በሚዋቀርበት ጊዜ የዚህ መተግበሪያ ማሳወቂያዎች እንዲሰሙ ይፍቀዱ"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"ለቀማን ይፍቀዱ"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ይህ መተግበሪያ የተወሰኑ ማሳወቂያዎችን ወደ ዕይታ ለአፍታ በማንሸራተት አሁን ባለው ማያ ገጽ ላይ አጽዕኖት እንዲሰጥባቸው ይፍቀዱ"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"አደጋ ሊያስከትል የሚችል ይዘትን ደብቅ"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"መሳሪያው በሚቆለፍበት ጊዜ፣ የግል መረጃን ገልጠው ሊያሳዩ የሚችሉ ማሳወቂያዎችን ይዘት ከዚህ መተግብሪያ ላይ ደብቅ"</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="zen_mode_default_option" msgid="6940069025071935243">"ይህን እስኪያጠፉት ድረስ"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"ቅድሚያ የሚሰጣቸው ማቋረጦች"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"የማይገኝበት ጊዜ"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ቀኖች"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ምንም"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"መቆራረጦች ተፈቅደዋል"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ቅድሚያ የሚሰጠው ብቻ"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ምንም"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"ራስ-ሰር ስራ"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"በራስ-ሰር አብራ"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"የደንብ ስም"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"ደንብ ያክሉ"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ደንብን ሰርዝ"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"«<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="3201273040477861538">"ደንብ የጊዜ ዕቅድ አስይዝ"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"ደንብ አልተገኘም።"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">"፣ "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"በጭራሽ"</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_from" msgid="1033337300289871697">"ጥሪዎች/መልዕክቶች ከ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ማንኛውም ሰው"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"እውቅያዎች ብቻ"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"ኮከብ የተደረገባቸው እውቅያዎች ብቻ"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"ክስተቶች እና አስታዋሾች"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"ማንቂያዎች ሁልጊዜ ቅድሚያ የሚሰጣቸው መቋረጫዎች ናቸው"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"ማንቂያዎች"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"አስታወሾች"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ክስተቶች"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"የተመረጡ ደዋዮች"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ደዋዮችን ድገም"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ተመሳሳይ ሰው ራሱ በ<xliff:g id="MINUTES">%d</xliff:g> ደቂቃ ክፍለ ጊዜ ውስጥ ለሁለተኛ ጊዜ ከደወለ፣ ፍቀድ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"በራስ-ሰር አብራ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"በጭራሽ"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> በቀጣዩ ቀን"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ወይም ቀድሞ ያለ ማንኛውም ማንቂያ"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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> next day"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"ማቋረጦች"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"ጥሪዎች እና ማሳወቂያዎች ሲመጡ"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"መቼ እንዲቋረጡ ይፈልጋሉ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ለምን ያህል ጊዜ?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"ሁልጊዜ አቋርጥ"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"አጥፋ፣ሁሉም፣እያንዳንዱ ነገር"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"ቅድሚያ የሚሰጣቸው ማቋረጦችን ብቻ ፍቀድ"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"ማንቂያዎችን ብቻ ፍቀድ"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"አታቋርጥ"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"ያለገደብ"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <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="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"ወደ ቅድሚያ ተሰጪ ማሳወቂያዎች ብቻ ያለገደብ ለውጥ"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"ወደ ማንቂያዎች ብቻ ያለገደብ ለውጥ"</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>
+    </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>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"ወደ ያለገደብ አታቋርጥ ለውጥ"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ወደ ሁልጊዜ አቋርጥ ለውጥ"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ለዘለዓለም"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"የመተግበሪያ ማሳወቂያዎች"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"የማሳወቂያ ቅንብሮች"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ስለዚህ መሣሪያ ግብረመልስ ላክ"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"በነባሪ አስነሳ"</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="app_launch_domain_links_title" msgid="458956710410857777">"የጎራ አገናኞች"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"የጎራ ዩአርኤሎችን ክፈት"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"መተግበሪያ በቀጥታ የጎራ ዩአርኤሎችን እንዲከፍት ይፍቀዱ"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"የሚደገፉ የጎራዎች ዩአርኤሎች"</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="410824961149037234">"ውስጣዊ ማህደረ ትውስታ"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"ውጫዊ ማህደረ ትውስታ"</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="storage_used" msgid="7128074132917008743">"ማከማቻው ጥቅም ላይ ውሏል"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"በርቷል"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"አግድ"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"ልዩ ጥንቃቄ የሚፈልገው"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"ቅድሚያ የሚሰጠው"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"ቅድሚያ የሚሰጠው እና ልዩ ጥንቃቄ የሚያስፈልገው"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <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="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> ከ<xliff:g id="COUNT_3">%d</xliff:g> ፈቃዶች ተሰጥቷል</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> ከ<xliff:g id="COUNT_3">%d</xliff:g> ፈቃዶች ተሰጥተዋል</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"አንዳንድ ነባሪዎ ተዘጋጅተዋል"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"ምንም ነባሪዎች አልተዘጋጁም"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"ሁሉም መተግበሪያዎች"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"የነቁ"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"የግል"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"ስራ"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"የታገዱ"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ቅድሚያ የሚሰጣቸው"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"ልዩ ጥንቃቄ የሚፈልጉ"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ከጎራ ዩአርኤሎች ጋር"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"በአስተዳዳሪ የተሰናከለ"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"የላቀ"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"ያልታወቀ መተግበሪያ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"መገለጫ ይምረጡ"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"የመተግበሪያ ፈቃዶች"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ከ<xliff:g id="COUNT_1">%d</xliff:g> መተግበሪያዎች ተጨማሪ መዳረሻ ይፈቅዳሉ"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ከ<xliff:g id="COUNT_1">%d</xliff:g> መተግበሪያዎች ይፈቀዳል"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"የጎራ ዩአርኤሎች"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"ምንም ዓይነት ዩአርኤል አትክፈት"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"«<xliff:g id="DOMAIN">%s</xliff:g>»ን ክፈት"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"«<xliff:g id="DOMAIN">%s</xliff:g>»ን እና ተዛማጅ ዩአርኤሎች ክፈት"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <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="fingerprint_not_recognized" msgid="1739529686957438119">"አልታወቀም"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ነባሪ መተግበሪያዎች"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"የአሳሽ መተግበሪያ"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ምንም ነባሪ አሳሽ የለም"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ነባሪ)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"የመተግበሪያዎች ማከማቻ"</string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index de81138..85e4161 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"طبقة النقل الآمنة"</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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"زر الدفع"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
     <item msgid="1148142988678569310">"وسائط المشروع"</item>
     <item msgid="9130014005474445273">"تنشيط الشبكة الظاهرية الخاصة"</item>
+    <item msgid="1165192162975045562">"كتابة الخلفية"</item>
+    <item msgid="7129487923652967258">"تركيبة مساعدة"</item>
+    <item msgid="1069023208100114540">"لقطة شاشة مساعدة"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"الموقع"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
     <item msgid="5906017727368097853">"وسائط المشروع"</item>
     <item msgid="2486614710846178542">"تنشيط الشبكة الظاهرية الخاصة"</item>
+    <item msgid="5586547561693629602">"كتابة الخلفية"</item>
+    <item msgid="32794179825485062">"تركيبة مساعدة"</item>
+    <item msgid="7872852746938272552">"لقطة شاشة مساعدة"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"قصيرة"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"منخفضة"</item>
     <item msgid="4212263919458209842">"حرجة"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"إيقاف"</item>
-    <item msgid="5656544177755411222">"انقطاعات محدودة"</item>
-    <item msgid="8735337502532332056">"بدون انقطاعات"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"عادية"</item>
     <item msgid="866544120205026771">"متوسطة"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"قرنفلي"</item>
     <item msgid="6131821495505931173">"أحمر"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"‏بروتوكول نقل الوسائط (MTP)"</item>
+    <item msgid="8856820259201251036">"‏بروتوكول نقل الصور (PTP)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)‎"</item>
+    <item msgid="2686051673589572111">"مصدر الصوت"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 7d254b11..58d9fd0 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -22,10 +22,14 @@
     <string name="allow" msgid="3349662621170855910">"سماح"</string>
     <string name="deny" msgid="6947806159746484865">"رفض"</string>
     <string name="device_info_default" msgid="7847265875578739287">"غير معروف"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى <xliff:g id="STEP_COUNT">%1$d</xliff:g> من الخطوات."</item>
-    <item quantity="other" msgid="6722953419953594148">"لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى <xliff:g id="STEP_COUNT">%1$d</xliff:g> من الخطوات."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="zero">لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج أية خطوة (<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>).</item>
+      <item quantity="two">لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى خطوتين (<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>).</item>
+      <item quantity="few">لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> خطوات.</item>
+      <item quantity="many">لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> خطوة.</item>
+      <item quantity="other">لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> من الخطوات.</item>
+      <item quantity="one">لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى خطوة واحدة (<xliff:g id="STEP_COUNT_0">%1$d</xliff:g>).</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"لقد أصبحت الآن مطور برامج!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"لا حاجة لذلك، فأنت مطور برامج فعلاً."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"اللاسلكي والشبكات"</string>
@@ -40,6 +44,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"‏إيقاف الرسائل القصيرة SMS عبر الرسائل الفورية"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"يجب تشغيل تسجيل الرسائل الفورية"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"يجب إيقاف تسجيل الرسائل الفورية"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"‏تمكين العلامة الخاضعة لإدارة حسابات VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"‏تعطيل العلامة الخاضعة لإدارة حسابات VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"تشغيل تفريغ ذاكرة الوصول العشوائي"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"إيقاف تفريغ ذاكرة الوصول العشوائي"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"‏عرض دفتر عناوين SIM"</string>
@@ -135,16 +141,7 @@
     <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_connected" msgid="6038755206916626419">"متصل"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"متصل (بجهاز غير الهاتف)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"متصل (بجهاز غير الوسائط)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"تم الاتصال (يتعذر الدخول إلى الرسائل)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"متصل (بجهاز غير الهاتف أو الوسائط)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"غير متصل"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"جارٍ قطع الاتصال..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"جارٍ الاتصال…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"جارٍ الاقتران..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"جهاز بلوتوث بدون اسم"</string>
     <string name="progress_scanning" msgid="192587958424295789">"البحث"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"لم يتم العثور على أجهزة بلوتوث بالجوار."</string>
@@ -154,7 +151,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"إظهار الملفات المستلمة"</string>
     <string name="device_picker" msgid="4978696506172252813">"اختيار جهاز البلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"طلب إذن بلوتوث"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"يريد أحد التطبيقات تشغيل بلوتوث."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"هناك تطبيق يريد تشغيل البلوتوث لهذا الجهاز."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"يريد أحد التطبيقات أن يجعل جهازك اللوحي مرئيًا لأجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"يريد أحد التطبيقات أن يجعل هاتفك مرئيًا لأجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"يريد أحد التطبيقات جعل جهازك اللوحي مرئيًا لأجهزة بلوتوث الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
@@ -275,12 +272,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"إلغاء"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"متابعة"</string>
     <string name="okay" msgid="1997666393121016642">"موافق"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"نعم"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"لا"</string>
-    <string name="forget" msgid="7267115980248732932">"حذف"</string>
+    <string name="forget" msgid="1400428660472591263">"نسيان"</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>
@@ -325,9 +320,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"تحسين مطابقة الوجه"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"التحقق من مدى الحياة"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"طلب طرفة عين أثناء إلغاء القفل"</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_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>
@@ -345,9 +337,37 @@
     <string name="location_settings_title" msgid="1369675479310751735">"الموقع"</string>
     <string name="account_settings_title" msgid="626177544686329806">"الحسابات"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"الأمان"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"‏تعيين موقعي، إلغاء تأمين الشاشة، تأمين بطاقة SIM، تأمين تخزين الاعتماد"</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="2930627259125138363">"كلمات المرور"</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="3453670509485083962">"إضافة"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"قفل الشاشة"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="zero"><xliff:g id="COUNT_1">%1$d</xliff:g> لم يتم تسجيل أية بصمات أصابع</item>
+      <item quantity="two">تم تسجيل بصمتي إصبع (<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="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>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"إعداد بصمة الإصبع"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"لاستخدام بصمة إصبعك لإلغاء قفل الشاشة أو تأكيد الشراء، سنحتاج إلى: \n\n✓ إعداد الطريقة الاحتياطية لقفل الشاشة \n\n✓ إضافة بصمة إصبعك"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"العثور على المستشعر"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ضع مستشعر بصمات الإصبع على الجزء الخلفي لهاتفك."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"البدء"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"ضع إصبعك على جهاز استشعار بصمة الإصبع وارفعه بعد الشعور بالاهتزاز."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"رائع! كرر الآن."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"ضع نفس الإصبع على جهاز استشعار بصمة الإصبع ثم ارفعه بعد الشعور بالاهتزاز."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"تمت إضافة بصمة إصبع"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"يمكنك استخدام بصمة إصبعك متى رأيت هذا الرمز لتحديد الهوية أو الإذن بعملية شراء."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"إضافة"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"التالي"</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>
@@ -360,7 +380,6 @@
     <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">"يجب تعيين رقم تعريف شخصي أو كلمة مرور لتأمين الشاشة قبل أن تتمكن من بدء عملية التشفير."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"يجب عليك رسم نقش إلغاء القفل لتأكيد تشفير الجهاز."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"التشفير؟"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"لا يمكن التراجع عن عملية التشفير، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الجهاز اللوحي عدة مرات."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"لا يمكن التراجع عن عملية التشفير، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الهاتف عدة مرات."</string>
@@ -391,22 +410,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"بالوجه"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"تأمين منخفض، تجريبي"</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_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="current_screen_lock" msgid="4104091715420072219">"قفل الشاشة الحالي"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"لن تعمل ميزات حماية الجهاز بعد الآن."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"تم تعطيله من جانب المشرف أو بسبب سياسة التشفير أو وحدة تخزين بيانات الاعتماد"</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_biometric_weak" msgid="3008473624490350142">"تأمين الجهاز بالوجه"</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_password" msgid="1203938057264146610">"كلمة المرور"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"‏بعد إعداد قفل شاشة، يمكنك أيضًا إعداد بصمة إصبعك في الإعدادات &gt; الأمان."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"إيقاف تأمين الشاشة"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"إزالة نقش إلغاء التأمين"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"‏إزالة رمز PIN لإلغاء التأمين"</string>
@@ -427,30 +445,54 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"يجب أن تحتوي كلمة المرور على رقم واحد على الأقل."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"يجب أن تحتوي كلمة المرور على رمز واحد على الأقل."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل."</item>
-    <item quantity="other" msgid="8186027808415585970">"‏يجب أن تحتوي كلمة المرور على %d من الأحرف على الأقل."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"يجب أن تحتوي كلمة المرور على حرف واحد صغير على الأقل."</item>
-    <item quantity="other" msgid="2693910942679679225">"‏يجب أن تحتوي كلمة المرور على %d من الأحرف الصغيرة على الأقل."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"يجب أن تحتوي كلمة المرور على حرف واحد كبير على الأقل."</item>
-    <item quantity="other" msgid="3030801209112209245">"‏يجب أن تحتوي كلمة المرور على %d من الأحرف الكبيرة على الأقل."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"يجب أن تحتوي كلمة المرور على رقم عددي واحد على الأقل."</item>
-    <item quantity="other" msgid="4703982391407595924">"‏يجب أن تحتوي كلمة المرور على %d من الأرقام العددية."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"يجب أن تحتوي كلمة المرور على رمز خاص واحد على الأقل."</item>
-    <item quantity="other" msgid="1221290525051187757">"‏يجب أن تحتوي كلمة المرور على %d من الرموز الخاصة على الأقل."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل ليس من الأحرف الأبجدية."</item>
-    <item quantity="other" msgid="3952508584649046404">"‏يجب أن تحتوي كلمة المرور على %d من الرموز على الأقل التي ليست أحرفًا."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="zero">‏لا يجب أن تحتوي كلمة المرور على أية أحرف (%d).</item>
+      <item quantity="two">‏يجب أن تحتوي كلمة المرور على حرفين (%d) على الأقل.</item>
+      <item quantity="few">‏يجب أن تحتوي كلمة المرور على %d أحرف على الأقل.</item>
+      <item quantity="many">‏يجب أن تحتوي كلمة المرور على %d حرفًا على الأقل.</item>
+      <item quantity="other">‏يجب أن تحتوي كلمة المرور على %d من الأحرف على الأقل.</item>
+      <item quantity="one">يجب أن تحتوي كلمة المرور على حرف واحد على الأقل.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="zero">‏لا يجب أن تحتوي كلمة المرور على أية أحرف صغيرة (%d).</item>
+      <item quantity="two">‏يجب أن تحتوي كلمة المرور على حرفين صغيرين (%d) على الأقل.</item>
+      <item quantity="few">‏يجب أن تحتوي كلمة المرور على %d أحرف صغيرة على الأقل.</item>
+      <item quantity="many">‏يجب أن تحتوي كلمة المرور على %d حرفًا صغيرًا على الأقل.</item>
+      <item quantity="other">‏يجب أن تحتوي كلمة المرور على %d من الأحرف الصغيرة على الأقل.</item>
+      <item quantity="one">يجب أن تحتوي كلمة المرور على حرف صغير واحد على الأقل.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="zero">‏لا يجب أن تحتوي كلمة المرور على أية أحرف كبيرة (%d).</item>
+      <item quantity="two">‏يجب أن تحتوي كلمة المرور على حرفين كبيرين (%d) على الأقل.</item>
+      <item quantity="few">‏يجب أن تحتوي كلمة المرور على %d أحرف كبيرة على الأقل.</item>
+      <item quantity="many">‏يجب أن تحتوي كلمة المرور على %d حرفًا كبيرًا على الأقل.</item>
+      <item quantity="other">‏يجب أن تحتوي كلمة المرور على %d من الأحرف الكبيرة على الأقل.</item>
+      <item quantity="one">يجب أن تحتوي كلمة المرور على حرف كبير واحد على الأقل.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="zero">‏لا يجب أن تحتوي كلمة المرور على أية أرقام عددية (%d).</item>
+      <item quantity="two">‏يجب أن تحتوي كلمة المرور على رقمين عدديين (%d) على الأقل.</item>
+      <item quantity="few">‏يجب أن تحتوي كلمة المرور على %d أرقام عددية على الأقل.</item>
+      <item quantity="many">‏يجب أن تحتوي كلمة المرور على %d رقمًا عدديًا على الأقل.</item>
+      <item quantity="other">‏يجب أن تحتوي كلمة المرور على %d من الأرقام العددية على الأقل.</item>
+      <item quantity="one">يجب أن تحتوي كلمة المرور على رقم عددي واحد على الأقل.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="zero">‏لا يجب أن تحتوي كلمة المرور على أية رموز خاصة (%d).</item>
+      <item quantity="two">‏يجب أن تحتوي كلمة المرور على رمزين خاصين (%d) على الأقل.</item>
+      <item quantity="few">‏يجب أن تحتوي كلمة المرور على %d رموز خاصة على الأقل.</item>
+      <item quantity="many">‏يجب أن تحتوي كلمة المرور على %d رمزًا خاصًا على الأقل.</item>
+      <item quantity="other">‏يجب أن تحتوي كلمة المرور على %d من الرموز الخاصة على الأقل.</item>
+      <item quantity="one">يجب أن تحتوي كلمة المرور على رمز خاص واحد على الأقل.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="zero">‏لا يجب أن تحتوي كلمة المرور على أية أحرف ليست من الأحرف الأبجدية (%d).</item>
+      <item quantity="two">‏يجب أن تحتوي كلمة المرور على حرفين (%d) ليسا من الأحرف الأبجدية على الأقل.</item>
+      <item quantity="few">‏يجب أن تحتوي كلمة المرور على %d أحرف ليست من الأحرف الأبجدية على الأقل.</item>
+      <item quantity="many">‏يجب أن تحتوي كلمة المرور على %d حرفًا ليس من الأحرف الأبجدية على الأقل.</item>
+      <item quantity="other">‏يجب أن تحتوي كلمة المرور على %d من الأحرف ليست من الأحرف الأبجدية على الأقل.</item>
+      <item quantity="one">يجب أن تحتوي كلمة المرور على حرف واحد ليس من الأحرف الأبجدية على الأقل.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"لا يسمح مشرف الجهاز باستخدام كلمة مرور تم استخدامها مؤخرًا."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"يُحظر استخدام الترتيب التصاعدي أو التنازلي أو المكرر للأرقام"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"موافق"</string>
@@ -480,15 +522,8 @@
     <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_accept" msgid="6163520056536604875">"اقتران"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"إقران"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"إلغاء"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"يضمن لك الإقران إمكانية الدخول إلى جهات اتصالك وسجل المكالمات عند الاتصال."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"تعذر الإقران مع <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"تعذر الإقران مع <xliff:g id="DEVICE_NAME">%1$s</xliff:g> نظرًا لوجود رقم تعريف شخصي أو مفتاح مرور غير صحيح."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"لا يمكن الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"تم رفض الاقتران بواسطة <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"تعذر الاتصال بـ <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>
@@ -515,16 +550,8 @@
     <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="3719383048635344071">"لتحسين دقة الموقع، ستبحث التطبيقات والخدمات عن أجهزة بلوتوث، حتى في حالة إيقاف البلوتوث، ويمكنك تغيير هذا في <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_specific_profiles_title" msgid="6952214406025825164">"الاتصال بـ…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"الإعدادات الصوتية للوسائط"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"الإعدادات الصوتية للهاتف"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"نقل الملف"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"جهاز الإرسال"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"الدخول إلى الإنترنت"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"مشاركة جهة الاتصال"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"استخدام مع مشاركة جهة الاتصال"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"مشاركة اتصال الإنترنت"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"الدخول إلى الرسائل"</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>
@@ -537,28 +564,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"متصل بالإعدادات الصوتية للوسائط"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"متصل بالإعدادات الصوتية للهاتف"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"متصل بخادم نقل الملف"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"تم الاتصال بملف تعريف الدخول إلى الرسائل"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"غير متصل بخادم نقل الملفات"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"متصل بجهاز الإدخال"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"الاستخدام للإعدادات الصوتية للوسائط"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"الاستخدام لإعدادات الهاتف الصوتية"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"استخدامه لنقل الملفات"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"استخدام للإدخال"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"الاستخدام للدخول على الإنترنت"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"استخدام لملف تعريف الدخول إلى الرسائل"</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_assistant_title" msgid="2553267316621598101">"‏مساعد Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"‏تم التوصيل عبر مساعد Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"بث الشاشة"</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>
@@ -570,6 +584,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +609,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"‏إيقاف Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"خطأ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"في وضع الطائرة"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"لا يمكن فحص الشبكات"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"رسالة تنبيه بالشبكات"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"إرسال إشعارات عند توفر شبكة عامة"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"تجنب الاتصالات الضعيفة"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"‏عدم استخدام شبكات Wi-Fi ما لم يكن لها اتصال إنترنت جيد"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"استخدام الشبكات ذات اتصال الإنترنت الجيد فقط"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"إتاحة الفحص دائمًا"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"السماح بالبحث دائمًا"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"‏السماح لخدمة الموقع في Google والتطبيقات الأخرى بالبحث عن الشبكات، حتى عند عدم تشغيل Wi-Fi"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"‏استخدام شبكات Wi‑Fi المفتوحة تلقائيًا"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"‏السماح لمساعد Wi‑Fi بالاتصال بالشبكات المفتوحة التي تم تحديد جودتها العالية"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"اختيار المساعد"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"تثبيت شهادات"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"‏لتحسين مستوى دقة الموقع ولأغراض أخرى، قد تُجري Google والتطبيقات الأخرى فحصًا للعثور على الشبكات القريبة، حتى عندما تكون ميزة Wi-Fi معطّلة. إذا لم تكن تريد إجراء هذا الفحص، فانتقل إلى الإعدادات المتقدمة &gt; إتاحة الفحص دائمًا."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"‏قد تُجري التطبيقات فحصًا للعثور على الشبكات القريبة، حتى عندما تكون Wi-Fi معطّلة. إذا لم تكن تريد إجراء هذا الفحص، فانتقل إلى الإعدادات المتقدمة &gt; إتاحة الفحص دائمًا."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"‏لتحسين دقة الموقع، ستبحث التطبيقات والخدمات عن شبكات Wi‑Fi، حتى في حالة إيقاف 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="5340097010842405981">"عدم الإظهار مرة أخرى"</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>
@@ -635,11 +646,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"إضافة شبكة أخرى"</string>
     <string name="wifi_more" msgid="3195296805089107950">"المزيد"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"‏الإعداد التلقائي (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"‏لإكمال الإعداد، يحتاج جهازك اللوحي إلى الدخول إلى Wi-Fi. وبعد الإعداد، يمكنك التبديل بين بيانات الجوّال وWi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"الخيارات المتقدمة"</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="5940801028985255304">"‏اضغط على زر الإعداد المحمي لشبكة Wi-Fi على جهاز التوجيه. قد يكون اسمه \"WPS\" أو قد يحتوي على الرمز التالي:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"‏اضغط على زر الإعداد المحمي لشبكة Wi-Fi على جهاز التوجيه والذي قد يكون اسمه \"WPS\" أو يحمل هذا الرمز:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"‏أدخل رمز PIN <xliff:g id="NUMBER">%1$s</xliff:g> في جهاز توجيه Wi-Fi. يمكن أن يستغرق إكمال الإعداد فترة قد تصل إلى دقيقتين."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"‏نجحت عملية WPS. جارٍ الاتصال بالشبكة…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"‏تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
@@ -665,20 +675,15 @@
     <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="219415018348922629">"‏تهيئة نطاق AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"نطاق بتردد 2.4 غيغاهرتز"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"نطاق بتردد 5 غيغاهرتز"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"‏إعدادات IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(لم يتم التغيير)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(غير محدد)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"تم الحفظ"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"معطلة"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏أخفقت تهيئة عنوان IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏أخفق اتصال WiFi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"حدثت مشكلة في المصادقة"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"ليست في النطاق"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"لم يتم اكتشاف اتصال بالإنترنت."</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_security_none" msgid="7985461072596594400">"لا شيء"</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>
@@ -686,6 +691,8 @@
     <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="1509171132175355674">"ليس لهذه الشبكة حق الدخول إلى الإنترنت. هل تريد استخدامها على أية حال؟"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"عدم السؤال مرة أخرى لهذه الشبكة"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"أخفق التوصيل بالشبكة"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"حذف"</string>
@@ -751,6 +758,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"‏نقطة اتصال Wi‑Fi المتنقلة عبر AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"‏نقطة اتصال إعداد نقطة اتصال 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_mode_title" msgid="2164073796253284289">"تفضيل الاتصال"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"‏وضع الاتصال عبر Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"‏شبكة Wi-Fi مُفضّلة"</item>
+    <item msgid="5267397515594230396">"شبكة الجوّال مُفضّلة"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"٢"</item>
+    <item msgid="1171822231056612021">"١"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"‏عند تشغيل الاتصال عبر Wi-Fi، يمكن للهاتف توجيه المكالمات عبر شبكات Wi-Fi أو عبر شبكة مشغّل شبكة الجوّال، حسب تفضيلك وحسب الإشارة الأقوى. وقبل تشغيل هذه الميزة، راجع رسوم مشغل شبكة الجوّال والتفاصيل الأخرى حول شبكة الجوّال."</string>
     <string name="home_settings" msgid="212375129455718176">"الشاشة الرئيسية"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"عرض"</string>
     <string name="sound_settings" msgid="5534671337768745343">"الصوت"</string>
@@ -814,6 +833,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"المظهر"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"فاتح"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"داكن"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"تلقائيًا"</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>
@@ -835,18 +859,18 @@
     <string name="doze_summary" msgid="7128970177894383698">"تنشيط الشاشة عند الإمساك بالجهاز أو تلقي إشعارات"</string>
     <string name="title_font_size" msgid="4405544325522105222">"حجم الخط"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"حجم الخط"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"‏إعدادات تأمين بطاقة SIM"</string>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"‏إعداد تأمين بطاقة SIM"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"‏تأمين بطاقة SIM"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"‏تأمين بطاقة SIM"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"‏إعدادات تأمين شريحة SIM"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"‏إعداد تأمين شريحة SIM"</string>
+    <string name="sim_lock_settings_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">"‏تغيير رمز 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_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">"‏رقم تعريف شخصي جديد لبطاقة SIM"</string>
     <string name="sim_reenter_new" msgid="6523819386793546888">"إعادة كتابة رقم التعريف الشخصي الجديد"</string>
@@ -855,20 +879,24 @@
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"أرقام التعريف الشخصي غير متطابقة"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"‏لا يمكن تغيير رمز PIN.\nيحتمل أن يكون رمز PIN غير صحيح."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"‏تم تغيير رمز PIN لبطاقة SIM بنجاح"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"‏لا يمكن تغيير حالة تأمين بطاقة SIM.\nيحتمل أن يكون رمز PIN غير صحيح."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"‏لا يمكن تغيير حالة تأمين شريحة SIM.\nيحتمل أن يكون رمز PIN غير صحيح."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"موافق"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"إلغاء"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"‏تم العثور على بطاقات SIM متعددة"</string>
-    <string name="sim_multi_sims_summary" msgid="7018740080801483990">"‏اختر بطاقة SIM المفضلة لبيانات الجوّال."</string>
-    <string name="sim_change_data_title" msgid="294357201685244532">"‏هل تريد تغيير بطاقة SIM للبيانات؟"</string>
+    <string name="sim_multi_sims_summary" msgid="7018740080801483990">"‏اختر شريحة SIM المفضلة لبيانات الجوّال."</string>
+    <string name="sim_change_data_title" msgid="294357201685244532">"‏هل تريد تغيير شريحة SIM للبيانات؟"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"هل تريد استخدام <xliff:g id="NEW_SIM">%1$s</xliff:g> بدلاً من <xliff:g id="OLD_SIM">%2$s</xliff:g> للبيانات الخلوية؟"</string>
-    <string name="sim_preferred_title" msgid="5567909634636045268">"‏هل تريد تحديث بطاقة SIM المفضلة؟"</string>
-    <string name="sim_preferred_message" msgid="301251431163650167">"‏<xliff:g id="NEW_SIM">%1$s</xliff:g> هي بطاقة SIM الوحيدة في جهازك. هل تريد استخدام بطاقة SIM هذه مع البيانات الخلوية والرسائل القصيرة SMS؟"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"‏هل تريد تحديث شريحة SIM المفضلة؟"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"‏<xliff:g id="NEW_SIM">%1$s</xliff:g> هي شريحة SIM الوحيدة في جهازك. هل تريد استخدام شريحة SIM هذه مع البيانات الخلوية والرسائل القصيرة SMS؟"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"‏رمز \"رقم التعريف الشخصي\" لبطاقة SIM غير صحيح، ويلزمك الاتصال الآن بمشغّل شبكة الجوّال لإلغاء قفل الجهاز."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"‏رمز \"رقم التعريف الشخصي\" لبطاقة SIM غير صحيح، ويتبقى لديك محاولة واحدة (<xliff:g id="NUMBER">%d</xliff:g>) يتعين عليك بعدها الاتصال بمشغّل شبكة الجوّال لإلغاء قفل الجهاز."</item>
-    <item quantity="other" msgid="77103619544346451">"‏رمز \"رقم التعريف الشخصي\" لبطاقة SIM غير صحيح، يتبقى لديك <xliff:g id="NUMBER">%d</xliff:g> من المحاولات."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="zero">‏رمز رقم التعريف الشخصي لبطاقة SIM غير صحيح، ولم يتبق لديك أية محاولات (<xliff:g id="NUMBER_1">%d</xliff:g>).</item>
+      <item quantity="two">‏رمز رقم التعريف الشخصي لبطاقة SIM غير صحيح، ويتبقى لديك محاولتان (<xliff:g id="NUMBER_1">%d</xliff:g>).</item>
+      <item quantity="few">‏رمز رقم التعريف الشخصي لبطاقة SIM غير صحيح، ويتبقى لديك <xliff:g id="NUMBER_1">%d</xliff:g> محاولات.</item>
+      <item quantity="many">‏رمز رقم التعريف الشخصي لبطاقة SIM غير صحيح، ويتبقى لديك <xliff:g id="NUMBER_1">%d</xliff:g> محاولة.</item>
+      <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="device_info_settings" product="tablet" msgid="1119755927536987178">"حالة الجهاز اللوحي"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"حالة الهاتف"</string>
@@ -917,12 +945,12 @@
     <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="2348501997988663688">"تطبيقات (بيانات محتوى وتطبيقات)"</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_dcim_usage" msgid="558887013613822577">"صور ومقاطع فيديو"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"ملفات صوتية (موسيقى ونغمات رنين ووسائط، إلخ.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"متنوع"</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="default" msgid="6915293408836853020">"‏إلغاء تحميل بطاقة SD"</string>
@@ -955,6 +983,11 @@
     <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_mount" msgid="1014683672493425425">"تحميل"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"إخراج"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"محو البيانات والتنسيق"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"محو بيانات وتنسيق كوحدة داخلية"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"‏اتصال USB بالكمبيوتر"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"‏اتصال USB بالكمبيوتر"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"اتصال كـ"</string>
@@ -962,8 +995,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"‏يتيح لك نقل ملفات الوسائط على Windows، أو استخدام نقل الملفات في Android على Mac (راجع www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"‏الكاميرا (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"‏يتيح لك نقل الصور باستخدام برامج الكاميرا، ونقل أي ملفات على أجهزة كمبيوتر لا تدعم MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"تثبيت أدوات نقل الملفات"</string>
+    <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_external_title" msgid="2723851748972673696">"وحدة التخزين القابلة للنقل"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> خالية (إجمالي السعة التخزينية <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"تم تحميل <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"تعذر تحميل <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="4161722509712992231">"تعذر إخراج <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="8343688274191391889">"تعذر تنسيق <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"إعادة تسمية وحدة التخزين"</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="3677827796634199714"><b>"عند إخراج <xliff:g id="NAME_0">^1</xliff:g>هذه، فإن التطبيقات المخزنة عليها ستتوقف عن العمل ولن تكون ملفات الوسائط المخزنة عليها متاحة حتى يتم إعادة إدخالها."</b>" \n\nلقد تم تنسيق <xliff:g id="NAME_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_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_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="1259216693690378749">"لا تزِل <xliff:g id="NAME">^1</xliff:g> أثناء تنسيقها."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"نقل البيانات إلى وحدة التخزين الجديدة"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"يمكنك نقل الصور والملفات وبيانات التطبيقات إلى <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="5035719146373359329"><b>"تستغرق عملية النقل حوالي <xliff:g id="TIME">^1</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="8641916179067596592">"أثناء عملية النقل: \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_move_confirm_title" msgid="292782012677890250">"نقل <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"لن يستغرق نقل <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="4288580957960820740">"لا تزِل <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="battery_status_title" msgid="9159414319574976203">"حالة البطارية"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"مستوى البطارية"</string>
     <string name="apn_settings" msgid="3743170484827528406">"‏أسماء نقاط الوصول (APN)"</string>
@@ -1007,10 +1080,15 @@
     <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_network_title" msgid="4557113742173895074">"تمت إعادة تعيين إعدادات الشبكة"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"‏سيؤدي هذا إلى إعادة تعيين كل إعدادات الشبكة، بما في ذلك:\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="4874737348054213767">"هل تريد إعادة تعيين كل إعدادات الشبكة؟ لا يمكنك التراجع عن هذا الإجراء!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"إعادة تعيين الإعدادات"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"هل تريد إعادة التعيين؟"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"تمت إعادة تعيين إعدادات الشبكة"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"إعادة تعيين الجهاز"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"إعادة الضبط بحسب بيانات المصنع"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"محو كل البيانات على الجهاز اللوحي"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"مسح جميع بيانات الهاتف"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:\n\n"<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"‏يؤدي ذلك إلى مسح جميع البيانات من "<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>
@@ -1024,9 +1102,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏محو جميع البيانات على بطاقة SD، مثل الموسيقى أو الصور"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"إعادة ضبط الجهاز اللوحي"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"إعادة تعيين الهاتف"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"هل تريد مسح جميع المعلومات الشخصية والتطبيقات التي تم تنزيلها؟ لا يمكنك عكس هذا الإجراء!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"هل تريد محو كل معلوماتك الشخصية وتطبيقاتك التي تم تنزيلها؟ لا يمكنك التراجع عن هذا الإجراء!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"مسح كل شيء"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"يلزمك رسم نقش إلغاء التأمين لتأكيد إعادة الضبط بحسب بيانات المصنع."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"‏لم يتم تنفيذ إعادة التعيين نظرًا لعدم توفر خدمة System Clear."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"هل تريد إعادة الضبط؟"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"لا تتوفر إمكانية إعادة تعيين إعدادات المصنع لهذا المستخدم"</string>
@@ -1043,8 +1120,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"‏هل تريد محو وحدة تخزين USB، وحذف جميع الملفات المخزنة عليها؟ لا يمكنك عكس هذا الإجراء!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"‏هل تريد محو بطاقة SD، وحذف جميع الملفات المخزنة عليها؟ لا يمكن عكس هذا الإجراء!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"مسح كل شيء"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"‏يلزمك رسم نقش إلغاء التأمين للتأكيد على أنك تريد محو وحدة تخزين USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"‏يلزمك رسم نقش إلغاء التأمين للتأكيد على أنك تريد محو وحدة بطاقة SD."</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>
@@ -1076,7 +1151,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"مساعدة"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"شبكات الجوّال"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"خطة الجوّال"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"‏تطبيق الرسائل القصيرة 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>
@@ -1085,7 +1160,7 @@
     <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="2399426808423775711">"‏ليس لدى %1$s موقع ويب معروف لإدارة حسابات"</string>
-    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"‏الرجاء إدخال بطاقة SIM وإعادة التشغيل"</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_category" msgid="6992546457880004735">"الملف الشخصي للعمل"</string>
@@ -1104,7 +1179,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"وضع الموقع"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏استخدام نظام تحديد المواقع العالمي (GPS) وشبكات Wi‑Fi وشبكات الجوّال لتحديد الموقع"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏استخدام شبكات Wi‑Fi وشبكات الجوّال لتحديد الموقع"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"‏استخدام نظام تحديد المواقع العالمي (GPS) لتحديد موقعك"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏استخدام نظام تحديد المواقع العالمي (GPS) في تحديد الموقع"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"البحث عن الموقع"</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="2070686681074461301">"‏يمكنك تحسين الموقع من خلال السماح للتطبيقات والخدمات بالبحث عن شبكات Wi‑Fi حتى في حالة إيقاف Wi‑Fi."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"البحث عن بلوتوث"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"يمكنك تحسين دقة الموقع بالسماح لخدمات النظام بالبحث عن أجهزة بلوتوث، حتى في حالة إيقاف البلوتوث."</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏موقع شبكة Wi‑Fi وشبكة الجوّال"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏دع التطبيقات تستخدم خدمة الموقع من Google لتقييم موقعك بشكل أسرع. سيتم جمع بيانات الموقع غير محددة الهوية وإرسالها إلى Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏الموقع الذي تم تحديده بواسطة Wi-Fi"</string>
@@ -1150,11 +1231,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"أمان الشاشة"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"استخدم النقش الذي حددته على جهازك للمتابعة."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"أدخل رقم التعريف الشخصي للجهاز للمتابعة."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"أدخل كلمة مرور الجهاز للمتابعة."</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_need_to_unlock" msgid="757935356911054465">"تأكيد النقش المحفوظ"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"أعد المحاولة:"</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>
@@ -1176,8 +1261,7 @@
     <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_header" msgid="819903817323783498">"المحاولات غير الصحيحة كثيرة للغاية!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"حاول مرة أخرى خلال <xliff:g id="NUMBER">%d</xliff:g> ثانية."</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="manageapplications_settings_title" msgid="7041951105633616745">"إدارة التطبيقات"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"إدارة التطبيقات المثبتة وإزالتها"</string>
@@ -1228,6 +1312,7 @@
     <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>
@@ -1299,6 +1384,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"استخدام وحدة التخزين"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"عرض سعة التخزين المستخدمة بواسطة التطبيقات"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"الخدمات قيد التشغيل"</string>
@@ -1396,17 +1482,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"معلومات الجهاز اللوحي"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"معلومات الهاتف"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"معلومات البطارية"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"تشغيل سريع"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"تعيين اختصارات لوحة المفاتيح لتشغيل التطبيقات"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"تعيين تطبيق"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"ليس هناك أي اختصارات"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"بحث + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"محو"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"سيتم محو اختصارك لـ <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"موافق"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"إلغاء"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"التطبيقات"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"الاختصارات"</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>
@@ -1441,23 +1516,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"التقاط حزم واجهة وحدة تحكم المضيف في ملف عبر بلوتوث"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"إلغاء قفل المصنّع الأصلي للجهاز"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"‏السماح بإلغاء قفل برنامج bootloader"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"أدخل رقم التعريف الشخصي"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"‏أدخل رقم التعريف الشخصي للجهاز لتمكين إلغاء قفل OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"هل تريد السماح بإلغاء قفل المصنّع الأصلي للجهاز؟"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"تحذير: لن تعمل ميزات الحماية على هذا الجهاز أثناء تشغيل هذا الإعداد."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"أحجام ذاكرة التخزين المؤقت للتسجيل"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"حدد أحجامًا أكبر لكل ذاكرة تخزين مؤقت للتسجيل"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"السماح بمواقع وهمية"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"السماح بمواقع وهمية"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"تمكين فحص سمة العرض"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"الشبكات"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"شهادة عرض شاشة لاسلكي"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏تمكين تسجيل Wi‑Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏تسليم Wi-Fi حاد إلى خلوي"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"‏السماح دائمًا بعمليات فحص Wi-Fi للتجوال"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"‏استخدام برنامج DHCP القديم"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"عرض خيارات شهادة عرض شاشة لاسلكي"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"‏زيادة مستوى تسجيل Wi-Fi، وعرض لكل SSID RSSI في منتقي Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"‏عند تمكينه، سيكون Wi-Fi أكثر حدة في تسليم اتصال البيانات إلى الشبكة الخلوية، وذلك عندما تكون إشارة WiFi منخفضة"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"‏السماح/عدم السماح بعمليات فحص Wi-Fi للتجوال بناءً على حجم حركة البيانات في الواجهة"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"أحجام ذاكرة التخزين المؤقت للتسجيل"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"حدد أحجامًا أكبر لكل ذاكرة تخزين مؤقت للتسجيل"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"‏حدد تهيئة USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"‏حدد تهيئة USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"السماح بمواقع وهمية"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"السماح بمواقع وهمية"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"تمكين فحص سمة العرض"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"‏يمكنك استخدام برنامج DHCP من Lollipop بدلاً من برنامج DHCP الجديد على Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏هل تريد السماح بتصحيح أخطاء USB؟"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"‏تم تصميم تصحيح أخطاء USB لأغراض التطوير فقط. يمكن استخدامه لنسخ البيانات بين الكمبيوتر والجهاز، وتثبيت التطبيقات على جهازك بدون تنبيه، وقراءة بيانات السجل."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"‏هل تريد إلغاء إمكانية الدخول إلى تصحيح أخطاء USB من جميع أجهزة الكمبيوتر التي تم التصريح لها سابقًا؟"</string>
@@ -1561,6 +1644,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"أرجواني"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"خدمة <xliff:g id="SERVICE">%1$s</xliff:g> تحتاج إلى:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"نظرًا لأن هناك تطبيقًا يحجب طلب الإذن، لا تستطيع الإعدادات التحقق من ردك."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"في حالة تمكين <xliff:g id="SERVICE">%1$s</xliff:g>، لن يستخدم جهازك ميزة قفل الشاشة لتحسين تشفير البيانات."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"لن يستخدم جهازك ميزة قفل الشاشة لتحسين تشفير البيانات، وذلك لأنك قد مكّنت إحدى خدمات إمكانية الوصول."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد النقش."</string>
@@ -1702,14 +1786,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> من التطبيقات خلال <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"تم استخدام <xliff:g id="USEDRAM">%1$s</xliff:g> من <xliff:g id="TOTALRAM">%2$s</xliff:g> خلال <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</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_memory_status" msgid="4251599550196193093">"ذاكرة الجهاز حاليًا <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"متوسط ​​استخدام ذاكرة الوصول العشوائي"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"الحد الأقصى لاستخدام ذاكرة الوصول العشوائي"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"‏نظام التشغيل Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"أصلية"</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">"وحدات ذاكرة التخزين المؤقت"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"استخدام ذاكرة الوصول العشوائي"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"استخدام ذاكرة الوصول العشوائي (الخلفية)"</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>
     <string name="mem_details_title" msgid="6548392825497290498">"تفاصيل الذاكرة"</string>
@@ -1726,6 +1816,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ساعة"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"يوم واحد"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"إظهار النظام"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"إخفاء النظام"</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>
@@ -1748,7 +1839,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"تتجاوز الإعدادات الافتراضية التالية إعدادات التطبيق"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"الإعدادات الافتراضية"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"المحرك الافتراضي"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"تعيين محرك اصطناع الحديث على الاستخدام للنص المنطوق"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"عيِّن محرك تركيب الصوت على الاستخدام مع النصوص المنطوقة"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"معدل سرعة الكلام"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"سرعة نطق الكلام"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"درجة الصوت"</string>
@@ -1822,7 +1913,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"يجب عليك رسم نقش إلغاء القفل لتأكيد تثبيت بيانات الاعتماد."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"اكتب كلمة المرور لوحدة تخزين بيانات الاعتماد."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"كلمة المرور الحالية:"</string>
@@ -1847,12 +1937,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"ليس هناك حساب يخزن حاليًا بيانات تم نسخها احتياطيًا."</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="5355557151569037197">"خدمة الاحتفاظ بنسخة احتياطية غير نشطة."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"يتم تعيين هذا حسب سياسة الجهاز."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"كلمة مرور احتياطية للكمبيوتر"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"النسخ الاحتياطية الكاملة لسطح المكتب غير محمية في الوقت الحالي"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"المس لتغيير كلمة مرور النسخ الاحتياطية الكاملة لسطح المكتب أو إزالتها"</string>
@@ -2024,6 +2112,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"حجم الرسوم المتحركة للنقل"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"طول مدة الرسوم المتحركة"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"محاكاة الشاشات الثانوية"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"وضع النوافذ المتعددة"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"أنشطة متعددة على الشاشة في آنٍ واحد."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"هل تريد تمكين وضع النوافذ المتعددة؟"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"تحذير: هذه ميزة تجريبية إلى حد كبير تسمح بإجراء أنشطة متعددة على الشاشة في آنٍ واحد من خلال واجهة مستخدم التطبيقات المستخدمة مؤخرًا. وقد تتعطل بعض التطبيقات أو قد لا تعمل بشكل صحيح عند استخدامها مع هذه الميزة."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"التطبيقات"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"عدم الاحتفاظ بالأنشطة"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"مسح كل نشاط فور مغادرة المستخدم له"</string>
@@ -2195,7 +2287,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="718192651887726259">"‏يمكنك مشاركة هذا الجهاز مع الآخرين من خلال إنشاء حسابات لمستخدمين إضافيين. سيحصل كل مستخدم على مساحته الخاصة التي يمكنه تخصيصها بتطبيقاته والصور الخلفية التي يريدها وغيرها. كما يمكن للمستخدمين ضبط إعدادات الجهاز مثل 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>
@@ -2226,13 +2318,13 @@
     <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="8310589470979488255">"السماح بالمكالمات الهاتفية"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"السماح بالمكالمات الهاتفية والرسائل القصيرة"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"تشغيل المكالمات الهاتفية"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"‏تشغيل المكالمات الهاتفية والرسائل القصيرة SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"إزالة المستخدم"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"هل تريد السماح بالمكالمات الهاتفية؟"</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_sms_confirm_title" msgid="188164598768941316">"السماح بالمكالمات الهاتفية والرسائل القصيرة؟"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"‏ستتم مشاركة سجل المكالمات والرسائل القصيرة SMS مع هذا المستخدم."</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="application_restrictions" msgid="8207332020898004394">"السماح بالتطبيقات والمحتوى"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"التطبيقات ذات القيود"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسيع إعدادات التطبيق"</string>
@@ -2278,13 +2370,13 @@
     <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="work_sim_title" msgid="4843322164662606891">"‏شريحة SIM للعمل"</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_not_supported_in_limited" msgid="913035259626149121">"هذا التطبيق غير متوافق مع الملفات الشخصية المقيدة"</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>
@@ -2308,27 +2400,27 @@
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"‏تم تغيير بطاقات SIM"</string>
     <string name="sim_cards_changed_message_summary" msgid="5452545583546944683">"المس لتعيين الأنشطة"</string>
     <string name="sim_cellular_data_unavailable" msgid="9018555543451203035">"بيانات الجوّال غير متوفرة"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"‏المس لتحديد بطاقة SIM للبيانات"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"‏المس لتحديد شريحة 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>
-    <string name="sim_slot_empty" msgid="8964505511911854688">"‏بطاقة SIM فارغة"</string>
-    <string name="sim_editor_name" msgid="1722945976676142029">"‏اسم بطاقة SIM"</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">"‏%1$d لمنفذ SIM"</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">"‏لون شريحة SIM"</string>
+    <string name="sim_card_select_title" msgid="6668492557519243456">"‏تحديد شريحة SIM"</string>
     <string name="color_orange" msgid="4417567658855022517">"برتقالي"</string>
     <string name="color_purple" msgid="3888532466427762504">"أرجواني"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"‏لم يتم إدراج بطاقات 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_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_other_call_settings" msgid="8247802316114482477">"إعدادات المكالمات الأخرى"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"نقل بيانات الشبكة المفضلة"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"تعطيل بث اسم الشبكة"</string>
@@ -2337,7 +2429,7 @@
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> ديسبل ميلي واط <xliff:g id="ASU">%2$d</xliff:g> وحدة إشارة واحدة"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"‏تم تغيير بطاقات SIM."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"المس للإعداد"</string>
-    <string name="sim_pref_divider" msgid="6778907671867621874">"‏بطاقة SIM المفضلة لـ"</string>
+    <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>
     <string name="dashboard_title" msgid="5453710313046681820">"الإعدادات"</string>
@@ -2349,13 +2441,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"‏اتصال شبكة واي فاي wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"رسالة نصية كتابة رسائل نصية إرسال رسائل"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏خلوي مشغِّل شبكة جوّال لاسلكي بيانات 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"شاشة لمس للشاشة"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"تعتيم شاشة شاشة لمس بطارية"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"تعتيم شاشة شاشة لمس بطارية"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"خلفية تخصيص التخصيص عرض"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"مظهر معتم وضع ليلي شاشة معتمة سطوع معكوس"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"خلفية تخصيص عرض"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"حجم النص"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"المشروع"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"عرض الإرسال"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"مسافة قرص محرك أقراص ثابتة جهاز استخدام"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"شحن استخدام طاقة"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"تهجئة قاموس تدقيق إملائي تصحيح تلقائي"</string>
@@ -2372,6 +2466,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"الحساب"</string>
     <string name="keywords_users" msgid="4673901601478559100">"تقييد يقيد مقيد"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"نص تصحيح صحح صوت اهتزاز تلقائي لغة إيماءة اقتراح يقترح مظهر مسيء كلمة يكتب رمز تعبيري دولي"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"reset preferences default"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"‏طوارئ ice تطبيق افتراضي \"emergency app default\""</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"أمان أذونات التطبيقات"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"التطبيقات الافتراضية"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"التمرير، كلمة المرور، النمط، رقم التعريف الشخصي"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏إعداد علامة NFC عبر Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"كتابة"</string>
@@ -2386,11 +2485,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"المقاطعات"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"عند تلقي المكالمات والإشعارات"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"المقاطعة دائمًا"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"السماح بالمقاطعات ذات الأولوية فقط"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"عدم المقاطعة"</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_option_important_interruptions" msgid="3903928008177972500">"الأولوية فقط"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"التنبيهات فقط"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"عدم الإزعاج"</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="ringtone_title" msgid="5379026328015343686">"نغمة رنين الهاتف"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"نغمة رنين الإشعارات الافتراضية"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"الاهتزاز أيضًا مع المكالمات"</string>
@@ -2416,62 +2516,151 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"اهتزاز"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"الدخول إلى الإشعارات"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"لا يُمكن للتطبيقات قراءة الإشعارات"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"‏يُمكن لتطبيق %d قراءة الإشعارات"</item>
-    <item quantity="other" msgid="980049191810249052">"‏يُمكن لتطبيقات %d قراءة الإشعارات"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="zero">‏لا يمكن قراءة الإشعارات بواسطة أي تطبيق (%d)</item>
+      <item quantity="two">‏يمكن قراءة الإشعارات بواسطة تطبيقين (%d)</item>
+      <item quantity="few">‏يمكن قراءة الإشعارات بواسطة %d تطبيقات</item>
+      <item quantity="many">‏يمكن قراءة الإشعارات بواسطة %d تطبيقًا</item>
+      <item quantity="other">‏يمكن قراءة الإشعارات بواسطة %d من التطبيقات</item>
+      <item quantity="one">‏يمكن قراءة الإشعارات بواسطة تطبيق واحد (%d)</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"لم يتم تثبيت برامج لتلقّي الإشعارات الصوتية."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"هل ترغب في تمكين <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"سيتمكن <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> من قراءة جميع الإشعارات التي تمّ نشرها من قِبل النظام أو أي من التطبيقات المثبتة، والتي قد تنطوي على معلومات شخصية مثل أسماء جهات الاتصال ونص الرسائل المرسلة إليك. وسيتمكن أيضًا من تجاهل هذه الإشعارات أو لمس أزرار الإجراءات بداخلها."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"موفرو الحالات"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ليست هناك تطبيقات توفر الحالات"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"‏%d تطبيق يوفر الحالات"</item>
-    <item quantity="other" msgid="358057362115673258">"‏%d من التطبيقات توفر الحالات"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"لم يتم تثبيت أي موفر للحالات."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"هل ترغب في تمكين <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> سيتمكن من إضافة حالات الخروج إلى وضع \"الرجاء عدم الإزعاج\"."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"جارٍ تحميل التطبيقات..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"حظر"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"حظر الكل"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"عدم عرض إشعارات من هذا التطبيق"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"الأولوية"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"عرض الإشعارات أعلى القائمة ومواصلة تلقيها عند تعيين الجهاز على المقاطعات للأولوية فقط"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"حساس"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"إخفاء أي محتوى حساس من إشعارات هذا التطبيق عندما يتم قفل الجهاز"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"معاملة كأولوية"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"السماح بسماع صوت إشعارات هذا التطبيق عند تعيين \"الرجاء عدم الإزعاج\" على \"الألوية\" فقط."</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"السماح بالظهور الخاطف"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"السماح لهذا التطبيق بالتشديد على إشعارات معينة من خلال عرضها لفترة وجيزة على الشاشة الحالية."</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"إخفاء المحتوى الحساس"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"إخفاء أي محتوى قد يكشف معلومات خاصة في إشعارات هذا التطبيق عند قفل الجهاز."</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="zen_mode_default_option" msgid="6940069025071935243">"لحين تعطيل هذا الإعداد"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"مقاطعات ذات أولوية"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"التعطل"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"أيام"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"بدون"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"تم السماح بالمقاطعات"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"الأولوية فقط"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"بدون"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"التشغيل التلقائي"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"تشغيل تلقائي"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"اسم القاعدة"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"إضافة قاعدة"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"حذف قاعدة"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"هل تريد حذف <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="3201273040477861538">"جدولة القاعدة زمنيًا"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"لم يتم العثور على القاعدة."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">"، "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"مطلقًا"</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_from" msgid="1033337300289871697">"مكالمات/رسائل من"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"أي شخص"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"جهات الاتصال فقط"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"جهات الاتصال المميزة بنجمة فقط"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"الأحداث والتذكيرات"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"تعد المنبهات دائمًا مقاطعات ذات أولوية"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"التنبيهات"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"التذكيرات"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"الأحداث"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"المتصلون المحددون"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"المتصلون المتكررون"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"في حال اتصال الشخص نفسه للمرة الثانية في غضون <xliff:g id="MINUTES">%d</xliff:g> من الدقائق، اسمح له."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"تشغيل تلقائي"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"مطلقًا"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> في اليوم التالي"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> أو أي تنبيه قبل ذلك"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"المقاطعات"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"عند وصول المكالمات والإشعارات"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"متى تريد أن تتم مقاطعتك؟"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"إلى متى؟"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"المقاطعة دائمًا"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"إيقاف، الكل، كل شيء"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"السماح بالمقاطعات ذات الأولوية فقط"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"السماح بالتنبيهات فقط"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"عدم المقاطعة"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"إلى أجل غير مسمى"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> من الدقائق</item>
+      <item quantity="two">دقيقتان (<xliff:g id="COUNT_1">%d</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> دقائق</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> دقيقة</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> من الدقائق</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> دقيقة</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"تغيير إلى الإشعارات ذات الأولوية فقط إلى أجل غير مسمى"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="zero">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الدقائق حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">تغيير إلى الإشعارات ذات الأولوية فقط لمدة دقيقتين (<xliff:g id="DURATION">%1$d</xliff:g>) حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> دقائق حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="zero">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الساعات (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">تغيير إلى الإشعارات ذات الأولوية فقط لمدة ساعتين (<xliff:g id="DURATION">%1$d</xliff:g>) (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> ساعات (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">تغيير إلى الإشعارات ذات الأولوية فقط لمدة <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"تغيير إلى تنبيهات فقط إلى أجل غير مسمى"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="zero">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الدقائق (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">تغيير إلى تنبيهات فقط لمدة دقيقتين (<xliff:g id="DURATION">%1$d</xliff:g>) (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> دقائق (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">تغيير إلى تنبيهات فقط لمدة <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="zero">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الساعات حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">تغيير إلى تنبيهات فقط لمدة ساعتين (<xliff:g id="DURATION">%1$d</xliff:g>) حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">تغيير إلى تنبيهات فقط لمدة <xliff:g id="DURATION">%1$d</xliff:g> ساعات حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">تغيير إلى تنبيهات فقط لمدة <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"تغيير إلى عدم الإزعاج إلى أجل غير مسمى"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="zero">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الدقائق (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">تغيير إلى وضع عدم الإزعاج لمدة دقيقتين (<xliff:g id="DURATION">%1$d</xliff:g>) (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> دقائق (حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">تغيير إلى وضع عدم الإزعاج لمدة <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="zero">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> من الساعات حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">تغيير إلى وضع عدم الإزعاج لمدة ساعتين (<xliff:g id="DURATION">%1$d</xliff:g>) حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">تغيير إلى وضع عدم الإزعاج لمدة <xliff:g id="DURATION">%1$d</xliff:g> ساعات حتى <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">تغيير إلى وضع عدم الإزعاج لمدة <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"تغيير إلى المقاطعة دائمًا"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"للأبد"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"إشعارات التطبيقات"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"إعدادات الإشعارات"</string>
     <string name="device_feedback" msgid="3238056036766293294">"إرسال تعليقات حول هذا الجهاز"</string>
@@ -2512,4 +2701,75 @@
     <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="2184141780491382435">"تشغيل بشكل افتراضي"</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="app_launch_domain_links_title" msgid="458956710410857777">"روابط النطاق"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"‏فتح عناوين URL الخاصة بالنطاق"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"‏السماح للتطبيق بفتح عناوين URL الخاصة بالنطاق مباشرة"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"‏عناوين URL المتوافقة للنطاقات"</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="410824961149037234">"ذاكرة داخلية"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"ذاكرة خارجية"</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="storage_used" msgid="7128074132917008743">"السعة التخزينية المستخدمة"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"تشغيل"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"حظر"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"الحساسية"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"الأولوية"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"الأولوية والحساسية"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="zero">تم منح <xliff:g id="COUNT_1">%d</xliff:g> من الأذونات</item>
+      <item quantity="two">تم منح إذنين (<xliff:g id="COUNT_1">%d</xliff:g>)</item>
+      <item quantity="few">تم منح <xliff:g id="COUNT_1">%d</xliff:g> أذونات</item>
+      <item quantity="many">تم منح <xliff:g id="COUNT_1">%d</xliff:g> إذنًا</item>
+      <item quantity="other">تم منح <xliff:g id="COUNT_1">%d</xliff:g> من الأذونات</item>
+      <item quantity="one">تم منح <xliff:g id="COUNT_0">%d</xliff:g> إذن</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="zero">تم منح <xliff:g id="COUNT_2">%d</xliff:g> من <xliff:g id="COUNT_3">%d</xliff:g> من الأذونات</item>
+      <item quantity="two">تم منح <xliff:g id="COUNT_2">%d</xliff:g> من <xliff:g id="COUNT_3">%d</xliff:g> من الأذونات</item>
+      <item quantity="few">تم منح <xliff:g id="COUNT_2">%d</xliff:g> من <xliff:g id="COUNT_3">%d</xliff:g> من الأذونات</item>
+      <item quantity="many">تم منح <xliff:g id="COUNT_2">%d</xliff:g> من <xliff:g id="COUNT_3">%d</xliff:g> من الأذونات</item>
+      <item quantity="other">تم منح <xliff:g id="COUNT_2">%d</xliff:g> من <xliff:g id="COUNT_3">%d</xliff:g> من الأذونات</item>
+      <item quantity="one">تم منح <xliff:g id="COUNT_0">%d</xliff:g> من <xliff:g id="COUNT_1">%d</xliff:g> إذن</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"تم تعيين بعض الإعدادات الافتراضية"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"لم يتم تعيين إعدادات افتراضية"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"جميع التطبيقات"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"ممكّن"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"شخصي"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"العمل"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"محظور"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"الأولوية"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"الحساسية"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"‏مع عناوين URL للنطاقات"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"معطّل بواسطة المشرف"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"متقدمة"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"تطبيق غير معروف"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"اختيار ملف شخصي"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"أذونات التطبيق"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"تم السماح بدخول إضافي لعدد <xliff:g id="COUNT_0">%d</xliff:g> من إجمالي <xliff:g id="COUNT_1">%d</xliff:g> من التطبيقات"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"تم السماح لعدد <xliff:g id="COUNT_0">%d</xliff:g> من إجمالي <xliff:g id="COUNT_1">%d</xliff:g> من التطبيقات"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"‏عناوين URL للنطاق"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"‏عدم فتح أي عنوان URL لنطاق"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"فتح \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"‏فتح \'<xliff:g id="DOMAIN">%s</xliff:g>\' وعناوين URL ذات الصلة"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="zero">‏ليس هناك أي تطبيق يمكنه فتح أي من عناوين URL الخاصة بالنطاق</item>
+      <item quantity="two">‏هناك تطبيقان (<xliff:g id="COUNT">%d</xliff:g>) يمكنهما فتح عناوين URL الخاصة بنطاقهما</item>
+      <item quantity="few">‏هناك <xliff:g id="COUNT">%d</xliff:g> تطبيقات يمكنها فتح عناوين URL الخاصة بنطاقاتها</item>
+      <item quantity="many">‏هناك <xliff:g id="COUNT">%d</xliff:g> تطبيقًا يمكنها فتح عناوين URL الخاصة بنطاقاتها</item>
+      <item quantity="other">‏هناك <xliff:g id="COUNT">%d</xliff:g> من التطبيقات يمكنها فتح عناوين URL الخاصة بنطاقاتها</item>
+      <item quantity="one">‏هناك تطبيق واحد يمكنه فتح عناوين URL الخاصة بنطاقه</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"لم يتم التعرف عليها"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"التطبيقات الافتراضية"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"تطبيق المتصفح"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ليس هناك متصفح افتراضي"</string>
+    <string name="default_app" msgid="6864503001385843060">"(افتراضي)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"سعة تخزين التطبيقات"</string>
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 78c447d..e0ae1c0 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -1293,17 +1293,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Planşet haqqında məlumat"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefon məlumatı"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Batareya haqqında məlumat"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Tez işə salma"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Tətbiqləri başlatmaq üçün klaviatura qısayolları ayarlayın"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Tətbiq ayırın"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Qısayol yoxdur"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Axtar + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Sil"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) üçün qısayolunuz silinəcək."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Ləğv et"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Tətbiqlər"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Qısayollar"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Mətn daxil etməsi"</string>
     <string name="input_method" msgid="5434026103176856164">"Daxiletmə metodu"</string>
     <string name="current_input_method" msgid="234072873286056438">"Defolt"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 14f9114..0863de3 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"ПАРОЛА"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Бутон"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"заглушаване/включване на микрофона"</item>
     <item msgid="1148142988678569310">"прожектиране на мултимедия"</item>
     <item msgid="9130014005474445273">"активиране на виртуална частна мрежа (VPN)"</item>
+    <item msgid="1165192162975045562">"запис на тапет"</item>
+    <item msgid="7129487923652967258">"структура за помощ"</item>
+    <item msgid="1069023208100114540">"екранна снимка за помощ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Местоположение"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Заглушаване/включване на микрофона"</item>
     <item msgid="5906017727368097853">"Прожектиране на мултимедия"</item>
     <item msgid="2486614710846178542">"Активиране на виртуална частна мрежа (VPN)"</item>
+    <item msgid="5586547561693629602">"Запис на тапет"</item>
+    <item msgid="32794179825485062">"Структура за помощ"</item>
+    <item msgid="7872852746938272552">"Екранна снимка за помощ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"лошо"</item>
     <item msgid="4212263919458209842">"критично"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Изключено"</item>
-    <item msgid="5656544177755411222">"Ограничени прекъсвания"</item>
-    <item msgid="8735337502532332056">"Нула прекъсвания"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Нормално"</item>
     <item msgid="866544120205026771">"Средно"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"розово"</item>
     <item msgid="6131821495505931173">"червено"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (протокол за пренос на мултимедия)"</item>
+    <item msgid="8856820259201251036">"PTP (протокол за пренос на картини)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet през USB)"</item>
+    <item msgid="2686051673589572111">"Аудиоизточник"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 155474c..c04a5c7 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Разрешаване"</string>
     <string name="deny" msgid="6947806159746484865">"Отказ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Вече сте на <xliff:g id="STEP_COUNT">%1$d</xliff:g> стъпка от това, да бъдете програмист."</item>
-    <item quantity="other" msgid="6722953419953594148">"Вече сте на <xliff:g id="STEP_COUNT">%1$d</xliff:g> стъпки от това, да бъдете програмист."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Вече сте на <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> стъпки от това, да бъдете програмист.</item>
+      <item quantity="one">Вече сте на <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> стъпка от това, да бъдете програмист.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Вече сте програмист!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Не е необходимо – вече сте програмист."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Кабелни и безжични мрежи"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Изключване на SMS през услугата за незабавни съобщения"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Изисква се включване на регистрацията за незабавни съобщения"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Изисква се изключване на регистрацията за незабавни съобщения"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Включване на сигнала за обезпечаване на VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Изключване на сигнала за обезпечаване на VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Включване на разтоварването на lte ram"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Изключване на разтоварването на lte ram"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Преглед на указателят на SIM картата"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"Установена е връзка"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Свързано (без телефона)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Свързано (без мултимедията)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Има връзка (няма достъп до съобщенията)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Свързано (без телефона или мултимедията)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Изкл."</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Изключва се..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Установява се връзка…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Сдвояване..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Устройство с Bluetooth без име"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Търси се"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"В района няма намерени у-ва с Bluetooth."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показване на получени файлове"</string>
     <string name="device_picker" msgid="4978696506172252813">"Изберете устройство с Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Заявка за разрешение на Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Приложение иска да включи Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Приложение иска да ВКЛЮЧИ Bluetooth за това устройство."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Приложение иска да направи таблета ви видим за други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Приложение иска да направи телефона ви видим за други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Приложение иска да направи таблета ви видим за други устройства с Bluetooth. Можете да промените това по-късно от настройките за функцията."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ОТКАЗ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"НАПРЕД"</string>
     <string name="okay" msgid="1997666393121016642">"ОK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ДА"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"НЕ"</string>
-    <string name="forget" msgid="7267115980248732932">"ЗАБРАВЯНЕ"</string>
+    <string name="forget" msgid="1400428660472591263">"Забравяне"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Подобряване на лицевотосъответствие"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Проверка за жизненост"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Изисква премигване при отключване"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Задаване на Моето местоположение, отключване на екран и заключване на хранилището за идентификационни данни"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</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">"Oтпечатък: Ползване за"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Добавяне"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"заключване на екрана"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"Отпечатък: Настройване"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"За да използвате отпечатъка си за отключване на екрана или за потвърждаване на покупки, ще трябва: \n\n✓ да настроим резервния ви начин на заключване на екрана; \n\n✓ да добавим отпечатъка ви."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Намиране на сензора"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Намерете сензора за отпечатък на гърба на телефона си."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Име"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ОK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Изтриване"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Да започваме!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Поставете пръста си върху сензора за отпечатъци. Вдигнете го, след като усетите вибриране."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Отлично! Повторете."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Поставете същия пръст върху сензора за отпечатъци и го вдигнете, след като усетите вибриране."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отпечатъкът е добавен!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Когато видите тази икона, можете да използвате отпечатъка си за идентификация или за оторизиране на покупка."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Добавяне"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Напред"</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>
@@ -360,7 +372,6 @@
     <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">"Трябва да зададете ПИН код или парола за заключване на екрана, преди да можете да започнете шифроването."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Трябва да начертаете фигурата си за отключване, за да потвърдите шифроването на устройството си."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Да се шифрова ли?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Операцията по шифроването е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време таблетът ще се рестартира няколко пъти."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Операцията по шифроването е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време телефонът ще се рестартира няколко пъти."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Отключване с лице"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Ниска защита, експериментално"</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_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="current_screen_lock" msgid="4104091715420072219">"Текущо заключване на екрана"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Функциите за защита на устройството вече няма да работят."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Деакт. от админ., правила за шифроване или хранил. за идент. данни"</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_biometric_weak" msgid="3008473624490350142">"Отключване с лице"</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="7579210814842056547">"След като сте настроили заключване на екрана, можете да настроите и отпечатъка си от „Настройки“ &gt; „Сигурност“."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Изключване на заключването на екрана"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Премахване на фигура за отключване"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Премахване на PIN кода за отключване"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Паролата трябва да съдържа поне една буква."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Паролата трябва да съдържа поне една цифра."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Паролата трябва да съдържа поне един символ."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Паролата трябва да съдържа поне 1 буква."</item>
-    <item quantity="other" msgid="8186027808415585970">"Паролата трябва да съдържа поне %d букви."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Паролата трябва да съдържа поне 1 малка буква."</item>
-    <item quantity="other" msgid="2693910942679679225">"Паролата трябва да съдържа поне %d малки букви."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Паролата трябва да съдържа поне 1 главна буква."</item>
-    <item quantity="other" msgid="3030801209112209245">"Паролата трябва да съдържа поне %d главни букви."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Паролата трябва да съдържа поне 1 цифра."</item>
-    <item quantity="other" msgid="4703982391407595924">"Паролата трябва да съдържа поне %d цифри."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Паролата трябва да съдържа поне 1 специален символ."</item>
-    <item quantity="other" msgid="1221290525051187757">"Паролата трябва да съдържа поне %d специални символа."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Паролата трябва да съдържа поне 1 небуквен знак."</item>
-    <item quantity="other" msgid="3952508584649046404">"Паролата трябва да съдържа поне %d небуквени знака."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Паролата трябва да съдържа поне %d букви.</item>
+      <item quantity="one">Паролата трябва да съдържа поне 1 буква.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Паролата трябва да съдържа поне %d малки букви.</item>
+      <item quantity="one">Паролата трябва да съдържа поне 1 малка буква.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Паролата трябва да съдържа поне %d главни букви.</item>
+      <item quantity="one">Паролата трябва да съдържа поне 1 главна буква.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Паролата трябва да съдържа поне %d цифри.</item>
+      <item quantity="one">Паролата трябва да съдържа поне 1 цифра.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Паролата трябва да съдържа поне %d специални символа.</item>
+      <item quantity="one">Паролата трябва да съдържа поне 1 специален символ.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Паролата трябва да съдържа поне %d небуквени знака.</item>
+      <item quantity="one">Паролата трябва да съдържа поне 1 небуквен знак.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Администраторът на устройството не разрешава използването на скорошна парола."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Възходящите, низходящите и повтарящите се поредици цифри са забранени"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"Сдвояване"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"СДВОЯВАНЕ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Отказ"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"При свързване сдвояването предоставя достъп до вашите контакти и история на обажданията."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Не можа да се сдвои с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Не можа да се сдвои с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g> поради неправилен ПИН или код за достъп."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Не може да се свърже с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Сдвояването е отхвърлено от <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Не можа да се установи връзка със: <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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"За подобряване на точността на местоположението приложенията и услугите ще сканират за устройства с Bluetooth дори когато Bluetooth е изключен. Можете да промените това от <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>настройките за сканиране<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Свързване с/ъс..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Мултимедийно аудио"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Звук на телефона"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Прехвърляне на файл"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Входно устройство"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Достъп до интернет"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Споделяне на контакти"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Използване за споделяне на контакти"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Споделяне на връзката с интернет"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Достъп до съобщенията"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"Установена е връзка с медийно аудио"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Връзка със звука на телефона"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установена е връзка със сървър за трансфер на файлове"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Има връзка с MAP"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Няма връзка със сървър за трансфер на файлове"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Има връзка с устройството за въвеждане"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Употреба за медийно аудио"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Използване на телефон за аудио"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Използване на за пренос на файлове"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Да се използва за въвеждане"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Използване за достъп до интернет"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Да се използва за MAP"</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_assistant_title" msgid="2553267316621598101">"Асистент за Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Установена е връзка чрез помощника за Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Екран за предаване"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi се изключва…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Грешка"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"В самолетен режим"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Не може да се сканира за мрежи"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Известие за мрежа"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Известяване, когато е налице обществена мрежа"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Да се избягват лоши връзки"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Да не се използва Wi‑Fi мрежа, освен ако няма добра връзка с интернет"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Да се ползват само мрежи с добра връзка с интернет"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканирането е винаги налице"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Сканирането да е разрешено винаги"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Разрешете на услугата на Google за местоположения и другите приложения да сканират за мрежи дори когато Wi-Fi е изключен"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Автом. ползване на отворени Wi‑Fi мрежи"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Помощникът за Wi‑Fi автоматично да се свързва с отворени мрежи, които определи за надеждни"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Избиране на помощник"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталиране на сертификати"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"За подобряване на точността на местоположението и за други цели Google и останалите приложения може да сканират за мрежи в района дори когато Wi-Fi е изключен. Ако не искате това да се случва, отворете „Разширени“ &gt; „Сканирането винаги да е налице“."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Приложенията може да сканират за мрежи в района дори когато Wi-Fi е изключен. Ако не искате това да се случва, отворете „Разширени“ &gt; „Сканирането винаги да е налице“."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"За подобряване на точността на местоположението приложенията и услугите ще сканират за Wi‑Fi мрежи дори когато 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="5340097010842405981">"Да не се показва отново"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Добавяне на друга мрежа"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Още"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авт. настройка (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"За да завърши настройването, таблетът ви се нуждае от достъп до Wi‑Fi. След това можете да превключвате между мобилни данни и Wi‑Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Разширени опции"</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="5940801028985255304">"Натиснете бутона за защитена настройка на Wi‑Fi на маршрутизатора си. Той може да е с името „WPS“ или да съдържа този символ:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Натиснете бутона за 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>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"Конфигуриране на честотата на точката за достъп"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Честота при 2,4 ГХц"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Честота при 5 ГХц"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Настройки за IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(непроменени)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(неизвестни)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Запазено"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Деактивирани"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Неуспешно конфигуриране на IP адреса"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Неуспешна връзка с Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем при удостоверяването"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Извън обхват"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Не е открит достъп до интернет. Няма да се свърже отново автоматично."</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_security_none" msgid="7985461072596594400">"Няма"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"Тази мрежа няма достъп до интернет. Да се използва ли въпреки това?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Без повторно запитване за тази мрежа"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Свързване"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Свързването с мрежата не бе успешно"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Забравяне"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Пренос. точка за достъп AndroidAP с WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Преносима точка за достъп до 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_mode_title" msgid="2164073796253284289">"Предпочитание за обаждания"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Режим на обаждания през Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Предпочита се Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Предпочита се клетъчна мрежа"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Когато функцията за обаждания през Wi-Fi е включена, телефонът ви може да маршрутизира обажданията през Wi-Fi мрежи или мрежата на оператора ви в зависимост от предпочитанието ви и от това, кой сигнал е по-силен. Преди да включите тази функция, потърсете от оператора си информация относно таксите и други подробности."</string>
     <string name="home_settings" msgid="212375129455718176">"Начало"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"Тема"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Светло"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Тъмно"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Автоматично"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Ще актуал. ли предпоч. за SIM?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> е единствената SIM карта в устройството ви. Искате ли да я използвате за пренос на клетъчни данни, обаждания и SMS съобщения?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Неправилен ПИН код за SIM картата – сега трябва да се свържете с оператора си, за да отключите устройството."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Неправилен ПИН код за SIM картата – остава ви <xliff:g id="NUMBER">%d</xliff:g> опит, преди да трябва да се свържете с оператора си, за да отключите устройството."</item>
-    <item quantity="other" msgid="77103619544346451">"Неправилен ПИН код за SIM картата – остават ви <xliff:g id="NUMBER">%d</xliff:g> опита."</item>
-  </plurals>
+    <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>
+    </plurals>
     <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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"Приложения (данни за приложения и медийно съдърж.)"</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_dcim_usage" msgid="558887013613822577">"Снимки, видеоклипове"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музика, мелодии, подкаст емисии и др.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Разни"</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="default" msgid="6915293408836853020">"Деактивиране на SD карта"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"Свързване"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Изваждане"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Изтриване и форматиране"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Изтр. и форм. като вътр. хран."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB връзка с компютър"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB връзка с компютър"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Свързване като"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Позволява ви да прехвърляте медийни файлове под Windows или да използвате Android File Transfer за Mac (вижте www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Позволява ви да прехвърляте снимки чрез софтуера за камера и файлове на компютри, които не поддържат MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Инсталиране на инструменти за прехвърляне на файлове"</string>
+    <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_external_title" msgid="2723851748972673696">"Сменяемо хранилище"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Свободно място: <xliff:g id="FREE">%1$s</xliff:g> от общо <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g>: Свързването бе успешно"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>: Не можа да се форматира"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Преименуване на хранилището"</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="3677827796634199714"><b>"Когато извадите това хранилище (<xliff:g id="NAME_0">^1</xliff:g>), съхраняваните там приложения ще спрат да работят, а съответните мултимедийни файлове няма да са налице, докато не го поставите отново."</b>" \n\nХранилището (<xliff:g id="NAME_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_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_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="1259216693690378749">"Не премахвайте хранилището (<xliff:g id="NAME">^1</xliff:g>), докато се форматира."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Премест. данните в новото хран."</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Можете да преместите своите снимки, файлове и данни на приложения в новото хранилище (<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="5035719146373359329"><b>"Преместването отнема около <xliff:g id="TIME">^1</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="8641916179067596592">"По време на преместването: \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_move_confirm_title" msgid="292782012677890250">"Преместете <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Преместването на приложението <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="4288580957960820740">"Не премахвайте хранилището (<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="battery_status_title" msgid="9159414319574976203">"Състояние на батерията"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво на батерията"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Имена на точките за достъп (APN)"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"Нулиране на настройките на мрежата"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Така ще се нулират всички мрежови настройки, включително тези за:\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="4874737348054213767">"Да се нулират ли всички мрежови настройки? Не можете да отмените това действие!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Нулиране на настройките"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Да се извърши ли нулиране?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Мрежовите настройки са нулирани"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Нулиране на устройството"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Възстановяване на фабричните настройки"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Изтрива всички данни на таблета"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Изтрива всички данни на телефона"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Това ще изтрие всички данни от "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Да се изтриват всички данни в SD картата, като музика или снимки"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Възстановяване на таблета"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Нулиране на телефона"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Да се изтрие ли цялата ви лична информация и всички изтеглени приложения? Не можете да отмените това действие!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Да се изтрият ли цялата ви лична информация и всички изтеглени приложения? Не можете да отмените това действие!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Изтриване на всичко"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Трябва да начертаете фигурата си за отключване, за да потвърдите възстановяването на фабричните настройки."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Не се състоя рестартиране, защото услугата за изчистване на системата не се предлага."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Да се зададе ли повторно?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"За този потребител не е налице възстановяване на фабричните настройки"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Да се изтрие ли USB хранилището заедно с всички съхранявани там файлове? Не можете да отмените това действие!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Да се изтрие ли SD картата заедно с всички съхранявани там файлове? Не можете да отмените това действие!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Изтриване на всичко"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Трябва да начертаете фигурата си за отключване, за да потвърдите, че искате да изтриете USB хранилището."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Трябва да начертаете фигурата си за отключване, за да потвърдите, че искате да изтриете SD картата."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помощ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Клетъчни мрежи"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Мобилен план"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Стандартно приложение за 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим за местоположението"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Използване на GPS, Wi‑Fi и клетъчни мрежи за определяне на местоположението"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Използване на Wi‑Fi и клетъчни мрежи за определяне на местоположението"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Използване на GPS за установяване на местоположението ви"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Използване на GPS за определяне на местоположението"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Сканиране"</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="2070686681074461301">"Подобряване на местоположението чрез разрешаване на приложенията и услугите да сканират за Wi‑Fi мрежи дори когато Wi‑Fi е изключен"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Сканиране за устройства с Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Подобряване на местоположението чрез разрешаване на системните услуги да сканират за устройства с Bluetooth дори когато Bluetooth е изключен"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Mестоп. от Wi‑Fi и клет. мрежа"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Прилож. да ползват услугата ни за местоп., за да прогнозират по-бързо вашето. Анонимни данни за местоп. ще се събират и изпращат на Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Местоположението се определя чрез Wi‑Fi"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"Защита на екрана"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Използвайте фигурата за устройството си, за да продължите."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Въведете ПИН кода за устройството си, за да продължите."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Въведете паролата за устройството си, за да продължите."</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_need_to_unlock" msgid="757935356911054465">"Потвърждаване на запазена фигура"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Опитайте отново:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"Твърде много грешни опити!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Опитайте отново след <xliff:g id="NUMBER">%d</xliff:g> секунди."</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="manageapplications_settings_title" msgid="7041951105633616745">"Управление на приложенията"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление и премахване на инсталирани приложения"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Употреба на хранилището"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Преглед на хранилището, използвано от приложения"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Течащи услуги:"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информация за таблета"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информация за телефон"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Информация за батерията"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Бързо стартиране"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Задаване на клавишни комбинации за стартиране на приложения"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Задаване на приложение"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Няма преки пътища"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Търсене + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Изчистване"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Прекият ви път за <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) ще бъде създаден."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Отказ"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Приложения"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Преки пътища"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Заснемане на всички пакети за Bluetooth с протокола HCI във файла"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Отключване от OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Разрешаване на първонач. зареждащата прогр. да се откл."</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Въведете ПИН кода си"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Въведете ПИН кода за устройството си, за да активирате OEM отключването"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Да се разреши ли отключване от OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ПРЕДУПРЕЖДЕНИЕ: Функциите за защита на устройството няма да работят на това, докато следната настройка е включена."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Размери на регистрационните буфери"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Размер на един рег. буфер: Избор"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Разрешаване на измислени местоположения"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешаване на измислени местоположения"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Активиране на инспектирането на атрибутите за преглед"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Мрежи"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертифициране на безжичния дисплей"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"„Многословно“ регистр. на Wi‑Fi: Актив."</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi към моб. мрежи: Агресивно предав."</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Сканирането за роуминг на Wi-Fi да е разрешено винаги"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Използване на наследена клиентска програма за DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показване на опциите за сертифициране на безжичния дисплей"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"По-подробно регистр. на Wi‑Fi – данни за RSSI на SSID в инстр. за избор на Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"При активиране предаването на връзката за данни от Wi-Fi към мобилната мрежа ще е по-агресивно, когато Wi-Fi сигналът е слаб"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Разрешаване/забраняване на сканирането за роуминг на Wi-Fi въз основа на посочения в интерфейса обем на трафика на данни"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Размери на регистрационните буфери"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Размер на един рег. буфер: Избор"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Избиране на конфигурация за USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Избиране на конфигурация за USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Разрешаване на измислени местоположения"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешаване на измислени местоположения"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Активиране на инспектирането на атрибутите за преглед"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Използване на клиентската програма за DHCP от Lollipop вместо новата програма на Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Разрешаване на отстраняването на грешки през USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Отстраняването на грешки през USB е предназначено само за програмни цели. Използвайте го за копиране на данни между компютъра и устройството си, за инсталиране на приложения на устройството си без известяване и за четене на регистрационни данни."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Да се отмени ли достъпът до отстраняването на грешки през USB от всички по-рано упълномощени от вас компютри?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Пурпурен"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Да се използва ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> има нужда от следните неща:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"От Настройки не може да се получи потвърждение за отговора ви, защото заявката за разрешение се прикрива от приложение."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако включите <xliff:g id="SERVICE">%1$s</xliff:g>, устройството ви няма да използва заключването на екрана ви за подобряване на шифроването на данни."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Тъй като сте включили услуга за достъпност, устройството ви няма да използва заключването на екрана ви за подобряване на шифроването на данни."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Тъй като включването на <xliff:g id="SERVICE">%1$s</xliff:g> засяга шифроването на данни, трябва да потвърдите фигурата си."</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Приложения (<xliff:g id="TYPE">%1$s</xliff:g>) за <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Използвахте <xliff:g id="USEDRAM">%1$s</xliff:g> от <xliff:g id="TOTALRAM">%2$s</xliff:g> за <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</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_memory_status" msgid="4251599550196193093">"Понастоящем състоянието на паметта на устройството е <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Средно използване на RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Максимално използване на RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Операционна система Android"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"Процеси"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Услуги"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Продължителност"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Подробности за паметта"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"Скриване на системните"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Стандартните настройки по-долу заменят тези на приложенията"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Стандартни настройки"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Стандартна машина"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Настройва машината за речеви синтез за изговорен текст"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Задаване за изговаряне на текст да се използва машината за синтезиране на говор"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Скорост на речта"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Скорост, с която се изговаря текста"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Височина"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"Трябва да начертаете фигурата си за отключване, за да потвърдите инсталирането на идентификационни данни."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Въведете паролата за хранилището за идентификационни данни."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текуща парола:"</string>
@@ -1847,12 +1901,10 @@
     <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="backup_configure_account_default_summary" msgid="2436933224764745553">"Понастоящем няма профил, който съхранява данните от резервното копие"</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="5355557151569037197">"Услугата за създ. на резервно копие не е активна."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Това е зададено от правилата на устройството ви."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Наст. комп.: Парола"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Понастоящем пълните резервни копия за настолен компютър не са защитени"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Докоснете, за да промените или премахнете паролата за пълни резервни копия на настолния компютър"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Скала на анимация: Преход"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Скала за Animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Симулиране на алтерн. дисплеи"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Режим за няколко прозор."</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Едновр. извършване на няколко дейности на екрана."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Да се активира ли режимът за няколко прозореца?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ПРЕДУПРЕЖДЕНИЕ: Това е силно експериментална функция, която позволява едновременното извършване на няколко дейности на екрана чрез потребителския интерфейс за скорошни приложения. Използването й може да доведе до срив в някои приложения или до неправилното им функциониране."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Приложения"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Без съхран. на дейностите"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Унищож. на всяка дейност при напускане от потребител"</string>
@@ -2195,7 +2251,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="718192651887726259">"Можете да споделите това устройство с други хора, като създадете допълнителни потребители. Всеки от тях има свое работно пространство, което може да персонализира със собствени приложения, тапет и др. Потребителите могат също да коригират настройки на устройството, които засягат всички – например 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"Разрешаване на телефонните обаждания"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Разрешаване на телефонните обаждания и SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Включване на телефонните обаждания"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Включване на телефонните обаждания и SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Премахване на потребителя"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Да се разрешат ли телефонните обаждания?"</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_sms_confirm_title" msgid="188164598768941316">"Да се разрешат ли тел. обаждания и SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Историята на обажданията и SMS съобщенията ще се сподели с този потребител."</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="application_restrictions" msgid="8207332020898004394">"Разрешаване на приложения и съдържание"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничения"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Настройки за прилож.: Разгъв."</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"Това приложение не се поддържа от потребителски профили с ограничена функционалност"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"Връзка с WiFi/Wi-Fi мрежа"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текстово съобщение изпращане на текстови съобщения съобщения"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"клетъчна мрежа клетка оператор безжична мрежа данни 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"WiFi, Wi-Fi, обаждане, обаждания"</string>
     <string name="keywords_home" msgid="3626170808219458848">"стартов панел"</string>
     <string name="keywords_display" msgid="6709007669501628320">"екран, сензорен екран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затъмнен екран сензорен екран батерия"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затъмнен екран сензорен екран батерия"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон персонализиране персонализиране на дисплея"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"тъмна тема, нощен режим, затъмняване на екрана, негатив на яркостта"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"фон, персонализиране, персонализиране на дисплея"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"размер на текста"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"прожектиране"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"предаване на проект"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"място диск твърд диск устройство употреба"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"разход на енергия зареждане"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"правописен речник проверка на правописа автоматично коригиране"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"профил"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ограничение, ограничаване, ограничено"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"коригиране на текст коригиране звук вибриране автоматично език жест предлагане предложение тема обидна дума тип емотикони международно"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"нулиране, предпочитания, стандартни стойности"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"спешен случай, спешност, приложение, стандартно"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"приложения, изтегляне, приложения, системни"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"сигурност на разрешенията за приложения"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"приложения, по подразбиране"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"плъзгане, парола, фигура, ПИН код"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Маркер за КБП за Wi-Fi: Настр."</string>
     <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Прекъсвания"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"При получаване на обаждания и известия"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Прекъсване винаги"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Разрешаване само на приоритетни прекъсвания"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Без прекъсване"</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_option_important_interruptions" msgid="3903928008177972500">"Само с приоритет"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Само будилници"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Без прекъсвания"</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="ringtone_title" msgid="5379026328015343686">"Мелодия на телефон"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Стандартна мелодия за известията"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибриране и при обаждания"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибриране"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Достъп до известията"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Приложенията не могат да четат известията"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d приложение може да чете известията"</item>
-    <item quantity="other" msgid="980049191810249052">"%d приложения могат да четат известията"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d приложения могат да четат известията</item>
+      <item quantity="one">%d приложение може да чете известията</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Няма инсталирани слушатели на известия."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Да се активира ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ще може да чете всички известия, публикувани от системата или инсталирано приложение, които може да включват лична информация, като имена за връзка и текста на изпратените до вас съобщения. Също така ще може да отхвърля тези известия или да докосва бутоните за действие в тях."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Доставчици на условия"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Няма приложения, които предоставят условия"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d приложение предоставя условия"</item>
-    <item quantity="other" msgid="358057362115673258">"%d приложения предоставят условия"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Няма инсталирани доставчици на условия."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Да се активира ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ще може да добавя условия за изход към режима „Не ме безпокойте“."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Приложенията се зареждат..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Блокиране"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Блокиране на всички"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Известията от това приложение никога не се показват"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Приоритет"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Когато за устройството е зададено да има само приоритетни прекъсвания, известията се показват в горната част на списъка и получаването им продължава"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Деликатно"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Когато устройството е заключено, деликатното съдържание от известията за това приложение се скрива"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Третиране като приоритетни"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Разрешаване на известията от това приложение, когато за „Не безпокойте“ е зададено „Само с приоритет“"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Разрешаване на мимолетно показване"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Разрешаване на това приложение да набляга върху определени известия, като за кратко ги показва на текущия екран чрез плъзгане"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Скриване на деликатното съдържание"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Когато устройството е заключено, от известията на това приложение се скрива съдържанието, което може да разкрие частна информация"</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="zen_mode_default_option" msgid="6940069025071935243">"Докато не изключите това"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Приоритетни прекъсвания"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Почивка"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Дни"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Няма"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Прекъсванията са разрешени"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Само с приоритет"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Без"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматизиране"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Автоматично включване"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Име на правилото"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Добавяне на правило"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Изтриване на правило"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Да се изтрие ли правилото „<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="3201273040477861538">"Правило за график"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Правилото не е намерено."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никога"</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_from" msgid="1033337300289871697">"Обаждания/съобщения от"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Всички"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Само контактите"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Само контактите със звезда"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Събития и напомняния"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Будилниците винаги са приоритетни прекъсвания"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Будилници"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Напомняния"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Събития"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Избрани обаждащи се"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повтаряне на обаждащите се"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ако един и същ човек се обади втори път в рамките на период от <xliff:g id="MINUTES">%d</xliff:g> мин, това да се разреши"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Авт. включване"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Никога"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> на следващия ден"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> или при всеки будилник преди това"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"Прекъсвания"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Кога да получавате обаждания и известия"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Кога искате да бъдете прекъсвани?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"За колко време?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Прекъсване винаги"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"изключено,всички,всичко"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Разрешаване само на приоритетни прекъсвания"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Разрешаване само на будилниците"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Без прекъсване"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"За неопределено време"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минути</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> минута</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Активиране на режима „Само с приоритет“ за неопределено време"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Активиране на режима „Само будилници“ за неопределено време"</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>
+      <item quantity="one">Активиране на режима „Само будилници“ за една минута до <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">Активиране на режима „Само будилници“ за <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Активиране на режима „Без прекъсвания“ за неопределено време"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Активиране на режима „Прекъсване винаги“"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"завинаги"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Известия за прилож."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Изпращане на отзиви за устройството"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"Стартиране по подразбиране"</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="app_launch_domain_links_title" msgid="458956710410857777">"Връзки към домейните"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Отваряне на URL адреси в домейните"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Разрешаване на приложението директно да отваря URL адреси в домейните"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL адреси в поддържаните домейни"</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="410824961149037234">"вътрешната памет"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"външната памет"</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="storage_used" msgid="7128074132917008743">"Използвано хранилище"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Включени"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Блокирани"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"С важна информация"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"С приоритет"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"С приоритет и важна информация"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other">Предоставени са <xliff:g id="COUNT_1">%d</xliff:g> разрешения</item>
+      <item quantity="one">Предоставено е <xliff:g id="COUNT_0">%d</xliff:g> разрешение</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">Предоставени са <xliff:g id="COUNT_2">%d</xliff:g> от <xliff:g id="COUNT_3">%d</xliff:g> разрешения</item>
+      <item quantity="one">Предоставено е <xliff:g id="COUNT_0">%d</xliff:g> от <xliff:g id="COUNT_1">%d</xliff:g> разрешение</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Зададени са някои стандартни настройки"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Няма зададени стандартни настройки"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Всички приложения"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Активирани"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Лични"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Служебни"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блокирани"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"С приоритет"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"С важна информация"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"С URL адреси в домейните"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Деактивирано от администратора"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Разширени"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Неизвестно приложение"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Избиране на потр. профил"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Разрешения за приложения"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> от <xliff:g id="COUNT_1">%d</xliff:g> приложения имат допълнителен достъп"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> от <xliff:g id="COUNT_1">%d</xliff:g> приложения имат разрешение"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL адреси в домейните"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Без отваряне на URL адреси в домейните"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Отваряне на „<xliff:g id="DOMAIN">%s</xliff:g>“"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Отваряне на „<xliff:g id="DOMAIN">%s</xliff:g>“ и сродни URL адреси"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> приложения могат да отварят URL адреси в домейните</item>
+      <item quantity="one">Едно приложение може да отваря URL адреси в домейните</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Не е разпознато"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Приложения по подразбиране"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Браузър"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Няма браузър по подразбиране"</string>
+    <string name="default_app" msgid="6864503001385843060">"(По подразбиране)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Хранилище за приложения"</string>
 </resources>
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn-rBD/arrays.xml
index 2c95367..cc8f346 100644
--- a/res/values-bn-rBD/arrays.xml
+++ b/res/values-bn-rBD/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"পুশ বোতাম"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"মাইক্রোফোন নিঃশব্দ/সশব্দ করুন"</item>
     <item msgid="1148142988678569310">"মিডিয়া অভিক্ষেপ করুন"</item>
     <item msgid="9130014005474445273">"VPN সক্রিয় করুন"</item>
+    <item msgid="1165192162975045562">"লেখার ওয়ালপেপার"</item>
+    <item msgid="7129487923652967258">"গঠন সহায়তা"</item>
+    <item msgid="1069023208100114540">"স্ক্রীনশট সহায়তা"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"অবস্থান"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"মাইক্রোফোন নিঃশব্দ/সশব্দ করুন"</item>
     <item msgid="5906017727368097853">"মিডিয়া প্রক্ষেপ করুন"</item>
     <item msgid="2486614710846178542">"VPN সক্রিয় করুন"</item>
+    <item msgid="5586547561693629602">"লেখার ওয়ালপেপার"</item>
+    <item msgid="32794179825485062">"গঠন সহায়তা"</item>
+    <item msgid="7872852746938272552">"স্ক্রীনশট সহায়তা"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"স্বল্প"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"নিম্ন"</item>
     <item msgid="4212263919458209842">"জটিল"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"বন্ধ করুন"</item>
-    <item msgid="5656544177755411222">"কল ও ম্যাসেজ কখন কখন আটকান"</item>
-    <item msgid="8735337502532332056">"কল ও ম্যাসেজ কখনই আটকাবেন না"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"স্বাভাবিক"</item>
     <item msgid="866544120205026771">"মাঝারি"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"গোলাপী"</item>
     <item msgid="6131821495505931173">"লাল"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (মিডিয়া ট্রান্সফার প্রোটোকল)"</item>
+    <item msgid="8856820259201251036">"PTP (পিকচার ট্রান্সফার প্রোটোকল)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB ইথারনেট)"</item>
+    <item msgid="2686051673589572111">"অডিও উৎস"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index c8c9cf6..14664ae 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"অনুমতি দিন"</string>
     <string name="deny" msgid="6947806159746484865">"আস্বীকার করুন"</string>
     <string name="device_info_default" msgid="7847265875578739287">"অজানা"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"একজন বিকাশকারী হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷"</item>
-    <item quantity="other" msgid="6722953419953594148">"একজন বিকাশকারী হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">একজন বিকাশকারী হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
+      <item quantity="other">একজন বিকাশকারী হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"আপনি এখন একজন বিকাশকারী!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"কোনো প্রয়োজন নেই, আপনি ইতিমধ্যেই একজন বিকাশকারী।"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ওয়্যারলেস ও নেটওয়ার্ক"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS এর উপর SMS বন্ধ করুন"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS নিবন্ধন প্রয়োজনীয়তা চালু করুন"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS নিবন্ধন প্রয়োজনীয়তা বন্ধ করুন"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE প্রস্তুত ফ্ল্যাগ চালু করুন"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE প্রস্তুত ফ্ল্যাগ বন্ধ করুন"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte র‌্যাম ডাম্প চালু করুন"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte র‌্যাম ডাম্প বন্ধ করুন"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"সিম ঠিকানা বই দেখুন"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"সংযুক্ত হয়েছে"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"সংযুক্ত (কোনো ফোন নেই)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"সংযুক্ত (কোনো মিডিয়া নেই)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"সংযুক্ত (কোনো বার্তা অ্যাক্সেস নেই)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"সংযুক্ত (কোনো ফোন বা মিডিয়া নেই)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"সংযোগ বিচ্ছিন্ন করা হয়েছে"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"সংযোগ বিচ্ছিন্ন হচ্ছে..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"সংযুক্ত হচ্ছে..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"যুক্ত করা হচ্ছে..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"নামবিহীন Bluetooth ডিভাইস"</string>
     <string name="progress_scanning" msgid="192587958424295789">"অনুসন্ধান করা হচ্ছে"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"কাছাকাছি কোনো Bluetooth ডিভাইস পাওয়া যায়নি।"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"পাওয়া ফাইলগুলি দেখান"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth ডিভাইস নির্বাচন করুন"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth অনুমতির অনুরোধ"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"একটি অ্যাপ্লিকেশান Bluetooth চালু করতে চাইছে।"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"একটি অ্যাপ্লিকেশান এই ডিভাইসের জন্য Bluetooth চালু করতে চায়।"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"একটি অ্যাপ্লিকেশান আপনার ট্যাবলেটকে অন্যান্য Bluetooth ডিভাইসের কাছে <xliff:g id="TIMEOUT">%1$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"একটি অ্যাপ্লিকেশান আপনার ফোনকে অন্যান্য Bluetooth ডিভাইসের কাছে <xliff:g id="TIMEOUT">%1$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"একটি অ্যাপ্লিকেশান অন্য ব্লুটুথ ডিভাইসগুলির কাছে আপনার ট্যাবলেটকে দৃশ্যমান করতে চাইছে। আপনি পরে ব্লুটুথ সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"বাতিল করুন"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"অবিরত থাকুন"</string>
     <string name="okay" msgid="1997666393121016642">"ঠিক আছে"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"হ্যাঁ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"না"</string>
-    <string name="forget" msgid="7267115980248732932">"ভুলে যান"</string>
+    <string name="forget" msgid="1400428660472591263">"ভুলে যান"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"মুখ মিলে যাওয়া উন্নত করুন"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Liveness চেক"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"আনলক করার  সময় চোখ পিট পিট করা প্রয়োজন"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"আমার স্থান, স্ক্রীন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"আমার স্থান, স্ক্রীন আনলক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"পাসওয়ার্ড"</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="3453670509485083962">"যোগ করুন"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"স্ক্রীন লক"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"আঙ্গুলের ছাপ সেটআপ করুন"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"আপনার স্ক্রীন আনলক অথবা ক্রয়গুলি নিশ্চিত করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে, আমাদের এগুলির প্রয়োজন হবে:\n\n✓ আপনার ব্যাক আপ স্ক্রীন লক করার পদ্ধতি নির্বাচন করুন \n\n✓ আপনার আঙ্গুলের ছাপ যোগ করুন"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"সেন্সরটি খুঁজুন"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"আপনার ফোনের পিছনে আঙ্গুলের ছাপ সেন্সরের অবস্থান নির্ণয় করুন৷"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"এখন শুরু করা যাক!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"আঙ্গুলের ছাপের সেন্সরের উপর আঙ্গুলটি রাখুন এবং একটি কম্পন অনুভব করার পর লিফ্ট করুন৷"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"দারুন! এখন আবার করুন৷"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"আঙ্গুলের ছাপের সেন্সরের উপর সেই একই আঙ্গুলটি রাখুন এবং একটি কম্পন অনুভব করার পর লিফ্ট করুন৷"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"আঙ্গুলের ছাপ যোগ করা হয়েছে!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"যখন আপনি এই আইকন দেখতে পাবেন তখনই আপনি সনাক্ত করার জন্য অথবা একটি ক্রয় করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারেন৷"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"যোগ করুন"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"পরবর্তী"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"আপনার চার্জার প্লাগ ইন করুন এবং আবার চেষ্টা করুন।"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"কোনো লক স্ক্রীন PIN বা পাসওয়ার্ড নেই"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"আপনি এনক্রিপশান শুরু করার আগে আপনাকে লক স্ক্রীন PIN বা পাসওয়ার্ড সেট করতে হবে।"</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"আপনার ডিভাইস এনক্রিপ্ট করা নিশ্চিত করতে আপনাকে আপনার আনলক প্যার্টান অঙ্কন করতে হবে।"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"এনক্রিপ্ট?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"এনক্রিপশন অপারেশন অপরিবর্তনীয় এবং আপনি এটা বিঘ্নিত করলে আপনি ডেটা হারাবেন। এনক্রিপশান হতে ঘন্টা খানেক বা তার বেশি সময় লাগবে, এইসময়ে ট্যাবলেট কয়েকবার পুনর্সূচনা হবে।"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"এনক্রিপশন অপারেশন অপরিবর্তনীয় এবং আপনি এটা বিঘ্নিত করলে আপনি ডেটা হারাবেন। এনক্রিপশান হতে ঘন্টা খানেক বা তার বেশি সময় লাগবে, এইসময়ে ফোন কয়েকবার পুনর্সূচনা হবে।"</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"মুখের সাহায্যে আনলক"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"নিম্ন নিরাপত্তা, পরীক্ষামূলক"</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_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="current_screen_lock" msgid="4104091715420072219">"বর্তমান স্ক্রীন লক"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আর কাজ করবে না৷"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"প্রশাসক, এনক্রিপশান নীতি, অথবা শংসাপত্র সঞ্চয়স্থান দ্বারা অক্ষম"</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_biometric_weak" msgid="3008473624490350142">"মুখের সাহায্যে আনলক"</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_password" msgid="1203938057264146610">"পাসওয়ার্ড"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"আপনি কোনো স্ক্রীন লকের সেট আপ করার পরে, সেটিংস &gt; নিরাপত্তার মধ্যে আপনার আঙুলের ছাপও সেট আপ করতে পারবেন।"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"স্ক্রীন লক বন্ধ করুন"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"আনলক প্যাটার্ন সরান"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"আনলক PIN সরান"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"পাসওয়ার্ডে কমপক্ষে ১টি অক্ষর থাকা আবশ্যক৷"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"পাসওয়ার্ডে কমপক্ষে একটি সংখ্যা থাকা আবশ্যক৷"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"পাসওয়ার্ডে কমপক্ষে একটি চিহ্ন থাকা আবশ্যক।"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"পাসওয়ার্ডে কমপক্ষে ১টি অক্ষর থাকা আবশ্যক৷"</item>
-    <item quantity="other" msgid="8186027808415585970">"পাসওয়ার্ডে কমপক্ষে %d টি অক্ষর থাকা আবশ্যক৷"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"পাসওয়ার্ডে কমপক্ষে ১টি ছোটহাতের অক্ষর থাকা আবশ্যক৷"</item>
-    <item quantity="other" msgid="2693910942679679225">"পাসওয়ার্ডে কমপক্ষে %d টি অক্ষর থাকা আবশ্যক৷"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"পাসওয়ার্ডে কমপক্ষে ১টি বড়হাতের অক্ষর থাকা আবশ্যক৷"</item>
-    <item quantity="other" msgid="3030801209112209245">"পাসওয়ার্ডে কমপক্ষে %dটি বড়হাতের অক্ষর থাকা আবশ্যক৷"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"পাসওয়ার্ডে কমপক্ষে ১টি নিউমেরিক সংখ্যা থাকা আবশ্যক৷"</item>
-    <item quantity="other" msgid="4703982391407595924">"পাসওয়ার্ডে %dটি নিউমেরিক সংখ্যা থাকা আবশ্যক৷"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"পাসওয়ার্ডে কমপক্ষে ১টি বিশেষ চিহ্ন থাকা আবশ্যক৷"</item>
-    <item quantity="other" msgid="1221290525051187757">"পাসওয়ার্ডে কমপক্ষে %dটি বিশেষ চিহ্ন থাকা আবশ্যক৷"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"পাসওয়ার্ডে কমপক্ষে ১টি বর্ণ নয় এমন অক্ষর থাকা আবশ্যক৷"</item>
-    <item quantity="other" msgid="3952508584649046404">"পাসওয়ার্ডে কমপক্ষে %d টি বর্ণ নয় এমন অক্ষর থাকা আবশ্যক৷"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">পাসওয়ার্ডে কমপক্ষে %dটি অক্ষর থাকা আবশ্যক৷</item>
+      <item quantity="other">পাসওয়ার্ডে কমপক্ষে %dটি অক্ষর থাকা আবশ্যক৷</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">পাসওয়ার্ডে কমপক্ষে %dটি ছোটহাতের অক্ষর থাকা আবশ্যক৷</item>
+      <item quantity="other">পাসওয়ার্ডে কমপক্ষে %dটি ছোটহাতের অক্ষর থাকা আবশ্যক৷</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">পাসওয়ার্ডে কমপক্ষে %dটি বড়হাতের অক্ষর থাকা আবশ্যক৷</item>
+      <item quantity="other">পাসওয়ার্ডে কমপক্ষে %dটি বড়হাতের অক্ষর থাকা আবশ্যক৷</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">পাসওয়ার্ডে কমপক্ষে %dটি নিউমেরিক সংখ্যা থাকা আবশ্যক৷</item>
+      <item quantity="other">পাসওয়ার্ডে কমপক্ষে %dটি নিউমেরিক সংখ্যা থাকা আবশ্যক৷</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">পাসওয়ার্ডে কমপক্ষে %dটি বিশেষ চিহ্ন থাকা আবশ্যক৷</item>
+      <item quantity="other">পাসওয়ার্ডে কমপক্ষে %dটি বিশেষ চিহ্ন থাকা আবশ্যক৷</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">পাসওয়ার্ডে কমপক্ষে %dটি বর্ণ নয় এমন অক্ষর থাকা আবশ্যক৷</item>
+      <item quantity="other">পাসওয়ার্ডে কমপক্ষে %dটি বর্ণ নয় এমন অক্ষর থাকা আবশ্যক৷</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"ডিভাইস প্রশাসক একটি সাম্প্রতিক পাসওয়ার্ড ব্যবহার করার অনুমতি দেয় না।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"উর্ধ্বক্রমে, নিম্নক্রমে বা পুনরাবৃত্ত ধারার সংখ্যা নিষিদ্ধ"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ঠিক আছে"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"যুক্ত করুন"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"যুক্ত করুন"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"বাতিল করুন"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"যুক্ত করা থাকলে তা সংযুক্ত থাকাকালীন অবস্থায় আপনার পরিচিতিগুলি এবং কলের ইতিহাসকে অ্যাক্সেস করতে অনুমোদিত করে৷"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সাথে যুক্ত করা যায়নি।"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ভুল PIN বা পাস কী দেওয়ার কারণে <xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সঙ্গে যুক্ত করা যায়নি।"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সঙ্গে যোগাযোগ করতে পারবেন না।"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"যুক্ত করা <xliff:g id="DEVICE_NAME">%1$s</xliff:g> প্রত্যাখ্যান করেছে।"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"অবস্থানের যথার্থতা উন্নত করতে, অ্যাপ্লিকেশান এবং পরিষেবাগুলি Bluetooth বন্ধ থাকার সময়েও Bluetooth ডিভাইসগুলিকে স্ক্যান করবে। আপনি এটিকে <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>স্ক্যানিং সেটিংস<xliff:g id="LINK_END_1">LINK_END</xliff:g> এর মধ্যে পরিবর্তন করতে পারেন।"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"এতে সংযুক্ত করুন..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"মিডিয়া অডিও"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ফোন অডিও"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ফাইল স্থানান্তর"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ইনপুট ডিভাইস"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ইন্টারনেট অ্যাক্সেস"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"পরিচিতি ভাগ করা"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"পরিচিতি ভাগ করার কাজে ব্যবহার করুন"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ইন্টারনেট সংযোগ ভাগ করা হচ্ছে"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"বার্তা অ্যাক্সেস"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"মিডিয়া অডিওতে সংযুক্ত রয়েছে"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ফোন অডিওতে সংযুক্ত"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ফাইল স্থানান্তর সার্ভারের সঙ্গে সংযুক্ত"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"মানচিত্রে সংযুক্ত"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ফাইল স্থানান্তর সার্ভারের সঙ্গে সংযুক্ত নয়"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ইনপুট ডিভাইসে সংযুক্ত"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"মিডিয়া অডিওয়ের জন্য ব্যবহার করুন"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ফোন অডিওয়ের জন্য ব্যবহার করুন"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ফাইল স্থানান্তরের জন্য ব্যবহার করুন"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ইনপুটের জন্য ব্যবহার করুন"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ইন্টারনেট অ্যাক্সেসের জন্য ব্যবহার করুন"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"মানচিত্রের জন্য ব্যবহার করুন"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi সহকারী"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi সহায়ক-এর মাধ্যমে সংযুক্ত হয়েছে"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"স্ক্রীণ কাস্ট করুন"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi বন্ধ করা হচ্ছে..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"ত্রুটি"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"বিমান মোডে"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"নেটওয়ার্কগুলির জন্য স্ক্যান করা যাবে না"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"নেটওয়ার্ক বিজ্ঞপ্তি"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"যখনই কোনো সর্বজনীন নেটওয়ার্ক উপলব্ধ হয় তখন বিজ্ঞপ্তি জানান"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"দুর্বল সংযোগগুলি এড়িয়ে চলুন"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"ভালো ইন্টারনেট সংযোগ না হলে Wi‑Fi ব্যবহার করবেন না"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"শুধুমাত্র ভাল ইন্টারনেট সংযোগ আছে এমন নেটওয়ার্ক ব্যবহার করুন"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"স্ক্যান করা সবসময় উপলব্ধ"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"সবসময় স্ক্যান করার অনুমতি দিন"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google এর অবস্থান পরিষেবা এবং অন্যান্য অ্যাপ্লিকেশানগুলিকে নেটওয়ার্কগুলির খোঁজে স্ক্যান করতে দিন, এমনকি Wi-Fi বন্ধ থাকা অবস্থায়ও"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"উন্মুক্ত Wi‑Fi স্বয়ংক্রিয়ভাবে ব্যবহার করুন"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"কোনো Wi‑Fi সহকারীকে স্বয়ংক্রিয়ভাবে উচ্চ মান হিসাবে নির্ধারিত উন্মুক্ত Wi‑Fi নেটওয়ার্কগুলিতে সংযোগ করতে দিন"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"সহায়ক নির্বাচন করুন"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"শংসাপত্রগুলি ইনস্টল করুন"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"অবস্থান নির্ভুলতা উন্নতি ও অন্যান্য উদ্দ্যেশ্যের জন্য Google এবং অন্যান্য অ্যাপ্লিকেশান কাছাকাছি নেটওয়ার্কগুলির জন্য স্ক্যান করতে পারে  এমনকি Wi-Fi বন্ধ থাকা সত্ত্বেও। আপনি যদি এটি না চান, তাহলে উন্নতিতে, সবসময় স্ক্যান করা উপলব্ধ এ যান।"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"অ্যাপ্লিকেশানগুলি কাছাকাছি নেটওয়ার্কগুলির জন্য স্ক্যান করতে পারে  এমনকি Wi-Fi বন্ধ থাকা সত্ত্বেও। আপনি যদি এটি না চান, তাহলে উন্নতিতে, সবসময় স্ক্যান করা উপলব্ধ এ যান।"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"অবস্থানের যথার্থতা উন্নত করতে, অ্যাপ্লিকেশান এবং পরিষেবাগুলি Wi‑Fi বন্ধ থাকার সময়েও 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="5340097010842405981">"আগ দেখাবেন না"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"আরেকটি নেটওয়ার্ক জুড়ুন"</string>
     <string name="wifi_more" msgid="3195296805089107950">"আরো"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"স্বয়ংক্রিয় সেটআপ (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"সেটআপ সম্পূর্ণ করতে আপনার ট্যাবলেটের Wi‑Fi অ্যাক্সেস করা প্রয়োজন। সেটআপের পর আপনি সেলুলার ডেটা ও Wi‑Fi এর মধ্যে স্যুইচ করতে পারবেন।"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"উন্নত সেটিংগুলি"</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="5940801028985255304">"আপনার রাউটারে Wi‑Fi সুরক্ষিত সেটআপ বোতাম টিপুন। এটিকে \"WPS\" বলা হতে পারে বা এই চিহ্ন সমন্বিত হতে পারে:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"আপনার রাউটারে 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_complete" msgid="2388138550456729134">"WPS সফল হয়েছে। নেটওয়ার্কের সাথে সংযুক্ত হচ্ছে..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi-Fi নেটওয়ার্ক <xliff:g id="NETWORK_NAME">%s</xliff:g> এর সাথে সংযুক্ত"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"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_unchanged" msgid="3410422020930397102">"(অপরিবর্তিত)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(অনির্দিষ্ট)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"সংরক্ষিত"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"অক্ষম হয়েছে"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP কনফিগারেশনের ব্যর্থতা"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi সংযোগের ব্যর্থতা"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"প্রমাণীকরণ সমস্যা"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"পরিসরের মধ্যে নয়"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"কোনো ইন্টারনেট অ্যাক্সেস শনাক্ত হয়নি, স্বয়ংক্রিয়ভাবে পুনরায় সংযোগ স্থাপন করবে না৷"</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_security_none" msgid="7985461072596594400">"কোনো কিছুই নয়"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"এই নেটওয়ার্কে কোন ইন্টারনেট অ্যাক্সেস নেই৷ যাইহোক এই নেটওয়ার্কটি ব্যবহার করতে চান?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"এই নেটওয়ার্কের জন্য আবার জিজ্ঞাসা করবেন না"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"সংযুক্ত করুন"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"নেটওয়ার্কের সাথে সংযোগ করতে ব্যর্থ হয়েছে"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ভুলে যান"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK পোর্টেবল Wi‑Fi হটস্পট"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> পোর্টেবল  Wi‑Fi হটস্পট"</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_mode_title" msgid="2164073796253284289">"কলিং পছন্দ"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi কলিং মোড"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi ব্যবহার করুন"</item>
+    <item msgid="5267397515594230396">"পছন্দের মোবাইল নেটওয়ার্ক"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"২"</item>
+    <item msgid="1171822231056612021">"১"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi কলিং চালু থাকার সময়ে, আপনার পছন্দ এবং কোন সিগন্যাল বেশী শক্তিশালী তার উপর নির্ভর করে আপনার ফোন Wi-Fi নেটওয়ার্ক বা আপনার পরিষেবা প্রদানকারীর নেটওয়ার্কের মাধ্যমে আপনার কলের রুট তৈরি করে। এই বৈশিষ্ট্যটি চালু করার আগে, আপনার পরিষেবা প্রদানকারীর কাছে ফি-গুলি এবং অন্যান্য বিশদ বিবরণ সম্বন্ধে পরীক্ষা করুন।"</string>
     <string name="home_settings" msgid="212375129455718176">"হোম"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"প্রদর্শন"</string>
     <string name="sound_settings" msgid="5534671337768745343">"শব্দ"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"থিম"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"হাল্কা করে"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"গাঢ়"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"স্বয়ংক্রিয়"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"পছন্দের SIM কার্ড আপডেট করবেন?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"আপনার ডিভাইসে শুধুমাত্র <xliff:g id="NEW_SIM">%1$s</xliff:g> SIMটি রয়েছে৷ আপনি কি মোবাইল ডেটা, কল এবং SMS বার্তাগুলির জন্য এই SIMটি ব্যবহার করতে চান?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ভুল সিম PIN কোড, আপনার ডিভাইসটি আনলক করতে এখন আপনাকে অবশ্যই আপনার ক্যারিয়ারের সাথে যোগাযোগ করতে হবে৷"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"ভুল সিম পিন কোড, আপনার কাছে আর <xliff:g id="NUMBER">%d</xliff:g>টি প্রচেষ্টা বাকি রয়েছে, তার পরে আপনার ডিভাইসটি আনলক করতে আপনাকে অবশ্যই আপনার ক্যারিয়ারের সাথে যোগাযোগ করতে হবে৷"</item>
-    <item quantity="other" msgid="77103619544346451">"ভুল সিম পিন কোড, আপনার কাছে আর <xliff:g id="NUMBER">%d</xliff:g> বার চেষ্টা করতে পারবেন৷"</item>
-  </plurals>
+    <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>
+    </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="default" msgid="475872867864762157">"ফোন স্থিতি"</string>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"অ্যাপ্লিকেশানগুলি (অ্যাপ্লিকেশান তথ্য ও মিডিয়া সামগ্রী)"</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_dcim_usage" msgid="558887013613822577">"ছবি, ভিডিওগুলি"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"অডিও (সঙ্গীত, রিংটোন, পডকাস্ট, ইত্যাদি)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"বিবিধ"</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="default" msgid="6915293408836853020">"SD কার্ড আনমাউন্ট করুন"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"মাউন্ট করা"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"বের করে নিন"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"মুছুন এবং ফর্ম্যাট করুন"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"মুছে ফেলুন এবং অভ্যন্তরীণ সঞ্চয়স্থান হিসাবে ফর্ম্যাট করুন"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB কম্পিউটার সংযোগ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB কম্পিউটার সংযোগ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"হিসাবে সংযুক্ত করুন"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows এ অথবা Android ফাইল স্থানান্তর ব্যবহার করে Mac এ মিডিয়া ফাইলগুলি স্থানান্তর করতে দেয় (www.android.com/filetransfer দেখুন)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"ক্যামেরা (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"আপনাকে ক্যামেরা সফ্টওয়্যার ব্যবহার করে ফটো স্থানান্তর, এবং MTP সমর্থন করে না এমন কম্পিউটারে যে কোনো ফাইল স্থানান্তর করতে দেয়"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ফাইল স্থানান্তর সরঞ্জাম ইনস্টল করুন"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI সক্ষমিত অ্যাপ্লিকেশানগুলিকে আপনার কম্পিউটারে MIDI সফ্টওয়্যারের সঙ্গে USB এর সাথে কাজ করতে দেয়৷"</string>
     <string name="storage_other_users" msgid="808708845102611856">"অন্য ব্যবহারকারীরা"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ডিভাইসের সঞ্চয়স্থান"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"মোছা যায় এমন সঞ্চয়স্থান"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> বিনামূল্যে (মোট <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> মাউন্ট করা হয়েছে"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> ফর্ম্যাট করা যায়নি"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"সঞ্চয়স্থানের পুনঃনামকরণ করুন"</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="3677827796634199714"><b>"যখন আপনি এই <xliff:g id="NAME_0">^1</xliff:g> সরিয়ে দেবেন, তখন এতে সঞ্চিত অ্যাপ্লিকেশানগুলি কাজ করা বন্ধ করে দেবে, এবং এতে সঞ্চিত মিডিয়া ফাইলগুলি এটি পুনরায় না ঢোকানো পর্যন্ত উপলব্ধ হবে না৷"</b>" \n\nএই <xliff:g id="NAME_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_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_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="1259216693690378749">"ফর্ম্যাট করার সময় <xliff:g id="NAME">^1</xliff:g> সরাবেন না৷"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ডেটা নতুন সঞ্চয়স্থানে সরান"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"আপনি এই নতুন <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="5035719146373359329"><b>"এটি সরাতে প্রায় <xliff:g id="TIME">^1</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="8641916179067596592">"সরানোর সময়: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> সরান"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"সরানোর সময় <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="battery_status_title" msgid="9159414319574976203">"ব্যাটারি স্থিতি"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ব্যাটারি স্তর"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNগুলি"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"নেটওয়ার্ক সেটিংস পুনরায় সেট করা"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"এটি \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="4874737348054213767">"সমস্ত নেটওয়ার্ক সেটিংস পুনরায় সেট করবেন? আপনি এই প্রক্রিয়াটি পূর্বাবস্থায় ফেরাতে পারবেন না!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"সেটিংস পুনরায় সেট করুন"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"পুনরায় সেট করবেন?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"নেটওয়ার্ক সেটিংস পুনরায় সেট করা হয়েছে"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"ডিভাইসটি পুনরায় সেট করুন"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ফ্যাক্টরি ডেটা পুনরায় সেট করুন"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"ট্যাবলেটের সমস্ত ডেটা মুছে দেয়"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"ফোনের সমস্ত ডেটা মুছে দেয়"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"এটি আপনার ট্যাবলেটের "<b>"অভ্যন্তরীণ সঞ্চয়স্থান"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশান ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশানগুলি"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"এটি আপনার ফোনের "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD কার্ডের সমস্ত তথ্য মুছে দিন, যেমন সঙ্গীত এবং ফটো"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ট্যাবলেট পুনরায় সেট করুন"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ফোন পুনরায় সেট করুন"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"আপনার সমস্ত ব্যক্তিগত ডেটা এবং ডাউনলোড করা অ্যাপ্লিকেশানগুলি মুছে দিতে চান? আপনি পদক্ষেপটি আর বাতিল করতে পারবেন না!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"আপনার সমস্ত ব্যক্তিগত তথ্য এবং ডাউনলোড করা অ্যাপ্লিকেশানগুলি মুছে দিতে চান? আপনি এই প্রক্রিয়াটি পূর্বাবস্থায় ফেরাতে পারবেন না!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"সবকিছু মুছে দিন"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ফ্যাক্টরি ডেটা রিসেট নিশ্চিত করতে আপনাকে আপনার আনলক প্যাটার্ন অঙ্কন করতে হবে।"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"সিস্টেম সাফ করুন পরিষেবাটি উপলব্ধ না থাকার কারণে কোনো পুনরায় সেট করুন নির্দেশ সঞ্চালনা করা যায়নি।"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"পুনরায় সেট করবেন?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"এই ব্যবহারকারীর জন্য ফ্যাক্টরি রিসেট উপলব্ধ নেই"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB সঞ্চয়স্থান মুছে দেবেন? এর ফলে এতে সঞ্চিত সমস্ত ফাইল মুছে যাবে। আপনি পদক্ষেপটি আর বাতিল করতে পারবেন না!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD কার্ড মুছবেন? এর ফলে তাতে সঞ্চিত সমস্ত ফাইল মুছে যাবে। আপনি পদক্ষেপটি আর বাতিল করতে পারবেন না!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"সবকিছু মুছে দিন"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"আপনি USB সঞ্চয়স্থান নিশ্চিহ্ন করতে চান তা নিশ্চিত করতে আপনাকে আপনার আনলক প্যাটার্ন আঁকতে হবে।"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"আপনি যে SD কার্ড মুছতে চান তা নিশ্চিত করতে আপনাকে আপনার আনলক প্যাটার্ন অঙ্কন করতে হবে।"</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"সহায়তা"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"সেলুলার নেটওয়ার্কগুলি"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"মোবাইল প্ল্যান"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"ডিফল্ট 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"অবস্থান মোড"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"অবস্থান নির্ণয় করার জন্য GPS, Wi‑Fi ও সেলুলার নেটওয়ার্ক ব্যবহার করুন"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"অবস্থান নির্ণয় করার জন্য Wi‑Fi ও সেলুলার নেটওয়ার্ক ব্যবহার করুন"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"আপনার অবস্থান নির্ণয় করতে GPS ব্যবহার করুন"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"অবস্থান নির্ণয় করতে GPS ব্যবহার করুন"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"স্ক্যান করা হচ্ছে"</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="2070686681074461301">"অ্যাপ্লিকেশান এবং পরিষেবাগুলিকে এমনকি Wi‑Fi বন্ধ থাকার অবস্থায়ও, নেটওয়ার্ক স্ক্যান করার অনুমতি দেওয়ার মাধ্যমে অবস্থান উন্নত করুন"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth স্ক্যানিং"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"সিস্টেমের পরিষেবাগুলিকে Bluetooth বন্ধ থাকার সময়েও Bluetooth ডিভাইসগুলিকে স্ক্যান করার অনুমতি দেওয়ার মাধ্যমে অবস্থান উন্নত করুন"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi ও সেলুলার নেটওয়ার্ক অবস্থান"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"দ্রুত আপনার অবস্থান নির্ধারণ করতে অ্যাপ্লিকেশানগুলিকে Google অবস্থান পরিষেবা ব্যবহার করতে দিন। বেনামী অবস্থান ডেটা সংগ্রহ করা হবে এবং Google এ পাঠানো হবে।"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi দ্বারা অবস্থান নির্ণয় করা হয়েছে"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"স্ক্রীন সুরক্ষা"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"অবিরত করতে আপনার ডিভাইসের প্যাটার্ন ব্যবহার করুন৷"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"অবিরত করতে আপনার ডিভাইসের PIN লিখুন৷"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"অবিরত করতে আপনার ডিভাইসের পাসওয়ার্ড লিখুন৷"</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_need_to_unlock" msgid="757935356911054465">"সংরক্ষিত প্যাটার্ন নিশ্চিত করুন"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"আবার চেষ্টা করুন:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"বেশ কয়েকবার ভুল প্রচেষ্টা!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> সেকেন্ডের মধ্যে আবার চেষ্টা করুন।"</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="manageapplications_settings_title" msgid="7041951105633616745">"অ্যাপ্লিকেশনগুলি পরিচালনা করুন"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ইনস্টল করা অ্যাপ্লিকেশানগুলি পরিচালনা করুন ও সরান"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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="runningservices_settings_title" msgid="8097287939865165213">"চলমান পরিষেবাগুলি"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ট্যাবলেট তথ্য"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ফোন তথ্য"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"ব্যাটারি তথ্য"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"দ্রুত লঞ্চ"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"অ্যাপ্লিকেশানগুলি লঞ্চ করতে কীবোর্ড শর্টকাট সেট করুন"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"অ্যাপ্লিকেশান হস্তান্তর করুন"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"কোনো শর্টকাট নেই"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"অনুসন্ধান + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"সাফ করুন"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) এর জন্য আপনার শর্টকাট সাফ করা হবে।"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ঠিক আছে"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"বাতিল"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"অ্যাপ্লিকেশানগুলি"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"শর্টকাটগুলি"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"একটি ফাইলে সব bluetooth HCI প্যাকেট ক্যাপচার করুন"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM আনলক করা হচ্ছে"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"বুট-লোডার আনলক করার অনুমতি দিন"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"আপনার PIN লিখুন"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM আনলক সক্ষম করতে ডিভাইস PIN লিখুন"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM আনলক করার অনুমতি দিতে চান?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"সতর্কতা: এই ডিভাইসে সেটিংটি চালু থাকা অবস্থায় ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি কাজ করবে না৷"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"লগার বাফারের আকারগুলি"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"লগ বাফার প্রতি অপেক্ষাকৃত বড় আকারগুলির নির্বাচন করুন"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"নকল অবস্থানের মঞ্জুরি দিন"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"মক অবস্থানগুলি মঞ্জুর করুন"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"অ্যাট্রিবিউট পরিদর্শন দেখা সক্ষম করুন"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"নেটওয়ার্কিং"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ওয়্যারলেস ডিসপ্লে সার্টিফিকেশন"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi ভারবোস লগিং সক্ষম করুন"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi থেকে সেলুলারে তৎপর পরিবর্তন"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"সর্বদা Wifi রোম স্ক্যানকে অনুমতি দিন"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"লেগাসি DHCP ক্লায়েন্ট ব্যবহার করুন"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ওয়্যারলেস প্রদর্শন সার্টিফিকেশন জন্য বিকল্পগুলি দেখান"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi লগিং স্তর বাড়ান, Wi‑Fi চয়নকারীতে SSID RSSI অনুযায়ী দেখান"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"সক্ষম করা থাকলে, নিম্নমানের Wi‑Fi সিগন্যালের ক্ষেত্রে, সেলুলার-এ ডেটা সংযোগ প্রদান করতে Wi‑Fi আরো বেশি শক্তিশালীভাবে কাজ করবে"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"ইন্টারফেসে উপস্থিত ডেটা ট্রাফিকের পরিমাণের উপরে ভিত্তি করে Wi‑Fi রোম স্ক্যানকে অনুমোদিত/অননুমোদিত করুন"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"লগার বাফারের আকারগুলি"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"লগ বাফার প্রতি অপেক্ষাকৃত বড় আকারগুলির নির্বাচন করুন"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB কনফিগারেশন নির্বাচন করুন"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB কনফিগারেশন নির্বাচন করুন"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"নকল অবস্থানের মঞ্জুরি দিন"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"মক অবস্থানগুলি মঞ্জুর করুন"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"অ্যাট্রিবিউট পরিদর্শন দেখা সক্ষম করুন"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"নতুন Android DHCP ক্লায়েন্টের পরিবর্তে Lollipop এর থেকে DHCP ক্লায়েন্ট ব্যবহার করুন৷"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB ডিবাগিং মঞ্জুর করবেন?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB ডিবাগিং কেবলমাত্র বিকাশ করার উদ্দেশ্যে। আপনার কম্পিউটার এবং আপনার ডিভাইসের মধ্যে ডেটা অনুলিপি করতে এটি ব্যবহার করুন, বিজ্ঞপ্তি ছাড়া আপনার ডিভাইসে অ্যাপ্লিকেশানগুলি ইনস্টল করুন এবং ডেটা লগ পড়ুন।"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"আপনি আগে যে সব কম্পিউটার USB ডিবাগিং এর অ্যাক্সেসের অনুমতি দিয়েছিলেন তা প্রত্যাহার করবেন?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"রাণী রঙ"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ব্যবহার করবেন?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> কে এটি করতে হবে:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"একটি অ্যাপ্লিকেশান কোনো অনুমোদনের অনুরোধকে অস্পষ্ট করছে, তাই সেটিংস আপনার প্রতিক্রিয়া যাচাই করতে পারেনি৷"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"আপনি যদি <xliff:g id="SERVICE">%1$s</xliff:g> চালু করেন, তাহলে ডেটা এনক্রিপশান উন্নত করতে আপনার ডিভাইস আপনার স্ক্রীন লক ব্যবহার করবে না৷"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"যেহেতু আপনি অ্যাক্সেসযোগ্যতা পরিষেবা চালু করেছেন, তাই ডেটা এনক্রিপশান উন্নত করতে আপনার ডিভাইস আপনার স্ক্রীন লক ব্যবহার করবে না৷"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"কারণ <xliff:g id="SERVICE">%1$s</xliff:g> চালু করলে সেটি ডেটা এনক্রিপশন প্রভাবিত করে, আপনাকে আপনার প্যাটার্ন নিশ্চিত করতে হবে।"</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> অ্যাপ্লিকেশানগুলি অতিক্রান্ত সময় <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="TOTALRAM">%2$s</xliff:g> এর <xliff:g id="USEDRAM">%1$s</xliff:g> ব্যবহৃত হয়েছে <xliff:g id="TIMEDURATION">%3$s</xliff:g> সময়ে"</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_memory_status" msgid="4251599550196193093">"বর্তমান ডিভাইস মেমরি হল <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM এর গড় ব্যবহার"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM এর সর্বোচ্চ ব্যবহার"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"প্রক্রিয়াগুলি"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"পরিষেবাগুলি"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"সময়কাল"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"মেমরির বিশদ বিবরণ"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"সিস্টেম লুকান"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ওভাররাইড অ্যাপ্লিকেশান সেটিংসের নীচের ডিফল্ট সেটিংস"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"ডিফল্ট সেটিংস"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"ডিফল্ট ইঞ্জিন"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"কথ্য পাঠ্যের জন্য ব্যবহৃত হবে এমন বিবৃতি সংশ্লেষণ ইঞ্জিন সেট করে"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"উচ্চারিত পাঠ্যের জন্য স্পীচ সংশ্লেষণ ইঞ্জিনের ব্যবহার সেট করুন"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"ভাষ্য হার"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"যে গতিতে পাঠ্য উচ্চারিত হয়"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"পিচ"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"ক্রেডেনশিয়াল ইনস্টলেশন নিশ্চিত করতে আপনাকে আপনার আনলক প্যার্টান অঙ্কন করতে হবে।"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"প্রমাণপত্রাদির সঞ্চয়স্থানের জন্য পাসওয়ার্ডটি টাইপ করুন।"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"বর্তমান পাসওয়ার্ড:"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"কোনো অ্যাকাউন্ট বর্তমানে ব্যাক আপ ডেটা সংরক্ষণ করছে না"</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="5355557151569037197">"ব্যাকআপ পরিষেবা নিষ্ক্রিয় রয়েছে৷"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"এটি আপনার ডিভাইস নীতির অনুসারে সেট করা হয়৷"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ডেস্কটপ ব্যাকআপ পাসওয়ার্ড"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ডেস্কটপ পূর্ণ ব্যাকআপ বর্তমানে সুরক্ষিত নয়"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ডেস্কটপ পুরো ব্যাকআপের জন্য পাসওয়ার্ড পরিবর্তন বা মুছে ফেলার জন্য স্পর্শ করুন"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"ট্র্যানজিশন অ্যানিমেশন স্কেল"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"অ্যানিমেটর সময়কাল স্কেল"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"গৌণ প্রদর্শনগুলি নকল করুন"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"একাধিক উইন্ডো মোড"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"একই সময়ে স্ক্রীনে একাধিক কার্যকলাপ৷"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"একাধিক উইন্ডো মোড সক্ষম করবেন?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"সতর্কতা: এটি হল একটি উচ্চ পরীক্ষামূলক বৈশিষ্ট্য যা সাম্প্রতিক অ্যাপ্লিকেশানগুলির UI মাধ্যমে একই সময়ে স্ক্রীনে একাধিক কার্যকলাপের মঞ্জুরি দেয়৷ এই বৈশিষ্ট্যটি ব্যবহার করার সময় কিছু অ্যাপ্লিকেশান ক্র্যাশ করতে পারে বা সঠিক ভাবে কাজ নাও করতে পারে৷"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"অ্যাপ্লিকেশানগুলি"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"কার্যকলাপ রাখবেন না"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ব্যবহারকারী এটি ছেড়ে যাওয়ার পরে যত তাড়াতাড়ি সম্ভব প্রতিটি কার্যকলাপ ধ্বংস করুন"</string>
@@ -2195,7 +2251,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="718192651887726259">"আপনি একাধিক ব্যবহারকারী তৈরি করে অন্যদের সাথে এই ডিভাইস শেয়ার করতে পারেন। প্রতিটি ব্যবহারকারী তাদের নিজস্ব স্থান রয়েছে যা তারা অ্যাপ্লিকেশান, ওয়ালপেপার, এবং আরো অনেক কিছু দিয়ে কাস্টমাইজ করতে পারেন। ব্যবহারকারীরা 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"ফোন কলের অনুমতি দিন"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"ফোন কল ও SMS এর অনুমতি দিন"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"ফোন কলগুলিকে চালু করুন"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"ফোন কলগুলিকে এবং SMS চালু করবেন?"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"ব্যবহারকারী সরান"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"ফোন কলের অনুমতি দিবেন?"</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_sms_confirm_title" msgid="188164598768941316">"ফোন কল এবং SMS এর অনুমতি দিবেন?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"কল ও SMS ইতিহাস এই ব্যবহারকারীর সাথে ভাগ করা হবে।"</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="application_restrictions" msgid="8207332020898004394">"অ্যাপ্লিকেশান এবং সামগ্রীর অনুমতি দিন"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"সীমাবদ্ধ সহ অ্যাপ্লিকেশানগুলি"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"অ্যাপ্লিকেশানের জন্য সেটিংস প্রসারিত করুন"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"এই অ্যাপ্লিকেশানটি সীমাবদ্ধযুক্ত প্রোফাইলগুলিতে সমর্থিত নয়"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi নেটওয়ার্ক সংযোগ"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"পাঠ্য বার্তা পাঠ্য রচনা বার্তাগুলি বার্তালাপ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"সেলুলার ফোন ক্যারিয়ার ওয়্যারলেস ডেটা 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi এর দ্বারা কল হচ্ছে"</string>
     <string name="keywords_home" msgid="3626170808219458848">"লঞ্চার"</string>
     <string name="keywords_display" msgid="6709007669501628320">"স্ক্রীন টাচস্ক্রীন"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"হালকা আলো টাচস্ক্রীন ব্যাটারি"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"হালকা আলো টাচস্ক্রীন ব্যাটারি"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"পটভূমি ব্যক্তিগতকৃত কাস্টমাইজ প্রদর্শন"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"গাঢ় থিম রাত মোড অস্পষ্ট স্ক্রীন বিপরীতমুখী উজ্জ্বলতা"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"পটভূমি ব্যক্তিগতকৃত কাস্টমাইজ প্রদর্শন"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"পাঠ্য আকার"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"অভিক্ষেপ করুন"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"প্রকল্প কাস্ট"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"স্থান ডিস্ক হার্ড ড্রাইভ ডিভাইস ব্যবহার"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"পাওয়ার ব্যবহার চার্জ"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"বানান অভিধান বানান-পরীক্ষা স্বতঃ-সংশোধন"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"অ্যাকাউন্ট"</string>
     <string name="keywords_users" msgid="4673901601478559100">"বাধানিষেধ বাধানিষেধ আরোপ করা বাধানিষেধযুক্ত"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"পাঠ্য সংশোধন সঠিক শব্দ স্পন্দন স্বয়ং ভাষা অঙ্গভঙ্গি প্রস্তাব প্রস্তাবনা থিম আপত্তিজনক শব্দ লেখা ইমোজি অন্তর্জাতিক"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"পছন্দগুলিকে ডিফল্ট অনুযায়ী পুনরায় সেট করুন"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"জরুরি আইস অ্যাপ্লিকেশন ডিফল্ট"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"অ্যাপ্লিকেশানগুলি ডাউনলোড করার অ্যাপ্লিকেশান সিস্টেম"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"অ্যাপ্লিকেশান অনুমতিগুলির নিরাপত্তা"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"অ্যাপ্লিকেশান ডিফল্ট"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"পাসওয়ার্ড প্যাটার্ন PIN স্লাইড করুন"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ট্যাগ সেটআপ করুন"</string>
     <string name="write_tag" msgid="8571858602896222537">"লিখুন"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"কল ও ম্যাসেজ আটকান"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"যখন কল এবং বিজ্ঞপ্তিগুলি আসবে"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"সর্বদা বাধা দিন"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"শুধুমাত্র প্রাধান্য কল ও ম্যাসেজ কখন কখন আটকানোর অনুমতি দিন"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"বাধা দেবেন না"</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_option_important_interruptions" msgid="3903928008177972500">"শুধুমাত্র অগ্রাধিকার"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"শুধুমাত্র অ্যালার্মগুলি"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"কোনো বাধা নেই"</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="ringtone_title" msgid="5379026328015343686">"ফোন রিংটোন"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"বিজ্ঞপ্তির ডিফল্ট রিংটোন"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"এছাড়াও কল এলে স্পন্দিত করুন"</string>
@@ -2416,60 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"কম্পন"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"বিজ্ঞপ্তির অ্যাক্সেস"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"অ্যাপ্লিকেশানগুলি বিজ্ঞপ্তি পড়তে পারে না"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%dটি অ্যাপ্লিকেশান বিজ্ঞপ্তি পড়তে পারে"</item>
-    <item quantity="other" msgid="980049191810249052">"%dটি অ্যাপ্লিকেশান বিজ্ঞপ্তি পড়তে পারে"</item>
-  </plurals>
+    <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="2767405417723149879">"কোন বিজ্ঞপ্তি শ্রোতা ইনস্টল করা নেই।"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> সক্ষম করবেন?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"পরিচিতি নাম এবং আপনার কাছে পাঠানো বার্তাগুলির মতো ব্যক্তিগত তথ্য থাকতে পারে এমন যে কোনো অ্যাপ্লিকেশান দ্বারা অথবা সিস্টেম দ্বারা পোস্ট করা সমস্ত বিজ্ঞপ্তি <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> পড়তে পারবে। এটি এইসব বিজ্ঞপ্তি বা স্পর্শ ক্রিয়া বোতামগুলির মধ্যে খারিজ করতে পারবে।"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"শর্ত প্রদানকারী"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"কোনো অ্যাপ্লিকেশান শর্ত প্রদান করছে না"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for manage_condition_providers_summary_nonzero:other (358057362115673258) -->
-    <string name="no_condition_providers" msgid="6183782892066424125">"কোনো শর্ত প্রদানকারী ইনস্টল করা নেই৷"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> সক্ষম করবেন?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> বিরক্ত করবেন না মোডে প্রস্থান শর্তগুলি যোগ করতে পারবে৷"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"অ্যাপ্লিকেশানগুলি লোড করা হচ্ছে..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"অবরুদ্ধ করুন"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"সমস্ত অবরুদ্ধ করুন"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"এই অ্যাপ্লিকেশান থেকে কখনোই বিজ্ঞপ্তিগুলি দেখাবেন না"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"অগ্রাধিকার"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"বিজ্ঞপ্তিগুলিকে তালিকার শীর্ষে দেখান এবং ডিভাইসকে শুধুমাত্র প্রাধান্য পাওয়া কল ও ম্যাসেজ আটকান সেট করা থাকলে বিজ্ঞপ্তিগুলিকে আসতে দিন"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"সংবেদনশীল"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"ডিভাইস লক করা থাকলে, এই অ্যাপ্লিকেশানের বিজ্ঞপ্তি থেকে যেকোনো সংবেদনশীল বিষয়বস্তু লুকান"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"অগ্রাধিকার হিসেবে বিবেচনা করুন"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"যখন \'বিরক্ত করবেন না\' কে শুধুমাত্র অগ্রাধিকার এ সেট করা থাকবে তখন অ্যাপ্লিকেশান বিজ্ঞপ্তিকে বাজার অনুমতি দিন"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"বেছে নেওয়ার অনুমতি দিন"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"বর্তমান স্ক্রীনে নির্দিষ্ট বিজ্ঞপ্তিগুলিকে দর্শনের মধ্যে সংক্ষিপ্ত সময়ের মধ্যে স্লাইড করার দ্বারা, অ্যাপ্লিকেশানটিকে সেগুলির উপর বেশি গুরুত্ব দিতে দিন"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"সংবেদনশীল সামগ্রী লুকান"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"ডিভাইসটি লক করা থাকলে, এই অ্যাপ্লিকেশান বিজ্ঞপ্তির মধ্যে, ব্যক্তিগত তথ্য প্রকাশ করতে পারে এমন সামগ্রী লুকান"</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="zen_mode_default_option" msgid="6940069025071935243">"যতক্ষণ না আপনি এটি বন্ধ করছেন"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"প্রাধান্য পাওয়া কল ও ম্যাসেজ আটকান"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ডাউনটাইম"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"দিন"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"কোনো কিছুই নয়"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"বাধাগুলি অনুমোদিত রয়েছে"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"শুধুমাত্র অগ্রাধিকার"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"একবারও না"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"অটোমেশন"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"স্বয়ংক্রিয়ভাবে চালু"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"নিয়মের নাম"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"নিয়ম যোগ করুন"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"নিয়ম মুছুন"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<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="3201273040477861538">"সময়সূচীর নিয়ম"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"নিয়ম খুঁজে পাওয়া যায়নি৷"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"কখনও নয়"</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_from" msgid="1033337300289871697">"এর থেকে কলগুলি/বার্তাগুলি"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"যে কেউ"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"শুধুমাত্র পরিচিতিগুলি"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"শুধুমাত্র তারকাচিহ্নিত পরিচিতিগুলি"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"ইভেন্ট এবং অনুস্মারকগুলি"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"অ্যালার্ম সর্বদা আপনাকে আপনার আগ্রাধিকার কাজ সম্পর্কে স্মরণ করিয়ে দেয়।"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"অ্যালার্মগুলি"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"অনুস্মারকগুলি"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ইভেন্টগুলি"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"নির্বাচিত কলারগুলি"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"কলারগুলির পুনরাবৃত্তি করুন"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"যদি একই ব্যক্তি <xliff:g id="MINUTES">%d</xliff:g> মিনিটের মধ্যে দ্বিতীয়বার কলগুলি করেন, তবে এটি অনুমোদন করুন"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"স্বয়ংক্রিয়ভাবে চালু"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"কখনও নয়"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> পরের দিন"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> বা কোনো অ্যালার্ম বাজার পূর্বে"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"বাধাগুলি"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"যখন কল এবং বিজ্ঞপ্তিগুলি আসবে"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"আপনি কখন বাধা দিতে চান?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"কতক্ষণ ধরে?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"সর্বদা বাধা দিন"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"বন্ধ,সব,সবকিছু"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"শুধুমাত্র প্রাধান্য বাধাগুলিকে অনুমতি দিন"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"শুধুমাত্র অ্যালার্মগুলিকে অনুমতি দিন"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"বাধা দেবেন না"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"অনির্দিষ্টভাবে"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <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="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"শুধুমাত্র অনির্দিষ্টকালের জন্য অগ্রাধিকার বিজ্ঞপ্তিগুলি পরিবর্তন করুন"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"শুধুমাত্র অনির্দিষ্টকালের জন্য অ্যালার্মগুলি পরিবর্তন করুন"</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>
+    </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>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"অনির্দিষ্টকালের বাধা না দেওয়াতে পরিবর্তন করুন"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_always" msgid="6172985102689237703">"সর্বদা বাধা দেওয়াতে পরিবর্তন করুন"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"সব সময়"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"অ্যাপ বিজ্ঞপ্তিগুলি"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"বিজ্ঞপ্তির সেটিংস"</string>
     <string name="device_feedback" msgid="3238056036766293294">"এই ডিভাইসের সম্পর্কে মতামত পাঠান"</string>
@@ -2510,4 +2629,63 @@
     <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="2184141780491382435">"ডিফল্ট রূপে লঞ্চ করুন"</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="app_launch_domain_links_title" msgid="458956710410857777">"ডোমেনের লিঙ্কগুলি"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"ডোমেনের URLগুলি খুলুন"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"অ্যাপ্লিকেশানটিকে সরাসরি ডোমেনের URLগুলি খোলার মঞ্জুরি দিন"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"সমর্থিত ডোমেনের URLগুলি"</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="410824961149037234">"অভ্যন্তরীণ মেমরি"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"বহিরাগত মেমরি"</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="notifications_enabled" msgid="6983396130566021385">"চালু আছে"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"অবরুদ্ধ করুন"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"সংবেদনশীল"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"অগ্রাধিকার"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"অগ্রাধিকার এবং সংবেদনশীল"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <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="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_3">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_2">%d</xliff:g>টির অনুমতি মঞ্জুরিপ্রাপ্ত</item>
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_2">%d</xliff:g>টির অনুমতি মঞ্জুরিপ্রাপ্ত</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"কিছু ডিফল্ট সেট করা রয়েছে"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"কোনো ডিফল্ট সেট করা নেই"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"সমস্ত অ্যাপ্লিকেশান"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"সক্ষমিত"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"ব্যক্তিগত"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"কাজ"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"অবরুদ্ধ রয়েছে"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"অগ্রাধিকার"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"সংবেদনশীল"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ডোমেনের URLগুলি সহ"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"প্রশাসক দ্বারা অক্ষমিত"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"উন্নত"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"অজানা অ্যাপ্লিকেশান"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"প্রোফাইল বেছে নিন"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"অ্যাপ্লিকেশানের অনুমতি"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%d</xliff:g>টি অ্যাপ্লিকেশান অতিরিক্ত অ্যাক্সেস মঞ্জুরিপ্রাপ্ত"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%d</xliff:g>টি অ্যাপ্লিকেশান মঞ্জুরিপ্রাপ্ত"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"ডোমেনের URLগুলি"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"কোনো ডোমেনের URL খুলবেন না"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' খুলুন"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' এবং সম্পর্কিত URLগুলি খুলুন"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g>টি অ্যাপ্লিকেশান তার ডোমেনের URLগুলি খুলতে পারে</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>টি অ্যাপ্লিকেশান তার ডোমেনের URLগুলি খুলতে পারে</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"স্বীকৃত নয়"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ডিফল্ট অ্যাপ্লিকেশানগুলি"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ব্রাউজার অ্যাপ্লিকেশান"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"কোনো ডিফল্ট ব্রাউজার নেই"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ডিফল্ট)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"অ্যাপ্লিকেশানের সঞ্চয়স্থান"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index ad501bc..05b6569 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Botó per prémer"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"silenciar el micròfon o activar-ne el so"</item>
     <item msgid="1148142988678569310">"projectar fitxers multimèdia"</item>
     <item msgid="9130014005474445273">"activa la VPN"</item>
+    <item msgid="1165192162975045562">"fons de pantalla d\'escriptura"</item>
+    <item msgid="7129487923652967258">"estructura d\'assistència"</item>
+    <item msgid="1069023208100114540">"captura de pantalla d\'assistència"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicació"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Silenciar el micròfon o activar-ne el so"</item>
     <item msgid="5906017727368097853">"Projectar fitxers multimèdia"</item>
     <item msgid="2486614710846178542">"Activa la VPN"</item>
+    <item msgid="5586547561693629602">"Fons de pantalla d\'escriptura"</item>
+    <item msgid="32794179825485062">"Estructura d\'assistència"</item>
+    <item msgid="7872852746938272552">"Captura de pantalla d\'assistència"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curt"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"baixa"</item>
     <item msgid="4212263919458209842">"molt baixa"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desactivat"</item>
-    <item msgid="5656544177755411222">"Interrupcions limitades"</item>
-    <item msgid="8735337502532332056">"Cap interrupció"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderada"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Vermell"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (protocol de transferència de fitxers multimèdia)"</item>
+    <item msgid="8856820259201251036">"PTP (protocol de transferència d\'imatges)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Font d\'àudio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 809f30e..6da6095 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Permet"</string>
     <string name="deny" msgid="6947806159746484865">"Denega"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconegut"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Ara només et queda <xliff:g id="STEP_COUNT">%1$d</xliff:g> pas per convertir-te en desenvolupador"</item>
-    <item quantity="other" msgid="6722953419953594148">"Ara només et queden <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos per convertir-te en desenvolupador"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Ara només et queden <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos per convertir-te en desenvolupador.</item>
+      <item quantity="one">Ara només et queda <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> pas per convertir-te en desenvolupador.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ara ja ets un desenvolupador"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No és necessari, ja ets un desenvolupador"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Connexions sense fil i xarxes"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Desactiva SMS a través d\'IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"És necessari activar el registre de MI"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"És necessari desactivar el registre de MI"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Activa la marca VoLTE subministrada"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Desactiva la marca VoLTE subministrada"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Activa l\'abocament de ram lte"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Desactiva l\'abocament de ram lte"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visualitza la llibreta d\'adreces de la SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emissió"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vols desactivar el perfil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Aquesta acció desactivarà:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Connectat"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connectats (sense telèfon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connectat (sense fitxers multimèdia)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connectat (no hi ha accés als missatges)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connectat (sense telèfon o disp. mult.)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconnectat"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"S\'està desconnectant..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"S\'està connectant…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"S\'està emparellant..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Dispositiu Bluetooth sense nom"</string>
     <string name="progress_scanning" msgid="192587958424295789">"S\'està cercant"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No s\'ha trobat cap dispositiu Bluetooth a prop."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra els fitxers rebuts"</string>
     <string name="device_picker" msgid="4978696506172252813">"Tria un dispositiu Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Sol·licitud de permís de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Una aplicació vol activar el Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Una aplicació vol que s\'activi el Bluetooth per a aquest dispositiu."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Una aplicació vol que la tauleta sigui visible per a la resta de dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicació vol que el telèfon sigui visible per a la resta de dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicació vol que la tauleta sigui visible per a altres dispositius amb Bluetooth. Més endavant podràs canviar la configuració de Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Targeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configuració del servidor intermediari"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancel·la"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCEL·LA"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUA"</string>
     <string name="okay" msgid="1997666393121016642">"D\'acord"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SÍ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"ESBORRA"</string>
+    <string name="forget" msgid="1400428660472591263">"Esborra"</string>
+    <string name="save" msgid="879993180139353333">"Desa"</string>
+    <string name="done" msgid="6942539184162713160">"Fet"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configuració"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configuració"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Drecera de configuració"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordena per zona horària"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Millora la coincidència facial"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Comprovació de moviment"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Requereix parpelleig d\'ulls en desbloquejar"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloqueja automàticament"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> després d\'entrar en repòs"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> després del repòs, excepte quan l\'agent <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> el mantingui desbloquejat"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Defineix La meva ubicació, el desbloqueig de pantalla i el bloqueig d\'emmagatzematge de credencials"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasenyes"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Empremta digital"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gest. empremtes digit."</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Util. empr. digit. per"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Afegeix"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueig de pantalla"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empremta digital sol·licitada</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> empremtes digitals sol·licitades</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Conf. empremta digital"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Per fer servir la teva empremta digital per desbloquejar la pantalla o confirmar compres, haurem de fer el següent: \n\n✓ Configurar el mètode de bloqueig de pantalla de seguretat \n\n✓ Afegir la teva empremta digital"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Cerca el sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Cerca el sensor d\'empremtes digitals a la part posterior del telèfon."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nom"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"D\'acord"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Suprimeix"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Comencem"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Col·loca el dit al sensor d\'empremtes digitals. Aixeca\'l quan notis una vibració."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Molt bé. Repeteix-ho."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Col·loca el mateix dit al sensor d\'empremtes digitals i aixeca\'l quan notis una vibració."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empremta dig. afegida"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quan vegis aquesta icona, pots fer servir la teva empremta digital per identificar o per autoritzar una compra."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Afegeix"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Següent"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptació"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptació de la tauleta"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encripta el telèfon"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Endolla el carregador i torna-ho a provar."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"No hi ha cap PIN ni cap contrasenya de bloqueig de la pantalla"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Has de definir un PIN o una contrasenya de bloqueig de la pàgina per començar l\'encriptació."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Has de dibuixar el patró de desbloqueig per confirmar l\'encriptació del dispositiu."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vols encriptar?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"L\'operació d\'encriptació és irreversible i, si l\'interromps, perdràs dades. L\'encriptació necessita una hora com a mínim, durant la qual la tauleta es reiniciarà diverses vegades."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"L\'operació d\'encriptació és irreversible i, si l\'interromps, perdràs dades. L\'encriptació necessita una hora com a mínim, durant la qual el telèfon es reiniciarà diverses vegades."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Fes lliscar el dit"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"No hi ha seguretat"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Desbloqueig facial"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Nivell de seguretat baix, experimental"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patró"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Nivell de seguretat mitjà"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivell de seguretat mitjà o alt"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasenya"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivell de seguretat alt"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueig de pantalla actual"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Les funcions de protecció del dispositiu deixaran de funcionar."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivat per administrador, política d\'encriptació o emmagatzematge de credencials"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Cap"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Fes lliscar el dit"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueig facial"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patró"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Contrasenya"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Quan hagis configurat un bloqueig de pantalla, també pots configurar la teva empremta digital a Configuració &gt; Seguretat."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactiva el bloqueig de pantalla"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Elimina el patró de desbloqueig"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Elimina el PIN de desbloqueig"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"La contrasenya ha de contenir almenys una lletra."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"La contrasenya ha de contenir almenys un dígit."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"La contrasenya ha de contenir almenys un símbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"La contrasenya ha de contenir com a mínim una lletra."</item>
-    <item quantity="other" msgid="8186027808415585970">"La contrasenya ha de contenir com a mínim %d lletres."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"La contrasenya ha de contenir com a mínim una lletra en minúscules."</item>
-    <item quantity="other" msgid="2693910942679679225">"La contrasenya ha de contenir com a mínim %d lletres en minúscules."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"La contrasenya ha de contenir com a mínim 1 lletra en majúscules."</item>
-    <item quantity="other" msgid="3030801209112209245">"La contrasenya ha de contenir com a mínim %d lletres en majúscules."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"La contrasenya ha de contenir com a mínim un dígit numèric."</item>
-    <item quantity="other" msgid="4703982391407595924">"La contrasenya ha de contenir com a mínim %d dígits numèrics."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"La contrasenya ha de contenir com a mínim un símbol especial."</item>
-    <item quantity="other" msgid="1221290525051187757">"La contrasenya ha de contenir com a mínim %d símbols especials."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"La contrasenya ha de contenir com a mínim un caràcter que no sigui una lletra."</item>
-    <item quantity="other" msgid="3952508584649046404">"La contrasenya ha de contenir com a mínim %d caràcters que no siguin lletres."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">La contrasenya ha de contenir com a mínim %d lletres.</item>
+      <item quantity="one">La contrasenya ha de contenir com a mínim 1 lletra.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">La contrasenya ha de contenir com a mínim %d lletres en minúscules.</item>
+      <item quantity="one">La contrasenya ha de contenir com a mínim 1 lletra en minúscules.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">La contrasenya ha de contenir com a mínim %d lletres en majúscules.</item>
+      <item quantity="one">La contrasenya ha de contenir com a mínim 1 lletra en majúscules.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">La contrasenya ha de contenir com a mínim %d dígits numèrics.</item>
+      <item quantity="one">La contrasenya ha de contenir com a mínim 1 dígit numèric.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">La contrasenya ha de contenir com a mínim %d símbols especials.</item>
+      <item quantity="one">La contrasenya ha de contenir com a mínim 1 símbol especial.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">La contrasenya ha de contenir com a mínim %d caràcters que no siguin una lletra.</item>
+      <item quantity="one">La contrasenya ha de contenir com a mínim 1 caràcter que no sigui una lletra.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"L\'administrador del dispositiu no permet l\'ús d\'una contrasenya recent."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"No es permet una seqüència de dígits ascendents, descendents ni repetits."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"D\'acord"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Per emparellar amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assegura\'t que apareix aquesta contrasenya:&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">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vols emparellar-lo amb aquest dispositiu?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Per sincronitzar amb:<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>Escriu <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> en el dispositiu i, a continuació, prem la tecla de retorn."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Emparella"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"EMPARELLA"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel·la"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Si està connectada, la sincronització permet accedir als contactes i a l\'historial de trucades."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No s\'ha pogut emparellar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No s\'ha pogut emparellar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, perquè el PIN o la contrasenya són incorrectes."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"No es pot comunicar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparellament rebutjat per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"No s\'ha pogut connectar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Cerca dispositius"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Actualitza"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançades"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançat"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Amb el Bluetooth activat, el dispositiu pot connectar amb més dispositius Bluetooth a prop."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Per millorar la precisió de la ubicació, les aplicacions i els serveis cercaran dispositius Bluetooth fins i tot quan el Bluetooth estigui desactivat. Pots canviar aquest paràmetre a la <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuració de cerca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connecta\'t a..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Àudio multimèdia"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Àudio del telèfon"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferència del fitxer"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositiu d\'entrada"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accés a Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Compartir contactes"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"S\'utilitza per compartir contactes."</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Connexió compartida a Internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accés al missatge"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio del mitjà."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio de mans lliures."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà del dispositiu d\'entrada."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"S\'utilitza per"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Canvia el nom"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permet transf. fitxers entrants"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connectat a l\'àudio del mitjà"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connectat a àudio del telèfon"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connectat al servidor de transferència de fitxers"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connectat a un mapa"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No està connectat al servidor de transferència de fitxers"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connectat a dispositiu d\'entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connectat al dispositiu per a accés a Internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"S\'està compartint la connexió a Internet amb el dispositiu"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilitza per a l\'àudio del mitjà"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilitza-ho per a l\'àudio del telèfon"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilitza per a la transferència de fitxers"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilitza per a entrada"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilitza\'l per a l\'accés a Internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utilitza per al mapa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configuració de la base"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Ús de la base per a àudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Com a telèfon amb altaveu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per a música i contingut multimèdia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recorda la configuració"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistent de Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Connectat mitjançant l\'assistent de Wi‑Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Emet pantalla"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Emissió"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activa pantalla sense fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No s\'ha trobat cap dispositiu a prop."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"S\'està connectant"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Esborra"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Fet"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nom"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permet l\'intercanvi de dades quan la tauleta toqui un altre dispositiu"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permet l\'intercanvi de dades quan el telèfon toqui un altre dispositiu"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"S\'està desactivant la Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"En mode d\'avió"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"No es poden cercar xarxes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificació de xarxa"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Crea una notificació si hi ha una xarxa pública disponible."</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Només connexions estables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"No utilitzis una xarxa Wi-Fi tret que tingui una bona connexió a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilitza només les xarxes amb una bona connexió a Internet."</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Cerca xarxes sempre"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permet sempre la cerca"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permet que el servei d\'ubicacions de Google i altres aplicacions cerquin xarxes, fins i tot si la Wi-Fi està desactivada."</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utilitza automàticament xarxes Wi-Fi obertes"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permet que un assistent de Wi-Fi es connecti automàticament a les xarxes obertes considerades de bona qualitat"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Tria de l\'assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instal·la els certificats"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Per millorar la precisió de la ubicació i per a altres finalitats, Google i altres aplicacions poden cercar xarxes properes tot i que la Wi-Fi estigui desactivada. Si no vols que això passi, accedeix a Avançat &gt; Cerca xarxes sempre."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les aplicacions poden cercar xarxes properes tot i que la Wi-Fi estigui desactivada. Si no vols que això passi, accedeix a Avançat &gt; Cerca xarxes sempre."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Per millorar la precisió de la ubicació, les aplicacions i els serveis cercaran xarxes Wi-Fi fins i tot quan la Wi-Fi estigui desactivada. Pots canviar aquest paràmetre a la <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuració de cerca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No m\'ho tornis a mostrar"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Utilitza la Wi-Fi en repòs"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi activa en repòs"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Afegeix una altra xarxa"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Més"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automàtica (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Per completar la configuració, la tauleta necessita accés a la Wi-Fi. Quan hagi finalitzat, podràs canviar entre dades mòbils i Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Opcions avançades"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Configuració protegida de Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"S\'està iniciant WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Prem el botó Configuració protegida de Wi-Fi de l\'encaminador. Pot ser que s\'anomeni \"WPS\" o que contingui aquest símbol:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Prem el botó Configuració protegida de Wi-Fi de l\'encaminador. Pot ser que s\'anomeni \"WPS\" o que estigui marcat amb aquest símbol:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Introdueix el pin <xliff:g id="NUMBER">%1$s</xliff:g> a l\'encaminador Wi-Fi. La configuració pot trigar fins a dos minuts a completar-se."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"La configuració de WPS s\'ha dut a terme correctament. S\'està connectant a la xarxa..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Connectat a la xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitat anònima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Contrasenya"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Mostra la contrasenya"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Configura banda AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Configuració IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sense canvis)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(sense especificar)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Desat"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desactivada"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Error de configuració d\'IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Error de connexió Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema d\'autenticació"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora de l\'abast"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"No s\'ha detectat accés a Internet, no s\'hi tornarà a connectar automàticament."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introdueix la contrasenya de la xarxa."</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Cap"</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ó, vés a Opcions avançades al menú addicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permet"</string>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vols iniciar la sessió per connectar-te?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> necessita que iniciïs la sessió al web per connectar-te a la xarxa."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECTA"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Aquesta xarxa no té accés a Internet. Vols utilitzar-la de totes maneres?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"No ho tornis a preguntar en aquesta xarxa"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Zona Wi-Fi portàtil PSK AndroidAP WPA2"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portàtil"</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_mode_title" msgid="2164073796253284289">"Preferències de trucada"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Mode de trucades per Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Preferència per la Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Preferència per les dades mòbils"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Pàgina d\'inici"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillantor automàtica"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimitza el nivell de brillantor segons la llum disponible"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Clar"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Fosc"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automàtica"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Repòs"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla s\'apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Vols canviar la SIM preferida?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> és l\'única targeta SIM del dispositiu. Vols fer-la servir per a les dades mòbils, les trucades i els missatges SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"El codi PIN de la SIM no és correcte. Has de contactar amb l\'operador de telefonia mòbil per desbloquejar el dispositiu."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"El codi PIN de la SIM no és correcte. Et queda <xliff:g id="NUMBER">%d</xliff:g> intent; si no l\'encertes, contacta amb l\'operador de telefonia mòbil per desbloquejar el dispositiu."</item>
-    <item quantity="other" msgid="77103619544346451">"El codi PIN de la SIM no és correcte. Et queden <xliff:g id="NUMBER">%d</xliff:g> intents."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">El codi PIN de la SIM no és correcte. Et queden <xliff:g id="NUMBER_1">%d</xliff:g> intents.</item>
+      <item quantity="one">El codi PIN de la SIM no és correcte. Et queda <xliff:g id="NUMBER_0">%d</xliff:g> intent; si no l\'encertes, contacta amb l\'operador de telefonia mòbil per desbloquejar el dispositiu.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Hi ha hagut un problema en l\'operació del PIN de la SIM."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estat de la tauleta"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Estat del telèfon"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (només de lectura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espai total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"S\'està calculant..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicacions (dades aplicacions i contingut multimèdia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicacions i dades de les aplicacions"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimèdia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Baixades"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imatges, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Àudio (música, tons, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Altres fitxers"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dades emmagatzemades a la memòria cau"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactiva emmagatzematge"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactiva la targeta SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desactivació en procés"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"S\'està acabant l\'espai d\'emmag."</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"És possible que algunes funcions del sistema, com ara la sincronització, no funcionin bé. Prova d\'alliberar espai: suprimeix o desfixa elements, com ara aplicacions o contingut multimèdia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Canvia el nom"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Activa"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Expulsa"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Esborra i formata"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Esborra i formata (emmagatz. intern)"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Connexió USB a l\'ordinador"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Connexió USB a l\'ordinador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connexió com a"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Et permet transferir fitxers multimèdia a Windows o utilitzant l\'aplicació de transferència de fitxers d\'Android a Mac (consulta www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Càmera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Et permet transferir fotos amb programari de la càmera i transferir qualsevol fitxer en els equips que no són compatibles amb MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instal·la eines de transferència de fitxers"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Permet que les aplicacions compatibles amb MIDI utilitzin programari de MIDI al teu ordinador per USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Altres usuaris"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Emmagatzematge del dispositiu"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Emmagatzematge extraïble"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Lliure: <xliff:g id="FREE">%1$s</xliff:g> (total: <xliff:g id="TOTAL">%2$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="8928389741212129060">"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>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"No s\'ha pogut expulsar <xliff:g id="NAME">%1$s</xliff:g> de manera segura"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"S\'ha formatat <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"No s\'ha pogut formatar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Canvia nom emmagatzematge"</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="3677827796634199714"><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> es formata per funcionar només en aquest dispositiu. No funcionarà en altres dispositius."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilitza com a emmagatzematge portàtil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Per desplaçar fotos i altres fitxers multimèdia entre dispositius."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utilitza com a emmagatzematge intern"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Per emmagatzemar dades només en aquest dispositiu, com ara aplicacions i fotos. Cal formatar-lo perquè no es pugui fer servir en altres dispositius."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatar com emmagatzem. intern"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"S\'ha de formatar <xliff:g id="NAME_0">^1</xliff:g> perquè funcioni de manera segura. \n\nUn cop s\'hagi formatat, <xliff:g id="NAME_1">^1</xliff:g> només funcionarà en aquest dispositiu. \n\n"<b>"En formatar <xliff:g id="NAME_2">^1</xliff:g>, se n\'esborraran totes dels dades."</b>" Per no perdre les dades, et recomanem que en facis una còpia de seguretat."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Esborra i formata"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"S\'està formatant <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"No extreguis <xliff:g id="NAME">^1</xliff:g> mentre s\'està formatant."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Desplaçar dades al nou emmagatz."</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Pots desplaçar fotos, fitxers i dades d\'aplicacions a <xliff:g id="NAME">^1</xliff:g>. \n\nEl desplaçament tardarà <xliff:g id="TIME">^2</xliff:g> aproximadament i alliberarà <xliff:g id="SIZE">^3</xliff:g> de l\'emmagatzematge intern. És possible que algunes aplicacions no funcionin durant el procés."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Desplaça ara"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Desplaça més tard"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Desplaçar les dades ara"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"El desplaçament tardarà <xliff:g id="TIME">^1</xliff:g> aproximadament i alliberarà <xliff:g id="SIZE">^2</xliff:g> de l\'emmagatzematge intern."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Desplaça"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"S\'estan desplaçant les dades…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Durant el desplaçament: \n• No extreguis <xliff:g id="NAME">^1</xliff:g>. \n• Algunes aplicacions no funcionaran correctament. \n• Mantén el dispositiu carregat."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> ja es pot utilitzar"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"S\'ha configurat <xliff:g id="NAME">^1</xliff:g> per poder treballar-hi amb fotos i altres fitxers multimèdia."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> ja funciona. \n\nSi vols desplaçar fotos, fitxers o dades d\'aplicacions a aquest dispositiu, ves a Configuració &gt; Emmagatzematge."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Desplaçar <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Només caldran uns quants minuts per desplaçar <xliff:g id="APP">^1</xliff:g> i les dades relacionades a <xliff:g id="NAME_0">^2</xliff:g>. No podràs fer servir l\'aplicació fins que el desplaçament no hagi finalitzat. \n\nNo extreguis <xliff:g id="NAME_1">^2</xliff:g> durant el desplaçament."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"S\'està desplaçant <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"No extreguis <xliff:g id="NAME">^1</xliff:g> durant el desplaçament. \n\nL\'aplicació <xliff:g id="APP">^2</xliff:g> no estarà disponible en aquest dispositiu fins que el desplaçament no hagi finalitzat."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancel·la el desplaçament"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estat de la bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivell de la bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"S\'està restaurant la configuració predeterminada d\'APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restableix al valor predeterminat"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"S\'ha restablert la configuració predeterminada d\'APN."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"S\'ha restablert la configuració de la xarxa"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Es restablirà tota la configuració de la xarxa, com ara:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dades mòbils"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Restableix la configuració"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Vols restablir tota la configuració de la xarxa? Aquesta acció no es pot desfer."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restableix la configuració"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vols restablir-la?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"S\'ha restablert la configuració de la xarxa"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Restableix el dispositiu"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restableix dades de fàbrica"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Esborra totes les dades de la tauleta"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Esborra totes les dades del telèfon"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, és a dir:\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="9165016501623540228">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del teu telèfon, és a dir:\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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Esborra totes les dades de la targeta SD, com ara música o fotos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restableix la tauleta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restableix el telèfon"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Vols esborrar tota la informació personal i les aplicacions baixades? Aquesta acció no es pot desfer."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Vols esborrar tota la informació personal i les aplicacions baixades? Aquesta acció no es pot desfer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Esborra-ho tot"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Has de dibuixar el teu patró de desbloqueig per confirmar el restabliment de dades de fàbrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No s\'ha restablert perquè el servei d\'esborrament del sistema no està disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Restablir?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"El restabliment de fàbrica no està disponible per a aquest usuari."</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vols esborrar l\'emmagatzematge USB i suprimir tots els fitxers que hi ha emmagatzemats? Aquesta acció no es pot desfer."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vols esborrar la targeta SD i suprimir tots els fitxers que hi ha emmagatzemats? Aquesta acció no es pot desfer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Esborra-ho tot"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar l\'emmagatzematge USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar la targeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Configuració de trucades"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configura la bústia, la desviació de trucades, les trucades en espera i l\'identificador"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ancoratge d\'USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Xarxes mòbils"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Pla mòbil"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicació per a SMS predeterminada"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicació de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vols canviar l\'aplicació per a SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vols fer servir <xliff:g id="NEW_APP">%1$s</xliff:g> en lloc de <xliff:g id="CURRENT_APP">%2$s</xliff:g> com a aplicació per als SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vols fer servir <xliff:g id="NEW_APP">%s</xliff:g> com a aplicació per als SMS?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode d\'ubicació"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Fa servir el GPS, la Wi-Fi i les xarxes mòbils per determinar la ubicació."</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Fa servir la Wi-Fi i les xarxes mòbils per determinar la ubicació."</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Fa servir el GPS per calcular la ubicació."</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilitza el GPS per determinar la ubicació"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Anàlisi"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Anàlisi"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Cerca de Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Per millorar la ubicació, permet als serveis del sistema cercar xarxes Wi-Fi fins i tot quan la Wi-Fi estigui desactivada"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Cerca de Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Per millorar la ubicació, permet als serveis del sistema cercar dispositius Bluetooth fins i tot quan el Bluetooth estigui desactivat"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Ubicació xarxa Wi‑Fi i mòbil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permet que les aplicacions utilitzin el servei d\'ubicació de Google per calcular la teva ubicació més ràpidament. Es recopilaran dades d\'ubicació anònimes i s\'enviaran a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicació determinada per Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"La contrasenya s\'ha definit"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"S\'ha definit el PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"El patró s\'ha definit"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Seguretat de la pantalla"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Introdueix el patró del dispositiu per continuar."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Introdueix el PIN del dispositiu per continuar."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Introdueix la contrasenya del dispositiu per continuar."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Seguretat del dispositiu"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Canvia el patró de desbloqueig"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Canvia el PIN de desbloqueig"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirma el patró desat"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Torna-ho a provar:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Crea un patró de desbloqueig"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Premeu Menú per obtenir ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Deixa anar el dit en acabar"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Defineix el patró de desbloqueig"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Canvia el patró de desbloqueig"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Com dibuixar un patró de desbloqueig"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Massa intents incorrectes"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Torneu-ho a provar d\'aquí a <xliff:g id="NUMBER">%d</xliff:g> segons."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Massa intents incorrectes. Torna-ho a provar d\'aquí a <xliff:g id="NUMBER">%d</xliff:g> segons."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"L\'aplicació no està instal·lada al telèfon."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestiona les aplicacions"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestiona i elimina les aplicacions instal·lades"</string>
@@ -1219,7 +1267,7 @@
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Has triat executar aquesta aplicació de manera predeterminada per dur a terme algunes accions."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Has seleccionat que vols permetre que aquesta aplicació creï widgets i que accedeixi a les seves dades."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No s\'ha definit cap valor predeterminat."</string>
-    <string name="clear_activities" msgid="7408923511535174430">"Esborra els valors predeterminats"</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Esborra valors predet."</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"És possible que aquesta aplicació no hagi estat dissenyada per a la teva pantalla; pots controlar com s\'ajusta a la pantalla aquí."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Pregunta-ho en iniciar"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Escala l\'aplicació"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordena per mida"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostra els serveis que s\'estan executant"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processos cau"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicació en casos d\'emergència"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restableix preferències"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vols rest. pref. aplic.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Amb aquesta acció, es restabliran les preferències dels elements següents:\n\n "<li>"Aplicacions desactivades"</li>\n" "<li>"Notificacions d\'aplicacions desactivades"</li>\n" "<li>"Aplicacions predeterminades per a les accions"</li>\n" "<li>"Restriccions de dades en segon pla per a les aplicacions"</li>\n" "<li>"Restriccions de permisos"</li>\n\n" No perdràs les dades de les aplicacions."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Operacions d\'aplicacions"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"S\'està executant"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(No s\'ha utilitzat mai)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Sense aplic. predetermin."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Ús d\'emmagatzematge"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Mostra l\'emmagatzematge que utilitzen les aplicacions"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serveis en execució"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informació de la tauleta"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informació del telèfon"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informació de la bateria"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Inici ràpid"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Defineix les tecles de drecera per iniciar aplicacions"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Assigna l\'aplicació"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Cap drecera"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Cerca + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Esborra"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"La drecera de <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) s\'esborrarà."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"D\'acord"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Cancel·la"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplicacions"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Dreceres"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Introducció de text"</string>
     <string name="input_method" msgid="5434026103176856164">"Mètode d\'introducció de text"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Teclat actual"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Captura tots els paquets HCI de Bluetooth en un fitxer"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueig d\'OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permet el desbloqueig del carregador d\'arrencada."</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introdueix el PIN."</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Per activar el desbloqueig OEM, introdueix el PIN del dispositiu."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vols permetre el desbloqueig d\'OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVERTIMENT: les característiques de protecció del dispositiu no funcionaran mentre aquesta opció estigui activada."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Mides de la memòria cau del registrador"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Selecc. mides registr. per memòria"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Ubicacions simulades"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions simulades"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Activa la inspecció de l\'atribut de visualització"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Xarxes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificació de pantalla sense fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Activa el registre detallat de la Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Traspàs agressiu de Wi-Fi a dades mòbils"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Permet sempre les anàlisis d\'itinerància de la Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Utilitza el client DHCP heretat"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostra les opcions de certificació de pantalla sense fil"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Augmenta nivell de registre Wi‑Fi i mostra\'l per SSID RSSI al Selector de Wi‑Fi."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Si s\'activa, la Wi-Fi serà més agressiva per traspassar la connexió de dades al mode mòbil quan la senyal de Wi-Fi sigui feble."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Permet/No permetis la detecció de xarxes Wi-Fi en itinerància en funció de la quantitat de trànsit de dades que hi hagi a la interfície."</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Mides de la memòria cau del registrador"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Selecc. mides registr. per memòria"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Selecciona la configuració USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Selecciona la configuració USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicacions simulades"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions simulades"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Activa la inspecció de l\'atribut de visualització"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utilitza el client DHCP de Lollipop en lloc del client DHCP d\'Android nou."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Voleu permetre la depuració USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"La depuració USB només està indicada per a activitats de desenvolupament. Fes-la servir intercanviar dades entre l\'ordinador i el dispositiu, per instal·lar aplicacions al dispositiu sense rebre notificacions i per llegir dades de registre."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Vols revocar l\'accés a la depuració d\'USB dels ordinadors que has autoritzat anteriorment?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Com que hi ha una aplicació que oculta una sol·licitud de permís, no es pot verificar la teva resposta des de la configuració."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si actives <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositiu no farà servir el bloqueig de pantalla per millorar l\'encriptació de dades."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Com que has activat un servei d\'accessibilitat, el teu dispositiu no farà servir el bloqueig de pantalla per millorar l\'encriptació de dades."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Cal que confirmis el patró perquè l\'activació del servei <xliff:g id="SERVICE">%1$s</xliff:g> afecta l\'encriptació de les dades."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadístiques sobre processos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estadístiques sobre els processos en execució"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Ús de la memòria"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> aplicacions durant <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> de <xliff:g id="TOTALRAM">%2$s</xliff:g> utilitzada durant <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Fons"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Primer pla"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Memòria"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"En aquests moments la memòria del dispositiu és <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Ús mitjà de RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Ús màxim de RAM"</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_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>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Ús de memòria RAM (en segon pla)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Temps d\'execució"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Processos"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Serveis"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durada"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Detalls de la memòria"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hores"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostra el sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Amaga els processos del sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Fes servir Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipus d\'estadístiques"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Fons"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"La configuració predeterminada que hi ha a continuació substitueix la configuració d\'aplicacions"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuració predeterminada"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor predeterminat"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Defineix el motor de síntesi de veu que s\'utilitzarà per al text parlat"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Defineix el motor de síntesi de veu que es farà servir per al text en veu alta"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Velocitat de veu"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocitat a la qual es llegeix el text"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"To"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Emmagatzemat en maquinari"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Només programari"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Les credencials no estan disponibles per a aquest usuari."</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Has de dibuixar el teu patró de desbloqueig per confirmar la instal·lació de les credencials."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Copia les meves dades"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Fes una còpia de seguretat de les dades de les aplicacions, de les contrasenyes Wi-Fi i d\'altres configuracions als servidors de Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Compte de còpia de seguretat"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"En aquests moments no hi ha cap compte que emmagatzemi una còpia de seguretat de les dades"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Inclou dades de l\'aplicació"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauració automàtica"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Quan tornis a instal·lar una aplicació, restaura la configuració i les dades incloses a la còpia de seguretat"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"El servei de còpia de seguretat està inactiu."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Es defineix a la política del dispositiu."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contrasenya per a còpies d\'ordinador"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les còpies de seguretat d\'ordinador completes no estan protegides"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca per canviar o eliminar la contrasenya per a còpies de seguretat d\'ordinador completes"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala d\'animació transició"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala de durada d\'animació"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simula pantalles secundàries"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Mode de multifinestra"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Diverses activitats a la pantalla a la vegada."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Vols activar el mode de multifinestra?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ADVERTIMENT: amb aquesta funció altament experimental es permet dur a terme diverses activitats a la pantalla a la vegada mitjançant la interfície d\'usuari Aplicacions recents. Pot ser que algunes aplicacions es bloquegin o no funcionin correctament quan s\'utilitzin amb aquesta funció."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicacions"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Destrueix activitats"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destrueix activitats quan l\'usuari deixi d\'usar-les"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuari"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restringit"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Vols afegir un usuari nou?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Pots crear usuaris addicionals i compartir aquest dispositiu amb altres persones. Cada usuari té el seu espai i el pot personalitzar amb aplicacions, fons de pantalla i moltes més coses. Els usuaris també poden ajustar la configuració del dispositiu que afecta tothom, com ara la de la xarxa Wi‑Fi.\n\nQuan s\'afegeix un usuari nou, aquest usuari ha de configurar el seu espai.\n\nQualsevol usuari pot actualitzar les aplicacions dels altres usuaris. ."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Pots compartir aquest dispositiu amb altres usuaris creant usuaris addicionals. Cada usuari té el seu propi espai, que pot personalitzar amb aplicacions i fons de pantalla, entre d\'altres. Els usuaris també poden ajustar opcions de configuració del dispositiu, com ara la Wi-Fi, que afecten els altres usuaris.\n\nQuan afegeixis un usuari nou, haurà de configurar el seu espai.\n\nTots els usuaris poden actualitzar les aplicacions de la resta."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Quan s\'afegeix un usuari nou, aquest usuari ha de configurar el seu espai.\n\nQualsevol usuari pot actualitzar les aplicacions dels altres usuaris."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Vols configurar l\'usuari ara?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Comprova que l\'usuari tingui accés al dispositiu i que pugui configurar el seu espai."</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Vols suprimir el convidat?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Totes les aplicacions i les dades d\'aquesta sessió se suprimiran."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Suprimeix"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Permetre trucades"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Permet trucades i SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Activar les trucades telefòniques"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Activar les trucades i els SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Suprimeix l\'usuari"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Vols permetre les trucades?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Vols activar les trucades?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"L\'historial de trucades es compartirà amb aquest usuari."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Vols permetre trucades i SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"L\'historial de trucades i de SMS es compartirà amb aquest usuari."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vols activar les trucades i els SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historial de trucades i de SMS es compartirà amb aquest usuari."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permet aplicacions i contingut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacions amb restriccions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Desplega configuració aplicació"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"CANVIA EL NOM"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Defineix les restriccions d\'aplicacions"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlades per <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Aquesta aplicació no és compatible amb perfils restringits."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Aquesta aplicació pot accedir als teus comptes"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Aquesta aplicació pot accedir als teus comptes. Controlades per <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi i mòbil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permet la modificació de la configuració Wi‑Fi i mòbil"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"connexió xarxa wifi wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"missatge de text missatges de text missatges missatgeria"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mòbil telèfon mòbil operador de telefonia mòbil dades sense fil 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi trucar trucades"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla pantalla tàctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"pantalla atenuada pantalla tàctil bateria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"pantalla atenuada pantalla tàctil bateria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fons de pantalla personalitzar adaptar pantalla"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tema fosc mode nocturn pantalla tènue inverteix la brillantor"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"fons de pantalla personalitzar adaptar pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"mida del text"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projecte"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"emissió de projectes"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espai disc unitat de disc dur dispositiu ús"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"ús de la bateria càrrega"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografia diccionari corrector ortogràfic correcció automàtica"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"compte"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restricció restringir restringit"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correcció corregir so vibració automàtic idioma gest suggerir suggeriment tema ofensiu paraula tipus emoji internacional"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"restablir preferències predeterminades"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"emergència ice aplicació predeterminada"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplicacions baixada aplicacions sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"seguretat per als permisos d\'aplicacions"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplicacions predeterminades"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"fer lliscar el dit, contrasenya, patró, PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura l\'etiqueta de NFC per a Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escriu-hi"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volum de l\'alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volum del to"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volum de notificació"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupcions"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"En rebre trucades i notificacions"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Interromp sempre"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permet només interrupcions amb prioritat"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"No interrompis"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Només interrupcions priorit."</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regles automàtiques"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Només amb prioritat"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Només alarmes"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Cap interrupció"</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="ringtone_title" msgid="5379026328015343686">"To de trucada"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"So de notificació predeterminat"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibra també per a les trucades"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibració"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Accés a les notificacions"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Les aplicacions no poden llegir notificacions"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplicació pot llegir notificacions."</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplicacions poden llegir notificacions."</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d aplicacions poden llegir notificacions</item>
+      <item quantity="one">%d aplicació pot llegir notificacions</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"No hi ha cap detector de notificacions instal·lat."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vols activar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrà llegir totes les notificacions que publiqui el sistema o qualsevol aplicació instal·lada, que poden contenir informació personal com ara noms de contactes i el text dels missatges que rebeu. També podrà ometre-les o tocar els botons d\'acció que continguin."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveïdors de condicions"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No hi ha cap aplicació que proporcioni condicions."</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplicació proporciona condicions."</item>
-    <item quantity="other" msgid="358057362115673258">"%d aplicacions proporcionen condicions."</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No hi ha cap proveïdor de condicions instal·lat."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vols activar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> podrà afegir condicions de sortida al mode No molesteu."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"S\'estan carregant les aplicacions..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Bloqueja"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Bloqueja-ho tot"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostris mai les notificacions d\'aquesta aplicació"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritat"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Mostra les notificacions a la part superior de la llista i continua rebent-les quan el dispositiu estigui configurat només per a interrupcions amb prioritat."</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Confidencials"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Amaga el contingut confidencial de les notificacions d\'aquesta aplicació quan el dispositiu estigui bloquejat"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tracta com a prioritària"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Permet que se sentin les notificacions d\'aquesta aplicació quan el mode No molesteu estigui definit en Només amb prioritat"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permet la vista"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permet que aquesta aplicació destaqui notificacions determinades fent-les lliscar perquè es mostrin a la pantalla actual"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Amaga el contingut confidencial"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Quan el dispositiu estigui bloquejat, amaga el contingut de les notificacions d\'aquesta aplicació que pugui revelar informació privada"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloquejat"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritat"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Delicat"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fet"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Fins que no ho desactivis"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupcions amb prioritat"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Temps d\'inactivitat"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dies"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Cap"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interrupcions permeses"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Només amb prioritat"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Cap"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatització"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activa automàticament"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nom de la regla"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Afegeix una regla"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Suprimeix la regla"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vols suprimir la regla \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Suprimeix"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipus de regla"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Desconegut"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configura una regla"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Planifica una regla"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"No s\'ha trobat la regla."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mai"</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> a <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Trucades"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Missatges"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Trucades i missatges de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Qualsevol usuari"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Només els contactes"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Només els contactes destacats"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Esdeveniments i recordatoris"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Les alarmes sempre són interrupcions prioritàries"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatoris"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Esdeveniments"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Autors de la trucada seleccionats"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repeteix els autors de la trucada"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Si la mateixa persona truca una segona vegada dins d\'un període de <xliff:g id="MINUTES">%d</xliff:g> minuts, es permet"</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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Nits entre setmana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora d\'inici"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalització"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"A les <xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"A les <xliff:g id="FORMATTED_TIME">%s</xliff:g> o amb qualsevol alarma anterior"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"A les <xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent o amb qualsevol alarma anterior"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"A les <xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interrupcions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"En rebre trucades i notificacions"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quan vols que t\'interrompin?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Durant quanta estona?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Interromp sempre"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"desactivades,totes,tot"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Permet només interrupcions amb prioritat"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Permet només les alarmes"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"No interrompis"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidament"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuts</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hores</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Canvia al mode Només notificacions prioritàries indefinidament"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Canvia al mode Només notificacions prioritàries durant <xliff:g id="DURATION">%1$d</xliff:g> minuts fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Canvia al mode Només notificacions prioritàries durant un minut fins a les <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Canvia al mode Només notificacions prioritàries durant <xliff:g id="DURATION">%1$d</xliff:g> hores (fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Canvia al mode Només notificacions prioritàries durant una hora fins a les <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Canvia al mode Només alarmes indefinidament"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Canvia al mode Només alarmes durant <xliff:g id="DURATION">%1$d</xliff:g> minuts (fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Canvia al mode Només alarmes durant un minut fins a les <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">Canvia al mode Només alarmes durant <xliff:g id="DURATION">%1$d</xliff:g> hores fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Canvia al mode Només alarmes durant una hora fins a les <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Canvia al mode No interrompis indefinidament"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Canvia al mode No interrompis durant <xliff:g id="DURATION">%1$d</xliff:g> minuts (fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Canvia al mode No interrompis durant un minut fins a les <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Canvia al mode No interrompis durant <xliff:g id="DURATION">%1$d</xliff:g> hores fins a les <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Canvia al mode No interrompis durant una hora fins a les <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Canvia al mode Interromp sempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"sempre"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificacions d\'aplicacions"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Comentaris sobre aquest dispositiu"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Informació sobre l\'IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Informació relativa a l\'IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Ranura <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Obre de manera predeterminada"</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="app_launch_domain_links_title" msgid="458956710410857777">"Enllaços del domini"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Obre els URL del domini"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Permet que l\'aplicació obri directament els URL del domini"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL de dominis 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_type_internal" msgid="410824961149037234">"memòria interna"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"memòria externa"</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="storage_used" msgid="7128074132917008743">"Emmagatzematge utilitzat"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Activades"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloquejades"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Confidencials"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritàries"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritàries i confidencials"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permisos concedits</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permís concedit</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> permisos de <xliff:g id="COUNT_3">%d</xliff:g> concedits</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permís de <xliff:g id="COUNT_1">%d</xliff:g> concedit</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"S\'han definit valors predeterminats"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"No s\'ha definit cap valor predeterminat"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Totes les aplicacions"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Activades"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personals"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Professionals"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloquejades"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritàries"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidencials"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Amb URL del domini"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desactivat per l\'administrador"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Avançada"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Aplicació desconeguda"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Triar un perfil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Permisos de l\'aplicació"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> aplicacions de <xliff:g id="COUNT_1">%d</xliff:g> disposen d\'accés addicional"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Es permeten <xliff:g id="COUNT_0">%d</xliff:g> aplicacions d\'un total de <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL del domini"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"No obris l\'URL de cap domini"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Obre <xliff:g id="DOMAIN">%s</xliff:g>"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Obre <xliff:g id="DOMAIN">%s</xliff:g> i els URL relacionats"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicacions poden obrir els URL dels seus dominis</item>
+      <item quantity="one">Una aplicació pot obrir els URL del seu domini</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"No s\'ha reconegut"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicacions predeterminades"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicació de navegador"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Navegador no predeterminat"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predeterminat)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Emmagatzematge d\'aplicacions"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 2d7e311..7f5c35d 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Stisknutí tlačítka"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"vypnout nebo zapnout zvuk mikrofonu"</item>
     <item msgid="1148142988678569310">"promítat média"</item>
     <item msgid="9130014005474445273">"aktivovat VPN"</item>
+    <item msgid="1165192162975045562">"zápis tapety"</item>
+    <item msgid="7129487923652967258">"struktura asistence"</item>
+    <item msgid="1069023208100114540">"snímek obrazovky asistence"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Poloha"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Vypnout nebo zapnout zvuk mikrofonu"</item>
     <item msgid="5906017727368097853">"Promítat média"</item>
     <item msgid="2486614710846178542">"Aktivovat VPN"</item>
+    <item msgid="5586547561693629602">"Zápis tapety"</item>
+    <item msgid="32794179825485062">"Struktura asistence"</item>
+    <item msgid="7872852746938272552">"Snímek obrazovky asistence"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátká"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"nízká"</item>
     <item msgid="4212263919458209842">"kritická"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Vypnuto"</item>
-    <item msgid="5656544177755411222">"Omezený počet vyrušování"</item>
-    <item msgid="8735337502532332056">"Žádná vyrušování"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normální"</item>
     <item msgid="866544120205026771">"Střední"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Růžová"</item>
     <item msgid="6131821495505931173">"Červená"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Zdroj zvuku"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2150cee..edd245d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -22,10 +22,12 @@
     <string name="allow" msgid="3349662621170855910">"Povolit"</string>
     <string name="deny" msgid="6947806159746484865">"Odmítnout"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznámé"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Ještě <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí a bude z vás vývojář."</item>
-    <item quantity="other" msgid="6722953419953594148">"Ještě <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí a bude z vás vývojář."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="few">Ještě <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroky a bude z vás vývojář.</item>
+      <item quantity="many">Ještě <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroku a bude z vás vývojář.</item>
+      <item quantity="other">Ještě <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroků a bude z vás vývojář.</item>
+      <item quantity="one">Ještě <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> krok a bude z vás vývojář.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Voilà! Stal se z vás vývojář."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Není potřeba, již jste vývojář."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Bezdrátová připojení a sítě"</string>
@@ -40,6 +42,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Vypnout zprávy SMS prostřednictvím IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Vyžaduje se zapnutí registrace IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Vyžaduje se vypnutí registrace IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Zapnout příznak poskytnutí VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Vypnout příznak poskytnutí VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Zapnout výpis paměti lte ram"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Vypnout výpis paměti lte ram"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Zobrazit adresář SIM karty"</string>
@@ -135,16 +139,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysílání"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Deaktivovat profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Toto nastavení vypne profil:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Připojeno"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Připojeno (žádný telefon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Připojeno (žádná média)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Připojeno (bez přístupu ke zprávám)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Připojeno (žádný telefon nebo média)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojeno"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Odpojování..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Připojování..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Párování..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Nepojmenované zařízení Bluetooth"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Hledání"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"V okolí nejsou žádná zařízení Bluetooth."</string>
@@ -154,7 +149,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobrazit přijaté soubory"</string>
     <string name="device_picker" msgid="4978696506172252813">"Zvolit zařízení Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Požadavek na povolení zařízení Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikace chce zapnout Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Nějaká aplikace žádá o zapnutí rozhraní Bluetooth v tomto zařízení."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikace požaduje zviditelnění tabletu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikace požaduje zviditelnění telefonu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikace chce tablet zviditelnit pro ostatní zařízení Bluetooth. Toto můžete později změnit v nastavení Bluetooth."</string>
@@ -275,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Karta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Nastavení proxy serveru"</string>
     <string name="cancel" msgid="6859253417269739139">"Zrušit"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ZRUŠIT"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"POKRAČOVAT"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ANO"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NE"</string>
-    <string name="forget" msgid="7267115980248732932">"ODSTRANIT"</string>
+    <string name="forget" msgid="1400428660472591263">"Zapomenout"</string>
+    <string name="save" msgid="879993180139353333">"Uložit"</string>
+    <string name="done" msgid="6942539184162713160">"Hotovo"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nastavení"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavení"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Zástupce nastavení"</string>
@@ -325,9 +318,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Řadit podle časového pásma"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Čas"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Zlepšit rozpoznávání obličeje"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Kontrola živosti"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Při odemykání vyžadovat mrknutí oka"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Automaticky zamknout"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po přechodu do spánku"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po režimu spánku, pokud odemknutí není udržováno pomocí <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,6 +338,32 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hesla"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisk prstu"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Správa otisků prstů"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"K čemu otisk používat"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Přidat"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"zámek obrazovky"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="few">Zaregistrovány <xliff:g id="COUNT_1">%1$d</xliff:g> otisky prstů</item>
+      <item quantity="many">Zaregistrováno <xliff:g id="COUNT_1">%1$d</xliff:g> otisku prstu</item>
+      <item quantity="other">Zaregistrováno <xliff:g id="COUNT_1">%1$d</xliff:g> otisků prstů</item>
+      <item quantity="one">Zaregistrován <xliff:g id="COUNT_0">%1$d</xliff:g> otisk prstu</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Nastavení otisku prstu"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Aby bylo možné pomocí otisku prstu odemykat obrazovku a potvrzovat nákupy, bude zapotřebí provést následující: \n\n✓ nastavit záložní metodu zámku obrazovky,\n\n✓ přidat otisk prstu."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Najděte senzor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Najděte senzor otisků prstů na zadní straně telefonu."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Jméno"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Smazat"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Začínáme!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Přiložte prst na senzor otisků. Až ucítíte vibraci, zvedněte jej."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"OK, nyní to zopakujte"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Přiložte na senzor otisků stejný prst a až ucítíte vibraci, zvedněte jej."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Otisk byl přidán!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kdykoli se zobrazí tato ikona, můžete se identifikovat nebo autorizovat nákup pomocí svého otisku prstu."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Přidat"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Další"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrování"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovat tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrování telefonu"</string>
@@ -360,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Připojte nabíječku a zkuste to znovu."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Chybí heslo nebo kód PIN zámku obrazovky"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Před začátkem šifrování musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Šifrování zařízení je třeba potvrdit provedením bezpečnostního gesta."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Zašifrovat?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Zašifrování je nevratné, a pokud ho přerušíte, budou vaše data ztracena. Šifrování trvá hodinu a více. Během této doby bude tablet několikrát restartován."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Zašifrování je nevratné, a pokud ho přerušíte, budou vaše data ztracena. Šifrování trvá hodinu a více. Během této doby bude telefon několikrát restartován."</string>
@@ -391,22 +406,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Přejetí prstem"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Žádné zabezpečení"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Odemknutí obličejem"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Nízké zabezpečení, experimentální"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Gesto"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Střední zabezpečení"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Střední až vysoké zabezpečení"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Vysoké zabezpečení"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Aktuální zámek obrazovky"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Již nebudou fungovat funkce ochrany zařízení."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Zakázáno správcem, zásadami šifrování nebo úložištěm pověření"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Žádný"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Přejetí prstem"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Odemknutí obličejem"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Gesto"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Heslo"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Po nastavení zámku obrazovky můžete v Nastavení &gt; Zabezpečení nastavit také otisk prstu."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Vypnout zámek obrazovky"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odebrat bezpečnostní gesto"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odebrat bezpečnostní kód PIN"</string>
@@ -427,30 +441,42 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Heslo musí obsahovat nejméně jedno písmeno."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Heslo musí obsahovat alespoň jednu číslici."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Heslo musí obsahovat nejméně jeden symbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Heslo musí obsahovat nejméně jedno písmeno."</item>
-    <item quantity="other" msgid="8186027808415585970">"Požadovaný minimální počet písmen v heslu: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Heslo musí obsahovat nejméně jedno malé písmeno."</item>
-    <item quantity="other" msgid="2693910942679679225">"Požadovaný minimální počet malých písmen v heslu: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Heslo musí obsahovat nejméně jedno velké písmeno."</item>
-    <item quantity="other" msgid="3030801209112209245">"Požadovaný minimální počet velkých písmen v heslu: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Heslo musí obsahovat alespoň jednu číslici."</item>
-    <item quantity="other" msgid="4703982391407595924">"Požadovaný minimální počet číslic v heslu: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Heslo musí obsahovat nejméně jeden zvláštní symbol."</item>
-    <item quantity="other" msgid="1221290525051187757">"Požadovaný minimální počet zvláštních symbolů v heslu: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Heslo musí obsahovat nejméně jeden znak jiný než písmeno."</item>
-    <item quantity="other" msgid="3952508584649046404">"Požadovaný minimální počet nepísmenných znaků v heslu: %d."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="few">Heslo musí obsahovat alespoň %d písmena.</item>
+      <item quantity="many">Heslo musí obsahovat alespoň %d písmena.</item>
+      <item quantity="other">Heslo musí obsahovat alespoň %d písmen.</item>
+      <item quantity="one">Heslo musí obsahovat alespoň jedno písmeno.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="few">Heslo musí obsahovat alespoň %d malá písmena.</item>
+      <item quantity="many">Heslo musí obsahovat alespoň %d malého písmena.</item>
+      <item quantity="other">Heslo musí obsahovat alespoň %d malých písmen.</item>
+      <item quantity="one">Heslo musí obsahovat alespoň jedno malé písmeno.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="few">Heslo musí obsahovat alespoň %d velká písmena.</item>
+      <item quantity="many">Heslo musí obsahovat alespoň %d velkého písmena.</item>
+      <item quantity="other">Heslo musí obsahovat alespoň %d velkých písmen.</item>
+      <item quantity="one">Heslo musí obsahovat alespoň jedno velké písmeno.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="few">Heslo musí obsahovat alespoň %d číslice.</item>
+      <item quantity="many">Heslo musí obsahovat alespoň %d číslice.</item>
+      <item quantity="other">Heslo musí obsahovat alespoň %d číslic.</item>
+      <item quantity="one">Heslo musí obsahovat alespoň jednu číslici.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="few">Heslo musí obsahovat alespoň %d speciální symboly.</item>
+      <item quantity="many">Heslo musí obsahovat alespoň %d speciálního symbolu.</item>
+      <item quantity="other">Heslo musí obsahovat alespoň %d speciálních symbolů.</item>
+      <item quantity="one">Heslo musí obsahovat alespoň jeden speciální symbol.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="few">Heslo musí obsahovat alespoň %d znaky jiné než písmena.</item>
+      <item quantity="many">Heslo musí obsahovat alespoň %d znaku jiného než písmeno.</item>
+      <item quantity="other">Heslo musí obsahovat alespoň %d znaků jiných než písmena.</item>
+      <item quantity="one">Heslo musí obsahovat alespoň jeden znak jiný než písmeno.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Administrátor zařízení neumožňuje použít heslo, které jste použili nedávno."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Posloupnost rostoucích, klesajících nebo opakovaných číslic je zakázána."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +506,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Párování se zařízením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zkontrolujte, zda zařízení zobrazuje tento přístupový klíč:&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">"Ze zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Spárovat s tímto zařízením?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Párování se zařízením:<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>Zadejte:<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> a poté stiskněte klávesu Return nebo Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párovat"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PÁROVAT"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Zrušit"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Párováním připojenému zařízení udělíte přístup ke svým kontaktům a historii volání."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nelze párovat se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nelze párovat se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Kód PIN nebo přístupový klíč je nesprávný."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nelze navázat komunikaci."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Párování odmítnuto zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"K zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> se nelze připojit."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Vyhledat zařízení"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Obnovit"</string>
@@ -515,16 +534,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Rozšířené nastavení"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Rozšířené nastavení Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Když je zapnutá funkce Bluetooth, zařízení může komunikovat s ostatními zařízeními Bluetooth v okolí."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Za účelem zlepšení přesnosti polohy budou aplikace a služby vyhledávat zařízení Bluetooth, i když bude rozhraní Bluetooth vypnuté. Toto chování můžete změnit v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastavení vyhledávání<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Připojit k síti…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Zvuk médií"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvuk telefonu"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Přenos souborů"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vstupní zařízení"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Přístup k internetu"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Sdílení kontaktů"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Použít ke sdílení kontaktů"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Sdílení internetového připojení"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Přístup ke zprávám"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku médií."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku sady handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od vstupního zařízení."</string>
@@ -537,28 +548,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Použít pro"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Přejmenovat"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Povolit přích. přenosy souborů"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Připojeno ke zvukovému médiu"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Připojeno k náhlavní soupravě"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Připojeno k serveru pro přenos dat"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Připojeno k mapě"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nepřipojeno k serveru pro přenos souborů"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Připojeno ke vstupnímu zařízení"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Připojeno k zařízení za účelem přístupu k internetu"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Místní internetové připojení je sdíleno se zařízením"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Umožňuje připojení zvukového média"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Umožňuje připojení náhlavní soupravy"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Použít pro přenos souborů"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Použít pro vstup"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Použít pro přístup k internetu"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Použít pro mapu"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Nastavení doku"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Použít zvuk doku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon pro hlasitý poslech"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pro hudbu a média"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamatovat nastavení"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Google Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Připojeno pomocí asistenta připojení Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Odesílání obrazovky"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Odeslat"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Povolit bezdrátový displej"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V okolí nebyla nalezena žádná zařízení."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Připojování"</string>
@@ -570,6 +568,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Odstranit"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Hotovo"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Název"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povolit výměnu dat, pokud se tablet dotkne jiného zařízení"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povolit výměnu dat, pokud se telefon dotkne jiného zařízení"</string>
@@ -593,21 +593,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Vypínání Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Chyba"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Při režimu Letadlo"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nelze hledat sítě"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Oznamování sítě"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Upozornit, když bude dostupná veřejná síť"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Ignorovat slabá připojení"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Nepoužívat síť Wi-Fi, pokud nemá dostatečně kvalitní internetové připojení"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Použít jen sítě s dobrým připojením k internetu"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Hledání vždy zapnuto"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Vždy povolit vyhledávání sítí"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Povolit službě určování polohy Google a ostatním aplikacím hledat sítě, i když je síť Wi-Fi vypnutá"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automaticky používat otevřené sítě Wi-Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Nechat asistenta Wi‑Fi automaticky se připojit ke kvalitním otevřeným sítím"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Zvolit asistenta"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalace certifikátů"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Za účelem zvýšení přesnosti a k dalším účelům mohou aplikace Google a další aplikace vyhledávat sítě Wi-Fi v okolí, i když je Wi-Fi vypnuta. Chcete-li toto zakázat, přejděte do nabídky Wi-Fi &gt; Rozšířené nastavení &gt; Hledání vždy zapnuto."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikace mohou vyhledávat sítě v okolí i v případě, že je Wi-Fi vypnuta. Chcete-li nastavení změnit, přejděte do nabídky Rozšířené nastavení &gt; Hledání vždy zapnuto."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Za účelem zlepšení přesnosti polohy budou aplikace a služby vyhledávat sítě Wi-Fi, i když bude připojení Wi-Fi vypnuté. Toto chování můžete změnit v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastavení vyhledávání<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Tuto zprávu příště nezobrazovat"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi aktivní i v režimu spánku"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi aktivní i v režimu spánku"</string>
@@ -635,11 +630,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Přidat další síť"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Další"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. nastavení (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"K dokončení nastavení potřebuje tablet přístup k síti Wi-Fi. Po nastavení můžete přepínat mezi mobilním datovým připojením a sítí Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Rozšířené možnosti"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Chráněné nastavení Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spouštění WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Stiskněte na směrovači tlačítko Chráněné nastavení Wi-Fi. Může být označeno textem „WPS“ nebo tímto symbolem:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Stiskněte na směrovači tlačítko Chráněné nastavení Wi-Fi. Může být označeno textem „WPS“ nebo tímto symbolem:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Zadejte ve svém směrovači sítě Wi-Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavení může trvat až dvě minuty."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"Spuštění WPS se podařilo. Probíhá připojení k síti..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Připojeno k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +659,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymní identita"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Heslo"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Zobrazovat heslo"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfigurovat pásmo přístupového bodu"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Pásmo 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Pásmo 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Nastavení IP adresy"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nezměněno)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(neurčeno)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Uloženo"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Vypnuto"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Selhání konfigurace protokolu IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Selhání připojení Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problém s ověřením"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Nebyl zjištěn žádný přístup k internetu, připojení nebude automaticky obnoveno."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozici"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozici)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadejte heslo sítě"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Žádné"</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>
@@ -686,6 +675,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Chcete se přihlásit, abyste se mohli připojit?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> vyžaduje, abyste se před připojením k síti přihlásili na webu."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"PŘIPOJIT"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Tato síť nemá přístup k internetu. Chcete ji přesto použít?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"U této sítě se již nedotazovat"</string>
     <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>
@@ -751,6 +742,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Přenosný hotspot Wi-Fi AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Přenosný hotspot 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">"Volání přes Wi-Fi"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Předvolby volání"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Režim volání přes Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Preferována síť W-Fi"</item>
+    <item msgid="5267397515594230396">"Preferována mobilní síť"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Plocha"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zobrazení"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -814,6 +817,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Nastavení jasu displeje"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptivní jas"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimalizovat úroveň jasu podle okolního světla"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Motiv"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Světlý"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Tmavý"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatický"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutí obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -865,10 +873,12 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Změnit preferovanou SIM kartu?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> je jediná SIM karta v zařízení. Chcete tuto SIM kartu použít k mobilnímu datovému připojení, volání a odesílání zpráv SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Zadali jste nesprávný kód PIN SIM karty. Nyní musíte za účelem odemknutí zařízení kontaktovat svého operátora."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Zadali jste nesprávný kód PIN SIM karty. Máte ještě <xliff:g id="NUMBER">%d</xliff:g> pokus, poté budete muset o odemknutí zařízení požádat svého operátora."</item>
-    <item quantity="other" msgid="77103619544346451">"Zadali jste nesprávný kód PIN SIM karty. Počet zbývajících pokusů: <xliff:g id="NUMBER">%d</xliff:g>."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="few">Zadali jste nesprávný kód PIN SIM karty. Máte ještě <xliff:g id="NUMBER_1">%d</xliff:g> pokusy.</item>
+      <item quantity="many">Zadali jste nesprávný kód PIN SIM karty. Máte ještě <xliff:g id="NUMBER_1">%d</xliff:g> pokusu.</item>
+      <item quantity="other">Zadali jste nesprávný kód PIN SIM karty. Máte ještě <xliff:g id="NUMBER_1">%d</xliff:g> pokusů.</item>
+      <item quantity="one">Zadali jste nesprávný PIN SIM karty. Zbývá <xliff:g id="NUMBER_0">%d</xliff:g> pokus, poté bude muset zařízení odemknout operátor.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operace pomocí kódu PIN SIM karty se nezdařila!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stav tabletu"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Stav telefonu"</string>
@@ -917,12 +927,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"K dispozici (pouze pro čtení)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Celková paměť"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Výpočet…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikace (data apl. a multimediální obsah)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikace a data aplikací"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Média"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Stahování"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Fotografie, videa"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Zvuk (hudba, vyzvánění, podcasty atd.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Různé"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Jiné soubory"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data uložená v mezipaměti"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojit sdílené úložiště"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojit kartu SD"</string>
@@ -955,6 +965,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Probíhá odpojování"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"V úložišti je málo místa"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Některé systémové funkce, jako například synchronizace, nemusejí fungovat správně. Zkuste uvolnit místo smazáním nebo uvolněním položek, jako jsou aplikace nebo multimediální obsah."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Přejmenovat"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Připojit"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Odpojit"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Vymazat a naformátovat"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Vymazat a naformátovat interní úložiště"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Připojení USB k počítači"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Připojení USB k počítači"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Připojit jako"</string>
@@ -962,8 +977,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Umožňuje přenášet multimediální soubory v systému Windows nebo pomocí aplikace Android File Transfer v systému Mac (další informace na stránce www.android.com/filetransfer)."</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparát (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Umožňuje přenos fotografií pomocí softwaru fotoaparátu a přenos jakýchkoli souborů do počítačů, které nepodporují protokol MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalace nástrojů pro přenos souborů"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Umožňuje aplikacím s podporou formátu MIDI spolupracovat se softwarem ke zpracování souborů MIDI prostřednictvím USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Další uživatelé"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Úložiště zařízení"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Vyměnitelné úložiště"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Volné místo: <xliff:g id="FREE">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Úložiště <xliff:g id="NAME">%1$s</xliff:g> je připojeno"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Připojení úložiště <xliff:g id="NAME">%1$s</xliff:g> se nezdařilo"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Úložiště <xliff:g id="NAME">%1$s</xliff:g> bylo bezpečně odpojeno"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Úložiště <xliff:g id="NAME">%1$s</xliff:g> nebylo možné bezpečně odpojit"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Úložiště <xliff:g id="NAME">%1$s</xliff:g> je naformátováno"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Formátování úložiště <xliff:g id="NAME">%1$s</xliff:g> se nezdařilo"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Přejmenovat úložiště"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Po naformátování budete moci toto úložiště <xliff:g id="NAME_0">^1</xliff:g> používat s jinými zařízeními. \n\nVeškerá data v tomto úložišti <xliff:g id="NAME_1">^1</xliff:g> budou vymazána. Doporučujeme je nejprve zálohovat. \n\n"<b>"Zálohování fotek a jiných medií"</b>" \nMediální soubory přesuňte do jiného úložiště v zařízení nebo je pomocí kabelu USB přeneste do počítače. \n\n"<b>"Zálohování aplikací"</b>" \nVšechny aplikace uložené v tomto úložišti <xliff:g id="NAME_6">^1</xliff:g> budou odinstalovány a jejich data budou vymazána. Chcete-li tyto aplikace zachovat, přesuňte je do jiného úložiště v zařízení."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Když toto úložiště <xliff:g id="NAME_0">^1</xliff:g> odpojíte, aplikace, kterou jsou v něm uloženy, přestanou fungovat a mediální soubory nebudou dostupné, dokud jej opět nevložíte."</b>" \n\nToto úložiště <xliff:g id="NAME_1">^1</xliff:g> je naformátováno tak, aby fungovalo pouze v tomto zařízení. V jiných zařízeních fungovat nebude."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavte úložiště <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Použít jako přenosné úložiště"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"K přenášení fotek a dalších médií mezi zařízeními."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Použít jako interní úložiště"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"K ukládání libovolných dat, včetně aplikací a fotek, pouze do tohoto zařízení. Vyžaduje naformátování, které způsobí, že nebude fungovat v jiných zařízeních."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formátovat jako interní úložiště"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Proto je nutné úložiště <xliff:g id="NAME_0">^1</xliff:g> zabezpečit pomocí formátování. \n\nPo naformátování bude úložiště <xliff:g id="NAME_1">^1</xliff:g> fungovat pouze v tomto zařízení. \n\n"<b>"Formátováním vymažete veškerá data, která jsou v tomto úložišti <xliff:g id="NAME_2">^1</xliff:g> uložena."</b>" Chcete-li ztrátě dat předejít, doporučujeme je zálohovat."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Vymazat a naformátovat"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formátování úložiště <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Během formátování úložiště <xliff:g id="NAME">^1</xliff:g> neodpojujte."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Přesuňte data do nového úložiště"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Do tohoto nového úložiště <xliff:g id="NAME">^1</xliff:g> můžete přesunout fotky, soubory a data aplikací. \n\nPřesun bude trvat <xliff:g id="TIME">^2</xliff:g> a v interním úložišti uvolní <xliff:g id="SIZE">^3</xliff:g>. Během přesunu nebudou některé aplikace fungovat."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Přesunout"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Přesunout později"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Přesuňte data"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Přesun bude trvat asi <xliff:g id="TIME">^1</xliff:g>. V interním úložišti uvolní <xliff:g id="SIZE">^2</xliff:g>."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Přesunout"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Probíhá přesun dat…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Během přesunu: \n• Neodpojujte úložiště <xliff:g id="NAME">^1</xliff:g>. \n• Některé aplikace nebudou fungovat správně. \n• Udržujte zařízení nabité."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Úložiště <xliff:g id="NAME">^1</xliff:g> je připraveno"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Nyní do úložiště <xliff:g id="NAME">^1</xliff:g> můžete ukládat fotky a další média."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Nové úložiště <xliff:g id="NAME">^1</xliff:g> již funguje. \n\nChcete-li do tohoto zařízení přesunout fotky, soubory a data aplikací, přejděte do Nastavení &gt; Úložiště."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Přesuňte aplikaci <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Přesunutí aplikace <xliff:g id="APP">^1</xliff:g> a jejích dat do úložiště <xliff:g id="NAME_0">^2</xliff:g> bude trvat jen chvíli. Aplikaci bude možné používat až po dokončení přesunu. \n\nÚložiště <xliff:g id="NAME_1">^2</xliff:g> během přesunu neodpojujte."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Probíhá přesun aplikace <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Úložiště <xliff:g id="NAME">^1</xliff:g> během přesunu nevysouvejte. \n\nAplikace <xliff:g id="APP">^2</xliff:g> bude v tomto zařízení k dispozici až po dokončení přesunu."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Zrušit přesun"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stav baterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Stav baterie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Přístupové body"</string>
@@ -1007,10 +1062,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Obnovování výchozích nastavení názvu přístupového bodu (APN)"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Obnovit výchozí"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Obnovení výchozích nastavení názvu přístupového bodu (APN) bylo dokončeno."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Resetování nastavení sítě"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Tímto resetujete nastavení všech sítí, včetně následujících:\n\n"<li>"Wi‑Fi,"</li>\n<li>"mobilní datové připojení,"</li>\n<li>"Bluetooth."</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Resetovat nastavení"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Chcete resetovat všechna nastavení sítí? Tuto akci nelze vrátit zpět."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Resetovat nastavení"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetovat?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Nastavení sítí bylo resetováno"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Resetovat zařízení"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovení továrních dat"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vymaže všechna data v tabletu"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vymaže všechna data v telefonu"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mimo jiné následují:\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="9165016501623540228">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mimo jiné i následující:\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>
@@ -1024,9 +1084,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Smazat všechna data na kartě SD, například hudbu a fotografie."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetovat tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetovat telefon"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Chcete smazat všechny osobní informace a stažené aplikace? Tuto akci nelze vrátit zpět."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Chcete vymazat všechny osobní údaje a stažené aplikace? Tuto akci nelze vrátit zpět."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Odstranit vše"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Chcete-li potvrdit obnovení továrních dat, musíte nakreslit bezpečnostní gesto."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Pokus o obnovení se nezdařil, protože služba System Clear není dostupná."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Resetovat?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Pro tohoto uživatele není obnovení továrního nastavení dostupné"</string>
@@ -1043,8 +1102,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Chcete úložiště USB smazat a odstranit tak všechny soubory, které jsou v něm uloženy? Tuto akci nelze vrátit zpět."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Chcete kartu SD smazat a odstranit tak všechny soubory, které jsou na ní uloženy? Tuto akci nelze vrátit zpět."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Odstranit vše"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Smazání úložiště USB je třeba potvrdit pomocí bezpečnostního gesta."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Smazání karty SD je třeba potvrdit pomocí bezpečnostního gesta."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavení hovorů"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavení hlasové schránky, přesměrování a čekání hovorů a ID volajícího"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering pomocí USB"</string>
@@ -1076,7 +1133,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Nápověda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilní sítě"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilní tarif"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Výchozí aplikace SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikace pro SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Chcete změnit aplikaci SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Chcete pro zprávy SMS používat aplikaci <xliff:g id="NEW_APP">%1$s</xliff:g> místo aplikace <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Chcete pro zprávy SMS používat aplikaci <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
@@ -1104,7 +1161,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim určování polohy"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"K určení polohy použít GPS, Wi-Fi a mobilní sítě"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"K určení polohy použít Wi-Fi a mobilní sítě"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"K určení polohy použít GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"K určení polohy použít GPS"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skenování"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skenování"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Vyhledávání Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Zlepšit přesnost polohy tím, že aplikace a služby budou vyhledávat sítě Wi-Fi, i když bude připojení Wi-Fi vypnuté"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Vyhledávání Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Zlepšit přesnost polohy tím, že systémové služby budou moci vyhledávat zařízení Bluetooth, i když bude rozhraní Bluetooth vypnuté"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Poloha z Wi-Fi a mobilních sítí"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Povolit aplikacím používat službu určování polohy Google a rychleji odhadovat vaši polohu. Anonymní data budou sbírána a odesílána Googlu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha určená sítí Wi-Fi"</string>
@@ -1150,11 +1213,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Heslo bylo nastaveno"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Kód PIN byl nastaven"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Gesto bylo nastaveno"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Zabezpečení obrazovky"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Chcete-li pokračovat, zadejte gesto zařízení."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Chcete-li pokračovat, zadejte PIN zařízení."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Chcete-li pokračovat, zadejte heslo zařízení."</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_need_to_unlock" msgid="757935356911054465">"Potvrďte uložené gesto"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Zkuste to znovu:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Proveďte gesto odemknutí"</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 zdvihněte prst z obrazovky"</string>
@@ -1176,8 +1243,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nastavení bezpečnostního gesta"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Změna bezpečnostního gesta"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Gesto odemknutí obrazovky proveďte tímto způsobem"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Příliš mnoho neplatných pokusů."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Sekundy zbývající do dalšího pokusu: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Příliš mnoho neplatných pokusů. Zkuste to znovu za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikace není v telefonu nainstalována."</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>
@@ -1228,6 +1294,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Řadit podle velikosti"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Zobrazit spuštěné služby"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Zobrazit mezipaměť"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikace k příjmu výstražných zpráv"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Obnovit nastavení apl."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnovit nastavení apl.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tímto resetujete všechna nastavení následujících položek:\n\n "<li>"zakázané aplikace,"</li>\n" "<li>"zakázaná oznámení aplikací,"</li>\n" "<li>"výchozí aplikace pro různé akce,"</li>\n" "<li>"omezení datových přenosů na pozadí pro aplikace,"</li>\n" "<li>"veškerá omezení oprávnění."</li>\n\n" Nepřijdete o žádná data aplikací."</string>
@@ -1299,6 +1366,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Operace aplikací"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Spuštěno"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nebylo použito)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Žádné výchozí aplikace"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využití úložiště"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Zobrazit aplikacemi používané úložiště"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spuštěné služby"</string>
@@ -1396,17 +1464,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informace o tabletu"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informace o telefonu"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Info o baterii"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Rychlé spuštění"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Umožňuje nastavit klávesové zkratky pro spouštění aplikací"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Přiřadit aplikaci"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Žádná klávesová zkratka"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Hledat + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Vymazat"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Klávesová zkratka <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) bude vymazána."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Zrušit"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplikace"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Zástupce"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Zadávání textu"</string>
     <string name="input_method" msgid="5434026103176856164">"Metoda zadávání dat"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Aktuální klávesnice"</string>
@@ -1441,23 +1498,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zachytit všechny pakety Bluetooth HCI do souboru"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Odemknutí OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Povolit odemknutí zavaděče"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Zadejte kód PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Chcete-li povolit odemknutí OEM, zadejte kód PIN zařízení."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Povolit odemknutí OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORNĚNÍ: Pokud bude toto nastavení zapnuto, nebudou v tomto zařízení fungovat funkce ochrany zařízení."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Velikosti vyrovn. pamětí protokol. nástroje"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vyberte velikosti protokolovacího nástroje na vyrovnávací paměť protokolů"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Povolit kontrolu atributu zobrazení"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Sítě"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikace bezdrátového displeje"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Povolit podrobné protokolování Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresivní předání z Wi-Fi na mobilní síť"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Vždy povolit vyhledávání roamingu Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Použít starý klient DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Zobrazit možnosti certifikace bezdrátového displeje"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Zvýší úroveň protokolování Wi‑Fi zobrazenou v SSID a RSSI při výběru sítě Wi‑Fi."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Pokud je tato možnost zapnuta, bude síť Wi-Fi agresivnější při předávání datového připojení mobilní síti při slabém signálu Wi-Fi."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Povolí nebo zakáže vyhledávání roamingu Wi-Fi na základě množství datového provozu na rozhraní."</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Velikosti vyrovn. pamětí protokol. nástroje"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vyberte velikosti protokolovacího nástroje na vyrovnávací paměť protokolů"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Výběr konfigurace USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Výběr konfigurace USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Povolit kontrolu atributu zobrazení"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Namísto nového klientu DHCP Android použít klient DHCP z verze Lollipop."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Povolit ladění USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ladění prostřednictvím rozhraní USB je určeno pouze pro účely vývoje. Použijte je ke kopírování dat mezi počítačem a zařízením, instalaci aplikací do zařízení bez upozornění a čtení dat protokolů."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Zrušit přístup k ladění USB ze všech počítačů, které jste v minulosti autorizovali?"</string>
@@ -1561,6 +1626,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Purpurová"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Použít službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> potřebuje:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Žádost o oprávnění je blokována jinou aplikací. Nastavení proto vaši odpověď nemůže ověřit."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Pokud zapnete službu <xliff:g id="SERVICE">%1$s</xliff:g>, zařízení nebude používat zámek obrazovky k vylepšení šifrování dat."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Vzhledem k tomu, že jste zapnuli službu usnadnění přístupu, nebude zařízení používat zámek obrazovky k vylepšení šifrování dat."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Protože zapnutí služby <xliff:g id="SERVICE">%1$s</xliff:g> má vliv na šifrování dat, je třeba, abyste potvrdili své gesto."</string>
@@ -1702,14 +1768,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiky procesů"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Podrobné statistiky běžících procesů"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Využití paměti"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplikace <xliff:g id="TYPE">%1$s</xliff:g> přes <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Využito <xliff:g id="USEDRAM">%1$s</xliff:g> z <xliff:g id="TOTALRAM">%2$s</xliff:g> za <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"na pozadí"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"v popředí"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"v mezipaměti"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Aktuální stav paměti zařízení: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Průměrné využití paměti RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Minimální využití paměti RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"OS Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Nativní"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Jádro"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Mezipaměti"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Využití RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Využití RAM (pozadí)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Doba běhu"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Procesy"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Služby"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Doba trvání"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Podrobnosti o paměti"</string>
@@ -1726,6 +1798,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hodin"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 den"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Zobrazit systém"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Skrytí systémových procesů"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Použít USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ statistik"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Pozadí"</string>
@@ -1748,7 +1821,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Výchozí nastavení níže přepíše nastavení jednotlivých aplikací"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Výchozí nastavení"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Výchozí modul"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Nastavuje modul pro syntézu řeči použitý pro mluvený text."</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Nastavit modul syntézy řeči, který se bude používat pro mluvený text"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Rychlost řeči"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Rychlost mluveného textu"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string>
@@ -1822,7 +1895,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarové"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Pouze software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Pro tohoto uživatele jsou identifikační údaje nedostupné."</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Instalaci pověření je třeba potvrdit provedením bezpečnostního gesta."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1919,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohování mých dat"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Zálohovat data aplikací, hesla sítí Wi-Fi a další nastavení na serverech Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Záložní účet"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Aktuálně nejsou zálohovaná data ukládána do žádného účtu."</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Zahrnout data aplikací"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatické obnovení"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Při přeinstalaci aplikace obnovit zálohovaná nastavení a další data"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Služba zálohování není aktivní."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Toto je nastaveno zásadami zařízení."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo pro zálohy v počítači"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Úplné zálohy v počítači nejsou v současné době chráněny"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tuto možnost vyberte, chcete-li změnit nebo odebrat heslo pro úplné zálohy v počítači"</string>
@@ -2024,6 +2094,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Měřítko animace přeměny"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Měřítko délky animace"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulovat sekundární displeje"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Režim několika oken"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Několik aktivit na obrazovce současně"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Aktivovat režim několika oken?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"UPOZORNĚNÍ: Toto je vysoce experimentální funkce, která prostřednictvím uživatelského rozhraní Nedávné aplikace umožňuje, aby na obrazovce probíhalo několik aktivit současně. Při použití této funkce mohou některé aplikace selhat nebo nemusejí fungovat správně."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikace"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Neukládat aktivity"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Rušit všechny činnosti, jakmile je uživatel zavře"</string>
@@ -2195,7 +2269,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Uživatel"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Omezený profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Přidat nového uživatele?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Vytvořením dalších uživatelů můžete toto zařízení sdílet s jinými lidmi. Každý uživatel má svůj prostor, který může personalizovat, nainstalovat své aplikace, tapetu atd. Uživatelé také mohou upravit nastavení zařízení (např. Wi-Fi), která ovlivní všechny ostatní uživatele.\n\nKdyž přidáte nového uživatele, musí si nastavit vlastní prostor.\n\nJakýkoli uživatel může aktualizovat aplikace všech ostatních uživatelů."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Vytvořením dalších uživatelů můžete toto zařízení sdílet s jinými lidmi. Každý uživatel má svůj prostor, který si může přizpůsobit instalací aplikací, přidáním tapety apod. Uživatelé také mohou upravit nastavení zařízení (např. Wi-Fi), která ovlivní všechny uživatele.\n\nKaždý nově přidaný uživatel si musí nastavit vlastní prostor.\n\nKaždý uživatel může aktualizovat aplikace všech ostatních uživatelů."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Když přidáte nového uživatele, musí si nastavit vlastní prostor.\n\nJakýkoli uživatel může aktualizovat aplikace všech ostatních uživatelů."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nastavit uživatele?"</string>
     <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>
@@ -2226,13 +2300,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Odstranit hosta?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Veškeré aplikace a data v této relaci budou vymazána."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Odstranit"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Povolit telefonní hovory"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Povolit telefonní hovory a SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Zapnout telefonní hovory"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Zapnout telefonní hovory a SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Odstranit uživatele"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Povolit telefonní hovory?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Zapnout telefonní hovory?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"S tímto uživatelem bude sdílena historie hovorů."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Povolit telefonní hovory a SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"S tímto uživatelem bude sdílena historie hovorů a SMS."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Zapnout telefonní hovory a SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"S tímto uživatelem bude sdílena historie hovorů a SMS."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Povolit aplikace a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikace s omezením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbalit nastavení aplikace"</string>
@@ -2283,8 +2357,8 @@
     <string name="user_rename" msgid="8523499513614655279">"PŘEJMENOVAT"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Nastavit omezení aplikací"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Řízeno aplikací <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Tato aplikace v omezených profilech není podporována."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Tato aplikace má přístup k vašim účtům"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Tato aplikace má přístup k vašim účtům. Řízeno aplikací <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Sítě Wi‑Fi a mobilní sítě"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Povolit úpravu nastavení sítí Wi-Fi a mobilních sítí"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2337,7 +2411,7 @@
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM karty byly změněny."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Nastavte dotykem"</string>
-    <string name="sim_pref_divider" msgid="6778907671867621874">"Preferovaná SIM karta pro"</string>
+    <string name="sim_pref_divider" msgid="6778907671867621874">"Preferovaná SIM karta"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pokaždé se zeptat"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Vyžadován výběr"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nastavení"</string>
@@ -2349,13 +2423,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi síť připojení"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textová zpráva SMS odesílání zpráv"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilní operátor mobilní data bezdrátový přenos 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi hovor volání"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"obrazovka dotykový displej"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ztlumit obrazovka dotykový displej baterie"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ztlumit obrazovka dotykový displej baterie"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"pozadí personalizace přizpůsobení displej"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tmavý motiv noční režim ztlumení obrazovky invertovat jas"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"pozadí personalizace přizpůsobení displej"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"velikost textu"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekce"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"promítání vysílání"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"místo disk pevný disk zařízení využití"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"využití energie nabití"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"pravopis slovník kontrola pravopisu automatické opravy"</string>
@@ -2372,6 +2448,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"účet"</string>
     <string name="keywords_users" msgid="4673901601478559100">"omezení omezit omezeno"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"oprava textu opravit zvuk vibrace automatický výběr jazyka návrh navrhování motiv nevhodné slovo psaní emodži mezinárodní"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"resetovat předvolby výchozí"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"výstražné nouzové aplikace výchozí"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplikace stahování systém"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikace oprávnění zabezpečení"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplikace výchozí"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"přejetí prstem heslo gesto pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavení štítku NFC pro Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapsat"</string>
@@ -2386,11 +2467,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hlasitost budíku"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Hlasitost vyzvánění"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hlasitost oznámení"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Vyrušení"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Při příchozím hovoru nebo oznámení"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Vždy vyrušit"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Povolit pouze prioritní vyrušení"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nerušit"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Povolit pouze prioritní"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatická pravidla"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Pouze prioritní"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Pouze budíky"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Žádná vyrušení"</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="ringtone_title" msgid="5379026328015343686">"Vyzváněcí tón telefonu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Výchozí tón oznámení"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrovat také u volání"</string>
@@ -2416,62 +2498,133 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrace"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Přístup k oznámením"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikace nesmí číst oznámení"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplikace může číst oznámení"</item>
-    <item quantity="other" msgid="980049191810249052">"Aplikace mohou číst oznámení (celkem %d)"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="few">%d aplikace mohou číst oznámení</item>
+      <item quantity="many">%d aplikace může číst oznámení</item>
+      <item quantity="other">%d aplikací může číst oznámení</item>
+      <item quantity="one">%d aplikace může číst oznámení</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nejsou nainstalovány žádné aplikace poslouchající oznámení."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Chcete zapnout <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> bude moci číst všechna oznámení zveřejněná systémem nebo jakoukoli nainstalovanou aplikací. Oznámení mohou obsahovat osobní údaje jako kontaktní jména nebo texty zpráv, které jsou vám odesílány. Aplikace bude také moci tato oznámení zavřít nebo klepnout na tlačítka akcí v oznámeních."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Poskytovatelé podmínek"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Žádné aplikace neposkytují podmínky"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"Aplikace poskytující podmínky: %d"</item>
-    <item quantity="other" msgid="358057362115673258">"Aplikace poskytující podmínky: %d"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nejsou nainstalováni žádní poskytovatelé podmínek."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Chcete zapnout službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Poskytovatel podmínek <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> bude do režimu Nerušit moci přidat podmínky ukončení."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítání aplikací..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blokovat"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovat vše"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikdy nezobrazovat oznámení z této aplikace"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritní"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Zobrazovat oznámení na začátku seznamu a nadále je zobrazovat, i když bude zařízení nastaveno pouze na prioritní vyrušení"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Důvěrné"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Když je zařízení uzamčeno, skrýt v oznámeních této aplikace veškerý citlivý obsah"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Považovat za prioritní"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Umožní aplikaci informovat o oznámeních, i když je režim Nerušit nastaven pouze na prioritní vyrušení."</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Povolit rychlý náhled"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Umožní aplikaci zdůraznit určitá upozornění tím, že je krátce zobrazí na aktuální obrazovce."</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skrýt citlivý obsah"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Když je zařízení uzamčeno, skryje se obsah oznámení této aplikace, která by mohla vyzradit soukromé údaje."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Zablokováno"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritní"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Důvěrné"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Dokud tuto funkci nevypnete"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritní vyrušení"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Výpadek"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dny"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Žádné"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Vyrušení jsou povolena"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Pouze prioritní"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Žádné"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizace"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automaticky zapnout"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Název pravidla"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Přidat pravidlo"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Smazat pravidlo"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Smazat pravidlo <xliff:g id="RULE">%1$s</xliff:g>?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Smazat"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Typ pravidla"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Neznámé"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Nakonfigurovat pravidlo"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Naplánované pravidlo"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Pravidlo nebylo nalezeno."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dny"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Žádná"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Každý den"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikdy"</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> až <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Volání"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Zprávy"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Volání/zprávy od"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Kohokoli"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Pouze kontakty"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kontakty s hvězdičkou"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Události a připomenutí"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Budíky jsou vždy prioritní vyrušení."</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Připomenutí"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Události"</string>
+    <string name="zen_mode_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é za <xliff:g id="MINUTES">%d</xliff:g> min, bude povolena"</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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Víkendy"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Čas zahájení"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Čas ukončení"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Zítra v čase <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"V čase <xliff:g id="FORMATTED_TIME">%s</xliff:g> nebo při jakémkoli dřívějším budíku"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Zítra v čase <xliff:g id="FORMATTED_TIME">%s</xliff:g> nebo při jakémkoli dřívějším budíku"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Zítra v <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Vyrušení"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Při příchozím hovoru nebo oznámení"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kdy vás můžeme rušit?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Na jak dlouho?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Vždy vyrušit"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"vypnout,vše,všechno"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Povolit pouze prioritní vyrušení"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Povolit pouze budíky"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Nerušit"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Na dobu neurčitou"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> minuty</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minut</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuta</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> hodiny</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> hodiny</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hodin</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hodina</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Na dobu neurčitou přepnout do režimu Pouze prioritní oznámení"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> minut (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="one">Na minutu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> hodin (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+      <item quantity="one">Na hodinu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Pouze prioritní oznámení</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Na dobu neurčitou přepnout do režimu Pouze budíky"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> minut (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="one">Na minutu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> hodin (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+      <item quantity="one">Na hodinu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Pouze budíky</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Na dobu neurčitou přepnout do režimu Nerušit"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> minuty (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> minut (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="one">Na minutu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="few">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="many">Na <xliff:g id="DURATION">%1$d</xliff:g> hodiny (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="other">Na <xliff:g id="DURATION">%1$d</xliff:g> hodin (tedy do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+      <item quantity="one">Na hodinu (tedy do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>) přepnout do režimu Nerušit</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Přejít do režimu Vždy vyrušit"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"navždy"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Oznámení aplikací"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odeslat zpětnou vazbu o tomto zařízení"</string>
@@ -2512,4 +2665,69 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Informace o kódu IMEI"</string>
     <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="2184141780491382435">"Spouštět ve výchozím nastavení"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> – využito <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Odkazy na domény"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Otevřít adresy URL domény"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Povolit aplikaci přímo otevřít adresy URL domény"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Podporované adresy URL domény"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Další výchozí hodnoty"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> – využito <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"Interní paměť"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"Externí paměť"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Interní úložiště"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Externí úložiště"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Využití dat aplikací"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"Od <xliff:g id="DATE">%2$s</xliff:g> využito <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Využití úložiště"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Zapnuto"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blokováno"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Důvěrné"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritní"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritní a důvěrné"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="few">Udělena <xliff:g id="COUNT_1">%d</xliff:g> oprávnění</item>
+      <item quantity="many">Uděleno <xliff:g id="COUNT_1">%d</xliff:g> oprávnění</item>
+      <item quantity="other">Uděleno <xliff:g id="COUNT_1">%d</xliff:g> oprávnění</item>
+      <item quantity="one">Uděleno <xliff:g id="COUNT_0">%d</xliff:g> oprávnění</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="few">Bylo uděleno <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g> oprávnění</item>
+      <item quantity="many">Bylo uděleno <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g> oprávnění</item>
+      <item quantity="other">Bylo uděleno <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g> oprávnění</item>
+      <item quantity="one">Bylo uděleno <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> oprávnění</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Je nastaveno několik výchozích hodnot"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Nejsou nastaveny žádné výchozí hodnoty"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Všechny aplikace"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Zapnuto"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Osobní"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Práce"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Zablokováno"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritní"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Důvěrné"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S adresami URL domény"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Zakázáno administrátorem"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Rozšířená nastavení"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Neznámá aplikace"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Vyberte profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Oprávnění aplikace"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Další přístup povolen u <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikací"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Povoleno u <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikací"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Adresy URL domény"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Neotevírat adresy URL domény"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Otevřít adresu <xliff:g id="DOMAIN">%s</xliff:g>"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Otevřít adresu <xliff:g id="DOMAIN">%s</xliff:g> a související adresy URL"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="few">Adresy URL domény mohou otevřít <xliff:g id="COUNT">%d</xliff:g> aplikace</item>
+      <item quantity="many">Adresy URL domény může otevřít <xliff:g id="COUNT">%d</xliff:g> aplikace</item>
+      <item quantity="other">Adresy URL domény může otevřít <xliff:g id="COUNT">%d</xliff:g> aplikací</item>
+      <item quantity="one">Adresy URL domény může otevřít jedna aplikace</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nerozpoznáno"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Výchozí aplikace"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Prohlížeč"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Žádný výchozí prohlížeč"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Výchozí)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Úložiště aplikací"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 31ff237..5e4d542 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Trykknap"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"slå mikrofonlyd til/fra"</item>
     <item msgid="1148142988678569310">"medieprojektion"</item>
     <item msgid="9130014005474445273">"aktivér VPN"</item>
+    <item msgid="1165192162975045562">"skriv baggrund"</item>
+    <item msgid="7129487923652967258">"forslagsstruktur"</item>
+    <item msgid="1069023208100114540">"forslagsskærmbillede"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Placering"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Slå mikrofonlyd til/fra"</item>
     <item msgid="5906017727368097853">"Medieprojektion"</item>
     <item msgid="2486614710846178542">"Aktivér VPN"</item>
+    <item msgid="5586547561693629602">"Skriv baggrund"</item>
+    <item msgid="32794179825485062">"Forslagsstruktur"</item>
+    <item msgid="7872852746938272552">"Forslagsskærmbillede"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"lav"</item>
     <item msgid="4212263919458209842">"kritisk"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Fra"</item>
-    <item msgid="5656544177755411222">"Begrænsede afbrydelser"</item>
-    <item msgid="8735337502532332056">"Nul afbrydelser"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderat"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Pink"</item>
     <item msgid="6131821495505931173">"Rød"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Lydkilde"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6b0179d..289a767 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Tillad"</string>
     <string name="deny" msgid="6947806159746484865">"Afvis"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukendt"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Du er nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> skridt væk fra at være udvikler."</item>
-    <item quantity="other" msgid="6722953419953594148">"Du er nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> skridt væk fra at være udvikler."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Du er nu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skridt fra at være udvikler.</item>
+      <item quantity="other">Du er nu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skridt fra at være udvikler.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Nu er du udvikler."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det behøver du ikke. Du er allerede udvikler."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Trådløs og netværk"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Slå sms via IMS fra"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Det er nødvendigt at slå IMS-registrering til"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Sluk IMS-registrering nødvendig"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Aktivér det tildelte flag for VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Deaktiver det tildelte flag for VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Tænd kassering af LTE RAM"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Sluk for kassering af LTE RAM"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Vis adressebog på SIM-kortet"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Dataudveksling"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dette vil deaktivere:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Tilsluttet"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Forbundet (ingen telefon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Tilsluttet (intet medie)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Forbundet (ingen adgang til meddelelse)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Forbundet (ingen telefon eller medier)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Afbrudt"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Afbryder ..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Opretter forbindelse..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Parrer..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Unavngiven Bluetooth-enhed"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Søger"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Der blev ikke fundet Bluetooth-enheder."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis modtagne filer"</string>
     <string name="device_picker" msgid="4978696506172252813">"Vælg Bluetooth-enhed"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Anmodning om Bluetooth-tilladelse"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app ønsker at aktivere Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"En app anmoder om at slå Bluetooth TIL for denne enhed."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app ønsker at gøre din tablet synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app ønsker at gøre din telefon synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app ønsker at gøre din tablet synlig for andre Bluetooth-enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxyindstillinger"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuller"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANNULLER"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"FORTSÆT"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEJ"</string>
-    <string name="forget" msgid="7267115980248732932">"GLEM"</string>
+    <string name="forget" msgid="1400428660472591263">"Glem"</string>
+    <string name="save" msgid="879993180139353333">"Gem"</string>
+    <string name="done" msgid="6942539184162713160">"Udført"</string>
     <string name="settings_label" msgid="1626402585530130914">"Indstillinger"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Indstillinger"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Genvej til Indstillinger"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorter efter tidszone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Dato"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Tid"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Gør ansigtsregistreringen bedre"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Bevægelseskontrol"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Kræv et blink med øjnene, når der låses op"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Lås automatisk"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> efter dvale"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> efter dvale, undtagen når den holdes oplåst af <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -345,9 +333,33 @@
     <string name="location_settings_title" msgid="1369675479310751735">"Placering"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sikkerhed"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og lager for loginoplysninger"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låst SIM-kort og lager for loginoplysninger"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, lager for loginoplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Adgangskoder"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeraftryk"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Adm. fingeraftryk"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Brug fingeraftryk til"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Tilføj"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"skærmlås"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> registreringer af fingeraftryk</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> registreringer af fingeraftryk</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Registrer fingeraftryk"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Før du kan bruge dit fingeraftryk til at låse skærmen op eller bekræfte køb, skal vi: \n\n✓ Konfigurere skærmlåsningsmetoden for din baggrundsskærm \n\n✓ Tilføje dit fingeraftryk"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find sensoren"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Find fingeraftrykssensoren på bagsiden af ​​telefonen."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Navn"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Slet"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Lad os komme i gang!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Placer fingeren på fingeraftrykssensoren. Fjern den igen, når du mærker en vibration."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Godt gået! Gentag processen."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Placer den samme finger på fingeraftrykssensoren, og fjern den igen, når du mærker en vibration."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingeraftryk tilføjet!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikon, kan du bruge dit fingeraftryk til brugeridentifikation eller til at godkende et køb."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Tilføj"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Næste"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Krypter telefon"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Tilslut din oplader, og prøv igen."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ingen pinkode eller adgangskode til skærmlås"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du skal angive en pinkode eller adgangskode for skærmlås, inden du kan starte krypteringen."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Du skal tegne dit mønster til at låse op for at bekræfte krypteringen af din enhed."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vil du kryptere?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Denne handling kan ikke fortrydes, og den kan ikke afbrydes uden tab af data til følge. Krypteringen tager mindst en time, og i den tid genstartes tabletten flere gange."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Denne handling kan ikke fortrydes, og den kan ikke afbrydes uden tab af data til følge. Krypteringen tager mindst en time, og i den tid genstartes telefonen flere gange."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Stryg"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Ingen sikkerhed"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Ansigtslås"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Lav sikkerhed, eksperimenterende"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Mønster"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Mellem sikkerhed"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Pinkode"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium til høj sikkerhed"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Adgangskode"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Høj sikkerhed"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Aktuel skærmlås"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funktionerne til enhedsbeskyttelse vil ikke fungere længere."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deaktiveret af administrator, kryptering eller loginlager"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Stryg"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Ansigtslås"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Mønster"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Pinkode"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Adgangskode"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Når du har oprettet en skærmlås, kan du også oprette dit fingeraftryk i Indstillinger &gt; Sikkerhed."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Slå skærmlås fra"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern mønster til at låse op"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern pinkode til at låse op"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Adgangskoden skal indeholde mindst ét bogstav."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Adgangskoden skal indeholde mindst ét tal."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Adgangskoden skal indeholde mindst ét symbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Adgangskoden skal indeholde mindst ét bogstav."</item>
-    <item quantity="other" msgid="8186027808415585970">"Adgangskoden skal indeholde mindst %d bogstaver."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Adgangskoden skal indeholde mindst ét lille bogstav."</item>
-    <item quantity="other" msgid="2693910942679679225">"Adgangskoden skal indeholde mindst %d små bogstaver."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Adgangskoden skal indeholde mindst ét stort bogstav."</item>
-    <item quantity="other" msgid="3030801209112209245">"Adgangskoden skal indeholde mindst %d store bogstaver."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Adgangskoden skal indeholde mindst 1 tal."</item>
-    <item quantity="other" msgid="4703982391407595924">"Adgangskoden skal indeholde mindst %d tal."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Adgangskoden skal indeholde mindst ét specialtegn."</item>
-    <item quantity="other" msgid="1221290525051187757">"Adgangskoden skal indeholde mindst %d specialtegn."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Adgangskoden skal indeholde mindst ét tegn, der ikke er et bogstav."</item>
-    <item quantity="other" msgid="3952508584649046404">"Adgangskoden skal indeholde mindst %d tegn, der ikke er bogstaver."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Adgangskoden skal indeholder mindst %d bogstaver.</item>
+      <item quantity="other">Adgangskoden skal indeholder mindst %d bogstaver.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Adgangskoden skal indeholde mindst %d små bogstaver.</item>
+      <item quantity="other">Adgangskoden skal indeholde mindst %d små bogstaver.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Adgangskoden skal indeholde mindst %d store bogstaver.</item>
+      <item quantity="other">Adgangskoden skal indeholde mindst %d store bogstaver.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Adgangskoden skal indeholde mindst %d tal.</item>
+      <item quantity="other">Adgangskoden skal indeholde mindst %d tal.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Adgangskoden skal indeholde mindst %d specialtegn.</item>
+      <item quantity="other">Adgangskoden skal indeholde mindst %d specialtegn.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Adgangskoden skal indeholde mindst %d tegn, der ikke er bogstaver.</item>
+      <item quantity="other">Adgangskoden skal indeholde mindst %d tegn, der ikke er bogstaver.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Enhedens administrator tillader ikke brug af en nylig brugt adgangskode."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"En stigende eller faldende sekvens af cifre og gentagne cifre er ikke tilladt"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Sådan parrer du med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sørg for, at den viser denne adgangsnøgle:&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">"Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Par med denne enhed?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Sådan parres med:<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>Skriv på den:<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>, og tryk derefter på Retur eller Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Par"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ACCEPTÉR PARRING"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuller"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Parring giver adgang til dine kontaktpersoner og din opkaldshistorik, når der er forbindelse til Wi-Fi."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Der kunne ikke parres med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Der kunne ikke parres med <xliff:g id="DEVICE_NAME">%1$s</xliff:g> på grund af en forkert pinkode eller adgangsnøgle."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Der kan ikke kommunikeres med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Parring afvist af <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Der kunne ikke oprettes forbindelse til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Søg efter enheder"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Opdater"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avanceret"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avanceret Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Når Bluetooth er aktiveret, kan enheden kommunikere med andre Bluetooth-enheder i nærheden."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"For at forbedre placeringsnøjagtigheden scanner apps og tjenester efter Bluetooth-enheder, selv når Bluetooth er slået fra. Du kan ændre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillinger for scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Opret forbindelse til..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medielyd"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefonlyd"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Filoverførsel"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Inputenhed"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetadgang"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Deling af kontaktpersoner"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Brug til deling af kontaktpersoner"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling af internetforbindelse"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Adgang til meddelelse"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra medielyd."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra håndfri lyd."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra inputenheden."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Brug til"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Omdøb"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Tillad indgående filoverførsler"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Forbundet til medielyd"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Forbundet til telefonlyd"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Forbundet til filoverførselsserver"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Forbundet til kort"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ikke forbundet til filoverførselsserver"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Forbundet til inputenhed"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tilsluttet enhed/internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Deler lokal internetforbindelse med enhed"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Brug til medielyd"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Brug til telefonlyd"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Brug til filoverførsel"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Brug til input"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Brug til internetadgang"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Brug til kort"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Indstillinger af Dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Brug dock til audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som højttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Til musik og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk indstillinger"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi-assistent"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Forbindelse via Wi-Fi-assistent"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Skærm til casting"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivér trådløs skærm"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Der blev ikke fundet enheder i nærheden."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Tilslutter"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Glem"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Udfør"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Navn"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillad dataudveksling, når tabletten rører en anden enhed"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillad dataudveksling, når telefonen rører en anden enhed"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Deaktiverer Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fejl"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"I flytilstand"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Der kan ikke søges efter netværk"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Underretning ved nye netværk"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Giv besked, når et offentligt netværk er tilgængeligt"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Undgå dårlige forbindelser"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Brug kun et Wi-Fi-netværk, hvis det har en god internetforbindelse"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Anvend kun netværk med god internetforbindelse"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanning altid tilgængelig"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Tillad altid scanning"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Lad Googles placeringstjeneste og andre apps søge efter netværk, selv når Wi-Fi er slået fra"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Brug automatisk åbent Wi-Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Giv en Wi‑Fi-assistent lov til automatisk at oprette forbindelse til åbne netværk af høj kvalitet"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Vælg en assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer certifikater"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Google og andre apps søger muligvis efter netværk i nærheden, selv når Wi-Fi er slukket, for at forbedre placeringsnøjagtighed m.m. Hvis du ikke ønsker dette, kan du gå til Avanceret &gt; Søgning altid tilgængelig."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps kan søge efter netværk i nærheden, selv når Wi-Fi er slukket. Hvis du ikke ønsker, at dette sker, skal du gå til Avanceret &gt; Scanning altid tilgængelig."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"For at forbedre placeringsnøjagtigheden scanner apps og tjenester efter Wi-Fi-netværk, selv når Wi-Fi er slået fra. Du kan ændre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillinger for scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Vis ikke igen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hold Wi-Fi aktiveret i dvale"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Slå Wi-Fi til i dvaletilstand"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Tilføj et andet netværk"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mere"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Din tablet skal have adgang til Wi-Fi, før konfigurationen kan gennemføres. Efter konfigurationen kan du skifte mellem mobildata og Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Avancerede valgmuligheder"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi-beskyttet konfiguration"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Tryk på Wi-Fi-beskyttet konfiguration på din router. Det kaldes muligvis \"WPS\" eller indeholder dette symbol:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Tryk på Wi-Fi-beskyttet konfiguration på din router. Det kaldes muligvis \"WPS\" eller kan være markeret med dette symbol:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Indtast pinkoden <xliff:g id="NUMBER">%1$s</xliff:g> på din Wi-Fi-router. Konfigurationen kan tage op til to minutter at fuldføre."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS godkendt. Opretter forbindelse til netværket..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Forbundet til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Adgangskode"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Vis adgangskode"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfigurer AP-bånd"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GHz-bånd"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz-bånd"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-indstillinger"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(uændret)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ikke specificeret)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Gemt"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiveret"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurationsfejl"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-forbindelsesfejl"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem med godkendelse"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ikke inden for rækkevidde"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Der blev ikke fundet nogen internetadgang. Forbindelsen bliver ikke automatisk genoprettet."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS er tilgængelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS er tilgængelig)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Indtast adgangskoden til dit netværk"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</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 overløbsmenuen for at slå denne funktion fra."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillad"</string>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vil du logge ind for at oprette forbindelse?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> kræver, at du logger ind, inden du opretter forbindelse til netværket."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"OPRET FORBINDELSE"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Dette netværk har ikke forbindelse til internettet. Vil du bruge netværket alligevel?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Spørg ikke igen for dette netværk"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP mobilt Wi‑Fi-hotspot, WPA2-PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> bærbart Wi-Fi-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_mode_title" msgid="2164073796253284289">"Opkaldspræference"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Tilstanden Opkald via Wi-Fi."</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"WiFi-netværk er foretrukket"</item>
+    <item msgid="5267397515594230396">"Mobilnetværk er foretrukket"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Startskærm"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skærm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Juster skærmens lysstyrke"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Tilpasset lysstyrke"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimer lysstyrken til det omgivende lys"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Lys"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Mørk"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatisk"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Dvale"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skærmen slukker"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -835,9 +827,9 @@
     <string name="doze_summary" msgid="7128970177894383698">"Væk skærmen, når du tager enheden op eller modtager meddelelser"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for lås af SIM-kort"</string>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Konfigurer låsning af SIM-kort"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortlås"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for låst SIM-kort"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Konfigurer låst SIM-kort"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"Låst SIM-kort"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Lås SIM-kort"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Kræv pinkode for at bruge tabletcomputeren"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Kræv pinkode for at bruge telefonen"</string>
@@ -855,7 +847,7 @@
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Pinkoderne er ikke ens"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"Pinkoden kan ikke ændres.\nPinkoden er muligvis forkert."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-koden til SIM-kortet er ændret"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortlåsens tilstand kan ikke ændres.\nDet skyldes muligvis en forkert pinkode."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortets tilstand kan ikke ændres.\nMuligvis pga. en forkert pinkode."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuller"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Der blev fundet flere SIM-kort"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Skal dit SIM-kort opdateres?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> er det eneste SIM-kort i enheden. Vil du bruge dette SIM-kort til mobildata, opkald og sms-beskeder?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Forkert pinkode til SIM-kort. Du skal nu kontakte dit mobilselskab for at låse din enhed op."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Forkert pinkode til SIM-kort. Du har <xliff:g id="NUMBER">%d</xliff:g> forsøg tilbage, før du skal kontakte dit mobilselskab for at låse din enhed op."</item>
-    <item quantity="other" msgid="77103619544346451">"Forkert pinkode til SIM-kort. Du har <xliff:g id="NUMBER">%d</xliff:g> forsøg tilbage."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Forkert pinkode til SIM-kort. Du har <xliff:g id="NUMBER_1">%d</xliff:g> forsøg tilbage.</item>
+      <item quantity="other">Forkert pinkode til SIM-kort. Du har <xliff:g id="NUMBER_1">%d</xliff:g> forsøg tilbage.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Pinkoden til SIM-kortet blev afvist."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status for tabletcomputeren"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonstatus"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Tilgængelig (skrivebeskyttet)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Plads i alt"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (appdata og medieindhold)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps og appdata"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medier"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Billeder, videoer"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Lyd (musik, ringetoner osv.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Andre filer"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cachelagrede data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demonter delt hukommelse"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demonter SD-kort"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontering i gang"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Der er snart ikke mere lagerplads"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Nogle systemfunktioner, som f.eks. synkronisering, fungerer muligvis ikke korrekt. Prøv at frigøre plads ved at slette eller fjerne elementer såsom apps eller medieindhold."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Omdøb"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Monter"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Skub ud"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Slet og formatér"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Slet og formatér som internt lager"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-tilslutning til computer"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tilslutning til computer"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Tilslut som"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Lader dig overføre mediefiler i Windows eller ved hjælp af Android File Transfer på Mac (se www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Lader dig overføre fotos ved hjælp af kamera-software og overføre filer på computere, der ikke understøtter MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installer værktøjer til filoverførsel"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Gør det muligt for applikationer, der understøtter MIDI, at fungere via USB med MIDI-software på din computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Andre brugere"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Lagerplads på enheden"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Flytbart lager"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ledig (I alt <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> blev monteret"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> kunne ikke monteres"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> blev skubbet sikkert ud"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> kunne ikke skubbes sikkert ud"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> blev formateret"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> kunne ikke formateres"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Omdøb lagerplads"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Efter formatering kan du bruge dette <xliff:g id="NAME_0">^1</xliff:g> i andre enheder. \n\nAlle data på dette <xliff:g id="NAME_1">^1</xliff:g> slettes. Overvej at tage en sikkerhedskopi først. \n\n"<b>"Sikkerhedskopiér billeder og andre medier"</b>\n"Flyt dine mediefiler til en anden lagerplads på denne enhed, eller overfør dem til en computer ved hjælp af et USB-kabel. \n\n"<b>"Sikkerhedskopiér apps"</b>\n"Alle apps, der er gemt på dette <xliff:g id="NAME_6">^1</xliff:g> afinstalleres, og de tilhørende data slettes. Hvis du vil beholde disse apps, skal du flytte dem til en anden lagerplads på denne enhed."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Når du skubber dette <xliff:g id="NAME_0">^1</xliff:g> ud, holder de apps, der er gemt her, op med at fungere, og mediefiler, der er gemt her, er utilgængelige, indtil det er sat i igen."</b>" \n\nDette <xliff:g id="NAME_1">^1</xliff:g> er formateret til kun at fungere på denne enhed og ikke på nogen andre."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurer dit <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Brug som bærbar lagerplads"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Til flytning af billeder og andre medier mellem enheder."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Brug som intern lagerplads"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Til lagring af hvad som helst kun på denne enhed, herunder apps og billeder. Kræver formatering, der forhindrer det i at fungere sammen med andre enheder."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatér som intern lagerplads"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Dette kræver, at dit <xliff:g id="NAME_0">^1</xliff:g> sikres ved hjælp af formatering. \n\nEfter formateringen fungerer dette <xliff:g id="NAME_1">^1</xliff:g> kun på denne enhed. \n\n"<b>"Ved formatering slettes alle data, der i øjeblikket er gemt på dit <xliff:g id="NAME_2">^1</xliff:g>."</b>" Overvej at tage en sikkerhedskopi for at undgå at miste dine data."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Slet og formatér"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formaterer <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Fjern ikke dit <xliff:g id="NAME">^1</xliff:g> under formateringen."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Flyt data til ny lagerplads"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Du kan flytte dine billeder, filer og appdata til dette nye <xliff:g id="NAME">^1</xliff:g>. \n\nFlytningen tager cirka <xliff:g id="TIME">^2</xliff:g> og vil frigøre <xliff:g id="SIZE">^3</xliff:g> intern lagerplads. Nogle apps fungerer ikke under flytningen."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Flyt nu"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Flyt senere"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Flyt data nu"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Flytningen tager cirka <xliff:g id="TIME">^1</xliff:g>. Det vil frigøre <xliff:g id="SIZE">^2</xliff:g> intern lagerplads."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Flyt"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Flytter data…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Under flytningen: \n• Undgå at fjerne dit <xliff:g id="NAME">^1</xliff:g>. \n• Nogle apps vil ikke fungere korrekt. \n• Hold enheden opladet."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> er klar"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Dit <xliff:g id="NAME">^1</xliff:g> er klar til billeder og andre medier."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Dit nye <xliff:g id="NAME">^1</xliff:g> fungerer. \n\nHvis du vil flytte billeder, filer og appdata til denne enhed, skal du gå til Indstillinger &gt; Lagerplads."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Flyt <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Flytningen af <xliff:g id="APP">^1</xliff:g> og de tilhørende data til <xliff:g id="NAME_0">^2</xliff:g> tager kun et øjeblik. Du kan ikke bruge appen, før flytningen er gennemført. \n\nFjern ikke dit <xliff:g id="NAME_1">^2</xliff:g> under flytningen."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Flytter <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Fjern ikke dit <xliff:g id="NAME">^1</xliff:g> under flytningen. \n\nAppen <xliff:g id="APP">^2</xliff:g> på denne enhed vil ikke være tilgængelig, før flytningen er gennemført."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annuller flytning"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batteriniveau"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Adgangspunkter"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Gendannelse af standardindstillingerne for adgangspunktet."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Nulstil til standard"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Standardindstillingerne for adgangspunktet er nulstillet."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Nulstil netværksindstillinger"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Denne handling nulstiller alle netværksindstillinger, herunder: \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>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Vil du nulstille alle netværksindstillingerne? Du kan ikke fortryde denne handling."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Nulstil indstillinger"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vil du nulstille?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Netværksindstillingerne er blevet nulstillet"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Nulstil enhed"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Gendannelse af fabriksdata"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på tabletcomputeren"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Slet alle data på telefonen"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette sletter alle data fra tablettens "<b>"interne lager"</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="9165016501623540228">"Dette sletter alle data fra telefonens "<b>"interne lager"</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_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:\n"</string>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Slet alle data på SD-kortet, f.eks. musik eller billeder"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Nulstil tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Nulstil telefon"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Vil du slette alle dine personlige oplysninger og downloadede apps? Denne handling kan ikke fortrydes!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Vil du slette alle dine personlige oplysninger og downloadede apps? Du kan ikke fortryde denne handling."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Slet alt"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du skal tegne dit oplåsningsmønster for at bekræfte en gendannelse af fabriksindstillingerne."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Der blev ikke foretaget nogen nulstilling, fordi tjenesten Systemoprydning ikke er tilgængelig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vil du nulstille?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Gendannelse af fabriksindstillinger er ikke tilgængeligt for denne bruger"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vil du slette USB-lageret og alle filer, som er gemt der? Handlingen kan ikke fortrydes!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vil du rydde SD-kortet og alle dets filer? Handlingen kan ikke fortrydes!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Slet alt"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette USB-lagringen."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Indstillinger for opkald"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Konfigurer telefonsvarer, viderestilling af opkald, ventende opkald, opkalds-id"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Netdeling via USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjælp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilnetværk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilabonnement"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standardapp til sms-beskeder"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Sms-app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vil du skifte sms-app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vil du bruge <xliff:g id="NEW_APP">%1$s</xliff:g> i stedet for <xliff:g id="CURRENT_APP">%2$s</xliff:g> som din standardapp til sms?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vil du bruge <xliff:g id="NEW_APP">%s</xliff:g> som din sms-app?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Placeringstilstand"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Brug GPS, Wi-Fi- og mobilnetværk til at fastslå din placering"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Brug Wi-Fi- og mobilnetværk til at fastslå din placering"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Brug GPS-signal til at fastlægge din placering"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Brug GPS-signal til at fastslå din placering"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Søger"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Søger"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi-scanning"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Du kan opnå en forbedret placeringsnøjagtighed ved at tillade apps og tjenester at scanne efter Wi-Fi-netværk, selv når Wi-Fi er slået fra"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-scanning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Du kan opnå en forbedret placeringsnøjagtighed ved at tillade systemtjenester at scanne efter Bluetooth-enheder, selv når Bluetooth er slået fra"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Placering via Wi-Fi og mobilnetværk"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Tillad, at apps bruger Googles placeringstjeneste til at beregne din placering hurtigere. Der indsamles anonyme placeringsdata, som sendes til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Placeringen fastlægges af Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Adgangskoden er indstillet"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Pinkoden er blevet indstillet"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mønsteret er blevet indstillet"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Skærmsikkerhed"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Brug mønsteret til din enhed for at fortsætte."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Indtast pinkoden til din enhed for at fortsætte."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Indtast adgangskoden til din enhed for at fortsætte."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Enhedssikkerhed"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Skift oplåsningsmønster"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Skift pinkode til at låse op"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekræft gemt mønster"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Prøv igen:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Tegn et oplåsningsmønster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryk på Menu for at få hjælp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Slip, når du er færdig"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Angiv oplåsningsmønster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Skift oplåsningsmønster"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Sådan tegnes et oplåsningsmønster"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"For mange forkerte forsøg!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Prøv igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"For mange mislykkede forsøg. Prøv igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Applikationen er ikke installeret på din telefon."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerede apps"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter efter størrelse"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Vis kørende tjenester"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Cachelagrede processer"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Nødapp"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Nulstil app-præferencer"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nulstil app-præferencer?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dette vil nulstille alle præferencer for:\n\n "<li>"deaktiverede apps"</li>\n" "<li>"deaktiverede appunderretninger"</li>\n" "<li>"standardapplikationer til handlinger"</li>\n" "<li>"begrænsning af baggrundsdata for apps"</li>\n" "<li>"eventuelle begrænsede tilladelser"</li>\n\n" Du vil ikke miste nogen appdata."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Handlinger i app"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Kører"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Aldrig brugt)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Ingen standardapps."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Lagerforbrug"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vis lagerplads, der bruges af apps"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kørende tjenester"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Oplysninger om tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefonoplysninger"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Batterioplysninger"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Hurtig start"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Angiv tastaturgenveje til start af apps"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Tildel app"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Ingen genvej"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Søg + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Ryd"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Din genvej til <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) ryddes."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Annuller"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apps"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Genveje"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Tekstinput"</string>
     <string name="input_method" msgid="5434026103176856164">"Inputmetode"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Aktuelt tastatur"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Gem alle Bluetooth HCI-pakker i en fil"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-oplåsning"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Tillad, at startindlæseren låses op"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Indtast din pinkode"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Indtast pinkoden for din enhed for at aktivere OEM-oplåsning"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vil du tillade OEM-oplåsning?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVARSEL! Funktioner, der beskytter enheden, fungerer ikke på denne enhed, når denne indstilling er slået til."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Størrelser for Logger-buffer"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vælg Logger-størrelser pr. logbuffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Imiterede placeringer"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placeringer"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivér visning af attributinspektion"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Netværk"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificering af trådløs skærm"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktivér detaljeret Wi-Fi-logføring"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Gennemtving skift fra Wi-Fi til mobildata"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Tillad altid scanning af Wi-Fi-roaming"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Brug ældre DHCP-klient"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Vis valgmuligheder for certificering af trådløs skærm"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Øg mængden af Wi‑Fi-logføring. Vis opdelt efter SSID RSSI i Wi‑Fi-vælgeren"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Når dette er aktiveret, gennemtvinges en overdragelse af dataforbindelsen fra Wi-Fi til mobilnetværk, når Wi-Fi-signalet er svagt"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Tillad/forbyd scanning i forbindelse med Wi-Fi-roaming afhængigt af mængden af datatrafik i grænsefladen"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Størrelser for Logger-buffer"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vælg Logger-størrelser pr. logbuffer"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Vælg USB-konfiguration"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Vælg USB-konfiguration"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Imiterede placeringer"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placeringer"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivér visning af attributinspektion"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Brug DHCP-klienten fra Lollipop i stedet for den nye DHCP-klient fra Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vil du tillade USB-fejlretning?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-fejlretning er kun beregnet til udvikling og kan bruges til at kopiere data mellem din computer og enheden, installere apps på enheden uden meddelelser og læse logdata."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Vil du ophæve adgangen til USB-fejlfinding for alle computere, du tidligere har godkendt?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Lyslilla"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> har brug for at:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Indstillinger kan ikke bekræfte dit svar, fordi en app tilslører tilladelsesanmodningen."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Hvis du aktiverer <xliff:g id="SERVICE">%1$s</xliff:g>, vil enheden ikke benytte skærmlåsen til at forbedre datakrypteringen."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Fordi du har aktiveret en tilgængelighedstjeneste, vil enheden ikke benytte skærmlåsen for at forbedre datakrypteringen."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Fordi det påvirker datakryptering at slå <xliff:g id="SERVICE">%1$s</xliff:g> til, skal du bekræfte dit mønster."</string>
@@ -1695,21 +1743,27 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Opdater"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medieserver"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"Batteribesparelse"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"Batterisparefunktion"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Slå automatisk til"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Aldrig"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"ved %1$s batteri"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistikker"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nørdede statistikker om kørende processer"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"hukommelse brugt"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g>-apps over <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> ud af <xliff:g id="TOTALRAM">%2$s</xliff:g> brugt i løbet af <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Baggrund"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Forgrund"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Cachelagret"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Enhedens hukommelse er i øjeblikket <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Gennemsnitligt RAM-forbrug"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimalt RAM-forbrug"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Indbygget"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kerne"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Cacher"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM-brug"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM-brug (baggrund)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Visningstid"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Processer"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Tjenester"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Varighed"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Hukommelsesoplysninger"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 timer"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Vis systemet"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Skjul systemet"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Brug Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktype"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Baggrund"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Standardindstillingerne nedenfor tilsidesætter indstillinger for app"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardindstillinger"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Standardmaskine"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Angiver den talesyntesemaskine, der skal bruges til oplæsning af tekst."</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Angiv, at talesyntesprogrammet skal bruges til at oplæse tekst"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Talehastighed"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Oplæsningshastighed for tekst"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonehøjde"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarebaseret"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Kun software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Loginoplysningerne for denne bruger er ikke tilgængelige"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du skal tegne dit oplåsningsmønster for at bekræfte en gendannelse af fabriksindstillingerne."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopier data"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sikkerhedskopiér appdata, Wi-Fi-adgangskoder og andre indstillinger på Googles servere"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Backupkonto"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Der er ingen konto, der i øjeblikket lagrer sikkerhedskopierede data"</string>
     <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">"Når du geninstallerer en app, skal du gendanne sikkerhedskopierede indstillinger og data"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Tjenesten til sikkerhedskopiering er inaktiv."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Denne indstilles af din enhedspolitik."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kode til lokal sikkerhedskopi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Lokale fuldstændige sikkerhedskopieringer er i øjeblikket ikke beskyttet"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tryk for at skifte eller fjerne adgangskoden til fuld lokal sikkerhedskopiering"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimationsskala"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animatorvarighedsskala"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuler sekundære skærme"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Multivinduestilstand"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Flere aktiviteter på skærmen på samme tid."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Vil du aktivere multivinduestilstanden?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ADVARSEL! Dette er en meget eksperimentel funktion, der tillader flere aktiviteter på skærmen på samme tid via brugergrænsefladen Seneste apps. Nogle apps kan gå ned eller holde op med at fungere korrekt, når de bruges sammen med denne funktion."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Behold ikke aktiviteter"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Luk hver aktivitet, så snart brugeren forlader den"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Bruger"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begrænset profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Vil du tilføje en ny bruger?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Du kan dele denne enhed med andre ved at oprette flere brugere. Hver bruger har deres eget område, hvor de kan tilpasse deres egne apps, baggrunde osv. Brugere kan også justere enhedsindstillinger, der påvirker alle, såsom Wi-Fi.\n\nNår du tilføjer en ny bruger, skal personen konfigurere sit område.\n\nEnhver bruger kan opdatere apps for alle andre brugere."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Du kan dele denne enhed med andre ved at oprette flere brugere. Hver bruger har sit eget område, som de kan tilpasse med apps, baggrunde osv. Brugere kan også justere enhedsindstillinger, der påvirker alle, som f.eks. Wi-Fi.\n\nNår du tilføjer en ny bruger, skal personen konfigurere sit område.\n\nEnhver bruger kan opdatere apps for alle andre brugere."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Når du tilføjer en ny bruger, skal personen konfigurere sit område.\n\nEnhver bruger kan opdatere apps for alle andre brugere."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Vil du konfigurere brugeren nu?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Sørg for, at brugeren har mulighed for at oprette sin egen plads på enheden"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Vil du fjerne gæsten?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Alle apps og data i denne session slettes."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Fjern"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Tillad telefonopkald"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Tillad telefonopkald og sms"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Aktivér telefonopkald"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Aktivér telefonopkald og sms"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Fjern bruger"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Vil du tillade telefonopkald?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Vil du aktivere telefonopkald?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Opkaldshistorikken deles med denne bruger."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Vil du tillade telefonopkald og sms?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Opkalds- og sms-historikken deles med denne bruger."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vil du aktivere telefonopkald og sms?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Opkalds- og sms-historikken deles med denne bruger."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillad apps og indhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applikationer med begrænsninger"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Udvid indstillingerne for applikationen"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"OMDØB"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Angiv begrænsninger for appen"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrolleret af <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Denne app understøttes ikke for begrænsede profiler"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Denne app kan få adgang til dine konti"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Denne app har adgang til dine konti. Administreres af <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi og mobil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Tillad ændring af Wi-Fi- og mobilindstillinger"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi netværk forbindelse"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"sms besked beskeder chat"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobil mobilselskab trådløst netværk data 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi ring op opkald"</string>
     <string name="keywords_home" msgid="3626170808219458848">"starter"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skærm berøringsskærm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dæmpe skærm touchskærm batteri"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dæmpe skærm touchskærm batteri"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"baggrund personliggør tilpas visning"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"mørkt tema, natfunktion, dæmp skærm, inverter lysstyrken"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"baggrund, personliggør, tilpas, visning"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekststørrelse"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projektér casting"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"plads disk harddisk enhedsbrug"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"strømforbrug opladning"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"stavning ordbog stavekontrol autokorrektur"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"begrænsning begræns begrænset"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekst korrektion korriger lyd vibrer auto sprog bevægelse foreslå forslag tema stødende ord type emoji international"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"nulstilling af præferencer til standard"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"Nødapp, standard"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"system til download af applikationer"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps tilladelser sikkerhed"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"stryg adgangskode mønster pinkode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmlydstyrke"</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>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Afbrydelser"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Når der modtages opkald og underretninger"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Afbryd altid"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Tillad kun prioriterede afbrydelser"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Afbryd ikke"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritet tillader kun"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Kun prioritet"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Kun alarmer"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Ingen afbrydelser"</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="ringtone_title" msgid="5379026328015343686">"Ringetone ved opkald"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardringetone for underretninger"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrer også ved opkald"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrer"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Adgang til underretninger"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps kan ikke læse underretninger"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Appen %d kan læse underretninger"</item>
-    <item quantity="other" msgid="980049191810249052">"Appene %d kan læse underretninger"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d apps kan læse underretninger</item>
+      <item quantity="other">%d apps kan læse underretninger</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Ingen underretningslyttere er installeret."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Skal <xliff:g id="SERVICE">%1$s</xliff:g> aktiveres?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> vil kunne læse alle underretninger, der er sendt af systemet eller en hvilken som helst installeret app, som kan indeholde personlige oplysninger, som f.eks. kontaktpersoner og teksten i beskeder, der sendes til dig. Den vil også kunne afvise disse underretninger eller trykke på handlingsknapper i dem."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Tjenester til formidling af betingelser"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ingen apps formidler betingelser"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app formidler betingelser"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apps formidler betingelser"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Der er ikke installeret nogen tjenester til formidling af betingelser."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Skal <xliff:g id="SERVICE">%1$s</xliff:g> aktiveres?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan tilføje afslutningsbetingelser til tilstanden Vil ikke forstyrres."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Indlæser apps..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Bloker"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Bloker alle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Vis aldrig underretninger fra denne app"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritet"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Vis underretninger øverst på ​​listen, og vis dem også, når enheden er indstillet til kun at tillade prioriterede afbrydelser"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Følsomt indhold"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Når enheden er låst, skal alt følsomt indhold skjules i denne apps underretninger"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Opfat som prioritet"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Tillad, at underretninger fra denne app høres, når \"Vil ikke forstyrres\" er indstillet til \"Kun prioritet\""</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Tillad smugkig"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Lad denne app fremhæve visse underretninger ved kortvarigt at lade dem glide ind i synsfeltet på den aktuelle skærm"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skjul følsomt indhold"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Skjul indholdet i underretninger fra denne app, som kan afsløre personlige oplysninger, når enheden er låst"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeret"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Følsomme"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Udfør"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Indtil du slår denne indstilling fra"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriterede afbrydelser"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Nedetid"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dage"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ingen"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Afbrydelser er tilladte"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Kun prioritet"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ingen"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisering"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Slå automatisk til"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Regelnavn"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Tilføj regel"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Slet regel"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vil du slette reglen \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Slet"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Regeltype"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Ukendt"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigurer regel"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Planlæg regel"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Reglen blev ikke fundet."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dage"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ingen"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Hver dag"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldrig"</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> til <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Opkald"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Beskeder"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Opkald/sms-beskeder fra"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Alle"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Kun kontaktpersoner"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kun stjernemarkerede kontakter"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Begivenheder og påmindelser"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmer er altid prioriterede afbrydelser"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Påmindelser"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Begivenheder"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Udvalgte opkaldere"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gentagende opkald"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Tillad, hvis den samme person ringer for anden gang inden for en periode på <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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Hverdagsaftener"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttidspunkt"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttidspunkt"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> eller en tidligere alarm"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag eller en tidligere alarm"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Afbrydelser"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Når der modtages opkald og underretninger"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Hvornår vil du afbrydes?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"I hvor lang tid?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Afbryd altid"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"fra, alle, alt"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Tillad kun prioriterede afbrydelser"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Tillad kun alarmer"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Afbryd ikke"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"På ubestemt tid"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minutter</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutter</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> timer</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> timer</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Skift til Kun prioriterede underretninger på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Skift til Kun prioriterede underretninger i <xliff:g id="DURATION">%1$d</xliff:g> minutter indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Skift til Kun prioriterede underretninger i <xliff:g id="DURATION">%1$d</xliff:g> minutter indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Skift til Kun prioriterede underretninger i <xliff:g id="DURATION">%1$d</xliff:g> timer (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Skift til Kun prioriterede underretninger i <xliff:g id="DURATION">%1$d</xliff:g> timer (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Skift til Kun alarmer på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> minutter (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> minutter (indtil <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">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> timer indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> timer indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Skift til Afbryd ikke på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Skift til Afbryd ikke i <xliff:g id="DURATION">%1$d</xliff:g> minutter (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Skift til Afbryd ikke i <xliff:g id="DURATION">%1$d</xliff:g> minutter (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Skift til Afbryd ikke i <xliff:g id="DURATION">%1$d</xliff:g> timer indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Skift til Afbryd ikke i <xliff:g id="DURATION">%1$d</xliff:g> timer indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Skift til Afbryd altid"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"for altid"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appunderretninger"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-oplysninger"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Relative IMEI-oplysninger"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Port <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Åbn som standard"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> brugt i <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Domænelinks"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Åbn domænets webadresser"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Giv appen tilladelse til at åbne domænets webadresser direkte"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Understøttede webadresser for domænet"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Andre standarder"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> brugt i <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"intern hukommelse"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"ekstern hukommelse"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Intern lagerplads"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Ekstern lagerplads"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Dataforbrug for appen"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> brugt siden <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Brugt lagerplads"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Slået til"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloker"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Følsomt indhold"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioriteret"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioriteret og med følsomt indhold"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one">Der er givet <xliff:g id="COUNT_1">%d</xliff:g> tilladelser</item>
+      <item quantity="other">Der er givet <xliff:g id="COUNT_1">%d</xliff:g> tilladelser</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> af <xliff:g id="COUNT_3">%d</xliff:g> tilladelser blev givet</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> af <xliff:g id="COUNT_3">%d</xliff:g> tilladelser blev givet</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Der er angivet nogle standarder"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Der er ikke angivet nogen standarder"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Alle apps"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Aktiveret"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personlig"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Arbejde"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeret"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritet"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Følsomt indhold"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med domænets webadresser"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Deaktiveret af administratoren"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Avanceret"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Ukendt app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Vælg profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Apptilladelser"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ud af <xliff:g id="COUNT_1">%d</xliff:g> apps har yderligere adgangstilladelse"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ud af <xliff:g id="COUNT_1">%d</xliff:g> apps har tilladelse"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domænets webadresser"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Undlad at åbne domænets webadresser"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Åbn \"<xliff:g id="DOMAIN">%s</xliff:g>\""</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Åbn \"<xliff:g id="DOMAIN">%s</xliff:g>\" og relaterede webadresser"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps kan åbne domænets webadresser</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps kan åbne domænets webadresser</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Kan ikke genkendes"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Standardapps"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browserapp"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Ingen standardbrowser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Standard)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Applagerplads"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 34cd2ce..d69f866 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push-Schaltfläche"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"Mikrofon aus- oder einschalten"</item>
     <item msgid="1148142988678569310">"Projektion von Medieninhalten"</item>
     <item msgid="9130014005474445273">"VPN aktivieren"</item>
+    <item msgid="1165192162975045562">"Hintergrund schreiben"</item>
+    <item msgid="7129487923652967258">"Strukturassistent"</item>
+    <item msgid="1069023208100114540">"Screenshotassistent"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Standort"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Mikrofon aus- oder einschalten"</item>
     <item msgid="5906017727368097853">"Projektion von Medieninhalten"</item>
     <item msgid="2486614710846178542">"VPN aktivieren"</item>
+    <item msgid="5586547561693629602">"Hintergrund schreiben"</item>
+    <item msgid="32794179825485062">"Strukturassistent"</item>
+    <item msgid="7872852746938272552">"Screenshotassistent"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kurz"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"niedrig"</item>
     <item msgid="4212263919458209842">"kritisch"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Deaktiviert"</item>
-    <item msgid="5656544177755411222">"Begrenzte Unterbrechungen"</item>
-    <item msgid="8735337502532332056">"Keine Unterbrechungen"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Mittel"</item>
     <item msgid="866544120205026771">"Moderat"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Pink"</item>
     <item msgid="6131821495505931173">"Rot"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB-Ethernet)"</item>
+    <item msgid="2686051673589572111">"Audioquelle"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 2381e76..a4eaa83 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Zulassen"</string>
     <string name="deny" msgid="6947806159746484865">"Ablehnen"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unbekannt"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"In <xliff:g id="STEP_COUNT">%1$d</xliff:g> Schritt sind Sie ein Entwickler."</item>
-    <item quantity="other" msgid="6722953419953594148">"In <xliff:g id="STEP_COUNT">%1$d</xliff:g> Schritten sind Sie ein Entwickler."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">In <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> Schritten sind Sie ein Entwickler.</item>
+      <item quantity="one">In <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> Schritt sind Sie ein Entwickler.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sie sind jetzt ein Entwickler!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Okay, Sie sind bereits ein Entwickler."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Drahtlos &amp; Netzwerke"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"SMS über IMS deaktivieren"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Die IMS-Registrierung muss aktiviert werden."</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Die IMS-Registrierung muss deaktiviert werden."</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE-Kennzeichnung aktivieren"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE-Kennzeichnung deaktivieren"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"LTE-RAM-Dump aktivieren"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"LTE-RAM-Dump deaktivieren"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM-Adressbuch anzeigen"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Übertragung"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil deaktivieren?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Deaktiviert:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Verbunden"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Verbunden (kein Telefon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Verbunden (außer Audiomedien)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Verbunden (ohne Nachrichtenzugriff)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Verbunden (außer Telefon- und Audiomedien)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Nicht verbunden"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Verbindung wird getrennt..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Verbindung wird hergestellt..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing läuft…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Unbenanntes Bluetooth-Gerät"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Suche läuft"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Kein Bluetooth-Gerät in der Nähe gefunden"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Empfangene Dateien anzeigen"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth-Gerät auswählen"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-Berechtigungsanfrage"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Eine App versucht, Bluetooth zu aktivieren."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Eine App fordert die Berechtigung zum Aktivieren von Bluetooth für dieses Gerät an."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Eine App versucht, Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Eine App versucht, Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Eine App versucht, Ihr Tablet für andere Bluetooth-Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-Karte"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-Einstellungen"</string>
     <string name="cancel" msgid="6859253417269739139">"Abbrechen"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"Abbrechen"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"Weiter"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"Ja"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"Nein"</string>
-    <string name="forget" msgid="7267115980248732932">"Entfernen"</string>
+    <string name="forget" msgid="1400428660472591263">"Entfernen"</string>
+    <string name="save" msgid="879993180139353333">"Speichern"</string>
+    <string name="done" msgid="6942539184162713160">"Fertig"</string>
     <string name="settings_label" msgid="1626402585530130914">"Einstellungen"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Einstellungen"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Einstellungsverknüpfung"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Nach Zeitzone sortieren"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Uhrzeit"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Gesichtserkennung verbessern"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Aktualitätsprüfung"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Augenzwinkern beim Entsperren erforderlich"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Automatisch sperren"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Nach <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> im Ruhezustand"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"Nach <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> im Ruhezustand, außer bei dauerhafter Entsperrung durch <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldeinformationsspeicher festlegen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwörter"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerabdruck"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Fingerabdrücke verwalten"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Abdruck nutzen für"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Hinzufügen"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"Displaysperre"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Fingerabdrücke erfasst</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Fingerabdruck erfasst</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Abdruck einrichten"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Zum Entsperren des Bildschirms oder Bestätigen von Käufen per Fingerabdruck: \n\n✓ Richten Sie die Sperrmethode für den Sicherungsbildschirm ein. \n\n✓ Fügen Sie Ihren Fingerabdruck hinzu."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensor suchen"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Suchen Sie auf der Rückseite Ihres Smartphones nach dem Fingerabdrucksensor."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Name"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Löschen"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Los geht\'s!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Legen Sie Ihren Finger auf den Fingerabdrucksensor. Heben Sie ihn an, sobald Sie eine Vibration spüren."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Super! Noch einmal."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Legen Sie den gleichen Finger auf den Sensor und heben Sie ihn an, sobald Sie eine Vibration spüren."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Abdruck hinzugefügt"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wenn Sie dieses Symbol sehen, können Sie Ihren Fingerabdruck zur Identifizierung oder zur Autorisierung eines Kaufs verwenden."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Hinzufügen"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Weiter"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Verschlüsselung"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet verschlüsseln"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefon verschlüsseln"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Schließen Sie Ihr Ladegerät an und versuchen Sie es erneut."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Keine PIN oder kein Passwort für Displaysperre"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Sie müssen eine PIN oder ein Passwort für die Displaysperre festlegen, bevor Sie die Verschlüsselung starten können."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Zeichnen Sie Ihr Entsperrungsmuster, um die Geräteverschlüsselung zu bestätigen."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Verschlüsseln?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Tablet mehrfach neu gestartet."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Telefon mehrfach neu gestartet."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Wischen"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Keine Sicherheit"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Geringe Sicherheit, experimentell"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Muster"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Mittlere Sicherheit"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Mittlere bis hohe Sicherheit"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passwort"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hohe Sicherheit"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Aktuelle Displaysperre"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Geräteschutzfunktionen funktionieren dann nicht mehr."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Von Admin, Richtlinie oder Anmeldedaten deaktiviert"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Keine"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Wischen"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Muster"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Passwort"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Sobald Sie eine Displaysperre eingerichtet haben, können Sie unter \"Einstellungen\" &gt; \"Sicherheit\" auch Ihren Fingerabdruck einrichten."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Displaysperre deaktivieren"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Entsperrungsmuster entfernen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Entsperrungs-PIN entfernen"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Das Passwort muss mindestens einen Buchstaben enthalten."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Das Passwort muss mindestens eine Ziffer enthalten."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Das Passwort muss mindestens ein Symbol enthalten."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Das Passwort muss mindestens einen Buchstaben enthalten."</item>
-    <item quantity="other" msgid="8186027808415585970">"Das Passwort muss mindestens %d Buchstaben enthalten."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Das Passwort muss mindestens einen Kleinbuchstaben enthalten."</item>
-    <item quantity="other" msgid="2693910942679679225">"Das Passwort muss mindestens %d Kleinbuchstaben enthalten."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Das Passwort muss mindestens einen Großbuchstaben enthalten."</item>
-    <item quantity="other" msgid="3030801209112209245">"Das Passwort muss mindestens %d Großbuchstaben enthalten."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Das Passwort muss mindestens eine Ziffer enthalten."</item>
-    <item quantity="other" msgid="4703982391407595924">"Das Passwort muss mindestens %d Ziffern enthalten."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Das Passwort muss mindestens ein Sonderzeichen enthalten."</item>
-    <item quantity="other" msgid="1221290525051187757">"Das Passwort muss mindestens %d Sonderzeichen enthalten."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Das Passwort muss mindestens ein Zeichen enthalten, das kein Buchstabe ist."</item>
-    <item quantity="other" msgid="3952508584649046404">"Das Passwort muss mindestens %d Zeichen enthalten, die keine Buchstaben sind."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Das Passwort muss mindestens %d Buchstaben enthalten.</item>
+      <item quantity="one">Das Passwort muss mindestens einen Buchstaben enthalten.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Das Passwort muss mindestens %d Kleinbuchstaben enthalten.</item>
+      <item quantity="one">Das Passwort muss mindestens einen Kleinbuchstaben enthalten.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Das Passwort muss mindestens %d Großbuchstaben enthalten.</item>
+      <item quantity="one">Das Passwort muss mindestens einen Großbuchstaben enthalten.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Das Passwort muss mindestens %d Ziffern enthalten.</item>
+      <item quantity="one">Das Passwort muss mindestens eine Ziffer enthalten.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Das Passwort muss mindestens %d Sonderzeichen enthalten.</item>
+      <item quantity="one">Das Passwort muss mindestens ein Sonderzeichen enthalten.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Das Passwort muss mindestens %d Zeichen enthalten, die keine Buchstaben sind.</item>
+      <item quantity="one">Das Passwort muss mindestens ein Zeichen enthalten, das kein Buchstabe ist.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Der Geräteadministrator lässt die Verwendung eines früheren Passworts nicht zu."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Eine aufsteigende, absteigende oder wiederholte Ziffernfolge ist nicht zulässig."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -481,15 +491,8 @@
 )  -->
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pairing mit diesem Gerät durchführen?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Geben Sie zum Pairing mit <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> ein und drücken Sie anschließend die Eingabetaste."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pairing durchführen"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"Pairing durchführen"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Abbrechen"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Über das Pairing kann auf Ihre Kontakte und auf Ihren Anrufverlauf zugegriffen werden, wenn eine Verbindung besteht."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> war nicht möglich."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> war nicht möglich, weil die eingegebene PIN oder der Zugangscode falsch ist."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kommunikation mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist nicht möglich."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Verbindung wurde von <xliff:g id="DEVICE_NAME">%1$s</xliff:g> abgelehnt."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Keine Verbindung zu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> möglich"</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Scan nach Geräten"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Aktualisieren"</string>
@@ -516,16 +519,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Erweitert"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth - Erweitert"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bei aktiviertem Bluetooth kann Ihr Gerät mit Bluetooth-Geräten in der Nähe kommunizieren."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Zur Erhöhung der Standortgenauigkeit suchen Apps und Dienste nach Bluetooth-Geräten, auch wenn die Bluetooth-Funktion deaktiviert ist. Sie können dies unter <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Sucheinstellungen<xliff:g id="LINK_END_1">LINK_END</xliff:g> ändern."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Verbinden mit..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media-Audio"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon-Audio"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Dateiübertragung"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Eingabegerät"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetzugriff"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktfreigabe"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Für Kontaktfreigabe nutzen"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Freigabe der Internetverbindung"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Nachrichtenzugriff"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird vom Medien-Audiosystem getrennt."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird von der Freisprechfunktion getrennt."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird vom Eingabegerät getrennt."</string>
@@ -538,28 +533,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Nutzen für"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Umbenennen"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Eingeh. Dateitransfer zulassen"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbunden mit  Audiosystem von Medien"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbunden mit Audiosystem des Telefons"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Mit Dateiübertragungsserver verbunden"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Mit Karte verbunden"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nicht mit Dateiübertragungsserver verbunden"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Mit einem Eingabegerät verbunden"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Für Internetzugriff an Gerät angeschlossen"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Lokale Internetverbindung für Gerät freigeben"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Für Audiosystem von Medien verwenden"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Für Audiosystem des Telefons verwenden"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Für Dateiübertragung verwenden"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Für Eingabe verwenden"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Für Internetzugriff verwenden"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Für Karte verwenden"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dock-Einstellungen"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Dock für Audio verwenden"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als Lautsprechertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Für Musik und Medien"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Einstellungen speichern"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Über WLAN-Assistenten verbunden"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Bildschirmübertragung"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Übertragen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Kabellose Übertragung aktivieren"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Kein Gerät in der Nähe gefunden"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Verbindung wird hergestellt..."</string>
@@ -571,6 +553,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Entfernen"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Fertig"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
@@ -594,21 +578,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"WLAN wird deaktiviert…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fehler"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Im Flugmodus"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Netzwerkscan nicht möglich"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netzwerkhinweis"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Immer benachrichtigen, wenn öffentliches Netzwerk verfügbar"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Schlechte Internetverbindungen vermeiden"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"WLAN nur bei guter Internetverbindung verwenden"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Nur Netzwerke mit stabiler Internetverbindung verwenden"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Erkennungsfunktion immer verfügbar"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"WLAN-Suche immer zulassen"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Der Standortdienst von Google und andere Apps sollen auch bei deaktiviertem WLAN nach Netzwerken suchen."</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automatisch offenes WLAN verwenden"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Automatische Verbindung mit offenen Netzwerken von hoher Qualität durch WLAN-Assistenten zulassen"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Assistent auswählen"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Zertifikate installieren"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Zur Erhöhung der Standortgenauigkeit und aus anderen Gründen können Google und andere Apps auch bei deaktiviertem WLAN nach Netzwerken in der Nähe suchen. Wenn Sie das nicht möchten, können Sie dies unter \"Erweitert\" &gt; \"Scannen immer verfügbar\" ändern."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps können auch bei deaktiviertem WLAN nach Netzwerken in der Nähe suchen. Wenn Sie das nicht möchten, können Sie dies unter \"Erweitert\" &gt; \"Scannen immer verfügbar\" ändern."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Zur Erhöhung der Standortgenauigkeit suchen Apps und Dienste nach WLAN-Netzwerken, auch wenn die WLAN-Funktion deaktiviert ist. Sie können dies unter <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Sucheinstellungen<xliff:g id="LINK_END_1">LINK_END</xliff:g> ändern."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nicht erneut anzeigen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"WLAN im Ruhemodus aktiviert lassen"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"WLAN im Ruhemodus aktiviert"</string>
@@ -636,11 +615,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Weiteres Netzwerk hinzufügen"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mehr"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisches Setup (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Ihr Tablet muss eine WLAN-Verbindung haben, damit die Einrichtung abgeschlossen werden kann. Nach der Einrichtung können Sie zwischen WLAN und Mobilfunk wechseln."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Erweiterte Optionen"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS wird gestartet…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Wählen Sie die Schaltfläche \"Wi-Fi Protected Setup\" auf Ihrem Router aus. Eventuell lautet sie auch \"WPS\" oder enthält dieses Symbol:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Wählen Sie die Schaltfläche \"Wi-Fi Protected Setup\" auf Ihrem Router aus. Eventuell lautet sie auch \"WPS\" oder ist mit diesem Symbol gekennzeichnet:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Geben Sie die PIN <xliff:g id="NUMBER">%1$s</xliff:g> auf Ihrem WLAN-Router ein. Die Einrichtung kann bis zu 2 Minuten dauern."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS erfolgreich. Netzwerkverbindung wird hergestellt…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
@@ -666,20 +644,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme Identität"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Passwort"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Passwort anzeigen"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Band für Zugriffspunkt konfigurieren"</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-Einstellungen"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nicht geändert)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(keine Angabe)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Gespeichert"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiviert"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-Konfigurationsfehler"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WLAN-Verbindungsfehler"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentifizierungsproblem"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Nicht in Reichweite"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Keine Internetverbindung erkannt, es kann nicht automatisch eine Verbindung hergestellt werden."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS verfügbar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS verfügbar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Geben Sie Ihr Netzwerkpasswort ein."</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Keine"</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öchten Sie dies für alle Apps zulassen, die eine Überprüfung durchführen möchten?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Rufen Sie im Überlaufmenü \"Erweitert\" auf, um diese Option zu deaktivieren."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zulassen"</string>
@@ -687,6 +660,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Zum Verbinden anmelden?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> erfordert vor dem Verbinden mit dem Netzwerk Ihre Onlineameldung."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"Verbinden"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Dieses Netzwerk hat keinen Internetzugriff. Netzwerk trotzdem verwenden?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Für dieses Netzwerk nicht mehr fragen"</string>
     <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>
@@ -752,6 +727,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Mobiler WLAN-Hotspot AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> mobiler WLAN-Hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"WLAN-Telefonie"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Bevorzugte Anrufeinstellung"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"WLAN-Anrufmodus"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"WLAN bevorzugt"</item>
+    <item msgid="5267397515594230396">"Mobilfunk bevorzugt"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wenn WLAN-Anrufe aktiviert sind, kann Ihr Smartphone abhängig von Ihrer Einstellung und von der Signalstärke Anrufe über WLAN-Netzwerke oder über das Netz Ihres Mobilfunkanbieters übertragen. Erkundigen Sie sich bei Ihrem Mobilfunkanbieter über die hierfür erhobenen Gebühren und andere Informationen, bevor Sie diese Funktion aktivieren."</string>
     <string name="home_settings" msgid="212375129455718176">"Startseite"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Töne"</string>
@@ -815,6 +802,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Helligkeit des Bildschirms anpassen"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive Helligkeit"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Helligkeitsstufe an Lichtverhältnisse anpassen"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Design"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Hell"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Dunkel"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatisch"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ruhezustand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Display wird ausgeschaltet."</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
@@ -866,10 +858,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Bevorzugte SIM-Karte aktualisieren?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"\"<xliff:g id="NEW_SIM">%1$s</xliff:g>\" ist die einzige SIM-Karte in Ihrem Gerät. Möchten Sie diese SIM-Karte für Mobilfunkdaten, Anrufe und SMS verwenden?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Falscher PIN-Code der SIM-Karte. Bitte wenden Sie sich an Ihren Mobilfunkanbieter, damit er Ihr Gerät entsperrt."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Falscher PIN-Code der SIM-Karte. Sie haben noch <xliff:g id="NUMBER">%d</xliff:g> Versuch, bevor Sie das Gerät von Ihrem Mobilfunkanbieter entsperren lassen müssen."</item>
-    <item quantity="other" msgid="77103619544346451">"Falscher PIN-Code der SIM-Karte. Sie haben noch <xliff:g id="NUMBER">%d</xliff:g> Versuche."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Falscher PIN-Code der SIM-Karte. Sie haben noch <xliff:g id="NUMBER_1">%d</xliff:g> Versuche.</item>
+      <item quantity="one">Falscher PIN-Code der SIM-Karte. Noch <xliff:g id="NUMBER_0">%d</xliff:g> Versuch, bevor Gerät vom Mobilfunkanbieter entsperrt werden muss</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Fehler beim Entsperren mit der PIN der SIM-Karte"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet-Status"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonstatus"</string>
@@ -918,12 +910,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Verfügbar (schreibgeschützt)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Gesamtspeicher"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Wird berechnet..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (Appdaten &amp; Medieninhalte)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps und App-Daten"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medien"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Bilder, Videos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (Musik, Töne usw.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Sonstiges"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Sonstige Dateien"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Daten im Cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gemeinsamen Speicher trennen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-Karte entnehmen"</string>
@@ -956,6 +948,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Trennung..."</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Der Speicherplatz wird knapp"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Einige Systemfunktionen wie die Synchronisierung funktionieren möglicherweise nicht korrekt. Versuchen Sie, Speicherplatz freizugeben, indem Sie Elemente wie Apps oder Medieninhalte löschen oder ihre Offline-Verfügbarkeit aufheben."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Umbenennen"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Bereitstellen"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Auswerfen"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Löschen und formatieren"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Löschen und als internen Speicher formatieren"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-Verbindung (PC)"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-Verbindung (PC)"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Verbinden als"</string>
@@ -963,8 +960,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Ermöglicht die Übertragung von Mediendateien auf Windows- oder, mithilfe von Android File Transfer, auf Mac-Computer (siehe www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Ermöglicht die Übertragung von Fotos mithilfe der Kamera-Software sowie die Übertragung von Dateien auf Computer, die MTP nicht unterstützen"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Dateiübertragungstools installieren"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Lässt MIDI-kompatible Apps über USB mit MIDI-Software auf Ihrem Computer arbeiten"</string>
     <string name="storage_other_users" msgid="808708845102611856">"Andere Nutzer"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Gerätespeicher"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Wechselmedien"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> verfügbar (<xliff:g id="TOTAL">%2$s</xliff:g> insgesamt)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> wurde bereitgestellt."</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> konnte nicht bereitgestellt werden."</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> wurde sicher ausgeworfen."</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> konnte nicht sicher ausgeworfen werden."</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> wurde formatiert."</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> konnte nicht formatiert werden."</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Speicher umbenennen"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Nachdem die Formatierung abgeschlossen wurde, können Sie die <xliff:g id="NAME_0">^1</xliff:g> in anderen Geräten verwenden. \n\nAlle Daten auf der <xliff:g id="NAME_1">^1</xliff:g> werden gelöscht. Sichern Sie Ihre Daten daher vor der Formatierung. \n\n"<b>"Sichern Sie Fotos und andere Medien."</b>" \nVerschieben Sie Ihre Mediendateien auf ein anderes Speichermedium auf diesem Gerät oder kopieren Sie sie über ein USB-Kabel auf einen Computer. \n\n"<b>"Sichern Sie Ihre Apps."</b>" \nAlle Apps auf der <xliff:g id="NAME_6">^1</xliff:g> werden deinstalliert und ihre Daten werden gelöscht. Wenn Sie diese Apps beibehalten möchten, verschieben Sie sie auf ein anderes Speichermedium auf diesem Gerät."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Wenn Sie die <xliff:g id="NAME_0">^1</xliff:g> aus dem Gerät entfernen, funktionieren die auf dem Speichermedium vorhandenen Apps nicht mehr. Die gespeicherten Mediendateien können erst wieder auf dem Gerät aufgerufen werden, wenn Sie das Speichermedium einlegen."</b>" \n\nDie <xliff:g id="NAME_1">^1</xliff:g> ist nur für dieses Gerät formatiert und kann nicht mit anderen Geräten verwendet werden."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> einrichten"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Als tragbaren Speicher verwenden"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Zum Übertragen von Fotos und anderen Medien zwischen Geräten"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Als internen Speicher verwenden"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Zum Speichern Ihrer Daten wie Apps und Fotos nur auf diesem Gerät. Eine Formatierung ist erforderlich. Dadurch kann das Speichermedium nicht mit anderen Geräten verwendet werden."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Als internen Speicher formatieren"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Um die Sicherheit zu gewährleisten, muss die <xliff:g id="NAME_0">^1</xliff:g> zuerst formatiert werden. \n\nDanach ist die <xliff:g id="NAME_1">^1</xliff:g> ausschließlich für dieses Gerät formatiert und funktioniert nicht mit anderen Geräten. \n\n"<b>"Durch die Formatierung werden alle derzeit auf der <xliff:g id="NAME_2">^1</xliff:g> gespeicherten Daten gelöscht."</b>" Um den Verlust von Daten zu verhindern, sichern Sie sie vor der Formatierung."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Löschen und formatieren"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> wird formatiert…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Entfernen Sie die <xliff:g id="NAME">^1</xliff:g> nicht während der Formatierung."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Daten in neuen Speicher verschieben"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Sie können Ihre Fotos, Dateien und App-Daten jetzt auf die neue <xliff:g id="NAME">^1</xliff:g> verschieben. \n\nDieser Vorgang dauert etwa <xliff:g id="TIME">^2</xliff:g>. Dabei wird <xliff:g id="SIZE">^3</xliff:g> interner Speicherplatz freigegeben. Einige Apps funktionieren während des Vorgangs nicht."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Jetzt verschieben"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Später verschieben"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Daten jetzt verschieben"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Das Verschieben dauert etwa <xliff:g id="TIME">^1</xliff:g>. Dabei wird <xliff:g id="SIZE">^2</xliff:g> interner Speicherplatz freigegeben."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Verschieben"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Daten werden verschoben…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Beachten Sie beim Verschieben Ihrer Daten Folgendes: \n• Entfernen Sie die <xliff:g id="NAME">^1</xliff:g> nicht. \n• Einige Apps funktionieren möglicherweise nicht. \n• Achten Sie darauf, dass das Gerät dabei stets geladen wird."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> steht für Sie bereit"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Sie können Ihre <xliff:g id="NAME">^1</xliff:g> nun zum Speichern von Fotos und anderen Medien einsetzen."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Ihre neue <xliff:g id="NAME">^1</xliff:g> steht nun für Sie bereit. \n\nWenn Sie Fotos, Dateien und App-Daten auf dieses Gerät verschieben möchten, gehen Sie zu \"Einstellungen\" &gt; \"Speicher\"."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> verschieben"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Das Verschieben von <xliff:g id="APP">^1</xliff:g> und den entsprechenden Daten auf die <xliff:g id="NAME_0">^2</xliff:g> dauert nur einen Moment. Sie können die App erst wieder verwenden, nachdem sie vollständig verschoben wurde. \n\nEntfernen Sie die <xliff:g id="NAME_1">^2</xliff:g> während des Vorgangs nicht."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> wird verschoben…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Entfernen Sie die <xliff:g id="NAME">^1</xliff:g> während des Vorgangs nicht. \n\nDie App <xliff:g id="APP">^2</xliff:g> auf diesem Gerät ist erst wieder verfügbar, nachdem sie vollständig verschoben wurde."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Verschieben abbrechen"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akkustatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akkuladung"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1008,10 +1045,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Standard-APN-Einstellungen werden wiederhergestellt"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Auf Standard zurücksetzen"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Zurücksetzen auf Standard-APN-Einstellungen abgeschlossen"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Netzwerkeinstellungen zurücksetzen"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Dadurch werden alle Netzwerkeinstellungen zurückgesetzt, einschließlich:\n\n"<li>"WLAN"</li>\n<li>"Mobilfunkdaten"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Einstellungen zurücksetzen"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Alle Netzwerkeinstellungen zurücksetzen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Einstellungen zurücksetzen"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Zurücksetzen?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Die Netzwerkeinstellungen wurden zurückgesetzt."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Gerät zurücksetzen"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Auf Werkszustand zurück"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Löscht alle Daten auf dem Tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Löscht alle Daten auf dem Telefon"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Tablets gelöscht, u. a.\n\n"<li>"Ihr 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="9165016501623540228">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, u. a.\n\n"<li>"Ihr 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"Sie sind zurzeit in folgenden Konten angemeldet:\n"</string>
@@ -1025,9 +1067,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Alle Daten, z. B. Musik und Fotos, von der SD-Karte löschen"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tablet zurücksetzen"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon zurücksetzen"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Alle personenbezogenen Daten und heruntergeladenen Apps löschen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Alle personenbezogenen Daten und heruntergeladenen Apps löschen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles löschen"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen auf die Werkseinstellungen zu bestätigen."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Die Zurücksetzung konnte nicht durchgeführt werden, weil der Dienst zur Systembereinigung nicht verfügbar ist."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Zurücksetzen?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Das Zurücksetzen auf Werkseinstellungen ist für diesen Nutzer nicht verfügbar."</string>
@@ -1044,8 +1085,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB-Speicher und alle darauf gespeicherten Dateien löschen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD-Karte und alle darauf gespeicherten Dateien löschen? Die Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Alles löschen"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Sie müssen Ihr Entsperrungsmuster zeichnen, um die Löschung des USB-Speichers zu bestätigen."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Sie müssen Ihr Entsperrungsmuster zeichnen, um das Löschen der SD-Karte zu bestätigen."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Anrufeinstellungen"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Mailbox, Rufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-Tethering"</string>
@@ -1077,7 +1116,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hilfe"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilfunknetze"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilfunktarif"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standard-SMS-App"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-App"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS-App wechseln?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="NEW_APP">%1$s</xliff:g> statt <xliff:g id="CURRENT_APP">%2$s</xliff:g> als SMS-App verwenden?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> als SMS-App verwenden?"</string>
@@ -1105,7 +1144,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Standortmodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, WLAN- und Mobilfunknetze zur Standortbestimmung verwenden"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"WLAN- und Mobilfunknetze zur Standortbestimmung verwenden"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS zur Standortbestimmung nutzen"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS zur Standortbestimmung nutzen"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scannen"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scannen"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WLAN-Suche"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Apps und Diensten zwecks Erhöhung der Standortgenauigkeit die Suche nach WLAN-Netzwerken auch bei deaktivierter WLAN-Funktion gestatten"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-Suche"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Systemdiensten zwecks Erhöhung der Standortgenauigkeit die Suche nach Bluetooth-Geräten auch bei deaktivierter Bluetooth-Funktion gestatten"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Standort per WLAN und Mobilfunk"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps dürfen meinen Standort mit dem Google-Standortdienst schneller bestimmen. Anonyme Standortdaten werden erfasst und an Google gesendet."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Standort per WLAN ermittelt"</string>
@@ -1151,11 +1196,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Das Passwort wurde festgelegt."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Die PIN wurde festgelegt."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Das Muster wurde festgelegt."</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Bildschirmsicherheit"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Geben Sie zum Fortfahren das Muster für Ihr Gerät ein."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Geben Sie zum Fortfahren die PIN für Ihr Gerät ein."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Geben Sie zum Fortfahren das Passwort für Ihr Gerät ein."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Gerätesicherheit"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Entsperrungsmuster ändern"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Entsperrungs-PIN ändern"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Gespeichertes Muster bestätigen"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Erneut versuchen:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Zeichnen Sie 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">"Lassen Sie die Tasten los, wenn Sie fertig sind."</string>
@@ -1177,8 +1226,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Entsperrungsmuster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Muster ändern"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Zeichnen eines Entsperrungsmusters"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Zu viele fehlgeschlagene Versuche!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"In <xliff:g id="NUMBER">%d</xliff:g> Sekunden erneut versuchen."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Zu viele fehlerhafte Versuche. Bitte versuchen Sie es in <xliff:g id="NUMBER">%d</xliff:g> Sekunden erneut."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"App ist nicht auf dem Telefon installiert."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installierte Apps verwalten und entfernen"</string>
@@ -1229,6 +1277,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Nach Größe sortieren"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Aktive Dienste anzeigen"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Prozesse im Cache anzeigen"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"App für Notfallbenachrichtigungen"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"App-Einstell. zurücksetzen"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"App-Einstellungen zurücksetzen?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dies wird die folgenden Einstellungen zurücksetzen:\n\n "<li>"Deaktivierte Apps"</li>\n" "<li>"Deaktivierte App-Benachrichtigungen"</li>\n" "<li>"Standard-Apps für bestimmte Aktionen"</li>\n" "<li>"Einschränkungen der Hintergrunddaten für Apps"</li>\n" "<li>"Jegliche Zugriffsbeschränkungen"</li>\n\n" Alle App-Daten bleiben erhalten."</string>
@@ -1300,6 +1349,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"App-Vorgänge"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Aktiv"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nie verwendet)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Keine Standard-Apps"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Speichernutzung"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Von Apps verwendeten Speicher anzeigen"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktive Dienste"</string>
@@ -1397,17 +1447,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet-Informationen"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformation"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Akkuinformationen"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Schnellstart"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Tastenkombinationen zum Starten von Apps festlegen"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"App zuweisen"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Kein Tasteaturkürzel"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Suche + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Löschen"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Die Verknüpfung für <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) wird gelöscht."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Abbrechen"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apps"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Tastenkombinationen"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Texteingabe"</string>
     <string name="input_method" msgid="5434026103176856164">"Eingabemethode"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Aktuelle Tastatur"</string>
@@ -1442,23 +1481,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth HCI-Pakete in einer Datei erfassen"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-Entsperrung"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Bootloader-Entsperrung zulassen"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN eingeben"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Zum Aktivieren der OEM-Entsperrung Geräte-PIN eingeben"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM-Entsperrung zulassen?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"Achtung: Die Geräteschutzfunktionen funktionieren auf diesem Gerät nicht, solange diese Einstellung aktiviert ist."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger-Puffergrößen"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Größe pro Protokollpuffer wählen"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Simulierte Standorte"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Simulierte Standorte zulassen"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Inspektion der Anzeigeattribute aktivieren"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Netzwerke"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Kabellose Übertragung"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ausführliche WLAN-Protokolle aktivieren"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressives Handover von WLAN an Mobilfunk"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"WLAN-Roamingsuchen immer zulassen"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Alten DHCP-Client verwenden"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Optionen zur Zertifizierung für kabellose Übertragung anzeigen"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Level für WLAN-Protokollierung erhöhen, in WiFi Picker pro SSID-RSSI anzeigen"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Wenn diese Option aktiviert ist, ist WLAN bei schwachem Signal bei der Übergabe der Datenverbindung an den Mobilfunk aggressiver."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"WLAN-Roamingsuchen je nach Umfang des Datentraffics an der Schnittstelle zulassen bzw. nicht zulassen"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Logger-Puffergrößen"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Größe pro Protokollpuffer wählen"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB-Konfiguration auswählen"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB-Konfiguration auswählen"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Simulierte Standorte"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Simulierte Standorte zulassen"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Inspektion der Anzeigeattribute aktivieren"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"DHCP-Client von Lollipop statt des neuen Android-DHCP-Clients verwenden"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-Debugging zulassen?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-Debugging ist nur für Entwicklungszwecke vorgesehen. Damit können Sie Daten zwischen Ihrem Computer und Ihrem Gerät kopieren, Apps auf Ihrem Gerät ohne Benachrichtigung installieren und Protokolldaten lesen."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Zugriff auf USB-Debugging für alle zuvor autorisierten Computer aufheben?"</string>
@@ -1562,6 +1609,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> benötigt:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Ihre Eingabe wird von \"Einstellungen\" nicht erkannt, weil eine App die Berechtigungsanfrage verdeckt."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Wenn Sie <xliff:g id="SERVICE">%1$s</xliff:g> aktivieren, verwendet Ihr Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Da Sie eine Bedienungshilfe aktiviert haben, verwendet Ihr 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, müssen Sie Ihr Muster bestätigen."</string>
@@ -1703,14 +1751,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Prozessstatistiken"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiken zu laufenden Prozessen"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Speichernutzung"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Apps (<xliff:g id="TYPE">%1$s</xliff:g>) über <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> von <xliff:g id="TOTALRAM">%2$s</xliff:g> genutzt in <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Hintergrund"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Vordergrund"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Im Cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Der aktuelle Speicherstand des Geräts ist <xliff:g id="MEMSTATE">%1$s</xliff:g>."</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Durchschnittliche RAM-Nutzung"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximale RAM-Nutzung"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android-Betriebssystem"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Nativ"</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-Nutzung"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM-Nutzung (Hintergrund)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Laufzeit"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Prozesse"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Dienste"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Dauer"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Speicherdetails"</string>
@@ -1727,6 +1781,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 Stunden"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 Tag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Systemprozesse anzeigen"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"System ausblenden"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS verwenden"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktyp"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Hintergrund"</string>
@@ -1749,7 +1804,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Standardeinstellungen unten überschreiben App-Einstellungen."</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardeinstellungen"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Standardmodul"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Legt das Sprachsynthesemodul für gesprochenen Text fest."</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Engine für die Sprachsynthese festlegen, die für gesprochenen Text verwendet werden soll"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Sprechgeschwindigkeit"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Geschwindigkeit, mit der der Text gesprochen wird"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonlage"</string>
@@ -1823,7 +1878,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-gestützt"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Nur Software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Anmeldedaten sind für diesen Nutzer nicht verfügbar."</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Installieren der Anmeldedaten zu bestätigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Geben Sie das Passwort für den Anmeldeinformationsspeicher ein."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuelles Passwort:"</string>
@@ -1848,12 +1902,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Meine Daten sichern"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"App-Daten, WLAN-Passwörter und andere Einstellungen auf Google-Servern sichern"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Sicherungskonto"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Zurzeit werden in keinem Konto gesicherte Daten gespeichert."</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"App-Daten einschließen"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Autom. Wiederherstellung"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Nach der Neuinstallation einer App gesicherte Einstellungen und Daten wiederherstellen"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Der Sicherungsdienst ist inaktiv."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dies wird durch Ihre Geräterichtlinien festgelegt."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop-Sicherungspasswort"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Vollständige Desktop-Sicherungen sind momentan nicht passwortgeschützt."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Zum Ändern oder Entfernen des Passworts für vollständige Desktop-Sicherungen berühren"</string>
@@ -2025,6 +2077,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Maßstab Übergangsanimation"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Maßstab für Animatorzeit"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Sekundäre Displays simulieren"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Mehrfenstermodus"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Mehrere Aktivitäten gleichzeitig auf dem Bildschirm"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Mehrfenstermodus aktivieren?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"Achtung: Hierbei handelt es sich um eine äußerst experimentelle Funktion, die über die Benutzeroberfläche zuletzt aktiver Apps mehrere Aktivitäten gleichzeitig auf dem Bildschirm zulässt. Bei Verwendung mit dieser Funktion stürzen einige Apps möglicherweise ab oder funktionieren nicht richtig."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Aktionen nicht speichern"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Aktivität löschen, sobald der Nutzer diese beendet"</string>
@@ -2196,7 +2252,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Nutzer"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Eingeschränkte Profile"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Neuen Nutzer hinzufügen?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Sie können dieses Gerät für andere Nutzer freigeben, indem Sie weitere Nutzer erstellen. 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 Sie einen neuen Nutzer hinzufügen, muss dieser seinen Bereich einrichten.\n\nJeder Nutzer kann Apps für alle anderen Nutzer aktualisieren."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Sie können dieses Gerät für andere Nutzer freigeben, indem Sie weitere Nutzer erstellen. 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 Sie einen neuen Nutzer hinzufügen, 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 Sie einen neuen Nutzer hinzufügen, 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 ihren Speicherplatz einrichten."</string>
@@ -2227,13 +2283,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Gast entfernen?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Alle Apps und Daten in dieser Sitzung werden gelöscht."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Entfernen"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Telefonanrufe zulassen"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Telefonanrufe und SMS zulassen"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Anrufe aktivieren"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Anrufe &amp; SMS aktivieren?"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Nutzer entfernen"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Telefonanrufe zulassen?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Anrufe aktivieren?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Die Anrufliste wird für diesen Nutzer freigegeben."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Telefonanrufe und SMS zulassen?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Anrufliste und SMS-Verlauf werden für diesen Nutzer freigegeben."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Anrufe &amp; SMS aktivieren?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Anrufliste und SMS-Verlauf werden für diesen Nutzer freigegeben."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Apps und Inhalte zulassen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps mit Einschränkungen"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"App-Einstellungen erweitern"</string>
@@ -2284,8 +2340,8 @@
     <string name="user_rename" msgid="8523499513614655279">"Umbenennen"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"App-Beschränkungen festlegen"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Von <xliff:g id="APP">%1$s</xliff:g> festgelegt"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Diese App wird in eingeschränkten Profilen nicht unterstützt."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Diese App darf auf Ihre Konten zugreifen."</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Diese App darf auf Ihre Konten zugreifen. Von <xliff:g id="APP">%1$s</xliff:g> festgelegt"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"WLAN und mobile Nutzung"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Änderungen an Einstellungen für WLAN und mobile Nutzung zulassen"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2350,13 +2406,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wlan wifi wi-fi netzwerkverbindung"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textnachricht sms nachrichten messaging mms"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilfunk mobilfunkanbieter drahtlos drahtlose daten 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"WLAN-Anrufe"</string>
     <string name="keywords_home" msgid="3626170808219458848">"übersicht launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"bildschirm touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"display dimmen touchscreen akku"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"display dimmen touchscreen akku"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"hintergrund personalisieren display anpassen"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"dunkles Design Nachtmodus Display dimmen Helligkeit umkehren"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"Hintergrund personalisieren Display anpassen"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textgröße"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projizieren"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"Bildschirmübertragung"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"speicherplatz festplatte gerät nutzung gerätenutzung"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"strom verbrauch stromverbrauch aufladen"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"rechtschreibung schreibweise wörterbuch rechtschreibprüfung autokorrektur"</string>
@@ -2373,6 +2431,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"einschränkung einschränken eingeschränkt"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text korrektur textkorrektur korrigieren sound ton vibrieren automatisch sprache bewegung vorschlagen vorschlag design anstößig anstößiges wort eingeben emoji international"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"Standardeinstellung für das Zurücksetzen"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"notfall app standard"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"App-System für App-Download"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"App-Berechtigungen – Sicherheit"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"Apps-Standardeinstellung"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ziehen passwort muster pin slide password pattern"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WLAN-NFC-Tag einrichten"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schreiben"</string>
@@ -2387,11 +2450,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Weckerlautstärke"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Klingeltonlautstärke"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Benachrichtigungslautstärke"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Unterbrechungen"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Bei eingehenden Anrufen und Benachrichtigungen"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Immer unterbrechen"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Nur wichtige Unterbrechungen zulassen"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nicht unterbrechen"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Nur wichtige Unterbr. zulassen"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatische Regeln"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Nur wichtige Unterbrechungen"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Nur Wecker"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Keine Unterbrechungen"</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="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardton für Benachrichtigungen"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Bei Anrufen auch vibrieren"</string>
@@ -2399,7 +2463,7 @@
     <string name="notification_pulse_title" msgid="1247988024534030629">"Benachrichtigungslicht"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Bei gesperrtem Gerät"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Gesamten Nachrichteninhalt anzeigen"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sensible Benachrichtigungsinhalte ausblenden"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Vertrauliche Benachrichtigungsinhalte ausblenden"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Keine Benachrichtigungen anzeigen"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Wie sollen Benachrichtigungen angezeigt werden, wenn Ihr Gerät gesperrt ist?"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App-Benachrichtigungen"</string>
@@ -2417,62 +2481,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibration"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Benachrichtigungszugriff"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps können keine Benachrichtigungen lesen."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d App kann Benachrichtigungen lesen"</item>
-    <item quantity="other" msgid="980049191810249052">"%d Apps können Benachrichtigungen lesen"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d Apps können Benachrichtigungen lesen</item>
+      <item quantity="one">%d App kann Benachrichtigungen lesen</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Keine Benachrichtigungs-Listener installiert"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> aktivieren?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> darf alle Benachrichtigungen lesen, die vom System oder einer installierten App gesendet werden. Darin können personenbezogene Daten wie Kontaktnamen oder Inhalte der an Sie gesendeten Nachrichten enthalten sein. Der Listener kann diese Benachrichtigungen außerdem schließen oder Schaltflächen in den Benachrichtigungen betätigen."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Bedingungsanbieter"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Keine der Apps enthalten Bedingungen."</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d App enthält Bedingungen"</item>
-    <item quantity="other" msgid="358057362115673258">"%d Apps enthalten Bedingungen"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Es sind keine Bedingungsanbieter installiert."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> aktivieren?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kann Ausstiegsbedingungen zum Modus \"Nicht stören\" hinzufügen."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blockieren"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Alle blockieren"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Benachrichtigungen von dieser App nie anzeigen"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Wichtig"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Benachrichtigungen ganz oben auf der Liste anzeigen und weiterhin einblenden, wenn für das Gerät \"Nur wichtige Unterbrechungen\" festgelegt wurde"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensibel"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Wenn das Gerät gesperrt ist, werden sensible Inhalte aus den Benachrichtigungen der App ausgeblendet."</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Als Priorität behandeln"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Die Benachrichtigungen dieser App dürfen hörbar sein, wenn \"Nicht stören\" auf \"Nur wichtige\" festgelegt ist."</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Kurzes Einblenden zulassen"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Diese App darf bestimmte Benachrichtigungen durch kurzes Einblenden auf dem aktuellen Bildschirm hervorheben."</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Vertrauliche Inhalte ausblenden"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Wenn das Gerät gesperrt ist, werden Inhalte aus den Benachrichtigungen der App ausgeblendet, die personenbezogene Daten preisgeben könnten."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blockiert"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Wichtig"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensibel"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fertig"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Bis zur Deaktivierung"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Wichtige Unterbrechungen"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Inaktivität"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Tage"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Keine"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Zulässige Unterbrechungen"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Nur wichtige"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Keine"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisierung"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatisch aktivieren"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Regelname"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Regel hinzufügen"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Regel löschen"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Regel \"<xliff:g id="RULE">%1$s</xliff:g>\" löschen?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Löschen"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Regeltyp"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Unbekannt"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Regel konfigurieren"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Regel planen"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regel nicht gefunden"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Tage"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Keine"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Täglich"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nie"</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> bis <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Anrufe"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Nachrichten"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Anrufe/Nachrichten von"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Alle"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Nur Kontakte"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Nur markierte Kontakte"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Termine und Erinnerungen"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarme sind immer wichtige Unterbrechungen."</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Wecker"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Erinnerungen"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Termine"</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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Wochentags abends"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Startzeit"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Schlusszeit"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Um <xliff:g id="FORMATTED_TIME">%s</xliff:g> am nächsten Tag"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"Um <xliff:g id="FORMATTED_TIME">%s</xliff:g> oder bei einem Alarm davor"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Um <xliff:g id="FORMATTED_TIME">%s</xliff:g> am nächsten Tag oder bei einem Alarm davor"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Am nächsten Tag um <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Unterbrechungen"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Bei eingehenden Anrufen und Benachrichtigungen"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"In welchen Fällen möchten Sie unterbrochen werden?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Wie lange?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Immer unterbrechen"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"aus,alle,alles"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Nur wichtige Unterbrechungen zulassen"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Nur Alarme zulassen"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Nicht unterbrechen"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Unbegrenzt"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> Minuten</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Minute</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> Stunden</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Stunde</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Für unbegrenzte Zeit zur Option \"Nur wichtige Benachrichtigungen\" wechseln"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Minuten bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nur wichtige Benachrichtigungen\" wechseln</item>
+      <item quantity="one">Für eine Minute bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nur wichtige Benachrichtigungen\" wechseln</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Stunden bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nur wichtige Benachrichtigungen\" wechseln</item>
+      <item quantity="one">Für eine Stunde bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nur wichtige Benachrichtigungen\" wechseln</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Für unbegrenzte Zeit zur Option \"Nur Wecker\" wechseln"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Minuten bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nur Wecker\" wechseln</item>
+      <item quantity="one">Für eine Minute bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nur Wecker\" wechseln</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Stunden bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nur Wecker\" wechseln</item>
+      <item quantity="one">Für eine Stunde bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nur Wecker\" wechseln</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Für unbegrenzte Zeit zur Option \"Nicht unterbrechen\" wechseln"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Minuten bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nicht unterbrechen\" wechseln</item>
+      <item quantity="one">Für eine Minute bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nicht unterbrechen\" wechseln</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Für <xliff:g id="DURATION">%1$d</xliff:g> Stunden bis <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> zur Option \"Nicht unterbrechen\" wechseln</item>
+      <item quantity="one">Für eine Stunde bis <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> zur Option \"Nicht unterbrechen\" wechseln</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zur Option \"Immer unterbrechen\" wechseln"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"Dauerhaft"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-Benachrichtigungen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback zu diesem Gerät senden"</string>
@@ -2513,4 +2630,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-Informationen"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Informationen zur relativen 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="2184141780491382435">"Standardmäßig starten"</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> belegt"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Domain-Links"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Domain-URLs öffnen"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"App darf Domain-URLs direkt öffnen"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Unterstützte Domain-URLs"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Andere Standardeinstellungen"</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> belegt"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"interner Speicher"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"externer Speicher"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Interner Speicher"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Externer Speicher"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Datennutzung durch Apps"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> seit <xliff:g id="DATE">%2$s</xliff:g> genutzt"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Genutzter Speicher"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"An"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Aus"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensibel"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Wichtig"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Wichtig &amp; sensibel"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> Berechtigungen gewährt</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Berechtigung gewährt</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> von <xliff:g id="COUNT_3">%d</xliff:g> Berechtigungen gewährt</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> von <xliff:g id="COUNT_1">%d</xliff:g> Berechtigung gewährt</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Einige Standardeinstellungen festgelegt"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Keine Standardeinstellungen festgelegt"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Alle Apps"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Aktiviert"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Nutzer"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Arbeit"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blockiert"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Wichtig"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensibel"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Mit Domain-URLs"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Vom Administrator deaktiviert"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Erweitert"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Unbekannte App"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profil auswählen"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App-Berechtigungen"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> von <xliff:g id="COUNT_1">%d</xliff:g> Apps haben zusätzliche Zugriffsrechte."</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> von <xliff:g id="COUNT_1">%d</xliff:g> Apps sind berechtigt."</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domain-URLs"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Keine Domain-URL öffnen"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\"<xliff:g id="DOMAIN">%s</xliff:g>\" öffnen"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\"<xliff:g id="DOMAIN">%s</xliff:g>\" und zugehörige URLs öffnen"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> Apps können ihre Domain-URLs öffnen.</item>
+      <item quantity="one">Eine App kann ihre Domain-URLs öffnen.</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nicht erkannt"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Standard-Apps"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser-App"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Kein Standardbrowser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Standard)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Apps-Speicher"</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 195d048..9ee1117 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Πάτημα κουμπιού"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"σίγαση/κατάργηση σίγασης μικροφώνου"</item>
     <item msgid="1148142988678569310">"προβολή μέσου"</item>
     <item msgid="9130014005474445273">"ενεργοποίηση VPN"</item>
+    <item msgid="1165192162975045562">"ταπετσαρία σύνταξης"</item>
+    <item msgid="7129487923652967258">"δομή βοήθειας"</item>
+    <item msgid="1069023208100114540">"στιγμιότυπο οθόνης βοήθειας"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Τοποθεσία"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Σίγαση/κατάργηση σίγασης μικροφώνου"</item>
     <item msgid="5906017727368097853">"Προβολή μέσου"</item>
     <item msgid="2486614710846178542">"Ενεργοποίηση VPN"</item>
+    <item msgid="5586547561693629602">"Ταπετσαρία σύνταξης"</item>
+    <item msgid="32794179825485062">"Δομή βοήθειας"</item>
+    <item msgid="7872852746938272552">"Στιγμιότυπο οθόνης βοήθειας"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Σύντομο"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"χαμηλή"</item>
     <item msgid="4212263919458209842">"κρίσιμη"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Ανενεργό"</item>
-    <item msgid="5656544177755411222">"Περιορισμένες διακοπές"</item>
-    <item msgid="8735337502532332056">"Χωρίς διακοπές"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Κανονική"</item>
     <item msgid="866544120205026771">"Μέτρια"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Ροζ"</item>
     <item msgid="6131821495505931173">"Κόκκινο"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Πρωτόκολλο μεταφοράς πολυμέσων)"</item>
+    <item msgid="8856820259201251036">"PTP (Πρωτόκολλο μεταφοράς εικόνων)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Πηγή ήχου"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index eb40c9e..43b2c61 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Αποδοχή"</string>
     <string name="deny" msgid="6947806159746484865">"Απόρριψη"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Άγνωστο"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Απομένουν <xliff:g id="STEP_COUNT">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής."</item>
-    <item quantity="other" msgid="6722953419953594148">"Απομένουν <xliff:g id="STEP_COUNT">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Απομένουν <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής.</item>
+      <item quantity="one">Απομένει<xliff:g id="STEP_COUNT_0">%1$d</xliff:g> βήμα για να γίνετε προγραμματιστής.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Είστε πλέον προγραμματιστής!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Δεν χρειάζεται, είστε ήδη προγραμματιστής."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Ασύρματο και δίκτυα"</string>
@@ -40,10 +40,12 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Απενεργοποίηση SMS μέσω IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Απαιτείται ενεργοποίηση της εγγραφής IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Απαιτείται απενεργοποίηση της εγγραφής IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Ενεργοποίηση επισήμανσης που παρέχεται από VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Απενεργοποίηση επισήμανσης που παρέχεται από VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Ενεργοποίηση αρχείου ένδειξης σφαλμάτων lte ram"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Απενεργοποίηση αρχείου ένδειξης σφαλμάτων lte ram"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Προβολή βιβλίου διευθύνσεων κάρτας SIM"</string>
-    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Προβολή καθορισμένων αριθμών κλήσης"</string>
+    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Προβολή προκαθορισμένων αριθμών κλήσης"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Προβολή αριθμών κλήσης υπηρεσίας"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Λήψη λίστας PDP"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"Σε υπηρεσία"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"Συνδεδεμένο"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Συνδεδεμένο (όχι τηλ.)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Συνδεδεμένο (όχι μέσα)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Συνδεδεμένο (χωρίς πρόσβαση μηνύματος)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Συνδεδεμένο (χωρίς τηλέφωνο ή πολυμέσα)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Αποσυνδέθηκε"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Αποσύνδεση..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Σύνδεση..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Σύζευξη..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Συσκευή Bluetooth χωρίς όνομα"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Αναζήτηση"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Δεν βρέθηκαν συσκευές Bluetooth κοντά."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Εμφάνιση ληφθέντων αρχείων"</string>
     <string name="device_picker" msgid="4978696506172252813">"Επιλέξτε συσκευή Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Αίτημα άδειας Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth για αυτήν τη συσκευή."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Μια εφαρμογή θέλει να κάνει ορατό το tablet σας σε άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Μια εφαρμογή θέλει να κάνει ορατό το τηλέφωνό σας σε άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Μια εφαρμογή θέλει να κάνει το tablet σας ορατό σε άλλες συσκευές Bluetooth. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ΑΚΥΡΩΣΗ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ΣΥΝΕΧΕΙΑ"</string>
     <string name="okay" msgid="1997666393121016642">"ΟΚ"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ΝΑΙ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ΟΧΙ"</string>
-    <string name="forget" msgid="7267115980248732932">"ΔΙΑΓΡΑΦΗ"</string>
+    <string name="forget" msgid="1400428660472591263">"Διαγραφή"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Βελτίωση αντιστοίχισης προσώπων"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Έλεγχος ζωντάνιας"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Απαιτείται βλεφάρισμα ματιών κατά το ξεκλείδωμα"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Κωδικοί πρόσβασης"</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="3453670509485083962">"Προσθήκη"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"κλείδωμα οθόνης"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"Ρύθμ.μοναδικού χαρακτ."</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Για να χρησιμοποιείτε το μοναδικό χαρακτηριστικό σας για να ξεκλειδώσετε την οθόνη σας ή να επιβεβαιώσετε αγορές, θα πρέπει να: \n\n✓ Ρυθμίσετε την εφεδρική μέθοδο κλειδώματος της οθόνης  \n\n✓ Προσθέσετε το μοναδικό χαρακτηριστικό σας"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Βρείτε τον αισθητήρα"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Εντοπίστε τον αισθητήρα μοναδικού χαρακτηριστικού στο πίσω μέρος του τηλεφώνου σας."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Ας ξεκινήσουμε!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Τοποθετήστε το δάχτυλό σας στον αισθητήρα μοναδικού χαρακτηριστικού. Σηκώστε αφού αισθανθείτε μια δόνηση."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Τέλεια! Επαναλάβετε."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Τοποθετήστε το ίδιο δάχτυλό στον αισθητήρα μοναδικού χαρακτηριστικού και σηκώστε το αφού αισθανθείτε μια δόνηση."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Προστέθηκε μον.χαρακ.!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Όποτε βλέπετε αυτό το εικονίδιο, μπορείτε να χρησιμοποιείτε το μοναδικό χαρακτηριστικό σας για την ταυτοποίηση ή την εξουσιοδότηση μιας αγοράς."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Προσθήκη"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Επόμενο"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Κρυπτογράφηση"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Κρυπτογράφηση tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Κρυπτογράφηση τηλεφώνου"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Συνδέστε τον φορτιστή σας και δοκιμάστε ξανά."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Δεν υπάρχει κωδικός PIN ή κωδικός πρόσβασης κλειδώματος οθόνης"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Πρέπει να ορίσετε έναν κωδικό PIN ή έναν κωδικό κλειδώματος οθόνης προτού αρχίσει η κρυπτογράφηση."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Θα πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την κρυπτογράφηση της συσκευής σας."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Να γίνει κρυπτογράφηση;"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Η λειτουργία κρυπτογράφησης είναι μη αναστρέψιμη και, αν τη διακόψετε, θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο, κατά τη διάρκεια της οποίας θα γίνει πολλές φορές επανεκκίνηση του tablet."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Η λειτουργία κρυπτογράφησης είναι μη αναστρέψιμη και, αν τη διακόψετε, θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο, κατά τη διάρκεια της οποίας θα γίνει πολλές φορές επανεκκίνηση του τηλεφώνου."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Χαμηλό επίπεδο ασφάλειας, πειραματικό"</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_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="current_screen_lock" msgid="4104091715420072219">"Τρέχουσα οθόνη κλειδώματος"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Οι λειτουργίες προστασίας της συσκευής δεν θα λειτουργούν πλέον."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Απενεργοποιήθηκε λόγω διαχειριστή, πολιτικής κρυπτογράφησης ή χώρου αποθήκευσης διαπιστευτηρίων"</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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_password" msgid="1203938057264146610">"Κωδικός πρόσβασης"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Αφού ρυθμίσετε το κλείδωμα οθόνης, θα μπορείτε να ρυθμίσετε και τα δαχτυλικά αποτυπώματα από τις Ρυθμίσεις &gt; Ασφάλεια."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Απενεργοποίηση κλειδώματος οθόνης"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Κατάργηση μοτίβου ξεκλειδώματος"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Κατάργηση αριθμού PIN ξεκλειδώματος"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα γράμμα."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα ψηφίο."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα σύμβολο."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 γράμμα."</item>
-    <item quantity="other" msgid="8186027808415585970">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d γράμματα."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 πεζό γράμμα."</item>
-    <item quantity="other" msgid="2693910942679679225">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d πεζά γράμματα."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 κεφαλαίο γράμμα."</item>
-    <item quantity="other" msgid="3030801209112209245">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d κεφαλαία γράμματα."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 αριθμητικό ψηφίο."</item>
-    <item quantity="other" msgid="4703982391407595924">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d αριθμητικά ψηφία."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 ειδικό σύμβολο."</item>
-    <item quantity="other" msgid="1221290525051187757">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d ειδικά σύμβολα."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 χαρακτήρα που δεν είναι γράμμα."</item>
-    <item quantity="other" msgid="3952508584649046404">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d χαρακτήρες που δεν είναι γράμματα."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d γράμματα.</item>
+      <item quantity="one">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 γράμμα.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d πεζά γράμματα.</item>
+      <item quantity="one">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 πεζό γράμμα.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d κεφαλαία γράμματα.</item>
+      <item quantity="one">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 κεφαλαίο γράμμα.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d αριθμητικά ψηφία.</item>
+      <item quantity="one">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 αριθμητικό ψηφίο.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d ειδικά σύμβολα.</item>
+      <item quantity="one">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 ειδικό σύμβολο.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d χαρακτήρες που δεν είναι γράμματα.</item>
+      <item quantity="one">Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 χαρακτήρα που δεν είναι γράμμα.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Ο διαχειριστής της συσκευής δεν επιτρέπει τη χρήση πρόσφατου κωδικού πρόσβασης."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Απαγορεύεται η αύξουσα, φθίνουσα ή επαναλαμβανόμενη ακολουθία ψηφίων"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ΟΚ"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"Ζεύγος"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ΣΥΖΕΥΞΗ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Ακύρωση"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Η σύζευξη παρέχει πρόσβαση στις επαφές σας και το ιστορικό κλήσεων όταν συνδεθείτε."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Δεν ήταν δυνατή η σύζευξη με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Δεν ήταν δυνατή η σύζευξη με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> λόγω εσφαλμένου αριθμού PIN ή κλειδιού πρόσβασης."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Δεν είναι δυνατή η σύνδεση με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Η ζεύξη απορρίφθηκε από τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Δεν ήταν δυνατή η σύνδεση με τη συσκευή <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>
@@ -515,16 +518,8 @@
     <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">"Eνεργοποιήστε το Bluetooth."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Για τη βελτίωση του εντοπισμού τοποθεσίας, οι εφαρμογές και οι υπηρεσίες θα εκτελούν σάρωση για συσκευές Bluetooth, ακόμα και όταν το Bluetooth είναι απενεργοποιημένο. Μπορείτε να αλλάξετε την επιλογή από τις <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ρυθμίσεις σάρωσης<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Σύνδεση σε..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Ήχος πολυμέσων"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Ήχος τηλεφώνου"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Μεταφορά αρχείου"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Συσκευή εισόδου"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Πρόσβαση στο Διαδίκτυο"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Κοινή χρήση επαφών"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Για κοινή χρήση επαφών"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Κοινή χρήση σύνδεσης στο Διαδίκτυο"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Πρόσβαση στο μήνυμα"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από τον ήχο μέσων."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από τον ήχο handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από τη συσκευή εισόδου."</string>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"Συνδέθηκε σε ήχο πολυμέσων"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Συνδεδεμένο στον ήχο τηλεφώνου"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Συνδεδεμένο σε διακομιστή μεταφοράς αρχείων"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Συνδεδεμένο στο χάρτη"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Δεν έχει συνδεθεί σε διακομιστή μεταφοράς αρχείων"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Συνδέθηκε σε συσκευή εισόδου"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Χρήση για ήχο πολυμέσων"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Χρήση για ήχο τηλεφώνου"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Χρήση για τη μεταφορά αρχείων"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Χρήση για είσοδο"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Χρήση για την πρόσβαση στο Διαδίκτυο"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Χρήση για χάρτη"</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_assistant_title" msgid="2553267316621598101">"Βοηθός Wi-Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Σύνδεση μέσω βοηθού Wi‑Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Μετάδοση οθόνης"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το tablet έρχεται σε επαφή με μια άλλη συσκευή"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το τηλέφωνο αγγίζει μια άλλη συσκευή"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Απενεργοποίηση του Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Σφάλμα"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Σε λειτουργία πτήσης"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Δεν είναι δυνατή η σάρωση για δίκτυα"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Ειδοποίηση δικτύου"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Ειδοποίηση όποτε υπάρχει διαθέσιμο δημόσιο δίκτυο"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Αποφυγή κακών συνδέσεων"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Να μην γίνεται χρήση δικτύων Wi-Fi, εκτός αν υπάρχει καλή σύνδεση στο Διαδίκτυο"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Να χρησιμοποιούνται μόνο δίκτυα με καλή διαδικτυακή σύνδεση"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Σάρωση πάντα διαθέσιμη"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Να επιτρέπεται πάντα η σάρωση"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Να επιτρέπεται στην υπηρεσία τοποθεσίας της Google και σε άλλες εφαρμογές η σάρωση για δίκτυα, ακόμα και όταν το Wi‑Fi είναι απενεργοποιημένο"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Αυτόματη χρήση ανοιχτού δικτύου Wi‑Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Να επιτρέπεται σε ένα βοηθό Wi‑Fi η αυτόμ. σύνδεση σε ανοιχτά δίκτυα που θεωρούνται υψηλής ποιότητας"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Επιλογή βοηθού"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Εγκατάσταση πιστοποιητικών"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Για τη βελτίωση της ακρίβειας και για άλλους σκοπούς, το Google και άλλες εφαρμογές ενδέχεται να πραγματοποιούν σάρωση για κοντινά δίκτυα Wi-Fi, ακόμη και αν το Wi-Fi είναι απενεργοποιημένο. Αν δεν επιθυμείτε να συμβαίνει αυτό, μεταβείτε στη ρύθμιση Σύνθετες &gt; Πάντα διαθέσιμη σάρωση."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Οι εφαρμογές ενδέχεται να κάνουν σάρωση για κοντινά δίκτυα, ακόμη και αν το Wi-Fi είναι απενεργοποιημένο. Αν δεν επιθυμείτε να συμβαίνει αυτό, μεταβείτε στη ρύθμιση Σύνθετες &gt; Πάντα διαθέσιμη σάρωση."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Για τη βελτίωση του εντοπισμού τοποθεσίας, οι εφαρμογές και οι υπηρεσίες θα εκτελούν σάρωση για δίκτυα Wi‑Fi, ακόμα και όταν το 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="5340097010842405981">"Να μην εμφανιστεί ξανά"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Προσθήκη άλλου δικτύου"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Περισσότερα"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Αυτόματη ρύθμιση (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Για να ολοκληρωθεί η ρύθμιση, το tablet σας χρειάζεται πρόσβαση σε Wi‑Fi. Μετά τη ρύθμιση, μπορείτε να κάνετε εναλλαγή μεταξύ δεδομένων κινητής τηλεφωνίας και Wi‑Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Σύνθετες επιλογές"</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="5940801028985255304">"Πατήστε ο κουμπί ρύθμισης προστατευόμενου Wi-Fi στον δρομολογητή σας. Ενδέχεται να ονομάζεται \"WPS\" ή να περιέχει αυτό το σύμβολο:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Πατήστε το κουμπί ρύθμισης προστατευόμενου Wi-Fi στο δρομολογητή σας. Ενδέχεται να ονομάζεται \"WPS\" ή να επισημαίνεται με αυτό το σύμβολο:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Εισαγάγετε τον <xliff:g id="NUMBER">%1$s</xliff:g> pin στον δρομολογητή σας 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>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"Διαμόρφωση ζώνης σημείου πρόσβασης"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(δεν έγινε αλλαγή)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(δεν έχει καθοριστεί)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Αποθηκευμένο"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Απενεργοποιημένο"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Αποτυχία διαμόρφωσης διεύθυνσης IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Αποτυχία σύνδεσης Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Πρόβλημα ελέγχου ταυτότητας"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Εκτός εμβέλειας"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Δεν εντοπίστηκε καμία πρόσβαση στο διαδίκτυο, δεν θα γίνει αυτόματη επανασύνδεση."</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_security_none" msgid="7985461072596594400">"Καμία"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Να γίνει σύνδεση στο σημείο πρόσβασης Wi-Fi;"</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="1509171132175355674">"Αυτό το δίκτυο δεν έχει πρόσβαση στο διαδίκτυο. Χρήση αυτού του δικτύου ούτως ή άλλως;"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Να μην ερωτηθώ ξανά γι\' αυτό το δίκτυο"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Σύνδεση"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Αποτυχία σύνδεσης στο δίκτυο"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Να διαγραφεί από τη μνήμη"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Φορ. σημ. πρόσ. Wi-Fi AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Φορητό σημείο πρόσβασης 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_mode_title" msgid="2164073796253284289">"Προτίμηση κλήσεων"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Λειτουργία κλήσης Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Προτίμηση Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Προτίμηση δικτύου κινητής τηλεφωνίας"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Όταν είναι ενεργοποιημένη η λειτουργία κλήσης μέσω Wi-Fi, το τηλέφωνό σας μπορεί να δρομολογεί κλήσεις μέσω δικτύων Wi-Fi ή του δικτύου της εταιρείας κινητής τηλεφωνίας, ανάλογα με την προτίμησή σας και την ισχύ του κάθε σήματος. Πριν ενεργοποιήσετε τη λειτουργία, ρωτήστε την εταιρεία κινητής τηλεφωνίας για να μάθετε σχετικά με τις χρεώσεις και άλλες λεπτομέρειες."</string>
     <string name="home_settings" msgid="212375129455718176">"Αρχική σελίδα"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ήχος"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"Θέμα"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Ανοιχτόχρωμο"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Σκούρο"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Αυτόματο"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Ενημέρωση προτιμώμενης SIM;"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"Η κάρτα <xliff:g id="NEW_SIM">%1$s</xliff:g> είναι η μοναδική κάρτα SIM στη συσκευή σας. Θέλετε να χρησιμοποιήσετε αυτήν την κάρτα SIM για δεδομένα κινητής τηλεφωνίας, κλήσεις και μηνύματα SMS;"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Εσφαλμένος κωδικός PIN κάρτας SIM. Θα πρέπει να επικοινωνήσετε με τον πάροχο κινητής τηλεφωνίας σας για να ξεκλειδώσετε τη συσκευή σας."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Εσφαλμένος κωδικός PIN κάρτας SIM. Απομένει άλλη <xliff:g id="NUMBER">%d</xliff:g> προσπάθεια. Στη συνέχεια, θα πρέπει να επικοινωνήσετε με τον πάροχο κινητής τηλεφωνίας σας για να ξεκλειδώσετε τη συσκευή σας."</item>
-    <item quantity="other" msgid="77103619544346451">"Εσφαλμένος κωδικός PIN κάρτας SIM. Απομένουν <xliff:g id="NUMBER">%d</xliff:g> προσπάθειες."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Εσφαλμένος κωδικός PIN κάρτας 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">"Αποτυχία λειτουργίας κωδικού PIN κάρτας SIM!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Κατάσταση tablet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Κατάσταση τηλεφώνου"</string>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"Εφαρμογές (δεδομένα εφαρμογών και περιεχόμενο μέσων)"</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_dcim_usage" msgid="558887013613822577">"Εικόνες, βίντεο"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Ήχος (μουσική, ήχοι κλήσης, podcast κλπ.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Διάφορα"</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="default" msgid="6915293408836853020">"Αφαίρεση κάρτας SD"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"Προσάρτηση"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Εξαγωγή"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Διαγραφή δεδομένων και μορφ."</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Διαγ.δεδ. και μορφ.εσ.απ.χώρου"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Σύνδεση υπολογιστή μέσω USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Σύνδεση υπολογιστή μέσω USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Σύνδεση ως"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"Σας επιτρέπει να μεταφέρετε  φωτογραφίες χρησιμοποιώντας το λογισμικό της φωτογραφικής μηχανής και να μεταφέρετε οποιαδήποτε αρχεία σε υπολογιστές που δεν υποστηρίζουν MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Εγκατάσταση εργαλείων μεταφοράς αρχείων"</string>
+    <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_external_title" msgid="2723851748972673696">"Αφαιρούμενος αποθηκ. χώρος"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ελεύθερα (Σύνολο <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Προσαρτήθηκε <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Δεν ήταν δυνατή η προσάρτηση <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="4161722509712992231">"Δεν ήταν δυνατή η εξαγωγή του <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="8343688274191391889">"Δεν ήταν δυνατή η μορφοποίηση <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Μετονομασία αποθηκευτικού χώρου"</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="3677827796634199714"><b>"Όταν αφαιρέσετε αυτό το μέσο αποθήκευσης <xliff:g id="NAME_0">^1</xliff:g>, οι εφαρμογές που είναι αποθηκευμένες σε αυτό θα σταματήσουν να λειτουργούν και τα αρχεία μέσων που είναι αποθηκευμένα σε αυτό δεν θα είναι διαθέσιμα πριν από την εκ νέου εισαγωγή τους."</b>" \n\nΑυτό το μέσο αποθήκευσης <xliff:g id="NAME_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_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_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="1259216693690378749">"Μην αφαιρέσετε το μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g> κατά τη μορφοποίηση."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Μετακίνηση δεδ.σε νέο χώρο αποθ."</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Μπορείτε να μετακινήσετε τις φωτογραφίες, τα αρχεία και τα δεδομένα της εφαρμογής σας σε αυτό το νέο μέσο αποθήκευσης <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="5035719146373359329"><b>"Η μετακίνηση διαρκεί περίπου <xliff:g id="TIME">^1</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="8641916179067596592">"Κατά τη διάρκεια της μετακίνησης: \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_move_confirm_title" msgid="292782012677890250">"Μετακίνηση <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Η μετακίνηση της εφαρμογής <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="4288580957960820740">"Μην αφαιρέσετε το μέσο αποθήκευσης <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="battery_status_title" msgid="9159414319574976203">"Κατάσταση μπαταρίας"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Επίπεδο μπαταρίας"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"Επαναφορά των ρυθμίσεων δικτύου"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Με αυτόν τον τρόπο θα γίνει επαναφορά όλων των ρυθμίσεων δικτύου, μεταξύ των οποίων για:\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="4874737348054213767">"Επαναφορά όλων των ρυθμίσεων δικτύου; Δεν είναι δυνατή η αναίρεση αυτής της ενέργειας!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Επαναφορά ρυθμίσεων"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Να γίνει επαναφορά;"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Έγινε επαναφορά των ρυθμίσεων δικτύου."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Επαναφορά συσκευής"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Επαναφορά εργοστασιακών δεδομένων"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Διαγραφή όλων των δεδομένων στο tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Διαγραφή όλων των δεδομένων στο τηλέφωνο"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στην κάρτα SD, όπως αρχεία μουσικής και φωτογραφίες"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Επαναφορά tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Επαναφορά τηλεφώνου"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Να διαγραφούν όλα τα προσωπικά σας στοιχεία και οι ληφθείσες εφαρμογές; Δεν μπορείτε να αναστρέψετε αυτήν την ενέργεια!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Να διαγραφούν όλα τα προσωπικά σας στοιχεία και οι ληφθείσες εφαρμογές; Δεν είναι δυνατή η αναίρεση αυτής της ενέργειας!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Διαγραφή όλων"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την επαναφορά στις εργοστασιακές ρυθμίσεις."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Δεν πραγματοποιήθηκε επαναφορά επειδή η υπηρεσία Εκκαθάρισης συστήματος δεν είναι διαθέσιμη."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Να γίνει επαναφορά;"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Η επαναφορά των εργοστασιακών ρυθμίσεων δεν είναι διαθέσιμη γι\' αυτόν το χρήστη"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Να γίνει διαγραφή του αποθηκευτικού χώρου USB, η οποία θα διαγράψει όλα τα αρχεία που έχετε αποθηκεύσει εκεί; Δεν μπορείτε να αναστρέψετε αυτήν την ενέργεια!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Να γίνει διαγραφή της κάρτας SD, με την οποία θα διαγραφούν όλα τα αρχεία που έχετε αποθηκεύσει εκεί; Αυτή η ενέργεια είναι μη αναστρέψιμη!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Διαγραφή όλων"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να διαγράψετε το χώρο αποθήκευσης USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να διαγράψετε την κάρτα SD."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Βοήθεια"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Δίκτυα κινητής τηλεφωνίας"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Πρόγραμμα κινητής τηλεφωνίας"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Προεπιλεγμένη εφαρμογή 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Λειτουργία τοποθεσίας"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Χρήση GPS, Wi‑Fi και δικτύων κινητής τηλεφωνίας για καθορισμό τοποθεσίας"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Χρήση Wi‑Fi και δεδομένων κινητής τηλεφωνίας για καθορισμό τοποθεσίας"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Χρήση του GPS για τον καθορισμό της τοποθεσίας σας"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Χρήση GPS για τον προσδιορισμό της τοποθεσίας"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Σάρωση"</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="2070686681074461301">"Βελτιώστε την τοποθεσία επιτρέποντας σε εφαρμογές και υπηρεσίες να εκτελούν σάρωση για δίκτυα Wi-Fi, ακόμη και όταν το Wi-Fi είναι απενεργοποιημένο"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Σάρωση Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Βελτιώστε την τοποθεσία επιτρέποντας στις υπηρεσίες συστήματος για να εκτελούν σάρωση για υπηρεσίες Bluetooth, ακόμη και όταν το Bluetooth είναι απενεργοποιημένο"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi και τοποθ. δικτύου κιν. τηλ."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν την υπηρεσία τοποθεσίας της Google για γρήγορη εκτίμηση της τοποθεσίας σας. Θα συλλεχθούν ανώνυμα δεδομένα και θα αποσταλούν στην Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Η τοποθεσία καθορίζεται από το Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"Ασφάλεια οθόνης"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Χρησιμοποιήστε το μοτιβό της συσκευής σας για να συνεχίσετε."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Εισαγάγετε το PIN της συσκευής σας για να συνεχίσετε."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Εισαγάγετε τον κωδικό πρόσβασης της συσκευής σας για να συνεχίσετε."</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_need_to_unlock" msgid="757935356911054465">"Επιβεβαίωση αποθηκευμένου μοτίβου"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Επανάληψη:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"Πάρα πολλές ανεπιτυχείς προσπάθειες!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Προσπαθήστε ξανά σε <xliff:g id="NUMBER">%d</xliff:g> δευτερόλεπτα."</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="manageapplications_settings_title" msgid="7041951105633616745">"Διαχείριση εφαρμογών"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Διαχείριση και κατάργηση εγκατεστημένων εφαρμογών"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Αποθηκευτικός χώρος"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Προβολή χώρου αποθήκευσης που χρησιμοποιείται από τις εφαρμογές"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Υπηρεσίες που εκτελούνται"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Πληροφορίες tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Πληροφορίες τηλεφώνου"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Πληροφορίες μπαταρίας"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Γρήγορη εκκίνηση"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Ορισμός συντομεύσεων πληκτρολογίου για την εκκίνηση εφαρμογών"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Εκχώρηση εφαρμογής"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Δεν υπάρχει συντόμευση"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Αναζήτηση + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Εκκαθάριση"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Η συντόμευσή σας για <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) θα εκκαθαριστεί."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Ακύρωση"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Εφαρμογές"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Συντομεύσεις"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Καταγραφή όλων των πακέτων bluetooth HCI σε ένα αρχείο"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Ξεκλείδωμα OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Να επιτρέπεται το ξεκλείδωμα λειτουργίας εκκίνησης"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Εισαγάγετε το PIN σας"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Εισαγάγετε το PIN της συσκευής σας για να ενεργοποιήσετε το ξεκλείδωμα OEM."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Να επιτρέπεται το ξεκλείδωμα OEM;"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Οι λειτουργίες προστασίας συσκευής δεν θα λειτουργούν σε αυτήν τη συσκευή, όταν είναι ενεργοποιημένη αυτή η ρύθμιση."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Μέγεθος προσωρινής μνήμης για τη λειτουργία καταγραφής"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Επιλ.μεγ. για λειτ.κατ.ανά μέγ.πρ.μνήμ. καταγρ."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Ενεργοποίηση του ελέγχου χαρακτηριστικών προβολής"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Δικτύωση"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Πιστοποίηση ασύρματης οθόνης"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ενεργοποίηση λεπτομερ. καταγραφής Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Επιθ.μεταβ. Wi-Fi σε δίκτυο κιν.τηλ."</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Να επιτρέπεται πάντα η σάρωση Wi-Fi κατά την περιαγωγή"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Χρήση εφαρμογής-πελάτη DHCP παλαιού τύπου"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Εμφάνιση επιλογών για πιστοποίηση ασύρματης οθόνης"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Αύξηση επιπέδου καταγ. Wi-Fi, εμφάνιση ανά SSID RSSI στο εργαλείο επιλογής Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Όταν είναι ενεργό, το Wi-Fi θα μεταβιβάζει πιο επιθετικά τη σύνδ.δεδομένων σε δίκτυο κινητής τηλ., όταν το σήμα Wi-Fi είναι χαμηλό"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Να επιτρέπεται/να μην επιτρέπεται η σάρωση Wi-Fi κατά την περιαγωγή, βάσει της ποσότητας επισκεψιμότητας δεδομένων στη διεπαφή"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Μέγεθος προσωρινής μνήμης για τη λειτουργία καταγραφής"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Επιλ.μεγ. για λειτ.κατ.ανά μέγ.πρ.μνήμ. καταγρ."</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Επιλογή διαμόρφωσης USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Επιλογή διαμόρφωσης USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Ενεργοποίηση του ελέγχου χαρακτηριστικών προβολής"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Χρήση εφαρμογής-πελάτη DHCP παλαιού τύπου από το Lollipop αντί για τη νέα εφαρμογή-πελάτη DHCP Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Να επιτρέπεται ο εντοπισμός σφαλμάτων USB;"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ο εντοπισμός σφαλμάτων USB προορίζεται μόνο για σκοπούς προγραμματισμού. Χρησιμοποιήστε τον για αντιγραφή δεδομένων μεταξύ του υπολογιστή και της συσκευής σας, για την εγκατάσταση εφαρμογών στη συσκευή σας χωρίς προειδοποίηση και για την ανάγνωση δεδομένων καταγραφής."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Ανάκληση πρόσβασης στον εντοπισμό σφαλμάτων USB από όλους τους υπολογιστές για τους οποίους είχατε εξουσιοδότηση στο παρελθόν;"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Πορφυρό"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Χρήση υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> έχει τις εξής δυνατότητες:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Επειδή μια εφαρμογή αποκρύπτει ένα αίτημα άδειας, δεν είναι δυνατή η επαλήθευση της απάντησής σας από τις Ρυθμίσεις."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Εάν ενεργοποιήσετε την υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g>, η συσκευή σας δεν θα χρησιμοποιεί το κλείδωμα οθόνης για τη βελτίωση της κρυπτογράφησης δεδομένων."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Επειδή έχετε ενεργοποιήσει την υπηρεσία προσβασιμότητας, η συσκευή σας δεν θα χρησιμοποιεί το κλείδωμα οθόνης για τη βελτίωση της κρυπτογράφησης δεδομένων."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Επειδή η ενεργοποίηση της υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g> επηρεάζει την κρυπτογράφηση δεδομένων, χρειάζεται να επιβεβαιώσετε το μοτίβο σας."</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Εφαρμογές <xliff:g id="TYPE">%1$s</xliff:g> για διάστημα <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Χρησιμοποιήθηκαν <xliff:g id="USEDRAM">%1$s</xliff:g> από <xliff:g id="TOTALRAM">%2$s</xliff:g> σε διάστημα <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</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_memory_status" msgid="4251599550196193093">"Αυτήν τη στιγμή η μνήμη της συσκευής είναι <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Μέση χρήση RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Μέγιστη χρήση RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Λειτουργικό σύστημα Android"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"Διεργασίες"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Υπηρεσίες"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Διάρκεια"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Λεπτομέρειες μνήμης"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"Απόκρυψη συστήματος"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Οι παρακάτω προεπιλεγμένες ρυθμίσεις αντιγράφουν τις ρυθμίσεις της εφαρμογής"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Προεπιλεγμένες ρυθμίσεις"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Προεπιλεγμένη μηχανή"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Ρυθμίζει τη μηχανή σύνθεσης ομιλίας προκειμένου να χρησιμοποιείται για κείμενο που εκφέρεται"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Ρύθμιση του μηχανισμού σύνθεσης ομιλίας για χρήση με προφορικό κείμενο"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Ταχύτητα λόγου"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Ταχύτητα με την οποία εκφωνείται το κείμενο"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Τόνος"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την εγκατάσταση των διαπιστευτηρίων."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Πληκτρολογήστε τον κωδικό πρόσβασης του αποθηκευτικού χώρου διαπιστευτηρίων."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Τρέχον κωδικός πρόσβασης:"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"Κανένας λογαριασμός δεν αποθηκεύει αντίγραφα ασφαλείας"</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="5355557151569037197">"Η υπηρεσία αντιγράφων ασφαλείας είναι ανενεργή."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Η υπηρεσία αυτή ορίζεται από την πολιτική της συσκευής σας."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Κωδ.πρόσβ.αντ.ασφ.επιφ.εργ."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας δεν προστατεύονται αυτήν τη στιγμή"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Αγγίξτε για αλλαγή ή κατάργηση του κωδικού πρόσβασης για τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Κλίμακα κίνησης μετάβασης"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Κλίμ. διάρ. Animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Προσομ. δευτερ. προβολών"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Λειτουργία πολλ.παραθύρων"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Πολλαπλές δραστηριότητες στην οθόνη ταυτόχρονα"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Να ενεργοποιηθεί η λειτουργία πολλαπλών παραθύρων;"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ΠΡΟΣΟΧΗ: Αυτή η λειτουργία είναι ιδιαίτερα πειραματική και επιτρέπει την ταυτόχρονη εκτέλεση πολλαπλών δραστηριοτήτων στην οθόνη μέσω της διεπαφής των Πρόσφατων εφαρμογών. Ενδέχεται να διακοπεί η λειτουργία ορισμένων εφαρμογών ή να μην λειτουργούν σωστά όταν χρησιμοποιούνται με αυτήν τη λειτουργία."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Εφαρμογές"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Μη διατήρ. δραστηριοτήτων"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Διαγραφή κάθε δραστηριότητας μετά τον τερματισμό"</string>
@@ -2195,7 +2251,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="718192651887726259">"Μπορείτε να μοιραστείτε αυτήν τη συσκευή με άλλα άτομα, δημιουργώντας επιπλέον χρήστες. Κάθε χρήστης θα έχει το δικό του χώρο, τον οποίο μπορεί να προσαρμόσει με τις δικές του εφαρμογές, ταπετσαρία κ.λπ. Οι χρήστες μπορούν επίσης να προσαρμόσουν ρυθμίσεις της συσκευής, όπως το 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"Να επιτρέπονται οι τηλεφωνικές κλήσεις"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Να επιτρέπονται τηλεφωνικές κλήσεις και SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Ενεργοποίηση τηλεφωνικών κλήσεων"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Ενεργοποίηση τηλεφωνικών κλήσεων και SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Κατάργηση χρήστη"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Να επιτρέπονται οι τηλεφωνικές κλήσεις;"</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_sms_confirm_title" msgid="188164598768941316">"Να επιτρέπονται τηλεφωνικές κλήσεις και SMS;"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Θα γίνει κοινή χρήση του ιστορικού κλήσεων και SMS με αυτόν το χρήστη."</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="application_restrictions" msgid="8207332020898004394">"Να επιτρέπονται εφαρμογές και περιεχόμενο"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Εφαρμογές με περιορισμούς"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Επέκταση ρυθμίσεων για εφαρμ."</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"Αυτή η εφαρμογή δεν υποστηρίζεται σε περιορισμένα προφίλ"</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>
@@ -2340,7 +2396,7 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Οι κάρτες SIM άλλαξαν."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Αγγίξτε για ρύθμιση"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Προτιμώμενη SIM για"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Να γίνεται ερώτηση κάθε φορά"</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>
     <string name="search_results_title" msgid="1796252422574886932">"Ρυθμίσεις"</string>
@@ -2351,13 +2407,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi σύνδεση δικτύου"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"μήνυμα κειμένου ανταλλαγή μηνυμάτων κειμένου μηνύματα ανταλλαγή μηνυμάτων"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"δίκτυο κινητής τηλεφωνίας κελί εταιρεία κινητής τηλεφωνίας ασύρματα δεδομένα 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"Wi-Fi κλήση Wi-Fi κλήσεις"</string>
     <string name="keywords_home" msgid="3626170808219458848">"λειτουργία εκκίνησης"</string>
     <string name="keywords_display" msgid="6709007669501628320">"οθόνη αφής"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"μείωση φωτεινότητας οθόνης οθόνη αφής μπαταρία"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"μείωση φωτεινότητας οθόνης οθόνη αφής μπαταρία"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"φόντο εξατομίκευση προσαρμογή οθόνη"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"σκούρο θέμα νυχτερινή λειτουργία σκοτεινή οθόνη επαναφορά φωτεινότητας"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"φόντο εξατομίκευση προσαρμογή οθόνης"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"μέγεθος κειμένου"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"έργο"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"μετάδοση έργου"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"χώρος στο δίσκο σκληρός δίσκος χρήση συσκευής"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"χρήση ισχύος φόρτιση"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ορθογραφικό λεξικό ορθογραφικός έλεγχος αυτόματη διόρθωση"</string>
@@ -2374,6 +2432,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"λογαριασμός"</string>
     <string name="keywords_users" msgid="4673901601478559100">"περιορισμός περιορίζω περιορίστηκε"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"διόρθωση κειμένου διόρθωση ήχου δόνηση αυτόματο γλώσσα κίνηση προτείνω πρόταση θέμα προσβλητικό λέξη τύπος emoticon διεθνές"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"επαναφορά προεπιλεγμένων προτιμήσεων"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"Προεπιλογή εφαρμογής για περιπτώσεις έκτακτης ανάγκης"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"εφαρμογές λήψη εφαρμογές σύστημα"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ασφάλεια δικαιωμάτων εφαρμογών"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"προεπιλεγμένες εφαρμογές"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ολίσθηση κωδικός πρόσβασης μοτίβο pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ρύθμιση ετικέτας ΕΚΠ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Εγγραφή"</string>
@@ -2388,11 +2451,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Διακοπές"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Κατά τη λήψη κλήσεων και ειδοποιήσεων"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Διακοπή πάντα"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Να επιτρέπονται μόνο οι διακοπές προτεραιότητας"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Χωρίς διακοπή"</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_option_important_interruptions" msgid="3903928008177972500">"Μόνο προτεραιότητας"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Μόνο ειδοποιήσεις"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Χωρίς διακοπές"</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="ringtone_title" msgid="5379026328015343686">"Ήχος κλήσης τηλεφώνου"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Προεπιλεγμένος ήχος ειδοποίησης"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Επίσης δόνηση για κλήσεις"</string>
@@ -2418,62 +2482,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Δόνηση"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Πρόσβαση σε ειδοποιήσεις"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Οι εφαρμογές δεν μπορούν να διαβάσουν ειδοποιήσεις"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d εφαρμογή μπορεί να διαβάσει ειδοποιήσεις"</item>
-    <item quantity="other" msgid="980049191810249052">"%d εφαρμογές μπορούν να διαβάσουν ειδοποιήσεις"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d εφαρμογές μπορούν να διαβάσουν ειδοποιήσεις</item>
+      <item quantity="one">%d εφαρμογή μπορεί να διαβάσει ειδοποιήσεις</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Δεν έχουν εγκατασταθεί υπηρεσίες ακρόασης ειδοποιήσεων."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ενεργοποίηση <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Η εφαρμογή <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> θα μπορεί να διαβάζει όλες τις ειδοποιήσεις που δημοσιεύει το σύστημα ή οποιαδήποτε εγκατεστημένη εφαρμογή, οι οποίες ενδέχεται να συμπεριλαμβάνουν προσωπικά στοιχεία, όπως ονόματα επαφών και κείμενα από μηνύματα που έχετε λάβει. Θα έχει επίσης τη δυνατότητα να απορρίπτει αυτές τις ειδοποιήσεις ή να αγγίζει τα κουμπιά ενεργειών που περιέχονται σε αυτές."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Πάροχοι συνθηκών"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Καμία εφαρμογή δεν παρέχει συνθήκες"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d εφαρμογή παρέχει συνθήκες"</item>
-    <item quantity="other" msgid="358057362115673258">"%d εφαρμογές παρέχουν συνθήκες"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Δεν εγκαταστάθηκαν πάροχοι συνθηκών."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Ενεργοποίηση <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> θα έχει τη δυνατότητα να προσθέτει συνθήκες εξόδου στη λειτουργία \"Μην ενοχλείτε\"."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Φόρτωση εφαρμογών…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Αποκλεισμός"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Αποκλεισμός όλων"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Να μην εμφανίζονται ποτέ ειδοποιήσεις από αυτήν την εφαρμογή"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Προτεραιότητα"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Να εμφανίζονται ειδοποιήσεις στο επάνω μέρος της λίστας και να συνεχίσουν να λαμβάνονται όταν έχει οριστεί η λήψη μόνο διακοπών προτεραιότητας στη συσκευή"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Ευαίσθητο"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Όταν η συσκευή είναι κλειδωμένη, να γίνεται απόκρυψη του ευαίσθητου περιεχομένου από τις ειδοποιήσεις αυτής της εφαρμογής"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Αντιμετώπιση ως προτεραιότητα"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Να επιτρέπεται η εκφώνηση των ειδοποιήσεων αυτής της εφαρμογής όταν η λειτουργία \"Μην ενοχλείτε\" έχει οριστεί μόνο για ειδοποιήσεις προτεραιότητας."</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Να επιτρέπεται η σύντομη προβολή"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Να επιτρέπεται σε αυτήν την εφαρμογή να δίνει έμφαση σε συγκεκριμένες ειδοποιήσεις, σύροντάς τες σύντομα στην προβολή στην τρέχουσα οθόνη"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Απόκρυψη ευαίσθητου περιεχομένου"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Όταν η συσκευή είναι κλειδωμένη, να γίνεται απόκρυψη του περιεχομένου στις ειδοποιήσεις αυτής της εφαρμογής που ενδέχεται να αποκαλύπτουν προσωπικά στοιχεία"</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="zen_mode_default_option" msgid="6940069025071935243">"Μέχρι να το απενεργοποιήσετε"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Διακοπές προτεραιότητας"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Νεκρός χρόνος"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Ημέρες"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Καμία"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Επιτρέπονται διακοπές"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Μόνο προτεραιότητας"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Καμία"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Αυτοματοποίηση"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Αυτόματη ενεργοποίηση"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Όνομα κανόνα"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Προσθήκη κανόνα"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Διαγραφή κανόνα"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Διαγραφή κανόνα \"<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="3201273040477861538">"Κανόνας χρονοδιαγράμματος"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Ο κανόνας δεν βρέθηκε."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ποτέ"</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_from" msgid="1033337300289871697">"Κλήσεις/μηνύματα από"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Οποιοσδήποτε"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Μόνο επαφές"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Μόνο επαφές με αστέρι"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Εκδηλώσεις και υπενθυμίσεις"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Οι ειδοποιήσεις αποτελούν πάντα διακοπές προτεραιότητας"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Ξυπνητήρια"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Υπενθυμίσεις"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Εκδηλώσεις"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Επιλεγμένοι καλούντες"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Καλούντες κατ\' επανάληψη"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Εάν το ίδιο άτομο καλέσει δεύτερη φορά εντός διαστήματος <xliff:g id="MINUTES">%d</xliff:g> λεπτών, να επιτρέπεται"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Αυτόματη ενεργοπ."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Ποτέ"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> την επόμενη ημέρα"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ή κάθε προηγούμενη ειδοποίηση"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"Διακοπές"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Κατά τη λήψη κλήσεων και ειδοποιήσεων"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Πότε θέλετε να λαμβάνετε διακοπές;"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Για πόσο καιρό;"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Διακοπή πάντα"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ανενεργό, όλα, τα πάντα"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Να επιτρέπονται μόνο οι διακοπές προτεραιότητας"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Να επιτρέπονται μόνο τα ξυπνητήρια"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Χωρίς διακοπή"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Επ\' αόριστον"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> λεπτά</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> λεπτό</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Αλλαγή σε ειδοποιήσεις προτεραιότητας μόνο επ\' αόριστον"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Αλλαγή σε ξυπνητήρια μόνο επ\' αόριστον"</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>
+      <item quantity="one">Αλλαγή σε ξυπνητήρια μόνο για ένα λεπτό έως τις <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">Αλλαγή σε ξυπνητήρια μόνο για <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Αλλαγή σε καμία διακοπή επ\' αόριστον"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Αλλαγή σε διακοπές πάντα"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"για πάντα"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ειδοποιήσεις εφαρμ."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ρυθμίσεις ειδοποιήσεων"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Αποστολή σχολίων για τη συσκευή"</string>
@@ -2514,4 +2631,63 @@
     <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="2184141780491382435">"Εκκίνηση από προεπιλογή"</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="app_launch_domain_links_title" msgid="458956710410857777">"Σύνδεσμοι τομέων"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Άνοιγμα διευθύνσεων URL τομέα"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Να επιτρέπεται στην εφαρμογή να ανοίγει απευθείας διευθύνσεις URL τομέα"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Διευθύνσεις URL υποστηριζόμενων τομέων"</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="410824961149037234">"εσωτερική μνήμη"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"εξωτερική μνήμη"</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="storage_used" msgid="7128074132917008743">"Αποθηκευτικός χώρος που χρησιμοποιείται"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Ενεργό"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Αποκλεισμός"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Ευαίσθητες"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Προτεραιότητας"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Προτεραιότητας και ευαίσθητες"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> άδειες χορηγήθηκαν</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> άδεια χορηγήθηκε</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">Χορηγήθηκαν <xliff:g id="COUNT_2">%d</xliff:g> από <xliff:g id="COUNT_3">%d</xliff:g> άδειες</item>
+      <item quantity="one">Χορηγήθηκε <xliff:g id="COUNT_0">%d</xliff:g> από <xliff:g id="COUNT_1">%d</xliff:g> άδεια</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Έχουν οριστεί κάποιες προεπιλογές"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Δεν έχουν οριστεί προεπιλογές"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Όλες οι εφαρμογές"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Ενεργό"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Προσωπικό"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Εργασία"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Αποκλείστηκε"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Προτεραιότητας"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Ευαίσθητες"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Με διευθύνσεις URL τομέα"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Απενεργοποιήθηκε από το διαχειριστή"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Σύνθετες ρυθμίσεις"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Άγνωστη εφαρμογή"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Επιλογή προφίλ"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Δικαιώματα εφαρμογών"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Επιτρέπεται επιπλέον πρόσβαση σε <xliff:g id="COUNT_0">%d</xliff:g> από <xliff:g id="COUNT_1">%d</xliff:g> εφαρμ."</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Επιτρέπονται <xliff:g id="COUNT_0">%d</xliff:g> από <xliff:g id="COUNT_1">%d</xliff:g> εφαρμογές"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Διευθύνσεις URL τομέα"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Να μην ανοίγουν διευθύνσεις URL κανενός τομέα"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Άνοιγμα \"<xliff:g id="DOMAIN">%s</xliff:g>\""</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Άνοιγμα \"<xliff:g id="DOMAIN">%s</xliff:g>\" και σχετικών διευθύνσεων URL"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> εφαρμογές μπορούν να ανοίξουν τις διευθύνσεις URL του τομέα τους</item>
+      <item quantity="one">Μία εφαρμογή μπορεί να ανοίξει τις διευθύνσεις URL του τομέα της</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Δεν αναγνωρίστηκε"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Προεπιλεγμένες εφαρμογές"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Εφαρμογή προγρ.περιήγησης"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Κανένα προεπιλεγμένο πρόγραμμα περιήγησης"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Προεπιλογή)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Αποθηκευτικός χώρος εφαρμογών"</string>
 </resources>
diff --git a/res/drawable/setup_illustration_bg.xml b/res/values-en-rAU-nokeys/strings.xml
similarity index 61%
copy from res/drawable/setup_illustration_bg.xml
copy to res/values-en-rAU-nokeys/strings.xml
index 0a229c7..05263e9 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/values-en-rAU-nokeys/strings.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
+<?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.
--->
+ -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+<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-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
new file mode 100644
index 0000000..3f09f20
--- /dev/null
+++ b/res/values-en-rAU/arrays.xml
@@ -0,0 +1,549 @@
+<?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="1932071435506638315">"Normal"</item>
+    <item msgid="38373998008112077">"Large"</item>
+    <item msgid="7786168277516233536">"Huge"</item>
+  </string-array>
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Very slow"</item>
+    <item msgid="2361722960903353554">"Slow"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Fast"</item>
+    <item msgid="1370673569131070146">"Faster"</item>
+    <item msgid="4648206845228970803">"Very fast"</item>
+    <item msgid="4977949754169483251">"Rapid"</item>
+    <item msgid="6106302964845503577">"Very rapid"</item>
+    <item msgid="6800277205640837264">"Fastest"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Very low"</item>
+    <item msgid="2692137425242433765">"Low"</item>
+    <item msgid="3332408460740717754">"Normal"</item>
+    <item msgid="4907380534957572531">"High"</item>
+    <item msgid="4699640516390840297">"Very high"</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) -->
+    <!-- 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="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
+  </string-array>
+  <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="5615082285463430971">"Fair"</item>
+    <item msgid="3565079809875324621">"Good"</item>
+    <item msgid="5702329417707689835">"Excellent"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries">
+    <item msgid="3269131034472904310">"Always"</item>
+    <item msgid="844721238536786870">"Only when plugged in"</item>
+    <item msgid="1986753720941888596">"Never"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2124319326282651391">"Always"</item>
+    <item msgid="7433294150916905997">"Only when plugged in"</item>
+    <item msgid="1390404486722375028">"Never"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Last 30 days"</item>
+    <item msgid="6600989128423965319">"Set usage cycle..."</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="1013988753804838790">"Automatic"</item>
+    <item msgid="6670588712989942178">"5 GHz only"</item>
+    <item msgid="2715516524973207876">"2.4 GHz only"</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_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="1770285336669531300">"LTE"</item>
+    <item msgid="3044323519470167625">"eHRPD"</item>
+    <item msgid="6848428671997893147">"Unspecified"</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="1148142988678569310">"project media"</item>
+    <item msgid="9130014005474445273">"activate VPN"</item>
+    <item msgid="1165192162975045562">"write wallpaper"</item>
+    <item msgid="7129487923652967258">"assist structure"</item>
+    <item msgid="1069023208100114540">"assist screenshot"</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="5906017727368097853">"Project media"</item>
+    <item msgid="2486614710846178542">"Activate VPN"</item>
+    <item msgid="5586547561693629602">"Write wallpaper"</item>
+    <item msgid="32794179825485062">"Assist structure"</item>
+    <item msgid="7872852746938272552">"Assist screenshot"</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="select_logd_size_titles">
+    <item msgid="3100534874529240291">"64 K"</item>
+    <item msgid="505611754508988476">"256 K"</item>
+    <item msgid="6361286924268716397">"1 M"</item>
+    <item msgid="6405203239560695266">"4 M"</item>
+    <item msgid="3025431211013424097">"16 M"</item>
+  </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64 K"</item>
+    <item msgid="3534782711045262344">"256 K"</item>
+    <item msgid="8085867209202153403">"1 M"</item>
+  </string-array>
+  <string-array name="select_logd_size_summaries">
+    <item msgid="7346595473588765019">"64 K per log buffer"</item>
+    <item msgid="2822309747675758628">"256 K per log buffer"</item>
+    <item msgid="6699306198357496731">"1 M per log buffer"</item>
+    <item msgid="5748528643937500349">"4 M per log buffer"</item>
+    <item msgid="1978629051085111592">"16 M per log buffer"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Never check"</item>
+    <item msgid="6042769699089883931">"Check for DRM content only"</item>
+    <item msgid="9174900380056846820">"Always check"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Never use HDCP checking"</item>
+    <item msgid="3878793616631049349">"Use HDCP checking for DRM content only"</item>
+    <item msgid="45075631231212732">"Always use HDCP checking"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animation off"</item>
+    <item msgid="6624864048416710414">"Animation scale .5x"</item>
+    <item msgid="2219332261255416635">"Animation scale 1x"</item>
+    <item msgid="3544428804137048509">"Animation scale 1.5x"</item>
+    <item msgid="3110710404225974514">"Animation scale 2x"</item>
+    <item msgid="4402738611528318731">"Animation scale 5x"</item>
+    <item msgid="6189539267968330656">"Animation scale 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animation off"</item>
+    <item msgid="3375781541913316411">"Animation scale .5x"</item>
+    <item msgid="1991041427801869945">"Animation scale 1x"</item>
+    <item msgid="4012689927622382874">"Animation scale 1.5x"</item>
+    <item msgid="3289156759925947169">"Animation scale 2x"</item>
+    <item msgid="7705857441213621835">"Animation scale 5x"</item>
+    <item msgid="6660750935954853365">"Animation scale 10x"</item>
+  </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animation off"</item>
+    <item msgid="1138649021950863198">"Animation scale .5x"</item>
+    <item msgid="4394388961370833040">"Animation scale 1x"</item>
+    <item msgid="8125427921655194973">"Animation scale 1.5x"</item>
+    <item msgid="3334024790739189573">"Animation scale 2x"</item>
+    <item msgid="3170120558236848008">"Animation scale 5x"</item>
+    <item msgid="1069584980746680398">"Animation scale 10x"</item>
+  </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"None"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="6027541158956821790">"720 x 480 mdpi (secure)"</item>
+    <item msgid="8181151155909301030">"1280 x 720 tvdpi"</item>
+    <item msgid="2920655562462493148">"1280 x 720 tvdpi (secure)"</item>
+    <item msgid="8910371271391940941">"1920 x 1080 xhdpi"</item>
+    <item msgid="4171600481380800455">"1920 x 1080 xhdpi (secure)"</item>
+    <item msgid="1937752114395156918">"1280 x 720 tvdpi and 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"None"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (Graphics)"</item>
+    <item msgid="1340692776955662664">"Call stack on glGetError"</item>
+  </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Off"</item>
+    <item msgid="675719912558941285">"Draw non-rectangular clip region in blue"</item>
+    <item msgid="1064373276095698656">"Highlight tested drawing commands in green"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Off"</item>
+    <item msgid="2751513398307949636">"On screen as bars"</item>
+    <item msgid="1851438178120770973">"In adb shell dumpsys gfxinfo"</item>
+  </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Off"</item>
+    <item msgid="7688197031296835369">"Show overdraw areas"</item>
+    <item msgid="2290859360633824369">"Show areas for Deuteranomaly"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standard limit"</item>
+    <item msgid="4071574792028999443">"No background processes"</item>
+    <item msgid="4810006996171705398">"At most, 1 process"</item>
+    <item msgid="8586370216857360863">"At most, 2 processes"</item>
+    <item msgid="836593137872605381">"At most, 3 processes"</item>
+    <item msgid="7899496259191969307">"At most, 4 processes"</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="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"moderate"</item>
+    <item msgid="406385694840950802">"low"</item>
+    <item msgid="4212263919458209842">"critical"</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="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Audio Source"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
+</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..0976923
--- /dev/null
+++ b/res/values-en-rAU/strings.xml
@@ -0,0 +1,2691 @@
+<?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="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="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="turn_on_radio" msgid="8706561489788373676">"Turn on radio"</string>
+    <string name="turn_off_radio" msgid="1820294552893884115">"Turn off radio"</string>
+    <string name="sms_over_ims_on" msgid="5085290395865632925">"Turn on SMS over IMS"</string>
+    <string name="sms_over_ims_off" msgid="8354792045992793959">"Turn off SMS over IMS"</string>
+    <string name="ims_reg_required_on" msgid="3885152087309614653">"Turn on IMS registration required"</string>
+    <string name="ims_reg_required_off" msgid="1720570343422743943">"Turn off IMS registration required"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Turn on VoLTE provisioned flag"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Turn off VoLTE provisioned flag"</string>
+    <string name="lte_ram_dump_on" msgid="8568568019520172177">"Turn on lte ram dump"</string>
+    <string name="lte_ram_dump_off" msgid="2514507918652378283">"Turn off lte ram dump"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"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_getPDP" msgid="560610293888406317">"Get PDP list"</string>
+    <string name="radioInfo_service_in" msgid="1915416319177520020">"In service"</string>
+    <string name="radioInfo_service_out" msgid="5238736759641916278">"Out of service"</string>
+    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Emergency calls only"</string>
+    <string name="radioInfo_service_off" msgid="1434084741785525415">"Radio off"</string>
+    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roaming"</string>
+    <string name="radioInfo_roaming_not" msgid="2851853244069662307">"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="4174402846862780998">"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="737385314432468266">"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="small_font" msgid="2295331917424072635">"Small"</string>
+    <string name="medium_font" msgid="2068475425515133701">"Medium"</string>
+    <string name="large_font" msgid="599055175160971446">"Large"</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="battery_info_status_label" msgid="8109155295509700309">"Battery status:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Power plug:"</string>
+    <string name="battery_info_scale_label" msgid="3649763192389778437">"Battery scale:"</string>
+    <string name="battery_info_level_label" msgid="8706526709307788737">"Battery level:"</string>
+    <string name="battery_info_health_label" msgid="6416051542741886958">"Battery health:"</string>
+    <string name="battery_info_technology_label" msgid="788304533220748681">"Battery technology:"</string>
+    <string name="battery_info_voltage_label" msgid="8971764146757637863">"Battery voltage:"</string>
+    <string name="battery_info_voltage_units" msgid="8658490792208288107">"mV"</string>
+    <string name="battery_info_temperature_label" msgid="1968383098818648037">"Battery temperature:"</string>
+    <string name="battery_info_temperature_units" msgid="9098950587249987550">"° C"</string>
+    <string name="battery_info_uptime" msgid="5548545143573527992">"Time since boot:"</string>
+    <string name="battery_info_awake_battery" msgid="2557725975486185849">"Awake time on battery:"</string>
+    <string name="battery_info_awake_plugged" msgid="176716874713478188">"Awake time when charging:"</string>
+    <string name="battery_info_screen_on" msgid="376277447175613889">"Screen ON time:"</string>
+    <string name="battery_info_status_unknown" msgid="196130600938058547">"Unknown"</string>
+    <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string>
+    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Charging on AC"</string>
+    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Charging over USB"</string>
+    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Charging wirelessly"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>
+    <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Not charging"</string>
+    <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Unplugged"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"wireless"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Unknown"</string>
+    <string name="battery_info_health_unknown" msgid="5664295556921944255">"Unknown"</string>
+    <string name="battery_info_health_good" msgid="8070356565806711806">"Good"</string>
+    <string name="battery_info_health_overheat" msgid="8442959549291368806">"Overheat"</string>
+    <string name="battery_info_health_dead" msgid="1725917445762829059">"Dead"</string>
+    <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Over voltage"</string>
+    <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unknown error"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Cold"</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="6026705382020027966">"Disconnect?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"You don\'t have permission to change Bluetooth settings."</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_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="5300852675110479862">"Touch to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Show files received"</string>
+    <string name="device_picker" msgid="4978696506172252813">"Choose Bluetooth device"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth permission request"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"An app wants to turn Bluetooth ON for this device."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"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" product="default" msgid="5510358858113713272">"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="8863617309580598607">"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" product="default" msgid="6487606808683607975">"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_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth and Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"When this feature is turned on, your phone can communicate with other devices nearby.\n\nBroadcasting uses low-power Bluetooth signals."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"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" product="default" msgid="4724094889807196118">"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="989613204829097159">"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" product="default" msgid="6671615712909139801">"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="3687933246423942977">"Touch 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="6555508756987053866">"%1$s wants to access your contacts and call history. Give access to %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Don\'t ask again"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"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="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
+    <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
+    <string name="display_preview_label" msgid="1127597250917274792">"Preview:"</string>
+    <string name="display_font_size_label" msgid="8941851418397475389">"Font size:"</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_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</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_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</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="8052095511862922213">"The hostname that you typed isn\'t valid."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"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="2671425042711054494">"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="16475158265551708">"Location:"</string>
+    <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
+    <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Data attempts:"</string>
+    <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 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="1654674226961476872">"Call redirect:"</string>
+    <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"Number of PPP reset since boot:"</string>
+    <string name="radio_info_gsm_disconnects_label" msgid="1683069665736339820">"GSM disconnects:"</string>
+    <string name="radio_info_current_network_label" msgid="3256402602440102610">"Current network:"</string>
+    <string name="radio_info_data_successes_label" msgid="4417894113689054945">"Data successes:"</string>
+    <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"PPP received:"</string>
+    <string name="radio_info_gsm_service_label" msgid="2082332114596916985">"GSM service:"</string>
+    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"Signal strength:"</string>
+    <string name="radio_info_call_status_label" msgid="4896238900685510883">"Call status:"</string>
+    <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"PPP sent:"</string>
+    <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"Radio resets:"</string>
+    <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"Message waiting:"</string>
+    <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Phone number:"</string>
+    <string name="radio_info_band_mode_label" msgid="441469694142042022">"Select radio band"</string>
+    <string name="radio_info_network_type_label" msgid="3706382548257257987">"Network type:"</string>
+    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Set preferred network type:"</string>
+    <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping IpAddr:"</string>
+    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping Host Name (www.google.co.uk):"</string>
+    <string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP Client test:"</string>
+    <string name="ping_test_label" msgid="7255376471490860631">"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="8292252930563286858">"Toggle DNS check"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-specific Info/Settings"</string>
+    <string name="band_mode_title" msgid="954174198903776205">"Set GSM/UMTS band"</string>
+    <string name="band_mode_loading" msgid="548764766363847336">"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="9191210735703409245">"It is now safe to remove the USB storage."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"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="5349877711342869319">"Language"</string>
+    <string name="activity_picker_label" msgid="6295660302548177109">"Choose activity"</string>
+    <string name="device_info_label" msgid="6551553813651711205">"Device info"</string>
+    <string name="battery_info_label" msgid="4132685016148679403">"Battery 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="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="2837395036275123133">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, &amp; VPNs"</string>
+    <string name="cellular_data_title" msgid="2525947635539415202">"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="4575500999626276446">"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="7625933694709170887">"When you allow data roaming, you may incur significant roaming 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_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_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="2723190010708381889">"Owner info"</string>
+    <string name="security_enable_widgets_title" msgid="2754833397070967846">"Enable widgets"</string>
+    <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Disabled by administrator"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Type text to display on the lock screen"</string>
+    <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Show user info on lock screen"</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="7945465324818485460">"Security"</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="2930627259125138363">"Passwords"</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="3453670509485083962">"Add"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"screen lock"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints enrolled</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint enrolled</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Fingerprint setup"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to: \n\n✓ Set up your backup screen lock method \n\n✓ Add your fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find the sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Locate the fingerprint sensor on the back of your phone."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Let\'s start!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Put your finger on the fingerprint sensor. Lift after you feel a vibration."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Great! Now repeat."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Put the same finger on the fingerprint sensor and lift after you feel a vibration."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingerprint added!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Add"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</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="2876073029767953111">"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="5573427498609458721">"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="4453629424172409792">"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="5682944380460921880">"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="4478225241476039013">"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="3083477162766772532">"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="3775740783651700375">"The password you entered is correct, but unfortunately your data is corrupt. \n\nTo 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="6898436151871328007">"The password 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="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
+    <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Choose backup lock"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen 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_backup_info_summary" msgid="108524727803788172">"When Face Unlock can\'t see you, how do you want to unlock?"</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="current_screen_lock" msgid="4104091715420072219">"Current screen lock"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Device protection features will no longer work."</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by administrator, 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="7579210814842056547">"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_lock_pattern_summary" msgid="6801602880568869201">"Remove unlock pattern"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remove unlock PIN"</string>
+    <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Remove unlock password"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Remove screen lock"</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="lockpassword_password_too_short" msgid="7328975683669256660">"Password must be at least %d characters"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN must be at least %d characters"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Touch Continue when finished"</string>
+    <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Password must be fewer than <xliff:g id="NUMBER">%d</xliff:g> characters."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN must be fewer than <xliff:g id="NUMBER">%d</xliff:g> digits."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN must contain only digits 0-9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"The device administrator doesn\'t allow using a recent PIN."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Password contains an illegal character."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Password must contain at least one letter."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Password must contain at least one digit."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Password must contain at least one symbol."</string>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Password must contain at least %d letters.</item>
+      <item quantity="one">Password must contain at least 1 letter.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Password must contain at least %d lowercase letters.</item>
+      <item quantity="one">Password must contain at least 1 lowercase letter.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Password must contain at least %d uppercase letters.</item>
+      <item quantity="one">Password must contain at least 1 uppercase letter.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Password must contain at least %d numerical digits.</item>
+      <item quantity="one">Password must contain at least 1 numerical digit.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Password must contain at least %d special symbols.</item>
+      <item quantity="one">Password must contain at least 1 special symbol.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Password must contain at least %d non-letter characters.</item>
+      <item quantity="one">Password must contain at least 1 non-letter character.</item>
+    </plurals>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"The device administrator doesn\'t allow using a recent password."</string>
+    <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"An ascending, descending or repeated sequence of digits is forbidden"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel"</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="device_admin_title" msgid="3562216873644263804">"Device administration"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Device administrators"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"View or deactivate device administrators"</string>
+    <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="6804319935640148441">"View or deactivate trust agents"</string>
+    <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="6385750334766370310">"Bluetooth pairing request"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="4954085254142996877">"Device"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="333005542843637754">"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_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_will_share_phonebook" msgid="4982239145676394429">"Pairing grants access to your contacts and call history when connected."</string>
+    <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
+    <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"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="3719383048635344071">"To improve location accuracy, apps and services will scan for Bluetooth devices, even when Bluetooth is off. 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_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="5455448395850929200">"<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="5266851881175033601">"<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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</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">"Finished"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
+    <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="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="6981652347448777459">"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 Browser pages, YouTube videos, People contacts and more.\n\nJust bring the devices together (typically back to back) and then touch your screen. The app determines what gets beamed."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Network service discovery"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Allow apps on other devices to discover apps on this device"</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_setup_wizard_title" msgid="7873622558088429710">"Select Wi‑Fi network"</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_in_airplane_mode" msgid="8652520421778203796">"In aeroplane mode"</string>
+    <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Network notification"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Notify whenever a public network is available"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"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="wifi_automatically_connect_title" msgid="7950640291510621742">"Use open Wi‑Fi automatically"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Let a Wi‑Fi assistant automatically connect to open networks determined to be high quality"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Choose assistant"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Install certificates"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"To improve location accuracy, apps and services will scan for Wi‑Fi networks, even when Wi‑Fi is off. 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_remember_choice" msgid="5340097010842405981">"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_add_network" msgid="6234851776910938957">"Add network"</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_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="8280257225419947565">"You don\'t have permission to change the Wi‑Fi network."</string>
+    <string name="wifi_other_network" msgid="1484433183857764750">"Add another 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_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="7464388959427032052">"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_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="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_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="219415018348922629">"Config 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_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
+    <string name="wifi_unspecified" msgid="5431501214192991253">"(unspecified)"</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_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="1509171132175355674">"This network has no Internet access. Use this network anyway?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Don\'t ask again for this network"</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_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_skip_anyway" msgid="6965361454438011190">"Skip anyway"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Don\'t skip"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"WARNING: If you skip Wi‑Fi, your tablet will only use mobile data for initial downloads and updates. To avoid possible data charges, connect to Wi‑Fi."</string>
+    <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"WARNING: If you skip Wi‑Fi, your device will only use mobile data for initial downloads and updates. To avoid possible data charges, connect to Wi‑Fi."</string>
+    <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"WARNING: If you skip Wi‑Fi, your phone will only use mobile data for initial downloads and updates. To avoid possible data charges, connect to Wi‑Fi."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"If you skip Wi‑Fi:\n\nYour tablet won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"If you skip Wi‑Fi:\n\nYour device won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"If you skip Wi‑Fi:\n\nYour phone won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"The tablet was unable to connect to this Wi‑Fi network."</string>
+    <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"The device was unable to connect to this Wi‑Fi network."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"The phone was unable to connect to this Wi‑Fi network."</string>
+    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Saved networks"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced Wi‑Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi‑Fi frequency band"</string>
+    <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Specify the frequency range of operation"</string>
+    <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"There was a problem while setting the frequency band."</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_saved_access_points_label" msgid="2013409399392285262">"Saved networks"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP settings"</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="8921447388048243547">"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_tether_checkbox_text" msgid="1847167643625779136">"Portable Wi‑Fi hotspot"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
+    <string name="wifi_hotspot_checkbox_text_summary" msgid="3800646230853724318">"Use mobile connection to provide Wi‑Fi network"</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="8948641212931906143">"Portable hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 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="5618031116920832182">"AndroidAP WPA2 PSK portable Wi‑Fi hotspot"</string>
+    <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portable Wi‑Fi 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_mode_title" msgid="2164073796253284289">"Calling preference"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi Calling mode"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi preferred"</item>
+    <item msgid="5267397515594230396">"Mobile preferred"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Home"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
+    <string name="ringtone_summary" msgid="2630023412632683493"></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="7938706566797464165">"Ringer 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="1171590821131077296">"Touch sounds"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Screen lock sounds"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrate on touch"</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="5077843049805652363">"Don\'t play sound when inserting or removing tablet from dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Don\'t play sound when inserting or removing phone from dock"</string>
+    <string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
+    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
+    <string name="category_work" msgid="8699184680584175622">"Work"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Search"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Manage search settings and history"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Display"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</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="night_mode_title" msgid="6928425617491943384">"Theme"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Light"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Dark"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatic"</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_fragment_title" msgid="519078346877860129">"Choose wallpaper from"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"When docked or asleep and charging"</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_off" msgid="2481581696365146473">"Off"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"To control what happens when the phone is docked and/or sleeping, turn Dreams on."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"When to daydream"</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="doze_title" msgid="2259176504273878294">"Ambient display"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Wake screen when you pick up device or receive notifications"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
+    <string name="dialog_title_font_size" msgid="2231507851258955038">"Font size"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Set up SIM card lock"</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="8449681619822460312">"PINs don\'t match"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"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="5651596916127873626">"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="7018740080801483990">"Choose the SIM that 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="1313940695939674633">"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="301251431163650167">"<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="model_number" msgid="3765737700545384794">"Model number"</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="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>
+    <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_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="952552009117455166">"Mobile network type"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operator info"</string>
+    <string name="status_data_state" msgid="4578972321533789767">"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_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>
+    <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="4346280469528260684">"Cannot unmount USB storage. Try again later."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"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="8334422679047059459">"Erase &amp; format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Erase &amp; format as internal storage"</string>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB computer connection"</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="7673397474756664929">"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="2723851748972673696">"Removable storage"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> free (Total <xliff:g id="TOTAL">%2$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="8928389741212129060">"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="4161722509712992231">"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="8343688274191391889">"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_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="3677827796634199714"><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_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_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="1259216693690378749">"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="606648689408670617">"You can move your photos, files and app data 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="5035719146373359329"><b>"The move takes about <xliff:g id="TIME">^1</xliff:g>. It will free <xliff:g id="SIZE">^2</xliff:g> of internal storage."</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="8641916179067596592">"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\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="236043946721254139">"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="4288580957960820740">"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="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="8418502878620394756">"The Name field can\'t be empty."</string>
+    <string name="error_apn_empty" msgid="6056233831214537267">"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="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_network_title" msgid="4557113742173895074">"Network settings reset"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"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="4874737348054213767">"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="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
+    <string name="device_reset_title" msgid="2384019005638768076">"Reset device"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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_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="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="1062841478823409667">"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="7959646179737950703">"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="media_format_title" product="nosdcard" msgid="3999653431422767156">"Erase USB storage"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Erase SD card"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Erases all data in USB storage"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Erases all data on the SD card"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"Erase all USB storage? You will lose "<b>"all"</b>" stored data!"</string>
+    <string name="media_format_desc" product="default" msgid="8764037252319942415">"Erase the SD card? You will lose "<b>"all"</b>" data on the card!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Erase USB storage"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Erase SD card"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Erase the USB storage, deleting all files stored there? You cannot reverse this action!"</string>
+    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Erase the SD card, deleting all files stored there? You cannot reverse this action!"</string>
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"Erase everything"</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="8356136101061143841">"Tethering &amp; portable hotspot"</string>
+    <string name="usb_title" msgid="7483344855356312510">"USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB connected, tick to tether"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Tethered"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"Can\'t tether when USB storage is in use"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB not connected"</string>
+    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Connect to turn on"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB tethering error"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth tethering"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Sharing this tablet\'s Internet connection"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Sharing this phone\'s Internet connection"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Sharing this tablet\'s Internet connection to 1 device"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Sharing this phone\'s Internet connection to 1 device"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Sharing this tablet\'s Internet connection to <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> devices"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Sharing this phone\'s Internet connection to <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> devices"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="1790242032929221788">"Sharing this <xliff:g id="DEVICE_NAME">%1$d</xliff:g>\'s Internet connection"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Not sharing this tablet\'s Internet connection"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Not sharing this phone\'s Internet connection"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Not tethered"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"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_help_button_text" msgid="656117495547173630">"Help"</string>
+    <string name="network_settings_title" msgid="4871233236744292831">"Mobile networks"</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_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="2399426808423775711">"%1$s 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_category" msgid="6992546457880004735">"Work profile"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Turned off by your company"</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_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="5349014493087338351">"Use GPS, Wi‑Fi and mobile networks to determine location"</string>
+    <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Use Wi‑Fi and mobile networks to determine location"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scanning"</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="2070686681074461301">"Improve location by allowing apps and services to scan for Wi‑Fi networks even when Wi‑Fi is off"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth scanning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Improve location by allowing system services to scan for Bluetooth devices, even when Bluetooth is off"</string>
+    <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; mobile network location"</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"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_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="regulatory_information" msgid="5695464367088752150">"Regulatory information"</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_license_activity_title" msgid="7553683406244228650">"Open-source 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="232523852222964470">"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_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
+    <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Passwords don\'t match"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"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="7050256155547273836">"Use your device pattern to continue."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Enter your device PIN to continue."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Enter your device password to continue."</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="1949847413862309134">"Retry"</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_tactile_feedback_title" msgid="8898518337442601027">"Vibrate on touch"</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="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="1721442176406964682">"Apps"</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="install_unknown_applications_title" msgid="663831043139080992">"Lets you install apps from sources other than Google Play"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Allow installation of apps from unknown sources"</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Your tablet and personal data are more vulnerable to attack by apps from unknown sources. You agree that you are solely responsible for any damage to your tablet or loss of data that may result from using these apps."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Your phone and personal data are more vulnerable to attack by apps from unknown sources. You agree that you are solely responsible for any damage to your phone or loss of data that may result from using these apps."</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="3012617472833815382">"Launch 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>
+    <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="8494609207373874267">"App"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB storage app"</string>
+    <string name="data_size_label" msgid="8679376373625710107">"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="2652825923953591251">"You\'ve chosen to launch this app by default for some actions."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"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="5142129378749391876">"All"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Disabled"</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="disabled" msgid="9206776641295849915">"Disabled"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Not installed for this user"</string>
+    <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"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="8847257251846779938">"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="8333723538280257243">"The app wasn\'t found in the list of installed apps."</string>
+    <string name="clear_data_failed" msgid="1907582169616856698">"Couldn\'t clear app data."</string>
+    <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Uninstall updates"</string>
+    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"All updates to this Android system app will be uninstalled."</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Clear data"</string>
+    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"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_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="7563537715280712285">"Couldn\'t compute the package size."</string>
+    <string name="empty_list_msg" msgid="5993162337235907160">"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="insufficient_storage" msgid="481763122991093080">"Not enough storage space."</string>
+    <string name="does_not_exist" msgid="3476487214886606748">"App doesn\'t exist."</string>
+    <string name="app_forward_locked" msgid="6331564656683790866">"App is copy-protected."</string>
+    <string name="invalid_location" msgid="2786030127356312746">"Install location isn\'t valid."</string>
+    <string name="system_package" msgid="6222593098063037137">"System updates cannot 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="3465267182923054022">"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_text" msgid="3562567756362627323">"If you disable a built-in app, other apps may misbehave."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Delete data and disable app?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"If you disable a built-in app, other apps may misbehave. 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_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="runningservices_settings_title" msgid="8097287939865165213">"Running services"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"View and control currently running services"</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="2979218727598321095">"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="5034773197139654588">"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="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: currently in use. Touch 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_settings" msgid="5292716747264442359">"Language &amp; input"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Language &amp; input"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Language settings"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Keyboard &amp; input methods"</string>
+    <string name="phone_language" msgid="8870144109924299673">"Language"</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="3001113966880559611">"Make passwords visible"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"This input method 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="IME_APPLICATION_NAME">%1$s</xliff:g>. Use this input method?"</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="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Failed to open settings for <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
+    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/track pad"</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="8165273379942105271">"You do not have any words in the user dictionary. You can add a word by touching 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="testing_battery_info" msgid="3497865525976497848">"Battery 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="active_input_method_subtypes" msgid="3596398805424733238">"Active input methods"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Use system language"</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="development_settings_title" msgid="215179176067683667">"Developer options"</string>
+    <string name="development_settings_summary" msgid="1815795401632854041">"Set options for app development"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Developer options are not available for this user"</string>
+    <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN settings are not available for this user"</string>
+    <string name="tethering_settings_not_available" msgid="6765770438438291012">"Tethering settings are not available for this user"</string>
+    <string name="apn_settings_not_available" msgid="7873729032165324000">"Access Point Name settings are not available for this user"</string>
+    <string name="enable_adb" msgid="7982306934419797485">"USB debugging"</string>
+    <string name="enable_adb_summary" msgid="4881186971746056635">"Debug mode when USB is connected"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Revoke USB debugging authorisations"</string>
+    <string name="bugreport_in_power" msgid="7923901846375587241">"Bug report shortcut"</string>
+    <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Show a button in the power menu for taking a bug report"</string>
+    <string name="keep_screen_on" msgid="1146389631208760344">"Stay awake"</string>
+    <string name="keep_screen_on_summary" msgid="2173114350754293009">"Screen will never sleep while charging"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Enable Bluetooth HCI snoop log"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM unlocking"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Allow the bootloader to be unlocked"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Allow OEM unlocking?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WARNING: Device protection features will not work on this device while this setting is turned on."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Networking"</string>
+    <string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
+    <string name="wifi_verbose_logging" msgid="4203729756047242344">"Enable Wi‑Fi verbose logging"</string>
+    <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressive Wi‑Fi to Mobile handover"</string>
+    <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Always allow Wi‑Fi Roam Scans"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Use legacy DHCP client"</string>
+    <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Show options for wireless display certification"</string>
+    <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Increase Wi‑Fi logging level, show per SSID RSSI in Wi‑Fi Picker"</string>
+    <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"When enabled, Wi‑Fi will be more aggressive in handing over the data connection to Mobile, when Wi‑Fi signal is low"</string>
+    <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Allow/Disallow Wi‑Fi Roam Scans based on the amount of data traffic present at the interface"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Select USB Configuration"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Select USB Configuration"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Use the DHCP client from Lollipop instead of the new Android DHCP client."</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
+    <string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
+    <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revoke access to USB debugging from all computers you\'ve previously authorised?"</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Allow development settings?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"These settings are intended for development use only. They can cause your device and the applications on it to break or misbehave."</string>
+    <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verify apps over USB"</string>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Check apps installed via ADB/ADT for harmful behaviour."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protect USB storage"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps must request permission to read USB storage"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protect USB storage?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"When USB storage is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protect SD card"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps must request permission to read SD card"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protect SD card?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"When SD card is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Local terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Enable terminal app that offers local shell access"</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="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</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_services_title" msgid="2592221829284342237">"Services"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_display_title" msgid="7610175687949675162">"Display"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Captions"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Magnification gestures"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"When this feature is turned on, you can zoom in and out by triple-tapping the screen.\n\nWhile zoomed in, you can:\n"<ul><li>"Pan: Drag two or more fingers across the screen."</li>\n<li>"Adjust zoom level: Pinch two or more fingers together or spread them apart."</li></ul>\n\n"You can also temporarily magnify what\'s under your finger by triple-tapping and holding. In this magnified state, you can drag your finger to explore different parts of the screen. Lift your finger to return to your previous state.\n\nNote: Triple-tap for magnification works everywhere except the keyboard and navigation bar."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Accessibility shortcut"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"On"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Off"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"When this feature is turned on, you can quickly enable accessibility features in two steps:\n\nStep 1: Press and hold the power button until you hear a sound or feel a vibration.\n\nStep 2: Touch and hold two fingers until you hear audio confirmation.\n\nIf the device has multiple users, using this shortcut on the lock screen temporarily enables accessibility until the device is unlocked."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Large text"</string>
+    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"High contrast text"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Screen magnification"</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_speak_password_preference_title" msgid="5986628515113204844">"Speak passwords"</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="8658240868230680912">"(Experimental) May affect performance"</string>
+    <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Colour correction"</string>
+    <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"This feature is experimental and may affect performance."</string>
+    <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
+    <string name="daltonizer_type" msgid="1124178250809091080">"Correction mode"</string>
+    <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Overridden by <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"Disabled"</string>
+    <string name="daltonizer_mode_monochromacy" msgid="8485709880666106721">"Monochromacy"</string>
+    <string name="daltonizer_mode_deuteranomaly" msgid="5475532989673586329">"Deuteranomaly (red-green)"</string>
+    <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Protanomaly (red-green)"</string>
+    <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Tritanomaly (blue-yellow)"</string>
+    <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="accessibility_feature_or_input_method_not_allowed" msgid="5950315477009501647">"Not allowed by your organisation"</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="464101518421886337">"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="2095111008854376237">"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="2012273739481042318">"Touching 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_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_title" msgid="3685449667822217816">"Printing Services"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Your document may pass through one or more servers on its way to the printer."</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="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="3214000535532434353">"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="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – approx. <xliff:g id="TIME">%2$s</xliff:g> left"</string>
+    <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until full"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until full on AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until full over USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until full from wireless"</string>
+    <string name="power_usage_list_summary" msgid="2409288197839512482">"Use since last 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_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="3537569115723850618">"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="history_details_title" msgid="3608240585315506067">"History details"</string>
+    <string name="details_title" msgid="3792801565213935385">"Use details"</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="power_screen" msgid="3023346080675904613">"Screen"</string>
+    <string name="power_flashlight" msgid="7794409781003567614">"Flashlight"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Mobile 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="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_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_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="3355461362094706957">"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="1942935021750897422">"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="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="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="7536784431655058267">"at %1$s battery"</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="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> of <xliff:g id="TOTALRAM">%2$s</xliff:g> used over <xliff:g id="TIMEDURATION">%3$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_memory_status" msgid="4251599550196193093">"Device memory is currently <xliff:g id="MEMSTATE">%1$s</xliff:g>"</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_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_category" msgid="1430370497125803904">"Speech"</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_settings" msgid="8186971894801348327">"Text-to-speech settings"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Text-to-speech output"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Always use my settings"</string>
+    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Default settings below override app settings"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"default settings"</string>
+    <string name="tts_default_synth_title" msgid="4755558388333117572">"Default engine"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Set the speech synthesis engine to be used for spoken text"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Speech rate"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Speed at which the text is spoken"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affects the tone of the spoken text"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Language"</string>
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Use system language"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Language not selected"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Sets the language-specific voice for the spoken text"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Listen to an example"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Play a short demonstration of speech synthesis"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Install voice data"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Install the voice data required for speech synthesis"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Voices required for speech synthesis already properly installed"</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Your settings have changed. This is an example of how they sound."</string>
+    <string name="tts_engine_error" msgid="3305141107104670703">"The engine you have chosen can\'t run."</string>
+    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configure"</string>
+    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Choose another engine"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"This speech synthesis engine may be able to collect all the text that will be spoken, including personal data like passwords and credit card numbers. It comes from the <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Enable the use of this speech synthesis engine?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"This language requires a working network connection for text-to-speech output."</string>
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"This is an example of speech synthesis"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Default language status"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> is fully supported"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> requires network connection"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> is not supported"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Checking..."</string>
+    <string name="tts_engines_section" msgid="7515470972378742429">"Engines"</string>
+    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> Settings"</string>
+    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is enabled"</string>
+    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is disabled"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Engine settings"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Settings for <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
+    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Languages and voices"</string>
+    <string name="pico_installed" msgid="2452546687858267414">"Installed"</string>
+    <string name="pico_not_installed" msgid="6266845418419994311">"Not installed"</string>
+    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Female"</string>
+    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Male"</string>
+    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Speech synthesis engine installed"</string>
+    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Enable a new engine before use."</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Launch engine settings"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferred engine"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"General"</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="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="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_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="93461830775441220">"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="usage_access_title" msgid="332333405495457839">"Apps with usage access"</string>
+    <string name="allow_usage_access_title" msgid="2134237975190472249">"Allow access?"</string>
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"If you allow access, this app can view general information about the apps on your device, such as how often you use them."</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" msgid="5446972770562918934">"Backup &amp; reset"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Backup &amp; reset"</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="5355557151569037197">"Backup service is inactive."</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop backup password"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Desktop full backups aren\'t currently protected"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Touch to change or remove the password for desktop full backups"</string>
+    <string name="local_backup_password_toast_success" msgid="582016086228434290">"New backup password set"</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"New password and confirmation don\'t match"</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Failure setting backup password"</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="device_admin_settings_title" msgid="1335557832906433309">"Device administration settings"</string>
+    <string name="active_device_admin_msg" msgid="6930903262612422111">"Device administrator"</string>
+    <string name="remove_device_admin" msgid="3596845261596451437">"Deactivate"</string>
+    <string name="select_device_admin_msg" msgid="2645509057946368094">"Device administrators"</string>
+    <string name="no_device_admins" msgid="702695100241728775">"No available device administrators"</string>
+    <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"To stop <xliff:g id="APP_NAME">%1$s</xliff:g> from accessing your work profile, remove the profile under Settings &gt; Accounts"</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="6246742476064507965">"Activate device administrator?"</string>
+    <string name="add_device_admin" msgid="7133327675884827091">"Activate"</string>
+    <string name="device_admin_add_title" msgid="7705551449705676363">"Device administrator"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"Activating this administrator 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="4252975713178851910">"This administrator 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="6469780138110334180">"By proceeding, your User will be managed by your Administrator which may also be able to store associated data, in addition to your personal data.\n\nYour Administrator 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="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="7519563569903137003">"Touch 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="5335338851032315905">"EAP isn\'t supported."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"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="736032046548460779">"Touch "<b>"Next"</b>" to continue with setup.\n\nTouch "<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="3489771164851107822">"Work profile isn\'t available yet"</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="6766593624598183090">"Touch 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="4010643669489606536">"This change isn\'t allowed by your administrator"</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="8923508322291625282">"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>
+    <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="8581493237458496835">"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="hdcp_checking_title" msgid="8605478913544273282">"HDCP checking"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Set HDCP checking behaviour"</string>
+    <string name="debug_debugging_category" msgid="6781250159513471316">"Debugging"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Select debug app"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"No debug application set"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Debugging application: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Select application"</string>
+    <string name="no_application" msgid="2813387563129153880">"Nothing"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Wait for debugger"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Debugged application waits for debugger to attach before executing"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Input"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Drawing"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Hardware accelerated rendering"</string>
+    <string name="media_category" msgid="4388305075496848353">"Media"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitoring"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Strict mode enabled"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Flash screen when apps do long operations on main thread"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Pointer location"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Screen overlay showing current touch data"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Show touches"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Show visual feedback for touches"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Show surface updates"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash entire window surfaces when they update"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Show GPU view updates"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash views inside windows when drawn with the GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Show hardware layers updates"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Flash hardware layers green when they update"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Debug GPU overdraw"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Disable HW overlays"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Always use GPU for screen compositing"</string>
+    <string name="simulate_color_space" msgid="6745847141353345872">"Simulate colour space"</string>
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Enable OpenGL traces"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Use AwesomePlayer (deprecated)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Use AwesomePlayer instead of NuPlayer for most media playback"</string>
+    <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Disable USB audio routing"</string>
+    <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Disable automatic routing to USB audio peripherals"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Show layout bounds"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Show clip bounds, margins, etc."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Force RTL layout direction"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Force screen layout direction to RTL for all locales"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Show CPU usage"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Screen overlay showing current CPU usage"</string>
+    <string name="force_hw_ui" msgid="6426383462520888732">"Force GPU rendering"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Force use of GPU for 2D drawing"</string>
+    <string name="force_msaa" msgid="7920323238677284387">"Force 4x MSAA"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Enable 4x MSAA in OpenGL ES 2.0 apps"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Debug non-rectangular clip operations"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profile GPU rendering"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Window animation scale"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Transition animation scale"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator duration scale"</string>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulate secondary displays"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Multi-window mode"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Multiple activities on screen at the same time."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Enable multi-window mode?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"WARNING: This is a highly experimental feature that allows multiple activities on screen at the same time through the Recent Apps UI. Some apps may crash or not function correctly when used with this feature."</string>
+    <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Don\'t keep activities"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destroy every activity as soon as the user leaves it"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Background process limit"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Show all ANRs"</string>
+    <string name="show_all_anrs_summary" msgid="641908614413544127">"Show App Not Responding dialogue for background apps"</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="4859424346276043677">"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="5243515735055652279">"Mobile networks"</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="2613595056882494652">"Turn off mobile data?"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="3934211003105066167">"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="2084466270343460491">"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="7219011330831181312">"Mobile"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"None"</string>
+    <string name="data_usage_enable_mobile" msgid="5900650720568852325">"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="7510046552380574925">"Restrict app background data"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3720075732277934106">"Disable background data on mobile networks."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="1446565717342917727">"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="5871168521456832764">"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="4674085030810350875">"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="4744145757533455623">"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="5788774061143636263">"Your tablet will turn off mobile data once it reaches the limit that 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="3511301596446820549">"Your phone will turn off mobile data once it reaches the limit that 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="8210134218644196511">"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="3262993384666280985">"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="4352615206362479722">"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="21">"<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="21">"<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="5961720793603268572">"<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="1625833170144610767">"<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="3262343834446126044">"Metered networks are treated like cellular when background data is restricted. Apps may warn before using these networks for large downloads."</string>
+    <string name="data_usage_metered_mobile" msgid="2326986339431119372">"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_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="2095005387500126113">"(don\'t verify server)"</string>
+    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(received from server)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Cancel"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Save"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Connect"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Edit VPN profile"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Connect to <xliff:g id="PROFILE">%s</xliff:g>"</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_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_missing_cert" msgid="7972907102570411501">"A certificate is missing. Please edit 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_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="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="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>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Network monitoring"</string>
+    <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"This device is managed by:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nYour administrator is capable of monitoring your network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator."</string>
+    <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>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Check trusted credentials"</string>
+    <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="2596365678651842785">"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_owner" msgid="3879126011135546571">"Owner"</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_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="8440449301994432789">"Only the tablet\'s owner can manage users."</string>
+    <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"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_add_on_lockscreen_menu" msgid="3025132738715222247">"Add users when device is locked"</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="8167855311779740207">"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="5391888073786090274">"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="7593793549364168783">"All apps and data in this profile will be deleted."</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="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="home_app_uninstall_button" msgid="6808453012607962899">"Uninstall this application"</string>
+    <string name="only_one_home_message" msgid="3538846733750242759">"Home settings will be hidden until you install another home 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="global_font_change_title" msgid="1887126466191012035">"Change font size"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tap &amp; pay"</string>
+    <string name="google_wallet" msgid="9122936252378589227">"Google Wallet"</string>
+    <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Pay with just a tap"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Favour foreground app"</string>
+    <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Learn more"</string>
+    <string name="nfc_more_title" msgid="815910943655133280">"More..."</string>
+    <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Find apps"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Set as your preference?"</string>
+    <string name="nfc_payment_set_default" msgid="8961120988148253016">"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="3803693771001226795">"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="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="2451014351355183338">"Emergency broadcasts"</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="5452545583546944683">"Touch to set activities"</string>
+    <string name="sim_cellular_data_unavailable" msgid="9018555543451203035">"Mobile data is unavailable"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Touch 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="5024470200658902406">"Touch 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>
+    <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
+    <string name="search_menu" msgid="7053532283559077164">"Search"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Search settings"</string>
+    <string name="search_recents_queries_label" msgid="2128811638532309069">"Recent searches"</string>
+    <string name="search_results_label" msgid="4163304782363526148">"Results"</string>
+    <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobile network mobile operator wireless data 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call calling"</string>
+    <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
+    <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dim screen touchscreen battery"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"dark theme night mode dim screen invert brightness"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"background personalise customise display"</string>
+    <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"project cast"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"power usage charge"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling dictionary spell check auto-correct"</string>
+    <string name="keywords_voice_input" msgid="3519547605812413860">"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="392447904221657930">"rate language default speak speaking tts accessibility reader blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"clock military"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"wipe delete restore clear remove"</string>
+    <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
+    <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"speaker beep"</string>
+    <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"dont don\'t disturb interrupt interruption break"</string>
+    <string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
+    <string name="keywords_location" msgid="782326973714313480">"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="4673901601478559100">"restriction restrict restricted"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"reset preferences default"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"emergency ice app default"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps default"</string>
+    <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</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="notification_settings" msgid="8791730980212496561">"Sound &amp; notification"</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="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_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="1168212070233080706">"No interruptions"</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="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Default notification ringtone"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
+    <string name="notification_section_header" msgid="95661783916799134">"Notification"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"When device is locked"</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="3001013816427963576">"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="app_notifications_title" msgid="5810577805218003760">"App notifications"</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="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="674710566941697253">"Vibrate on touch"</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="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</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="2767405417723149879">"No notification listeners are installed."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> will be able to read all notifications posted by the system or any installed app, which may include personal information such as contact names and the text of messages sent to you. It will also be able to dismiss these notifications or touch action buttons within them."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
+    <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Treat as priority"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Let this app\'s notifications be heard when Do not disturb is set to Priority only"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Allow peeking"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Let this app emphasise certain notifications by sliding them briefly into view on the current screen"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Hide sensitive content"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"When the device is locked, hide content in this app\'s notifications that might reveal private information"</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="zen_mode_rule_name" msgid="5149068059383837549">"Rule name"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Add rule"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Delete rule"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Delete \"<xliff:g id="RULE">%1$s</xliff:g>\" rule?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Deleting"</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="3201273040477861538">"Schedule rule"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Rule not found."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%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="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_from" msgid="1033337300289871697">"Calls/messages from"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Anyone"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Contacts only"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Starred contacts only"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Events"</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_interruptions_voice_title" msgid="855256211259132964">"Interruptions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"When calls and notifications arrive"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"When would you like to be interrupted?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"For how long?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Always interrupt"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"off,all,everything"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Allow only priority interruptions"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Allow only alarms"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Don\'t interrupt"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinitely"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minute</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hours</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hour</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Change to priority notifications only indefinitely"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Change to priority notifications 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 priority notifications only for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Change to priority notifications 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 priority notifications only for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"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_no_interruptions_indefinite" msgid="5705225870569410806">"Change to don\'t interrupt indefinitely"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Change to don\'t interrupt 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 don\'t interrupt for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Change to don\'t interrupt 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 don\'t interrupt for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"forever"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
+    <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Enter administrator 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="1137904524037468263">"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. Touch Overview.\n\n4. Swipe up and then touch 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="managed_user_title" msgid="8101244883654409696">"Work profile"</string>
+    <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"When device is rotated"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotate the contents of the screen"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Stay in portrait view"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Stay in landscape view"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Stay in current orientation"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
+    <string name="encryption_interstitial_header" msgid="5790264941172726485">"Encryption"</string>
+    <string name="encryption_continue_button" msgid="1121880322636992402">"Continue"</string>
+    <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"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."</string>
+    <string name="encryption_interstitial_message_pattern" msgid="2944051427890104942">"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."</string>
+    <string name="encryption_interstitial_message_password" msgid="1439296580879440802">"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."</string>
+    <string name="encrypt_require_pin" msgid="2063945047845243752">"Require PIN to start device"</string>
+    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Require pattern to start device"</string>
+    <string name="encrypt_require_password" msgid="8770628366276570518">"Require password to start device"</string>
+    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"No, thanks"</string>
+    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"No, thanks"</string>
+    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"No, thanks"</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="1890374082842868489">"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="4474332516537386384">"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="8166099418487083927">"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="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="2184141780491382435">"Launch by default"</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="app_launch_domain_links_title" msgid="458956710410857777">"Domain links"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Open Domain URLs"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Allow app to directly open Domain URLs"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Supported domains URLs"</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="410824961149037234">"internal memory"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"external memory"</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="notifications_enabled" msgid="6983396130566021385">"On"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Block"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensitive"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Priority"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Priority &amp; Sensitive"</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>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Some defaults set"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"No defaults set"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"All apps"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Enabled"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocked"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priority"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitive"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disabled by administrator"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domain URLs"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Don\'t open any domain URL"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Open \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Open \'<xliff:g id="DOMAIN">%s</xliff:g>\' and related URLs"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can open their domain URLs</item>
+      <item quantity="one">One app can open its domain URLs</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Not recognised"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Default Apps"</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_app" msgid="6864503001385843060">"(Default)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Apps storage"</string>
+</resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 3491ad7..3f09f20 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push button"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"mute/unmute microphone"</item>
     <item msgid="1148142988678569310">"project media"</item>
     <item msgid="9130014005474445273">"activate VPN"</item>
+    <item msgid="1165192162975045562">"write wallpaper"</item>
+    <item msgid="7129487923652967258">"assist structure"</item>
+    <item msgid="1069023208100114540">"assist screenshot"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Location"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Mute/unmute microphone"</item>
     <item msgid="5906017727368097853">"Project media"</item>
     <item msgid="2486614710846178542">"Activate VPN"</item>
+    <item msgid="5586547561693629602">"Write wallpaper"</item>
+    <item msgid="32794179825485062">"Assist structure"</item>
+    <item msgid="7872852746938272552">"Assist screenshot"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Short"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"low"</item>
     <item msgid="4212263919458209842">"critical"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Off"</item>
-    <item msgid="5656544177755411222">"Limited interruptions"</item>
-    <item msgid="8735337502532332056">"Zero interruptions"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderate"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Pink"</item>
     <item msgid="6131821495505931173">"Red"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Audio Source"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 568c043..0976923 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Allow"</string>
     <string name="deny" msgid="6947806159746484865">"Deny"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"You are now <xliff:g id="STEP_COUNT">%1$d</xliff:g> step away from being a developer."</item>
-    <item quantity="other" msgid="6722953419953594148">"You are now <xliff:g id="STEP_COUNT">%1$d</xliff:g> steps away from being a developer."</item>
-  </plurals>
+    <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="header_category_wireless_networks" msgid="5110914332313954940">"Wireless &amp; networks"</string>
@@ -40,10 +40,12 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Turn off SMS over IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Turn on IMS registration required"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Turn off IMS registration required"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Turn on VoLTE provisioned flag"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Turn off VoLTE provisioned flag"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Turn on lte ram dump"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Turn off lte ram dump"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"View SIM address book"</string>
-    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"View Fixed Dialling Numbers"</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_getPDP" msgid="560610293888406317">"Get PDP list"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"In service"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"Connected"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connected (no phone)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connected (no media)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connected (no message access)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connected (no phone or media)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnected"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnecting…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Connecting…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing…"</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>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Show files received"</string>
     <string name="device_picker" msgid="4978696506172252813">"Choose Bluetooth device"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth permission request"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"An app wants to turn on Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"An app wants to turn Bluetooth ON for this device."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"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" product="default" msgid="5510358858113713272">"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="8863617309580598607">"An app wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"CANCEL"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUE"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"YES"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"FORGET"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Improve face matching"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Liveness check"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Require eye blink while unlocking"</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_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>
@@ -348,6 +336,30 @@
     <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="2930627259125138363">"Passwords"</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="3453670509485083962">"Add"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"screen lock"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints enrolled</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint enrolled</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Fingerprint setup"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to: \n\n✓ Set up your backup screen lock method \n\n✓ Add your fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find the sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Locate the fingerprint sensor on the back of your phone."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Let\'s start!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Put your finger on the fingerprint sensor. Lift after you feel a vibration."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Great! Now repeat."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Put the same finger on the fingerprint sensor and lift after you feel a vibration."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingerprint added!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Add"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"You need to draw your unlock pattern to confirm encrypting your device."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encrypt?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"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="5682944380460921880">"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>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Low security, experimental"</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="current_screen_lock" msgid="4104091715420072219">"Current screen lock"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Device protection features will no longer work."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by administrator, 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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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="7579210814842056547">"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_lock_pattern_summary" msgid="6801602880568869201">"Remove unlock pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remove unlock PIN"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Password must contain at least one letter."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Password must contain at least one digit."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Password must contain at least one symbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Password must contain at least 1 letter."</item>
-    <item quantity="other" msgid="8186027808415585970">"Password must contain at least %d letters."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Password must contain at least 1 lower-case letter."</item>
-    <item quantity="other" msgid="2693910942679679225">"Password must contain at least %d lower-case letters."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Password must contain at least 1 upper-case letter."</item>
-    <item quantity="other" msgid="3030801209112209245">"Password must contain at least %d upper-case letters."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Password must contain at least 1 numerical digit."</item>
-    <item quantity="other" msgid="4703982391407595924">"Password must contain at least %d numerical digits."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Password must contain at least 1 special symbol."</item>
-    <item quantity="other" msgid="1221290525051187757">"Password must contain at least %d special symbols."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Password must contain at least 1 non-letter character."</item>
-    <item quantity="other" msgid="3952508584649046404">"Password must contain at least %d non-letter characters."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Password must contain at least %d letters.</item>
+      <item quantity="one">Password must contain at least 1 letter.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Password must contain at least %d lowercase letters.</item>
+      <item quantity="one">Password must contain at least 1 lowercase letter.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Password must contain at least %d uppercase letters.</item>
+      <item quantity="one">Password must contain at least 1 uppercase letter.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Password must contain at least %d numerical digits.</item>
+      <item quantity="one">Password must contain at least 1 numerical digit.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Password must contain at least %d special symbols.</item>
+      <item quantity="one">Password must contain at least 1 special symbol.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Password must contain at least %d non-letter characters.</item>
+      <item quantity="one">Password must contain at least 1 non-letter character.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"The device administrator doesn\'t allow using a recent password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"An ascending, descending or repeated sequence of digits is forbidden"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"Pair"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PAIR"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Pairing grants access to your contacts and call history when connected."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Couldn\'t pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Couldn\'t pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g> because of an incorrect PIN or passkey."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Can\'t communicate with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Pairing rejected by <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"To improve location accuracy, apps and services will scan for Bluetooth devices, even when Bluetooth is off. 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_specific_profiles_title" msgid="6952214406025825164">"Connect to…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media audio"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Phone audio"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"File transfer"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Input device"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internet access"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Contact sharing"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Use for contact sharing"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet connection sharing"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Message Access"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"Connected to media audio"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connected to phone audio"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connected to file-transfer server"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connected to map"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Not connected to file-transfer server"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connected to input device"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Use for media audio"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Use for phone audio"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Use for file transfer"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Use for input"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Use for Internet access"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Use for map"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Connected via Wi‑Fi assistant"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast screen"</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>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Forget"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Finished"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Turning off Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In aeroplane mode"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Can\'t scan for networks"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Network notification"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Notify whenever a public network is available"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"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="wifi_scan_always_available" msgid="3470564139944368030">"Scanning always available"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Always allow scanning"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Let Google\'s location service and other apps scan for networks, even when Wi‑Fi is off"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Use open Wi‑Fi automatically"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Let a Wi‑Fi assistant automatically connect to open networks determined to be high quality"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Choose assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Install certificates"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"To improve location accuracy, apps and services will scan for Wi‑Fi networks, even when Wi‑Fi is off. 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_remember_choice" msgid="5340097010842405981">"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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Add another network"</string>
     <string name="wifi_more" msgid="3195296805089107950">"More"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"To complete setup, your tablet needs access to Wi‑Fi. After setup, you can switch between mobile data and Wi‑Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Advanced options"</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="5940801028985255304">"Press the Wi‑Fi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"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>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"Config 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_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(unspecified)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Saved"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disabled"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Configuration Failure"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi Connection Failure"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentication problem"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Not in range"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"No Internet Access Detected, won\'t automatically reconnect."</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_security_none" msgid="7985461072596594400">"None"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"This network has no Internet access. Use this network anyway?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Don\'t ask again for this network"</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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK portable Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portable Wi‑Fi 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_mode_title" msgid="2164073796253284289">"Calling preference"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi Calling mode"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi preferred"</item>
+    <item msgid="5267397515594230396">"Mobile preferred"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"Theme"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Light"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Dark"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatic"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Update preferred SIM card?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<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">
-    <item quantity="one" msgid="4840607930166101114">"Incorrect SIM PIN code; you have <xliff:g id="NUMBER">%d</xliff:g> remaining attempt/s before you must contact your carrier to unlock your device."</item>
-    <item quantity="other" msgid="77103619544346451">"Incorrect SIM PIN code, you have <xliff:g id="NUMBER">%d</xliff:g> remaining attempt/s."</item>
-  </plurals>
+    <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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"Apps (app data &amp; media content)"</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="235452944021647124">"Misc."</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>
@@ -955,6 +947,11 @@
     <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="8334422679047059459">"Erase &amp; format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Erase &amp; format as internal storage"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB computer connection"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB computer connection"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connect as"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"Lets you transfer photos using camera software and transfer any files on computers that don\'t support MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Install file-transfer tools"</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="2723851748972673696">"Removable storage"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> free (Total <xliff:g id="TOTAL">%2$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="8928389741212129060">"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="4161722509712992231">"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="8343688274191391889">"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_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="3677827796634199714"><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_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_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="1259216693690378749">"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="606648689408670617">"You can move your photos, files and app data 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="5035719146373359329"><b>"The move takes about <xliff:g id="TIME">^1</xliff:g>. It will free <xliff:g id="SIZE">^2</xliff:g> of internal storage."</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="8641916179067596592">"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\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="236043946721254139">"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="4288580957960820740">"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="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>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"Network settings reset"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"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="4874737348054213767">"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="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Reset device"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Erases all data on tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Erases all data on phone"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1066,8 @@
     <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="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="7209547812233487345">"Erase all your personal information and downloaded apps? You cannot reverse this action!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"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_gesture_explanation" msgid="826193821455182780">"You need to draw your unlock pattern to confirm a factory data reset."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"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>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Erase the USB storage, deleting all files stored there? You cannot reverse this action!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Erase the SD card, deleting all files stored there? You cannot reverse this action!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Erase everything"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"You need to draw your unlock pattern to confirm that you want to erase the USB storage."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"You need to draw your unlock pattern to confirm that you want to erase the SD card."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobile networks"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Default SMS app"</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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Use GPS, Wi‑Fi and mobile networks to determine location"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Use Wi‑Fi and mobile networks to determine location"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Use GPS to determine your location"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scanning"</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="2070686681074461301">"Improve location by allowing apps and services to scan for Wi‑Fi networks even when Wi‑Fi is off"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth scanning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Improve location by allowing system services to scan for Bluetooth devices, even when Bluetooth is off"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"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>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"Screen security"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Use your device pattern to continue."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Enter your device PIN to continue."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Enter your device password to continue."</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_need_to_unlock" msgid="757935356911054465">"Confirm saved pattern"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Try again:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"Too many incorrect attempts!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</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="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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="runningservices_settings_title" msgid="8097287939865165213">"Running services"</string>
@@ -1396,17 +1446,6 @@
     <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="testing_battery_info" msgid="3497865525976497848">"Battery information"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Quick launch"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Set keyboard shortcuts to launch apps"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Assign app"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"No shortcut"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Search + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Clear"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Your shortcut for <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) will be cleared."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Cancel"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apps"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Shortcuts"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM unlocking"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Allow the bootloader to be unlocked"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Enter your PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Enter your device PIN to enable OEM unlock"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Allow OEM unlocking?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WARNING: Device protection features will not work on this device while this setting is turned on."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Networking"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Enable Wi‑Fi verbose logging"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressive Wi‑Fi to Mobile handover"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Always allow Wi‑Fi Roam Scans"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Use legacy DHCP client"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Show options for wireless display certification"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Increase Wi‑Fi logging level, show per SSID RSSI in Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"When enabled, Wi‑Fi will be more aggressive in handing over the data connection to Mobile, when Wi‑Fi signal is low"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Allow/Disallow Wi‑Fi Roam Scans based on the amount of data traffic present at the interface"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Select USB Configuration"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Select USB Configuration"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Use the DHCP client from Lollipop instead of the new Android DHCP client."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revoke access to USB debugging from all computers you\'ve previously authorised?"</string>
@@ -1561,6 +1608,7 @@
     <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="464101518421886337">"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>
@@ -1702,14 +1750,20 @@
     <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="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apps over <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> of <xliff:g id="TOTALRAM">%2$s</xliff:g> used over <xliff:g id="TIMEDURATION">%3$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_memory_status" msgid="4251599550196193093">"Device memory is currently <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Average RAM use"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximum RAM use"</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>
@@ -1726,6 +1780,7 @@
     <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_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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Default settings below override app settings"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"default settings"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Default engine"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Sets the speech synthesis engine to be used for spoken text"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Set the speech synthesis engine to be used for spoken text"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Speech rate"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Speed at which the text is spoken"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
@@ -1822,7 +1877,6 @@
     <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="credentials_install_gesture_explanation" msgid="7408921172253634829">"You need to draw your unlock pattern to confirm credential installation."</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>
@@ -1847,12 +1901,10 @@
     <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="backup_configure_account_default_summary" msgid="2436933224764745553">"No account is currently storing backed up data"</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="5355557151569037197">"Backup service is inactive."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"This is set by your device policy."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop backup password"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Desktop full backups aren\'t currently protected"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Touch to change or remove the password for desktop full backups"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Transition animation scale"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator duration scale"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulate secondary displays"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Multi-window mode"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Multiple activities on screen at the same time."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Enable multi-window mode?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"WARNING: This is a highly experimental feature that allows multiple activities on screen at the same time through the Recent Apps UI. Some apps may crash or not function correctly when used with this feature."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Don\'t keep activities"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destroy every activity as soon as the user leaves it"</string>
@@ -2195,7 +2251,7 @@
     <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="718192651887726259">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with their own 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_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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"Allow phone calls"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Allow phone calls and SMS"</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="440218975766968124">"Allow phone calls?"</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_sms_confirm_title" msgid="188164598768941316">"Allow phone calls and SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Call and SMS 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="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>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"This app is not supported in restricted profiles"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobile network mobile operator wireless data 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dim screen touchscreen battery"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background personalise customise display"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"dark theme night mode dim screen invert brightness"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"background personalise customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"project"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"project cast"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"power usage charge"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling dictionary spell check auto-correct"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restriction restrict restricted"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"reset preferences default"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"emergency ice app default"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps default"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Interruptions"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"When calls and notifications arrive"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Always interrupt"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Allow only priority interruptions"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Don\'t interrupt"</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_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="1168212070233080706">"No interruptions"</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="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Default notification ringtone"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps cannot read notifications"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app can read notifications"</item>
-    <item quantity="other" msgid="980049191810249052">"%d apps can read notifications"</item>
-  </plurals>
+    <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="2767405417723149879">"No notification listeners are installed."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> will be able to read all notifications posted by the system or any installed app, which may include personal information such as contact names and the text of messages sent to you. It will also be able to dismiss these notifications or touch action buttons within them."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Condition providers"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No apps provide conditions"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app provides conditions"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apps provide conditions"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No condition providers are installed."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> will be able to add exit conditions to Do not disturb mode."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Block"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Priority"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Show notifications at the top of the list and keep them coming when the device is set to priority interruptions only"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensitive"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"When the device is locked, hide any sensitive content from this app\'s notifications"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Treat as priority"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Let this app\'s notifications be heard when Do not disturb is set to Priority only"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Allow peeking"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Let this app emphasise certain notifications by sliding them briefly into view on the current screen"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Hide sensitive content"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"When the device is locked, hide content in this app\'s notifications that might reveal private information"</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="zen_mode_default_option" msgid="6940069025071935243">"Until you turn this off"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Priority interruptions"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Downtime"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Days"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"None"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interruptions allowed"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Priority only"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"None"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automation"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatically turn on"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Rule name"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Add rule"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Delete rule"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Delete \"<xliff:g id="RULE">%1$s</xliff:g>\" rule?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Deleting"</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="3201273040477861538">"Schedule rule"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Rule not found."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Never"</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_from" msgid="1033337300289871697">"Calls/messages from"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Anyone"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Contacts only"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Starred contacts only"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Events and reminders"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarms are always priority interruptions"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Events"</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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> or any alarm before"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day or any alarm before"</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_interruptions_voice_title" msgid="855256211259132964">"Interruptions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"When calls and notifications arrive"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"When would you like to be interrupted?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"For how long?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Always interrupt"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"off,all,everything"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Allow only priority interruptions"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Allow only alarms"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Don\'t interrupt"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinitely"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minute</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hours</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hour</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Change to priority notifications only indefinitely"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Change to priority notifications 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 priority notifications only for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Change to priority notifications 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 priority notifications only for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"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_no_interruptions_indefinite" msgid="5705225870569410806">"Change to don\'t interrupt indefinitely"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Change to don\'t interrupt 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 don\'t interrupt for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Change to don\'t interrupt 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 don\'t interrupt for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"forever"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"Launch by default"</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="app_launch_domain_links_title" msgid="458956710410857777">"Domain links"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Open Domain URLs"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Allow app to directly open Domain URLs"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Supported domains URLs"</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="410824961149037234">"internal memory"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"external memory"</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="notifications_enabled" msgid="6983396130566021385">"On"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Block"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensitive"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Priority"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Priority &amp; Sensitive"</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>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Some defaults set"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"No defaults set"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"All apps"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Enabled"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocked"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priority"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitive"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disabled by administrator"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domain URLs"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Don\'t open any domain URL"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Open \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Open \'<xliff:g id="DOMAIN">%s</xliff:g>\' and related URLs"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can open their domain URLs</item>
+      <item quantity="one">One app can open its domain URLs</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Not recognised"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Default Apps"</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_app" msgid="6864503001385843060">"(Default)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Apps storage"</string>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 3491ad7..3f09f20 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push button"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"mute/unmute microphone"</item>
     <item msgid="1148142988678569310">"project media"</item>
     <item msgid="9130014005474445273">"activate VPN"</item>
+    <item msgid="1165192162975045562">"write wallpaper"</item>
+    <item msgid="7129487923652967258">"assist structure"</item>
+    <item msgid="1069023208100114540">"assist screenshot"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Location"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Mute/unmute microphone"</item>
     <item msgid="5906017727368097853">"Project media"</item>
     <item msgid="2486614710846178542">"Activate VPN"</item>
+    <item msgid="5586547561693629602">"Write wallpaper"</item>
+    <item msgid="32794179825485062">"Assist structure"</item>
+    <item msgid="7872852746938272552">"Assist screenshot"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Short"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"low"</item>
     <item msgid="4212263919458209842">"critical"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Off"</item>
-    <item msgid="5656544177755411222">"Limited interruptions"</item>
-    <item msgid="8735337502532332056">"Zero interruptions"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderate"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Pink"</item>
     <item msgid="6131821495505931173">"Red"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Audio Source"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 568c043..0976923 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Allow"</string>
     <string name="deny" msgid="6947806159746484865">"Deny"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"You are now <xliff:g id="STEP_COUNT">%1$d</xliff:g> step away from being a developer."</item>
-    <item quantity="other" msgid="6722953419953594148">"You are now <xliff:g id="STEP_COUNT">%1$d</xliff:g> steps away from being a developer."</item>
-  </plurals>
+    <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="header_category_wireless_networks" msgid="5110914332313954940">"Wireless &amp; networks"</string>
@@ -40,10 +40,12 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Turn off SMS over IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Turn on IMS registration required"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Turn off IMS registration required"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Turn on VoLTE provisioned flag"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Turn off VoLTE provisioned flag"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Turn on lte ram dump"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Turn off lte ram dump"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"View SIM address book"</string>
-    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"View Fixed Dialling Numbers"</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_getPDP" msgid="560610293888406317">"Get PDP list"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"In service"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"Connected"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connected (no phone)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connected (no media)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connected (no message access)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connected (no phone or media)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnected"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnecting…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Connecting…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing…"</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>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Show files received"</string>
     <string name="device_picker" msgid="4978696506172252813">"Choose Bluetooth device"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth permission request"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"An app wants to turn on Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"An app wants to turn Bluetooth ON for this device."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"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" product="default" msgid="5510358858113713272">"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="8863617309580598607">"An app wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"CANCEL"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUE"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"YES"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"FORGET"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Improve face matching"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Liveness check"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Require eye blink while unlocking"</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_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>
@@ -348,6 +336,30 @@
     <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="2930627259125138363">"Passwords"</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="3453670509485083962">"Add"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"screen lock"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints enrolled</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint enrolled</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Fingerprint setup"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to: \n\n✓ Set up your backup screen lock method \n\n✓ Add your fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find the sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Locate the fingerprint sensor on the back of your phone."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Let\'s start!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Put your finger on the fingerprint sensor. Lift after you feel a vibration."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Great! Now repeat."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Put the same finger on the fingerprint sensor and lift after you feel a vibration."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingerprint added!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Add"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"You need to draw your unlock pattern to confirm encrypting your device."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encrypt?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"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="5682944380460921880">"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>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Low security, experimental"</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="current_screen_lock" msgid="4104091715420072219">"Current screen lock"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Device protection features will no longer work."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by administrator, 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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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="7579210814842056547">"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_lock_pattern_summary" msgid="6801602880568869201">"Remove unlock pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remove unlock PIN"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Password must contain at least one letter."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Password must contain at least one digit."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Password must contain at least one symbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Password must contain at least 1 letter."</item>
-    <item quantity="other" msgid="8186027808415585970">"Password must contain at least %d letters."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Password must contain at least 1 lower-case letter."</item>
-    <item quantity="other" msgid="2693910942679679225">"Password must contain at least %d lower-case letters."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Password must contain at least 1 upper-case letter."</item>
-    <item quantity="other" msgid="3030801209112209245">"Password must contain at least %d upper-case letters."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Password must contain at least 1 numerical digit."</item>
-    <item quantity="other" msgid="4703982391407595924">"Password must contain at least %d numerical digits."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Password must contain at least 1 special symbol."</item>
-    <item quantity="other" msgid="1221290525051187757">"Password must contain at least %d special symbols."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Password must contain at least 1 non-letter character."</item>
-    <item quantity="other" msgid="3952508584649046404">"Password must contain at least %d non-letter characters."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Password must contain at least %d letters.</item>
+      <item quantity="one">Password must contain at least 1 letter.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Password must contain at least %d lowercase letters.</item>
+      <item quantity="one">Password must contain at least 1 lowercase letter.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Password must contain at least %d uppercase letters.</item>
+      <item quantity="one">Password must contain at least 1 uppercase letter.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Password must contain at least %d numerical digits.</item>
+      <item quantity="one">Password must contain at least 1 numerical digit.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Password must contain at least %d special symbols.</item>
+      <item quantity="one">Password must contain at least 1 special symbol.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Password must contain at least %d non-letter characters.</item>
+      <item quantity="one">Password must contain at least 1 non-letter character.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"The device administrator doesn\'t allow using a recent password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"An ascending, descending or repeated sequence of digits is forbidden"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"Pair"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PAIR"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Pairing grants access to your contacts and call history when connected."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Couldn\'t pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Couldn\'t pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g> because of an incorrect PIN or passkey."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Can\'t communicate with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Pairing rejected by <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"To improve location accuracy, apps and services will scan for Bluetooth devices, even when Bluetooth is off. 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_specific_profiles_title" msgid="6952214406025825164">"Connect to…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media audio"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Phone audio"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"File transfer"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Input device"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internet access"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Contact sharing"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Use for contact sharing"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet connection sharing"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Message Access"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"Connected to media audio"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connected to phone audio"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connected to file-transfer server"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connected to map"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Not connected to file-transfer server"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connected to input device"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Use for media audio"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Use for phone audio"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Use for file transfer"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Use for input"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Use for Internet access"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Use for map"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Connected via Wi‑Fi assistant"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast screen"</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>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Forget"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Finished"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Turning off Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In aeroplane mode"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Can\'t scan for networks"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Network notification"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Notify whenever a public network is available"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"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="wifi_scan_always_available" msgid="3470564139944368030">"Scanning always available"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Always allow scanning"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Let Google\'s location service and other apps scan for networks, even when Wi‑Fi is off"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Use open Wi‑Fi automatically"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Let a Wi‑Fi assistant automatically connect to open networks determined to be high quality"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Choose assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Install certificates"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"To improve location accuracy, apps and services will scan for Wi‑Fi networks, even when Wi‑Fi is off. 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_remember_choice" msgid="5340097010842405981">"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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Add another network"</string>
     <string name="wifi_more" msgid="3195296805089107950">"More"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"To complete setup, your tablet needs access to Wi‑Fi. After setup, you can switch between mobile data and Wi‑Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Advanced options"</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="5940801028985255304">"Press the Wi‑Fi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"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>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"Config 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_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(unspecified)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Saved"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disabled"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Configuration Failure"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi Connection Failure"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentication problem"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Not in range"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"No Internet Access Detected, won\'t automatically reconnect."</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_security_none" msgid="7985461072596594400">"None"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"This network has no Internet access. Use this network anyway?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Don\'t ask again for this network"</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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK portable Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portable Wi‑Fi 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_mode_title" msgid="2164073796253284289">"Calling preference"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi Calling mode"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi preferred"</item>
+    <item msgid="5267397515594230396">"Mobile preferred"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"Theme"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Light"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Dark"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatic"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Update preferred SIM card?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<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">
-    <item quantity="one" msgid="4840607930166101114">"Incorrect SIM PIN code; you have <xliff:g id="NUMBER">%d</xliff:g> remaining attempt/s before you must contact your carrier to unlock your device."</item>
-    <item quantity="other" msgid="77103619544346451">"Incorrect SIM PIN code, you have <xliff:g id="NUMBER">%d</xliff:g> remaining attempt/s."</item>
-  </plurals>
+    <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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"Apps (app data &amp; media content)"</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="235452944021647124">"Misc."</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>
@@ -955,6 +947,11 @@
     <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="8334422679047059459">"Erase &amp; format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Erase &amp; format as internal storage"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB computer connection"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB computer connection"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connect as"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"Lets you transfer photos using camera software and transfer any files on computers that don\'t support MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Install file-transfer tools"</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="2723851748972673696">"Removable storage"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> free (Total <xliff:g id="TOTAL">%2$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="8928389741212129060">"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="4161722509712992231">"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="8343688274191391889">"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_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="3677827796634199714"><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_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_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="1259216693690378749">"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="606648689408670617">"You can move your photos, files and app data 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="5035719146373359329"><b>"The move takes about <xliff:g id="TIME">^1</xliff:g>. It will free <xliff:g id="SIZE">^2</xliff:g> of internal storage."</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="8641916179067596592">"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\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="236043946721254139">"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="4288580957960820740">"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="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>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"Network settings reset"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"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="4874737348054213767">"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="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Reset device"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Erases all data on tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Erases all data on phone"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1066,8 @@
     <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="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="7209547812233487345">"Erase all your personal information and downloaded apps? You cannot reverse this action!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"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_gesture_explanation" msgid="826193821455182780">"You need to draw your unlock pattern to confirm a factory data reset."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"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>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Erase the USB storage, deleting all files stored there? You cannot reverse this action!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Erase the SD card, deleting all files stored there? You cannot reverse this action!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Erase everything"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"You need to draw your unlock pattern to confirm that you want to erase the USB storage."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"You need to draw your unlock pattern to confirm that you want to erase the SD card."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobile networks"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Default SMS app"</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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Use GPS, Wi‑Fi and mobile networks to determine location"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Use Wi‑Fi and mobile networks to determine location"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Use GPS to determine your location"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scanning"</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="2070686681074461301">"Improve location by allowing apps and services to scan for Wi‑Fi networks even when Wi‑Fi is off"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth scanning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Improve location by allowing system services to scan for Bluetooth devices, even when Bluetooth is off"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"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>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"Screen security"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Use your device pattern to continue."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Enter your device PIN to continue."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Enter your device password to continue."</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_need_to_unlock" msgid="757935356911054465">"Confirm saved pattern"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Try again:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"Too many incorrect attempts!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</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="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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="runningservices_settings_title" msgid="8097287939865165213">"Running services"</string>
@@ -1396,17 +1446,6 @@
     <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="testing_battery_info" msgid="3497865525976497848">"Battery information"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Quick launch"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Set keyboard shortcuts to launch apps"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Assign app"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"No shortcut"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Search + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Clear"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Your shortcut for <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) will be cleared."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Cancel"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apps"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Shortcuts"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM unlocking"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Allow the bootloader to be unlocked"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Enter your PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Enter your device PIN to enable OEM unlock"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Allow OEM unlocking?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WARNING: Device protection features will not work on this device while this setting is turned on."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Networking"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Enable Wi‑Fi verbose logging"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressive Wi‑Fi to Mobile handover"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Always allow Wi‑Fi Roam Scans"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Use legacy DHCP client"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Show options for wireless display certification"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Increase Wi‑Fi logging level, show per SSID RSSI in Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"When enabled, Wi‑Fi will be more aggressive in handing over the data connection to Mobile, when Wi‑Fi signal is low"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Allow/Disallow Wi‑Fi Roam Scans based on the amount of data traffic present at the interface"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Select USB Configuration"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Select USB Configuration"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Use the DHCP client from Lollipop instead of the new Android DHCP client."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revoke access to USB debugging from all computers you\'ve previously authorised?"</string>
@@ -1561,6 +1608,7 @@
     <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="464101518421886337">"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>
@@ -1702,14 +1750,20 @@
     <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="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apps over <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> of <xliff:g id="TOTALRAM">%2$s</xliff:g> used over <xliff:g id="TIMEDURATION">%3$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_memory_status" msgid="4251599550196193093">"Device memory is currently <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Average RAM use"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximum RAM use"</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>
@@ -1726,6 +1780,7 @@
     <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_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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Default settings below override app settings"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"default settings"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Default engine"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Sets the speech synthesis engine to be used for spoken text"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Set the speech synthesis engine to be used for spoken text"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Speech rate"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Speed at which the text is spoken"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
@@ -1822,7 +1877,6 @@
     <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="credentials_install_gesture_explanation" msgid="7408921172253634829">"You need to draw your unlock pattern to confirm credential installation."</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>
@@ -1847,12 +1901,10 @@
     <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="backup_configure_account_default_summary" msgid="2436933224764745553">"No account is currently storing backed up data"</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="5355557151569037197">"Backup service is inactive."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"This is set by your device policy."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop backup password"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Desktop full backups aren\'t currently protected"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Touch to change or remove the password for desktop full backups"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Transition animation scale"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator duration scale"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulate secondary displays"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Multi-window mode"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Multiple activities on screen at the same time."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Enable multi-window mode?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"WARNING: This is a highly experimental feature that allows multiple activities on screen at the same time through the Recent Apps UI. Some apps may crash or not function correctly when used with this feature."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Don\'t keep activities"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destroy every activity as soon as the user leaves it"</string>
@@ -2195,7 +2251,7 @@
     <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="718192651887726259">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with their own 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_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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"Allow phone calls"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Allow phone calls and SMS"</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="440218975766968124">"Allow phone calls?"</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_sms_confirm_title" msgid="188164598768941316">"Allow phone calls and SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Call and SMS 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="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>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"This app is not supported in restricted profiles"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobile network mobile operator wireless data 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dim screen touchscreen battery"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background personalise customise display"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"dark theme night mode dim screen invert brightness"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"background personalise customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"project"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"project cast"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"power usage charge"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling dictionary spell check auto-correct"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restriction restrict restricted"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"reset preferences default"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"emergency ice app default"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps default"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Interruptions"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"When calls and notifications arrive"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Always interrupt"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Allow only priority interruptions"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Don\'t interrupt"</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_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="1168212070233080706">"No interruptions"</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="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Default notification ringtone"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps cannot read notifications"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app can read notifications"</item>
-    <item quantity="other" msgid="980049191810249052">"%d apps can read notifications"</item>
-  </plurals>
+    <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="2767405417723149879">"No notification listeners are installed."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> will be able to read all notifications posted by the system or any installed app, which may include personal information such as contact names and the text of messages sent to you. It will also be able to dismiss these notifications or touch action buttons within them."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Condition providers"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No apps provide conditions"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app provides conditions"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apps provide conditions"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No condition providers are installed."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> will be able to add exit conditions to Do not disturb mode."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Block"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Priority"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Show notifications at the top of the list and keep them coming when the device is set to priority interruptions only"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensitive"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"When the device is locked, hide any sensitive content from this app\'s notifications"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Treat as priority"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Let this app\'s notifications be heard when Do not disturb is set to Priority only"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Allow peeking"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Let this app emphasise certain notifications by sliding them briefly into view on the current screen"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Hide sensitive content"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"When the device is locked, hide content in this app\'s notifications that might reveal private information"</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="zen_mode_default_option" msgid="6940069025071935243">"Until you turn this off"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Priority interruptions"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Downtime"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Days"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"None"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interruptions allowed"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Priority only"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"None"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automation"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatically turn on"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Rule name"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Add rule"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Delete rule"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Delete \"<xliff:g id="RULE">%1$s</xliff:g>\" rule?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Deleting"</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="3201273040477861538">"Schedule rule"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Rule not found."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Never"</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_from" msgid="1033337300289871697">"Calls/messages from"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Anyone"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Contacts only"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Starred contacts only"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Events and reminders"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarms are always priority interruptions"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Events"</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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> or any alarm before"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day or any alarm before"</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_interruptions_voice_title" msgid="855256211259132964">"Interruptions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"When calls and notifications arrive"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"When would you like to be interrupted?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"For how long?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Always interrupt"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"off,all,everything"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Allow only priority interruptions"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Allow only alarms"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Don\'t interrupt"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinitely"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minute</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hours</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hour</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Change to priority notifications only indefinitely"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Change to priority notifications 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 priority notifications only for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Change to priority notifications 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 priority notifications only for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"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_no_interruptions_indefinite" msgid="5705225870569410806">"Change to don\'t interrupt indefinitely"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Change to don\'t interrupt 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 don\'t interrupt for one minute until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Change to don\'t interrupt 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 don\'t interrupt for one hour until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"forever"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"Launch by default"</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="app_launch_domain_links_title" msgid="458956710410857777">"Domain links"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Open Domain URLs"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Allow app to directly open Domain URLs"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Supported domains URLs"</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="410824961149037234">"internal memory"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"external memory"</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="notifications_enabled" msgid="6983396130566021385">"On"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Block"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensitive"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Priority"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Priority &amp; Sensitive"</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>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Some defaults set"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"No defaults set"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"All apps"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Enabled"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocked"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priority"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitive"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disabled by administrator"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domain URLs"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Don\'t open any domain URL"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Open \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Open \'<xliff:g id="DOMAIN">%s</xliff:g>\' and related URLs"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can open their domain URLs</item>
+      <item quantity="one">One app can open its domain URLs</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Not recognised"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Default Apps"</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_app" msgid="6864503001385843060">"(Default)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Apps storage"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index f0c5445..300aaeb 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Presionar botón"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"silenciar/dejar de silenciar micrófono"</item>
     <item msgid="1148142988678569310">"proyectar contenido multimedia"</item>
     <item msgid="9130014005474445273">"activar VPN"</item>
+    <item msgid="1165192162975045562">"escribir fondo de pantalla"</item>
+    <item msgid="7129487923652967258">"asistir a la estructura"</item>
+    <item msgid="1069023208100114540">"asistir a la captura de pantalla"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicación"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Silenciar/dejar de silenciar micrófono"</item>
     <item msgid="5906017727368097853">"Proyectar contenido multimedia"</item>
     <item msgid="2486614710846178542">"Activar VPN"</item>
+    <item msgid="5586547561693629602">"Escribir fondo de pantalla"</item>
+    <item msgid="32794179825485062">"Asistir a la estructura"</item>
+    <item msgid="7872852746938272552">"Asistir a la captura de pantalla"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"bajo"</item>
     <item msgid="4212263919458209842">"crítico"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desactivado"</item>
-    <item msgid="5656544177755411222">"Interrupciones limitadas"</item>
-    <item msgid="8735337502532332056">"Sin interrupciones"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderado"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rosado"</item>
     <item msgid="6131821495505931173">"Rojo"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP"</item>
+    <item msgid="8856820259201251036">"PTP"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet USB)"</item>
+    <item msgid="2686051673589572111">"Fuente de audio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4f41a19..45e44f8 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Permitir"</string>
     <string name="deny" msgid="6947806159746484865">"Rechazar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso de ser programador."</item>
-    <item quantity="other" msgid="6722953419953594148">"Estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser programador."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Estás a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser programador.</item>
+      <item quantity="one">Estás a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> paso de ser programador.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"¡Ya eres programador!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres programador."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Conexiones inalámbricas y redes"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Desactivar SMS por IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Activar el registro de MI requerido"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Desactivar el registro de MI requerido"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Activar marca de aprovisionamiento de VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Desactivar marca de aprovisionamiento de VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Activar volcado LTE RAM"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Desactivar volcado LTE RAM"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ver libreta de direcciones de SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisión"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Esto inhabilitará &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sin teléfono)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sin audio multimedia)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectado (sin acceso a mensajes)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sin tel. ni audio multimedia)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Conectando…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Vinculando..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sin nombre"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Buscando"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No se encontraron dispositivos Bluetooth cercanos."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar los archivos recibidos"</string>
     <string name="device_picker" msgid="4978696506172252813">"Elegir el dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Una aplicación desea activar el Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Una aplicación quiere activar Bluetooth en este dispositivo."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicación quiere hacer visible tu dispositivo para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Tarjeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configuración de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCELAR"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAR"</string>
     <string name="okay" msgid="1997666393121016642">"Aceptar"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SÍ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"OLVIDAR"</string>
+    <string name="forget" msgid="1400428660472591263">"Olvidar"</string>
+    <string name="save" msgid="879993180139353333">"Guardar"</string>
+    <string name="done" msgid="6942539184162713160">"Listo"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configuración"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configuración"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Configuración"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Mejorar el reconocimiento facial"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Reconocimiento facial"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Solicitar parpadeo durante desbloqueo"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automáticamente"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> después de la suspensión"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> después de activar el modo de suspensión, excepto cuando <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> mantiene la pantalla desbloqueada."</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Huella digital"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Adm. huellas digitales"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar huella dig. para"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Agregar"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueo de pantalla"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> huellas digitales registradas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> huella digital registrada</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Config. huella digital"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"A fin de utilizar tu huella digital para desbloquear la pantalla o confirmar compras, tendremos que: \n\n✓ configurar el método de bloqueo de pantalla alternativo; \n\n✓ agregar tu huella digital."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Buscar el sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Busca el sensor de huellas digitales en la parte posterior del teléfono."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nombre"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Aceptar"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"¡Comencemos!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Coloca el dedo en el sensor de huellas digitales. Levántalo después de sentir una vibración."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Ahora repite la acción"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Coloca el mismo dedo en el sensor de huellas digitales y levántalo después de sentir una vibración."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Huella digit. agregada"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando veas este ícono, podrás utilizar tu huella digital para identificarte o para autorizar una compra."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Agregar"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Siguiente"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar Tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar dispositivo"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Enchufa tu cargador e inténtalo nuevamente."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Sin contraseña o PIN de pantalla de bloqueo"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Debes configurar una contraseña o PIN de pantalla de bloqueo antes de comenzar con la encriptación."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Debes crear tu patrón de desbloqueo para confirmar la encriptación del dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"¿Deseas encriptar el dispositivo?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, la tablet se reiniciará varias veces."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, el dispositivo se reiniciará varias veces."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Deslizar"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Sin seguridad"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Desbloqueo facial"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Seguridad baja, experimental"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patrón"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Seguridad media"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivel de seguridad medio a alto"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivel de seguridad alto"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueo de pantalla actual"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Las funciones de protección del dispositivo ya no funcionarán."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inhabilitado por administrador, política de encriptación o almacenamiento de credenciales"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueo facial"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patrón"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Contraseña"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Después de configurar el bloqueo de pantalla, también puedes establecer la huella digital en Configuración &gt; Seguridad."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar el bloqueo de pantalla"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar el patrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar el PIN de desbloqueo"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"La contraseña debe tener al menos una letra."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"La contraseña debe tener al menos un dígito."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"La contraseña debe tener al menos un símbolo."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"La contraseña debe tener al menos una letra."</item>
-    <item quantity="other" msgid="8186027808415585970">"La contraseña debe tener al menos %d letras."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"La contraseña debe tener al menos una letra minúscula."</item>
-    <item quantity="other" msgid="2693910942679679225">"La contraseña debe tener al menos %d letras minúsculas."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"La contraseña debe tener al menos una letra mayúscula."</item>
-    <item quantity="other" msgid="3030801209112209245">"La contraseña debe tener al menos %d letras mayúsculas."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"La contraseña debe tener al menos un dígito numérico."</item>
-    <item quantity="other" msgid="4703982391407595924">"La contraseña debe tener al menos %d dígitos numéricos."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"La contraseña debe tener al menos un símbolo especial."</item>
-    <item quantity="other" msgid="1221290525051187757">"La contraseña debe tener al menos %d símbolos especiales."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"La contraseña debe tener al menos un carácter que no sea una letra."</item>
-    <item quantity="other" msgid="3952508584649046404">"La contraseña debe tener al menos %d caracteres que no sean letras."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">La contraseña debe tener al menos %d letras.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 letra.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">La contraseña debe tener al menos %d letras minúsculas.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 letra minúscula.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">La contraseña debe tener al menos %d letras mayúsculas.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 letra mayúscula.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">La contraseña debe tener al menos %d dígitos numéricos.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 dígito numérico.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">La contraseña debe tener al menos %d símbolos especiales.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 símbolo especial.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">La contraseña debe tener al menos %d caracteres que no sean letras.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 carácter que no sea una letra.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"El administrador del dispositivo no permite el uso de una contraseña utilizada recientemente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"No se permiten una secuencia ascendente, descendente ni repetida de dígitos."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Para sincronizar con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;asegúrate de que se muestre esta clave de acceso:&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">"¿Desde: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;sincronizas con este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Para sincronizar con:<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>Escribe allí:<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> y luego presiona Volver o Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Vincular"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SINCRONIZAR"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"La sincronización te permite acceder a los contactos y al historial de llamadas cuando el dispositivo está conectado."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No se pudo sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No se pudo sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> debido a que el PIN o la clave de acceso son incorrectos."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"No se puede establecer la comunicación con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Vínculo rechazado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"No se pudo establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Buscar dispositivos"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Actualizar"</string>
@@ -515,16 +518,8 @@
     <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">"Bluetooth permite conexión con disposit. cercanos."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Para mejorar la precisión de la ubicación, las aplicaciones y los servicios buscarán dispositivos Bluetooth, incluso cuando la conexión Bluetooth esté desactivada. Puedes modificar esta opción en la <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de búsqueda<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar a..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimedia"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio del dispositivo"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferencia de archivos"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acceso a Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Compartir contactos"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utilizar para compartir contactos"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartir conexión a Internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acceso a mensajes"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio multimedia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de manos libres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del dispositivo de entrada."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Utilizar para"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Cambiar el nombre"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permitir transferencias de archivos entrantes"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio multimedia"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del dispositivo"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado al servidor de transferencia de archivo"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectado al mapa"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No conectado al servidor de transferencia de archivo"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado a dispositivo de entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado a un dispositivo para acceder a Internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Conexión a Internet local compartida con dispositivo"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para el audio multimedia"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para el audio del dispositivo"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizar para la transferencia de archivos"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizar para entrada"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizar para acceso a Internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Usar para mapa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configuración de la base"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizar la base para el audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y medios"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recordar la configuración"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistente de Wi-Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Conexión por asistente de Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Pantalla de Cast"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmitir"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No se encontraron dispositivos cercanos."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Borrar"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Listo"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nombre"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir el intercambio de datos cuando la tablet entre en contacto con otro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el dispositivo toque otro dispositivo"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Desactivando Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"En modo avión"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"No se pueden buscar las redes."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificación de red"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Notificarme cuando haya una red pública disponible"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar malas conexiones"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Usar solo redes con una conexión a Internet estable"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Búsqueda siempre disponible"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Siempre permitir la búsqueda"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permitir que el servicio de ubicación de Google y otras aplicaciones busquen redes aunque la conexión Wi-Fi esté desactivada"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Usar Wi-Fi abierto automáticamente"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permitir a un asistente de Wi-Fi conectarse automáticamente a redes abiertas de alta calidad."</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Elegir asistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mejorar la precisión de la ubicación y para otros fines, Google y otras aplicaciones pueden explorar las redes cercanas, incluso cuando Wi-Fi esté desactivado. Si no quieres que esto ocurra, ve a Avanzado &gt; Exploración siempre disponible."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Las aplicaciones pueden buscar redes cercanas incluso cuando Wi-Fi esté desactivado. Si no quieres que esto ocurra, ve a Config. avanzada &gt; Búsqueda siempre disponible."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Para mejorar la precisión de la ubicación, las aplicaciones y los servicios buscarán redes Wi‑Fi, incluso cuando la conexión Wi‑Fi esté desactivada. Puedes modificar esta opción en la <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de búsqueda<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No volver a mostrar"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Mantener Wi-Fi durante suspensión"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi activada en suspensión"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Agregar otra red"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Necesitas conexión Wi-Fi para completar la configuración. Una vez finalizada, podrás alternar entre Wi-Fi y conexión de datos móviles."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Opciones avanzadas"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Configuración Wi-Fi protegida"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando la WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Presiona el botón Configuración Wi-Fi protegida en el router. Es posible que se denomine \"WPS\" o que contenga este símbolo:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Pulse el botón de la Configuración Protegida Wi-Fi en su router. Se puede llamar \"WPS\" o puede estar marcado con este símbolo:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Ingresa el código <xliff:g id="NUMBER">%1$s</xliff:g> en el router de Wi‑Fi. El proceso de configuración puede tardar hasta dos minutos."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"La WPS se inició correctamente. Estableciendo conexión con la red…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Se estableció la conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidad anónima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Contraseña"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contraseña"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Configurar banda AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2.4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Configuración de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sin cambios)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(sin especificar)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitada"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Error de configuración IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Error de conexión Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticación"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de alcance"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"No se detectó el acceso a Internet. No se volverá a conectar de forma automática."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WSP disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ingresa la contraseña de la red."</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"¿Acceder para conectarse?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requiere acceso en línea para conectar a la red."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Esta red no tiene acceso a Internet. ¿Deseas usarla de todos modos?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"No volver a preguntar para esta red"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Zona Wi-Fi portátil AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi‑Fi portátil <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_mode_title" msgid="2164073796253284289">"Preferencia de llamada"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de llamada por Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Red Wi-Fi preferida"</item>
+    <item msgid="5267397515594230396">"Red móvil preferida"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Página principal"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizar el nivel de brillo según la luz disponible"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Claro"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Oscuro"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Cuando se apaga la pantalla"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"¿Actualizar tarjeta SIM?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> es la única SIM en el dispositivo. ¿Quieres utilizar esta SIM para datos móviles, llamadas y mensajes SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"El código PIN de la tarjeta SIM es incorrecto. Debes comunicarte con el proveedor para desbloquear el dispositivo."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"El código PIN de la tarjeta SIM es incorrecto. Te queda <xliff:g id="NUMBER">%d</xliff:g> intento antes de que debas comunicarte con el proveedor para desbloquear el dispositivo."</item>
-    <item quantity="other" msgid="77103619544346451">"El código PIN de la tarjeta SIM es incorrecto. Te quedan <xliff:g id="NUMBER">%d</xliff:g> intentos."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">El código PIN de la tarjeta SIM es incorrecto. Tienes <xliff:g id="NUMBER_1">%d</xliff:g> intentos más.</item>
+      <item quantity="one">El código PIN de la tarjeta SIM es incorrecto. Tienes <xliff:g id="NUMBER_0">%d</xliff:g> intento más antes de que debas comunicarte con el proveedor para desbloquear el dispositivo.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Error al desbloquear la tarjeta SIM con el PIN"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado del tablet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Estado del dispositivo"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (solo lectura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espacio total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicaciones (datos de aplic. y cont. multimedia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicaciones y datos de aplicaciones"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medios"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descargas"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imágenes, videos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tonos de teléfono, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Varios."</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 alm. comp."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar la tarjeta SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontaje en progreso"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Poco 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. Intenta 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>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Activar"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Expulsar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Borrar y formatear"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Borrar/format. como alm. int."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión con computadora por USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conexión con comput. por USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectarse como"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Te permite transferir archivos multimedia en Windows o a través de la aplicación Android File Transfer en Mac (visita www.android.com/filetransfer)."</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Cámara (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Te permite transferir fotos con el software de la cámara y archivos a computadoras que no admiten MTP."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar las herramientas de transferencia de archivos"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Permite que las aplicaciones compatibles con MIDI funcionen con software MIDI mediante USB en tu computadora."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Otros usuarios"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Almacenamiento del dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Almacenamiento desmontable"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> libres (total: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Se activó <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"No se pudo activar <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> se expulsó de forma segura."</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> no se pudo expulsar de forma segura."</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Se formateó <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"No se pudo formatear <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Renombrar almacenamiento"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Luego de formatear el dispositivo <xliff:g id="NAME_0">^1</xliff:g>, puedes usarlo en otros dispositivos. \n\nTodos los datos se borrarán de <xliff:g id="NAME_1">^1</xliff:g>. Primero, deberías realizar una copia de seguridad. \n\n"<b>"Realizar una copia de seguridad de las fotos y otro contenido multimedia"</b>" \nTransfiere los archivos multimedia a un medio de almacenamiento alternativo en este dispositivo o a un equipo mediante un cable USB. \n\n"<b>"Realizar una copia de seguridad de las aplicaciones"</b>" \nSe desinstalarán todas las aplicaciones guardadas en <xliff:g id="NAME_6">^1</xliff:g> y se eliminarán todos los datos relacionados. Para conservar estas aplicaciones, puedes transferirlas a un medio de almacenamiento alternativo en este dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Al expulsar este dispositivo interno <xliff:g id="NAME_0">^1</xliff:g>, las aplicaciones allí guardadas dejarán de funcionar, y los archivos multimedia almacenados no estarán disponibles hasta que vuelvas a insertarlo."</b>" \n\nEl medio de almacenamiento <xliff:g id="NAME_1">^1</xliff:g> está formateado para funcionar solo en este dispositivo; no funcionará en otro."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar el dispositivo <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como medio de almacenamiento portátil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para transferir fotos y otros archivos multimedia entre dispositivos"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Usar como medio de almacenamiento interno"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para guardar contenido solo en este dispositivo, incluidas aplicaciones y fotos. Requiere de formateo para evitar que funcione con otros dispositivos."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatear como almacenamiento"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Debes formatear el dispositivo <xliff:g id="NAME_0">^1</xliff:g> para que funcione de manera segura. \n\nAl finalizar, el medio de almacenamiento <xliff:g id="NAME_1">^1</xliff:g> solo funcionará en este dispositivo. \n\n"<b>"Al formatearlo, borrarás todos los datos almacenados en <xliff:g id="NAME_2">^1</xliff:g> de forma reciente."</b>" Para evitar perderlos, puedes realizar una copia de seguridad."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Borrar y formatear"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formateando dispositivo (<xliff:g id="NAME">^1</xliff:g>)…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"No extraigas el dispositivo <xliff:g id="NAME">^1</xliff:g> durante el proceso de formateo."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Transferir a almacenam. nuevo"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Puedes transferir las fotos, los archivos y los datos de aplicaciones a este nuevo dispositivo de almacenamiento <xliff:g id="NAME">^1</xliff:g>. \n\nLa transferencia demora <xliff:g id="TIME">^2</xliff:g>, y se libera(n) <xliff:g id="SIZE">^3</xliff:g> de almacenamiento interno. Algunas aplicaciones dejarán de funcionar durante el proceso."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Transferir los datos ahora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Transferir los datos más tarde"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Transferir los datos ahora"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Transferir el contenido demora alrededor de <xliff:g id="TIME">^1</xliff:g>. Con esta acción, se liberará(n) <xliff:g id="SIZE">^2</xliff:g> de almacenamiento interno."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Transferir"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Transfiriendo los datos…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Al transferir el contenido: \n• No extraigas el dispositivo <xliff:g id="NAME">^1</xliff:g>. \n• Algunas aplicaciones no funcionarán de forma correcta. \n• Mantén el dispositivo cargado."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"El dispositivo <xliff:g id="NAME">^1</xliff:g> está listo"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"El dispositivo <xliff:g id="NAME">^1</xliff:g> está listo para que lo uses con fotos y otro contenido multimedia."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"El nuevo dispositivo <xliff:g id="NAME">^1</xliff:g> está funcionando. \n\nPara transferir fotos, archivos y datos de aplicaciones a este dispositivo, ve a Configuración y almacenamiento."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Transferir la aplicación <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Transferir la aplicación <xliff:g id="APP">^1</xliff:g> y los datos relacionados al dispositivo <xliff:g id="NAME_0">^2</xliff:g> solo demorará un momento. Hasta que no se complete la transferencia, no podrás usar la aplicación. \n\nNo extraigas el dispositivo <xliff:g id="NAME_1">^2</xliff:g> durante el proceso."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Transfiriendo la aplicación <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Durante el proceso, no extraigas el dispositivo <xliff:g id="NAME">^1</xliff:g>. \n\nLa aplicación <xliff:g id="APP">^2</xliff:g> estará disponible en este dispositivo cuando se complete el proceso."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferencia"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de la batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando la configuración APN predeterminada"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se ha restablecido la configuración predeterminada de APN."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Restablecimiento de configuración de red"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Esta acción restablecerá las opciones de configuración de red, como las siguientes:\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="4874737348054213767">"¿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="reset_network_complete_toast" msgid="787829973559541880">"Se restableció la configuración de red."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Restablecer dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer valores de fábrica"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos de la tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Borra todos los datos del dispositivo"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del dispositivo, por ejemplo:\n\n"<li>"tu cuenta de Google,"</li>\n<li>"datos de aplicaciones y ajustes del sistema,"</li>\n<li>"las aplicaciones descargadas."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente has accedido a las siguientes cuentas:\n"</string>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos los datos de la tarjeta SD, como música o fotos."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer la tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer dispositivo"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"¿Deseas eliminar toda tu información personal y aplicaciones descargadas? Esta acción no se puede deshacer."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"¿Deseas eliminar toda tu información personal y las aplicaciones descargadas? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Eliminar todo"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Debes crear tu patrón de desbloqueo para confirmar que quieres restablecer los datos de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No se realizó ningún restablecimiento debido a que el servicio \"Eliminar sistema\" no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"El restablecimiento de la configuración de fábrica no está disponible para este usuario."</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"¿Deseas borrar el almacenamiento USB y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"¿Deseas borrar la tarjeta SD y todos los archivos almacenados allí? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Eliminar todo"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar el almacenamiento USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar la tarjeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Config. de llamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Establecer correo de voz, desvío de llamadas, llamada en espera, identificador de llamadas"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Anclaje a red USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Redes móviles"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móvil"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicación de SMS predeterminada"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicación de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"¿Quieres cambiar la aplicación de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"¿Quieres usar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como la aplicación de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"¿Quieres usar <xliff:g id="NEW_APP">%s</xliff:g> como la aplicación de SMS?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de ubicación"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Determinar ubicación con GPS, Wi‑Fi y redes móviles"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Determinar ubicación con Wi‑Fi y redes móviles"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Determinar ubicación con GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Determinar ubicación con GPS"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Analizando"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analizando"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Búsqueda de redes Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Para mejorar la precisión de la ubicación, permite que las aplicaciones y los servicios busquen redes Wi‑Fi, incluso cuando la conexión Wi‑Fi esté desactivada."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Búsqueda de dispositivos Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Para mejorar la precisión de la ubicación, permite que los servicios del sistema busquen dispositivos Bluetooth, incluso cuando la conexión Bluetooth esté desactivada."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Ubicación de Wi-Fi y red móvil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación (se enviarán datos anónimos a Google)"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
@@ -1119,7 +1164,7 @@
     <string name="location_access_title" msgid="7064108942964081243">"Acceso a mi ubicación"</string>
     <string name="location_access_summary" msgid="69031404093194341">"Permitir que las aplicaciones que solicitaron permiso usen la información de tu ubicación"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Fuentes de ubicación"</string>
-    <string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca del tablet"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca de la tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Acerca del dispositivo"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver información legal, estado, versión de software del tablet"</string>
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Se ha configurado la contraseña."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Se ha configurado el PIN."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Se ha configurado el patrón."</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Pantalla de seguridad"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Para continuar, usa el patrón del dispositivo."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Para continuar, ingresa el PIN del dispositivo."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Para continuar, ingresa la contraseña del dispositivo."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Seguridad del dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambiar patrón de desbloqueo"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar el patrón guardado"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Inténtalo de nuevo:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dibuja un patrón de desbloqueo"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Presiona Menú para obtener ayuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Levanta el dedo cuando termines."</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Conf. patrón de desbloq."</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambiar patrón de desbloqueo"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cómo se debe extraer un patrón de desbloqueo"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"¡Demasiados intentos incorrectos!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Vuelve a intentarlo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Demasiados intentos incorrectos. Vuelve a intentarlo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"La aplicación no está instalada en tu dispositivo."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar los servicios en ejecución"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos almacenados en la memoria caché"</string>
+    <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">"¿Restablec. preferencias?"</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>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Operaciones de las aplicaciones"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"En curso"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Sin utilizar)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Sin aplicaciones predet."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso del almacenamiento"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ver el almacenamiento que usan las aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Información del tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Información del dispositivo"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Información sobre la batería"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Lanzamiento rápido"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Establecer accesos rápidos del teclado para ejecutar aplicaciones"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Asignar aplicación"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"No hay acceso directo"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Buscar + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Eliminar"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Se borrará tu acceso directo para <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Aceptar"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Cancelar"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplicaciones"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Accesos directos"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Ingreso de texto"</string>
     <string name="input_method" msgid="5434026103176856164">"Método de entrada"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Teclado actual"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth en un archivo"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueo de OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir que el cargador de inicio se desbloquee"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Ingresa el PIN."</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ingresa el PIN del dispositivo para habilitar el desbloqueo OEM."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"¿Permitir desbloqueo de OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVERTENCIA: Las funciones de protección de dispositivos no funcionarán en este dispositivo mientras esta configuración esté activada."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. tamaños Logger/búfer registro"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones de prueba"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones de prueba"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Habilitar inspección de atributos de vista"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Redes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificación de pantalla inalámbrica"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Habilitar registro detallado de Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transferencia intensa de Wi‑Fi a celular"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Permitir siempre búsquedas de Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Usar cliente DHCP heredado"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opciones de certificación de pantalla inalámbrica"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumentar nivel de registro Wi-Fi; mostrar por SSID RSSI en el selector de Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Si está habilitada, la conexión Wi‑Fi será más intensa al transferir la conexión de datos al celular (si la señal Wi‑Fi es débil)."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Permitir/no permitir las búsquedas de Wi-Fi basadas la cantidad de tráfico de datos presente en la interfaz"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de Logger"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. tamaños Logger/búfer registro"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Seleccionar configuración de USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Seleccionar configuración de USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones de prueba"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones de prueba"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Habilitar inspección de atributos de vista"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Usar el cliente DHCP de Lollipop en lugar del nuevo cliente DHCP de Android"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración por USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"La depuración por USB solo está indicada para actividades de programación. Úsala para copiar datos entre tu computadora y el dispositivo, para instalar aplicaciones en el dispositivo sin recibir notificaciones y para leer datos de registro."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"¿Quieres revocar el acceso a la depuración por USB desde todas la computadoras que autorizaste hasta ahora?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Debido a que una aplicación está bloqueando una solicitud de permiso, la Configuración no puede verificar tu respuesta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Dado que activaste un servicio de accesibilidad, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Dado que la encriptación de datos se ve afectada al activar <xliff:g id="SERVICE">%1$s</xliff:g>, debes confirmar el patrón."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadísticas de procesos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estadísticas para geeks sobre procesos activos"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplicaciones <xliff:g id="TYPE">%1$s</xliff:g> durante <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Uso: <xliff:g id="USEDRAM">%1$s</xliff:g> de <xliff:g id="TOTALRAM">%2$s</xliff:g> durante <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"En el fondo"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"En primer plano"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"En caché"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"En este momento, el estado de la memoria del dispositivo es <xliff:g id="MEMSTATE">%1$s</xliff:g>."</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Uso promedio de RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso máximo de RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Sistema operativo Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Nativo"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kernel"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Zram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Memorias caché"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Uso de RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Uso de RAM (en segundo plano)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tiempo de ejecución"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Procesos"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servicios"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duración"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Detalles de la memoria"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 día"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ocultar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Usar USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estadística"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"En el fondo"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"La configuración predeterminada anula la de la aplicación."</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuración predeterminada"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor predeterminado"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Configura el motor de síntesis de voz para utilizarse en textos hablados."</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Establecer el motor de síntesis de voz para usar con el texto por voz"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Velocidad de voz"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidad en la que se habla el texto"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Sonido"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Copia de seguridad en hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Las credenciales no están disponibles para este usuario."</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes crear tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Hacer una copia de seguridad de mis datos"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Crear copias de seguridad de los datos de distintas aplicaciones, de contraseñas Wi-Fi y de otros parámetros de configuración en los servidores de Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Cuenta de copia de seguridad"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ninguna cuenta está almacenando datos con copia de seguridad."</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir datos de aplicación"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurar automáticamente"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Al reinstalar se restablece la configuración con copia de seguridad."</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Servicio de copia de seguridad inactivo"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Esta opción es establecida por la política de dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contras. copia de seguridad"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Tus copias de seguridad completas de escritorio no están protegidas por contraseña."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca para cambiar o eliminar la contraseña de las copias de seguridad completas de tu escritorio."</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Transición de escala de animación"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala de duración de animador"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simular pantallas secundarias"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Modo multiventana"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Varias actividades en pantalla al mismo tiempo"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"¿Deseas habilitar el modo multiventana?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ADVERTENCIA: esta es una función muy experimental que permite desarrollar varias actividades en pantalla al mismo tiempo mediante la interfaz de usuario de aplicaciones recientes. Cuando se usa esta función, es posible que algunas aplicaciones se bloqueen o no funcionen correctamente."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicaciones"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Eliminar actividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Descartar todas las actividades en cuanto el usuario las abandona"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restringido"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"¿Agregar usuario nuevo?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Si creas usuarios adicionales, puedes compartir este dispositivo con otras personas. Cada usuario tendrá su propio espacio, que podrá personalizar con sus propias aplicaciones, fondos de pantalla, etc. Los usuarios también pueden cambiar la configuración que afecta a todos, como la conexión Wi-Fi.\n\nCuando agregas un nuevo usuario, la persona debe configurar su espacio.\n\nCualquier usuario puede actualizar aplicaciones para todos los usuarios."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Si creas usuarios adicionales, puedes compartir este dispositivo con otras personas. Cada usuario tendrá su propio espacio, que podrá personalizar con sus propias aplicaciones, fondos de pantalla, etc. Además, los usuarios pueden cambiar las opciones de configuración del dispositivo que afectan a todos, como la conexión Wi-Fi.\n\nAl agregar un usuario nuevo, esa persona debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones para todos los usuarios."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Cuando agregas un nuevo usuario, esa persona debe configurar su espacio.\n\nCualquier usuario puede actualizar aplicaciones para todos los usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar el 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>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"¿Eliminar invitado?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Se eliminarán las aplicaciones y los datos de esta sesión."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Eliminar"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Permitir llamadas telefónicas"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Permitir llamadas telefónicas y SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Activar llamadas de teléfono"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Activar llamadas telefónicas y SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Eliminar usuario"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"¿Permitir llamadas telefónicas?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"¿Activar llamadas telefónicas?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Se compartirá el historial de llamadas con este usuario."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"¿Permitir llamadas telefónicas y SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Se compartirá el historial de llamadas y SMS con este usuario."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"¿Activar llamadas telefónicas y SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Se compartirá el historial de llamadas y SMS con este usuario."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. a aplicación"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"CAMBIAR NOMBRE"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Definir restricciones de aplicación"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Esta aplicación no se admite para perfiles restringidos."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Esta aplicación puede acceder a tus cuentas."</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Esta aplicación puede acceder a tus cuentas. Controlada por <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi y red de celulares"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permitir modificar la configuración de la red Wi‑Fi y de la red de celulares"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi, red, conexión"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensaje de texto, enviar mensajes de texto, mensajería"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular, operador de telefonía celular, datos inalámbricos, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi, wi-fi, llamar, llamada"</string>
     <string name="keywords_home" msgid="3626170808219458848">"selector"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar pantalla, pantalla táctil, batería"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"atenuar pantalla, pantalla táctil, batería"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano, personalizar, ajustar pantalla"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tema oscuro modo nocturno atenuar pantalla invertir brillo"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"personalizar el fondo personalizar la pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño del texto"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyectar"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"transmisión de proyecto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espacio, disco, disco duro, uso de dispositivo"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"uso de energía, cargo"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografía, diccionario, corrección ortográfica, corrección automática"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"cuenta"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restricción restringir restringido"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"corrección de texto, corregir, sonido, vibrar, automático, idioma, gesto, sugerir, sugerencia, tema, palabra ofensiva, tipo, emoji, internacional"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"restablecer, preferencias, predeterminadas"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"aplicación predeterminada en caso de emergencia"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplicaciones, descarga, aplicaciones, sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"seguridad de permisos de aplicaciones"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"configuración predeterminada de las aplicaciones"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar, contraseña, patrón, pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volumen de alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volumen de tono"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumen de notificación"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupciones"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Al recibir llamadas o notificaciones"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Interrumpir siempre"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permitir solo interrupciones de prioridad"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"No interrumpir"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permitir solo prioridad"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas de automatización"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Solo prioridad"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo alarmas"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Sin interrupciones"</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="ringtone_title" msgid="5379026328015343686">"Tono de llamada"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Tono de notificación predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar también en llamadas"</string>
@@ -2416,62 +2480,113 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificaciones"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Las aplicaciones no pueden leer las notificaciones."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Cantidad de aplicaciones que pueden leer notificaciones: %d"</item>
-    <item quantity="other" msgid="980049191810249052">"Cantidad de aplicaciones que pueden leer notificaciones: %d"</item>
-  </plurals>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for manage_notification_access_summary_nonzero (7930130030691218387) -->
     <string name="no_notification_listeners" msgid="2767405417723149879">"No hay detectores de notificaciones instalados."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"¿Habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrá leer todas las notificaciones publicadas por el sistema o por cualquier aplicación instalada. Las notificaciones pueden contener información personal, como nombres de contacto y el texto de los mensajes que recibes. También podrá rechazar estas notificaciones o tocar los botones de acción dentro de ellas."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveedores de condiciones"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ninguna aplicación proporciona condiciones"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"La aplicación %d proporciona condiciones"</item>
-    <item quantity="other" msgid="358057362115673258">"Las aplicaciones %d proporcionan condiciones"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No hay ningún proveedor de condiciones instalado."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"¿Habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> podrá agregar condiciones de salida al modo No molestar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Bloquear"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todos"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostrar nunca notificaciones de esta aplicación"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioridad"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Mostrar notificaciones en la parte superior de la lista y seguir recibiéndolas cuando el dispositivo esté configurado únicamente para interrupciones de prioridad"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Personal"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Cuando el dispositivo esté bloqueado, ocultar cualquier contenido personal de las notificaciones de esta aplicación"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratar como prioridad"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Permita que se escuchen las notificaciones de esta app cuando No molestar está configurado solo para Prioridad"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permitir dar un vistazo"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permita que esta aplicación enfatice ciertas notificaciones deslizándolas brevemente a la vista en la pantalla actual"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ocultar contenido confidencial"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Cuando el dispositivo está bloqueado, oculte el contenido de las notificaciones de esta aplicación que podría revelar información privada"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueadas"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridad"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Personal"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Listo"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Hasta que lo desactives"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupciones de prioridad"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Tiempo de inactividad"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Días"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ninguno"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Permitir interrupciones"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Solo prioridad"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ninguno"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatización"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activar automáticamente"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nombre de la regla"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Agregar regla"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Borrar regla"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"¿Quieres eliminar la regla \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Borrar"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de regla"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Desconocido"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurar regla"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Programar regla"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"No se encontró la regla."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Días"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ninguno"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Todos los días"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</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">"De <xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Llamadas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Llamadas y mensajes de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Cualquiera"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Solo contactos"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Solo contactos destacados"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Eventos y recordatorios"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Las alarmas son siempre interrupciones de prioridad."</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Emisores seleccionados"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repetir emisores"</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>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas las noches"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noches entre semana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> el día siguiente"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> o cualquier alarma anterior"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> el día siguiente o cualquier alarma anterior"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> el día siguiente"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interrupciones"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Al recibir llamadas o notificaciones"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"¿Cuándo quieres que te interrumpan?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"¿Por cuánto tiempo?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Interrumpir siempre"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"desactivadas, todas, todo"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Permitir solo interrupciones de prioridad"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Permitir solo las alarmas"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"No interrumpir"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidamente"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Cambiar a solo notificaciones de prioridad de forma indefinida"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Cambiar a solo notificaciones de prioridad durante <xliff:g id="DURATION">%1$d</xliff:g> minutos hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a solo notificaciones de prioridad durante un minuto hasta la hora <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Cambiar a solo notificaciones de prioridad durante <xliff:g id="DURATION">%1$d</xliff:g> horas hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a solo notificaciones de prioridad durante una hora hasta la hora <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Cambiar a solo alarmas de forma indefinida"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Cambiar a solo alarmas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a solo alarmas durante un minuto hasta la hora <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">Cambiar a solo alarmas durante <xliff:g id="DURATION">%1$d</xliff:g> horas hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a solo alarmas durante una hora hasta la hora <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Cambiar a no interrumpir de forma indefinida"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Cambiar a no interrumpir durante <xliff:g id="DURATION">%1$d</xliff:g> minutos hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a no interrumpir durante un minuto hasta la hora <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Cambiar a no interrumpir durante <xliff:g id="DURATION">%1$d</xliff:g> horas hasta la hora <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambiar a no interrumpir durante una hora hasta la hora <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"siempre"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
@@ -2512,4 +2627,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Información de IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Ranura <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Iniciar de manera predeterminada"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> usado en <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Vínculos del dominio"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Abrir las URL de dominio"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Permitir que la aplicación abra directamente las URL de dominio"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL de dominio admitidas"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Otras configuraciones predeterminadas"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> usado en <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"memoria interna"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"memoria externa"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Almacenamiento interno"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Almacenamiento externo"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Uso de datos de aplicación"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> desde el <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Almacenamiento utilizado"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Activadas"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloqueadas"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Confidenciales"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritarias"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritarias y confidenciales"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permisos otorgados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permiso otorgado</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> permisos de <xliff:g id="COUNT_3">%d</xliff:g> otorgados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permiso de <xliff:g id="COUNT_1">%d</xliff:g> otorgado</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Hay algunas configuraciones predeterminadas establecidas."</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"No hay configuraciones predeterminadas establecidas."</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Todas las aplicaciones"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Habilitadas"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Trabajo"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritarias"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidenciales"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL de dominio"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Inhabilitado por el administrador"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Elegir perfil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicaciones"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplic. con permiso de acceso adicional"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones permitidas"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL de dominio"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"No abre ninguna URL de dominio."</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Abre \"<xliff:g id="DOMAIN">%s</xliff:g>\"."</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Abre \"<xliff:g id="DOMAIN">%s</xliff:g>\" y URL relacionadas."</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicaciones pueden abrir sus URL de dominio.</item>
+      <item quantity="one">Una aplicación puede abrir sus URL de dominio.</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"No reconocido"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicaciones predeterminadas"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicación del navegador"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"No hay un navegador predeterminado."</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predeterminada)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Almacenamiento de aplicaciones"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 44d63c8..6b1ec90 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Botón WPS"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"silenciar/activar micrófono"</item>
     <item msgid="1148142988678569310">"proyectar contenido multimedia"</item>
     <item msgid="9130014005474445273">"activar VPN"</item>
+    <item msgid="1165192162975045562">"editar fondo de pantalla"</item>
+    <item msgid="7129487923652967258">"proporcionar asistencia a estructura"</item>
+    <item msgid="1069023208100114540">"proporcionar asistencia a captura de pantalla"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicación"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Silenciar/activar micrófono"</item>
     <item msgid="5906017727368097853">"Proyectar contenido multimedia"</item>
     <item msgid="2486614710846178542">"Activar VPN"</item>
+    <item msgid="5586547561693629602">"Editar fondo de pantalla"</item>
+    <item msgid="32794179825485062">"Proporcionar asistencia a estructura"</item>
+    <item msgid="7872852746938272552">"Proporcionar asistencia a captura de pantalla"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"bajo"</item>
     <item msgid="4212263919458209842">"crítico"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desactivado"</item>
-    <item msgid="5656544177755411222">"Interrupciones limitadas"</item>
-    <item msgid="8735337502532332056">"Sin interrupciones"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderado"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Rojo"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP"</item>
+    <item msgid="8856820259201251036">"PTP"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet USB)"</item>
+    <item msgid="2686051673589572111">"Fuente de audio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d098072..52e019f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Permitir"</string>
     <string name="deny" msgid="6947806159746484865">"Denegar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso de ser un desarrollador"</item>
-    <item quantity="other" msgid="6722953419953594148">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser un desarrollador"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Solo te quedan <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser un desarrollador.</item>
+      <item quantity="one">Solo te queda <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> paso de ser un desarrollador.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"¡Ahora están activadas las opciones de desarrollo!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, están activadas las opciones de desarrollo."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Conexiones inalámbricas y redes"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Desactivar SMS por IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Es necesario activar el registro de IMS."</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Es necesario desactivar el registro de IMS."</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Activar marca administrada de VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Desactivar marca administrada de VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Activar volcado RAM de LTE"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Desactivar volcado RAM de LTE"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ver libreta de direcciones de tarjeta SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emisiones"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Se inhabilitará&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;de&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;."</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sin teléfono)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sin audio multimedia)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectado (sin acceso a mensajes)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sin teléfono ni multimedia)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectada"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Estableciendo conexión…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Vinculando…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sin nombre"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Buscando"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No hay dispositivos Bluetooth cercanos."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar archivos recibidos"</string>
     <string name="device_picker" msgid="4978696506172252813">"Seleccionar dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Una aplicación quiere activar el Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Una aplicación quiere activar el Bluetooth en este dispositivo."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicación quiere hacer visible tu teléfono para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
@@ -230,7 +223,7 @@
     <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Número de teléfono:"</string>
     <string name="radio_info_band_mode_label" msgid="441469694142042022">"Seleccionar banda de señal móvil"</string>
     <string name="radio_info_network_type_label" msgid="3706382548257257987">"Tipo de red:"</string>
-    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Establecer tipo de red preferido:"</string>
+    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Establecer tipo de red preferida:"</string>
     <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Hacer ping a DirIP:"</string>
     <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Hacer ping a nombre de host (www.google.com):"</string>
     <string name="radio_info_http_client_test" msgid="5733604021077701555">"Prueba de cliente HTTP:"</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Tarjeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ajustes de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCELAR"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAR"</string>
     <string name="okay" msgid="1997666393121016642">"Aceptar"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SÍ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"BORRAR"</string>
+    <string name="forget" msgid="1400428660472591263">"Borrar"</string>
+    <string name="save" msgid="879993180139353333">"Guardar"</string>
+    <string name="done" msgid="6942539184162713160">"Listo"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ajustes"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ajustes"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Acceso a Ajustes"</string>
@@ -294,8 +285,8 @@
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permitir uso de datos en redes móviles"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permitir uso datos itinerancia"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerancia de datos"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Establecer conexión con servicios de datos en itinerancia"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Establecer conexión con servicios de datos en itinerancia"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Conectarse a servicios de datos en itinerancia"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Conectarse a servicios de datos en itinerancia"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Has perdido la conectividad de datos porque has dejado desactivada la itinerancia de datos de tu red doméstica."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activarla"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Al permitir la itinerancia de datos, es posible que te facturen cargos adicionales elevados."</string>
@@ -303,7 +294,7 @@
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Al permitir la itinerancia de datos, los costes de itinerancia que deberás asumir pueden ser significativos.\n\nEsta configuración afecta a todos los usuarios de este teléfono."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"¿Permitir itinerancia de datos?"</string>
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
-    <string name="sum_carrier_select" msgid="3616956422251879163">"Seleccionar un operador de red"</string>
+    <string name="sum_carrier_select" msgid="3616956422251879163">"Selecciona un operador de red"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Fecha y hora"</string>
     <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>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Mejorar el reconocimiento facial"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Reconocimiento facial"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Solicitar parpadeo al desbloquear"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automáticamente"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Tras <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> después de suspender"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> después de activar el modo de suspensión, salvo si <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> mantiene el dispositivo desbloqueado"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Huella digital"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Administrar huellas"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar huella para"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Añadir"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueo de pantalla"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> huellas digitales registradas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> huella digital registrada</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Configuración huella"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Si quieres utilizar tu huella digital para desbloquear la pantalla o confirmar compras, debes: \n\n✓ Configurar un método de bloqueo de pantalla alternativo \n\n✓ Añadir tu huella digital"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localiza el sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localiza el sensor de huellas digitales situado en la parte trasera del teléfono."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nombre"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Aceptar"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"¡Vamos a empezar!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Coloca el dedo en el sensor de huellas digitales y levántalo cuando notes una vibración."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"¡Genial! Ahora repítelo."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Coloca el mismo dedo en el sensor de huellas digitales y levántalo cuando notes una vibración."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Huella digital añadida"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando aparezca este icono, puedes usar tu huella digital para identificarte o autorizar una compra."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Añadir"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Siguiente"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Cifrado"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Cifrar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Cifrar teléfono"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conecta el cargador y vuelve a intentarlo."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Falta la contraseña o el PIN de la pantalla de bloqueo"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Debes establecer una contraseña o un PIN de la pantalla de bloqueo para poder iniciar el proceso de cifrado."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Tienes que dibujar tu patrón de desbloqueo para confirmar el cifrado del dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"¿Cifrar dispositivo?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"La operación de cifrado no se puede deshacer y, si la interrumpes, perderás datos. El cifrado tarda aproximadamente una hora y el tablet se reinicia varias veces durante este proceso."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"La operación de cifrado no se puede deshacer y, si la interrumpes, perderás datos. El cifrado puede tardar una hora o más y el teléfono se reinicia varias veces durante este proceso."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Deslizar"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Sin seguridad"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Desbloqueo facial"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Seguridad baja (experimental)"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patrón"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Seguridad media"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Seguridad media-alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Seguridad alta"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueo de pantalla actual"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Las funciones de protección del dispositivo ya no funcionarán."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivado por el administrador, política de cifrado o almacenamiento de credenciales"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueo facial"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patrón"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Contraseña"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Una vez que hayas configurado un bloqueo de pantalla, podrás configurar también la huella digital en Ajustes &gt; Seguridad."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar bloqueo pantalla"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar patrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar PIN de desbloqueo"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"La contraseña debe tener al menos una letra."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"La contraseña debe tener al menos un dígito."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"La contraseña debe tener al menos un símbolo."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"La contraseña debe tener al menos una letra."</item>
-    <item quantity="other" msgid="8186027808415585970">"La contraseña debe tener al menos %d letras."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"La contraseña debe tener al menos una letra minúscula."</item>
-    <item quantity="other" msgid="2693910942679679225">"La contraseña debe tener al menos %d letras minúsculas."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"La contraseña debe tener al menos una letra mayúscula."</item>
-    <item quantity="other" msgid="3030801209112209245">"La contraseña debe tener al menos %d letras mayúsculas."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"La contraseña debe tener al menos un dígito numérico."</item>
-    <item quantity="other" msgid="4703982391407595924">"La contraseña debe tener al menos %d dígitos numéricos."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"La contraseña debe tener al menos un símbolo especial."</item>
-    <item quantity="other" msgid="1221290525051187757">"La contraseña debe tener al menos %d símbolos especiales."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"La contraseña debe tener al menos un carácter no alfabético."</item>
-    <item quantity="other" msgid="3952508584649046404">"La contraseña debe tener al menos %d caracteres no alfabéticos."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">La contraseña debe tener al menos %d letras.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 letra.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">La contraseña debe tener al menos %d letras minúsculas.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 letra minúscula.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">La contraseña debe tener al menos %d letras mayúsculas.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 letra mayúscula.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">La contraseña debe tener al menos %d dígitos numéricos.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 dígito numérico.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">La contraseña debe tener al menos %d símbolos especiales.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 símbolo especial.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">La contraseña debe tener al menos %d caracteres no alfabéticos.</item>
+      <item quantity="one">La contraseña debe tener al menos 1 carácter no alfabético.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"El administrador de dispositivos no permite usar una contraseña reciente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"No se permiten una secuencia ascendente, descendente ni repetida de dígitos"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Para vincular con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Comprueba que se muestre la clave:&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">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;¿Vincular con este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Para vincular con:<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>Escribe<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> en el dispositivo y, a continuación, pulsa la tecla Intro o de retorno."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Vincular"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"VINCULAR"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"La vinculación permite acceder a tus contactos y al historial de llamadas cuando el dispositivo está conectado."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No se ha podido vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No se ha podido vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque la clave de acceso o el PIN son incorrectos."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"No se puede establecer comunicación con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Vinculación rechazada por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"No se ha podido establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Buscar dispositivos"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Actualizar"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Ajustes avanzados"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ajustes avanzados de Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Cuando se activa el Bluetooth, tu dispositivo puede comunicarse con otros dispositivos Bluetooh cercanos."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Para mejorar la precisión de la ubicación, las aplicaciones y los servicios buscarán dispositivos Bluetooth aunque la conexión Bluetooth esté desactivada. Puedes cambiar esta opción en los <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ajustes de búsqueda<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar con…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimedia"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio del teléfono"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferencia de archivos"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acceso a Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Compartir contactos"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Usar para compartir contactos"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartir conexión a Internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acceso a mensajes"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del perfil de audio A2DP."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio manos libres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del dispositivo de entrada."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Usar para"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Cambiar nombre"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permitir transferencias entrantes"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio del medio"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del teléfono"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado con el servidor de transferencia de archivos"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectado a mapa"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Sin conexión con el servidor de transferencia de archivos"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado a dispositivo de entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado para acceso a Internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Compartiendo conexión a Internet con el dispositivo"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para audio de medio"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para audio del teléfono"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Uso de la transferencia de archivos"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para entrada"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usar para acceder a Internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Usar para mapa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Ajustes de la base"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Uso de la base para audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz del teléfono"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y contenido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ajustes de recordatorio"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistente de Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado a través de asistente Wi‑Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Enviar pantalla"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Enviar"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No hay dispositivos cercanos."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Borrar"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Listo"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nombre"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir intercambio de datos cuando el tablet toque otro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el teléfono toque otro dispositivo"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Desactivando Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Modo avión"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"No se puede buscar redes."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificación de red disponible"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Recibir notificación si hay una red pública disponible"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Solo conexiones estables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Solo usar redes con buena conexión a Internet"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Buscar redes siempre"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permitir búsqueda siempre"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permitir que el servicio de ubicación de Google y otras aplicaciones busquen redes aunque la conexión Wi-Fi esté desactivada"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Usar redes Wi‑Fi abiertas automáticamente"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Dejar que un asistente de Wi‑Fi se conecte automáticamente a redes abiertas consideradas de buena calidad"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Elige un asistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mejorar la precisión de la ubicación y otros fines, Google y otras aplicaciones pueden buscar redes cercanas aunque la conexión Wi-Fi esté desactivada. Si no quieres que esto ocurra, accede a Ajustes avanzados &gt; Buscar redes siempre."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Las aplicaciones pueden buscar redes cercanas aunque la conexión Wi-Fi esté desactivada. Si no quieres que esto ocurra, accede a Ajustes avanzados &gt; Buscar redes siempre."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Para mejorar la precisión de la ubicación, las aplicaciones y los servicios buscarán redes Wi‑Fi aunque la conexión Wi‑Fi esté desactivada. Puedes cambiar esta opción en los <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ajustes de búsqueda<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No volver a mostrar"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Usar Wi-Fi en suspensión"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi activado en suspensión"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Añadir otra red"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Necesitas conexión Wi-Fi para completar la configuración. Una vez finalizada, podrás cambiar entre la conexión Wi-Fi y de datos."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Opciones avanzadas"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Configuración WPS"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando configuración WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Pulsa el botón de configuración WPS del router. Es posible que ponga \"WPS\" o que incluya este símbolo:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Pulsa el botón Configuración WPS del router. Es posible que se llame WPS o que esté identificado con este símbolo:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Introduce el código <xliff:g id="NUMBER">%1$s</xliff:g> en el router Wi‑Fi. El proceso de configuración puede tardar hasta dos minutos."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"La configuración WPS se ha iniciado correctamente. Estableciendo conexión con la red…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Conectado a la red Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidad anónima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Contraseña"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contraseña"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Configurar banda de AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Ajustes de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sin modificar)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(no especificado)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Guardado"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitado"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Error de configuración de IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Error de conexión Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Error de autenticación"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de rango"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"No se ha detectado acceso a Internet, no se volverá a conectar automáticamente."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce la contraseña de tu red"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"¿Iniciar sesión para conectar?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requiere que inicies sesión para conectarte."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Esta red no tiene acceso a Internet. ¿Quieres utilizarla de todos modos?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"No volver a preguntar por esta red"</string>
     <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">"Borrar"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Zona Wi-Fi portátil AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi-Fi portátil: <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_mode_title" msgid="2164073796253284289">"Preferencia de llamada"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de llamadas Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Preferir Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Preferir datos móviles"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Inicio"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizar el nivel de brillo según la luz disponible"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Claro"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Oscuro"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender después de"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla se apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"¿Actualizar tarjeta SIM preferida?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> es la única tarjeta SIM del dispositivo. ¿Quieres utilizar esta tarjeta SIM para datos móviles, llamadas y mensajes SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN de la tarjeta SIM incorrecto. Debes ponerte en contacto con tu operador para desbloquear el dispositivo."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Código PIN de la tarjeta SIM incorrecto. Queda <xliff:g id="NUMBER">%d</xliff:g> intento para tener que ponerte en contacto con tu operador para desbloquear el dispositivo."</item>
-    <item quantity="other" msgid="77103619544346451">"Código PIN de la tarjeta SIM incorrecto. Quedan <xliff:g id="NUMBER">%d</xliff:g> intentos."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Código PIN de la tarjeta SIM incorrecto. Te quedan <xliff:g id="NUMBER_1">%d</xliff:g> intentos.</item>
+      <item quantity="one">Código PIN de la tarjeta SIM incorrecto. Te queda <xliff:g id="NUMBER_0">%d</xliff:g> intento para tener que ponerte en contacto con tu operador para desbloquear el dispositivo.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Error al intentar desbloquear la tarjeta SIM con el código PIN"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado del tablet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Estado del teléfono"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (solo lectura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espacio total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicaciones (datos y multimedia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicaciones y datos de aplicaciones"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descargas"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imágenes, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tonos, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Varios"</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>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"La tarjeta SD se está desactivando."</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>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Activar"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Expulsar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Borrar y formatear"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Borrar/format. como alm. int."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión USB al ordenador"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conexión USB a ordenador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectar como"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Permitir transferir archivos multimedia en Windows o mediante la aplicación Android File Transfer en Mac (consulta la página www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Cámara (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Permitir transferir fotos con el software de la cámara y archivos a ordenadores que no admitan MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar herramientas de transferencia de archivos"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Permite a las aplicaciones compatibles con MIDI utilizar software de MIDI en tu ordenador por USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Otros usuarios"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Almacenamiento del dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Almacenamiento extraíble"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> libres (<xliff:g id="TOTAL">%2$s</xliff:g> en total)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> se ha activado"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Error al activar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> se ha expulsado de forma segura"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"No se ha podido expulsar <xliff:g id="NAME">%1$s</xliff:g> de forma segura"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> se ha formateado"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Error al formatear <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Cambiar nombre de almacenamiento"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Después de formatear la unidad, puedes utilizar tu <xliff:g id="NAME_0">^1</xliff:g> en otros dispositivos. \n\nTe recomendamos que hagas una copia de seguridad de los datos de tu <xliff:g id="NAME_1">^1</xliff:g>, ya que se borrarán cuando se formatee. \n\n"<b>"Copia de seguridad de fotos y de otro contenido multimedia"</b>" \nMueve tus archivos multimedia a otro espacio de almacenamiento del dispositivo o transfiérelos a un ordenador con un cable USB. \n\n"<b>"Copia de seguridad de aplicaciones"</b>" \nSe desinstalarán todas las aplicaciones almacenadas en tu <xliff:g id="NAME_6">^1</xliff:g> y se borrarán sus datos. Para conservarlas, muévelas a otro espacio de almacenamiento del dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Al extraer tu <xliff:g id="NAME_0">^1</xliff:g>, las aplicaciones almacenadas en esa unidad dejarán de funcionar y los archivos multimedia guardados en ella no estarán disponibles hasta que se vuelva a insertar."</b>" \n\nTu <xliff:g id="NAME_1">^1</xliff:g> se ha formateado para este dispositivo y no se puede utilizar en otros."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar tu <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizar como almacenamiento portátil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para mover fotos y otro contenido multimedia de un dispositivo a otro."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utilizar como almacenamiento interno"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para almacenar cualquier contenido (como aplicaciones y fotos) únicamente en este dispositivo. Se debe formatear la unidad para que no se pueda utilizar con otros dispositivos."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatear como almacen. interno"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Debes formatear tu <xliff:g id="NAME_0">^1</xliff:g> por seguridad. \n\nUna vez que se formatee, tu <xliff:g id="NAME_1">^1</xliff:g> solo funcionará en este dispositivo. \n\n"<b>"Al formatear tu <xliff:g id="NAME_2">^1</xliff:g>, se borrarán todos los datos que tenga almacenados."</b>" Te recomendamos que hagas una copia de seguridad de los datos para no perderlos."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Borrar y formatear"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formateando <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"No extraigas tu <xliff:g id="NAME">^1</xliff:g> mientras se esté formateando."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mover a nuevo almacenamiento"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Puedes mover tus fotos, tus archivos y los datos de tus aplicaciones a la nueva <xliff:g id="NAME">^1</xliff:g>. \n\nLa operación durará aproximadamente <xliff:g id="TIME">^2</xliff:g> y permitirá liberar <xliff:g id="SIZE">^3</xliff:g> de espacio de almacenamiento interno. Algunas aplicaciones no funcionarán hasta que finalice el proceso."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mover ahora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Mover más tarde"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Mover datos ahora"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"La migración durará aproximadamente <xliff:g id="TIME">^1</xliff:g> y permitirá liberar <xliff:g id="SIZE">^2</xliff:g> de espacio de almacenamiento interno."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Mover"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Moviendo datos…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Durante la migración: \n• No extraigas tu <xliff:g id="NAME">^1</xliff:g>. \n• Algunas aplicaciones no funcionarán correctamente. \n• Mantén cargado el dispositivo."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Tu <xliff:g id="NAME">^1</xliff:g> ya se puede utilizar"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Tu <xliff:g id="NAME">^1</xliff:g> se ha configurado para que se utilice con fotos y con otro contenido multimedia."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Tu nueva <xliff:g id="NAME">^1</xliff:g> está lista. \n\nPara mover fotos, archivos y datos de aplicaciones a este dispositivo, accede a Ajustes &gt; Almacenamiento."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"La migración de <xliff:g id="APP">^1</xliff:g> y de sus datos a tu <xliff:g id="NAME_0">^2</xliff:g> solo durará un momento. No podrás utilizar la aplicación hasta que finalice el proceso. \n\nNo extraigas tu <xliff:g id="NAME_1">^2</xliff:g> durante la migración."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Moviendo <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"No extraigas tu <xliff:g id="NAME">^1</xliff:g> durante la migración \n\nLa aplicación <xliff:g id="APP">^2</xliff:g> de este dispositivo no estará disponible hasta que finalice el proceso."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar migración"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de la batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando la configuración de APN predeterminada"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer configuración"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se ha restablecido la configuración predeterminada de APN."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Restablecimiento de ajustes de red"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Se restablecerá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>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"¿Quieres restablecer todos los ajustes de red? Esta acción no se puede deshacer."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restablecer ajustes"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"¿Restablecer?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Se han restablecido los ajustes de red"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Restablecer dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer datos de fábrica"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos del tablet."</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Borrar todos los datos del teléfono"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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 accedido a las cuentas que se indican a continuación:\n"</string>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos los datos de la tarjeta SD, como la música o las fotos."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer teléfono"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"¿Quieres borrar toda tu información personal y las aplicaciones descargadas? Esta acción no se puede deshacer."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"¿Quieres borrar toda tu información personal y todas las aplicaciones descargadas? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Debes dibujar un patrón de desbloqueo para confirmar que quieres restablecer los datos de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Este usuario no puede restablecer los datos de fábrica"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"¿Quieres borrar el almacenamiento USB y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"¿Quieres borrar la tarjeta SD y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Borrar todo"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar el almacenamiento USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar la tarjeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ajustes de llamadas"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar buzón, llamada en espera, desvío e identificador"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Anclaje por USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Redes móviles"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móvil"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicación de SMS predeterminada"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicación SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"¿Cambiar aplicación de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"¿Usar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como aplicación de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"¿Usar <xliff:g id="NEW_APP">%s</xliff:g> como aplicación de SMS?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de ubicación"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Determinar ubicación con GPS, Wi‑Fi y redes móviles"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Determinar ubicación con Wi‑Fi y redes móviles"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Determinar ubicación con GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Determinar ubicación con el GPS"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Buscando"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Buscando"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Búsqueda de redes Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Permitir que las aplicaciones y los servicios busquen redes Wi‑Fi aunque la conexión Wi‑Fi esté desactivada para mejorar la precisión de la ubicación"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Búsqueda de dispositivos Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Permitir que los servicios del sistema busquen dispositivos Bluetooth aunque la conexión Bluetooth esté desactivada para mejorar la precisión de la ubicación"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Ubicación de red móvil y Wi‑Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que las aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación más rápido. Se recopilarán datos de ubicación anónimos y se enviarán a Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
@@ -1127,7 +1172,7 @@
     <string name="regulatory_information" msgid="5695464367088752150">"Información regulatoria"</string>
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
-    <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
+    <string name="terms_title" msgid="7697580845616764642">"Condiciones de uso"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"Licencia de WebView del sistema"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fondos de pantalla"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Proveedores de imágenes de satélite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"La contraseña se ha establecido."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"El PIN se ha establecido."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"El patrón se ha establecido."</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Seguridad de la pantalla"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Para continuar, utiliza el patrón del dispositivo."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Para continuar, introduce el PIN del dispositivo."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Para continuar, introduce la contraseña del dispositivo."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Seguridad del dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambiar patrón desbloqueo"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirma el patrón guardado"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Inténtalo de nuevo"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Crea un patrón de desbloqueo"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pulsa la tecla de menú para obtener ayuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Levanta el dedo cuando termines"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Patrón de desbloqueo"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambiar patrón desbloqueo"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cómo crear un patrón de desbloqueo"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Se han realizado demasiados intentos incorrectos."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Espera <xliff:g id="NUMBER">%d</xliff:g> segundos y vuelve a intentarlo."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Demasiados intentos fallidos. Vuelve a intentarlo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"La aplicación no está instalada en el teléfono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Servicios en ejecución"</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 preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer preferencias?"</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 conexiones automáticas de aplicaciones,"</li>\n" "<li>"restricciones de permisos."</li>\n\n" No se perderán los datos de las aplicaciones."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Operaciones de la aplicación"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"En curso"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Sin utilizar)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Ninguna aplicación predeterminada"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso de almacenamiento"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ver almacenamiento usado por aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Información del tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Información sobre el teléfono"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Información sobre la batería"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Inicio rápido"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Establecer accesos rápidos del teclado para iniciar aplicaciones"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Asignar aplicación"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Sin acceso directo"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Buscar + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Borrar"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Se eliminará el acceso directo <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g><xliff:g id="APPLICATION_NAME">%2$s</xliff:g>."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Aceptar"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Cancelar"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplicaciones"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Accesos directos"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Introducción de texto"</string>
     <string name="input_method" msgid="5434026103176856164">"Introducción de texto"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Teclado actual"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth HCI en un archivo"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueo de OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir desbloquear el gestor de arranque"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introduce tu PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduce el PIN del dispositivo para habilitar el desbloqueo de OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"¿Permitir desbloqueo de OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVERTENCIA: Las funciones de protección no funcionarán en este dispositivo mientras esta opción esté activada."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Elegir tamaños Logger/búfer registro"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Habilitar inspección de atributos de vista"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Redes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificación de pantalla inalámbrica"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Habilitar registro Wi-Fi detallado"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transferencia total de Wi‑Fi a móvil"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Permitir siempre búsquedas de Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Usar cliente DHCP heredado"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opciones de certificación de pantalla inalámbrica"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumentar nivel registro sesión Wi-Fi, mostrar por SSID RSSI en selector Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Si está habilitada, la conexión Wi‑Fi será más agresiva al transferir conexión de datos al móvil (si la señal Wi‑Fi no es estable)"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Permitir/No permitir búsquedas de Wi-Fi basadas en la cantidad de tráfico de datos presente en la interfaz"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de Logger"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Elegir tamaños Logger/búfer registro"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Seleccionar configuración de USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Seleccionar configuración de USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Habilitar inspección de atributos de vista"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliza el cliente DHCP de Lollipop en lugar del nuevo cliente DHCP de Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"La depuración USB solo está indicada para actividades de desarrollo. Puedes utilizarla para intercambiar datos entre el ordenador y el dispositivo, para instalar aplicaciones en el dispositivo sin recibir notificaciones y para leer datos de registro."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"¿Quieres revocar el acceso a la depuración USB de todos los ordenadores que habías autorizado anteriormente?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Una aplicación está bloqueando una solicitud de permiso, por lo que Ajustes no puede verificar tu respuesta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Has activado un servicio de accesibilidad, por lo que el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Activar <xliff:g id="SERVICE">%1$s</xliff:g> afecta al cifrado de datos, por lo que debes confirmar tu patrón."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadísticas de procesos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estadísticas técnicas sobre procesos en ejecución"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplicaciones <xliff:g id="TYPE">%1$s</xliff:g> durante <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> de <xliff:g id="TOTALRAM">%2$s</xliff:g> usado en <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"En segundo plano"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"En primer plano"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"En caché"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Actualmente, la memoria del dispositivo es <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Uso medio de RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso máximo de RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Nativos"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kernel"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Zram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Almacenamientos en caché"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Uso de RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Uso de RAM (en segundo plano)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Duración"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Procesos"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servicios"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duración"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Detalles de la memoria"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 día"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ocultar procesos del sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Usar USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estadísticas"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"En segundo plano"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"La configuración predeterminada anula la de la aplicación."</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Ajustes predeterminados"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor predeterminado"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Establece el motor de síntesis de voz utilizado para el texto hablado."</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Establece el motor de síntesis de voz para que lo utilice el texto hablado"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Velocidad de la voz"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidad a la que se lee el texto"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tono"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Almacenado en hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Las credenciales no están disponibles para este usuario"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes dibujar tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Copiar mis datos"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Crear copia de seguridad de datos de aplicaciones, contraseñas Wi-Fi y otros ajustes en los servidores de Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Cuenta de copia de seguridad"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ninguna cuenta está almacenando datos con copia de seguridad en estos momentos."</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir datos de aplicaciones"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Cuando vuelvas a instalar una aplicación, restaurar la configuración y los datos incluidos en la copia"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"El servicio de copia de seguridad está inactivo."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Establecido por la política de tu dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contraseña para copias de ordenador"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Las copias de seguridad completas de ordenador no están protegidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocar para cambiar o eliminar la contraseña para las copias de seguridad completas de ordenador"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala de transición-animación"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala de duración de animador"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simular pantallas secundarias"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Modo multiventana"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Varias actividades en la pantalla al mismo tiempo."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"¿Habilitar modo multiventana?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ADVERTENCIA: Esta es una función experimental que permite realizar varias actividades en la pantalla al mismo tiempo a través de la interfaz de usuario de Aplicaciones recientes. Es posible que algunas aplicaciones se bloqueen o no funcionen correctamente cuando se utilicen con esta función."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicaciones"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Destruir actividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir actividades cuando el usuario deje de usarlas"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil limitado"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"¿Añadir nuevo usuario?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Puedes crear usuarios adicionales para compartir este dispositivo con otros usuarios. Cada usuario tiene su propio espacio y puede personalizarlo con sus aplicaciones, fondos de pantalla, etc. Los usuarios también pueden modificar opciones de configuración del dispositivo, como la conexión Wi‑Fi, que afectan a todos los usuarios.\n\nAl 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_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>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"¿Eliminar invitado?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Se eliminarán las aplicaciones y los datos de esta sesión."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Eliminar"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Permitir llamadas"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Permitir llamadas y SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Activar llamadas"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Activar llamadas y SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Eliminar usuario"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"¿Permitir llamadas?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"¿Activar llamadas?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"El historial de llamadas se compartirá con este usuario."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"¿Permitir llamadas y SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"El historial de SMS y de llamadas se compartirán con este usuario."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"¿Activar llamadas y SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"El historial de SMS y de llamadas se compartirán con este usuario."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ampliar ajustes de aplicación"</string>
@@ -2276,15 +2332,15 @@
     <string name="access_point_names" msgid="1381602020438634481">"Nombre de punto de acceso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo 4G LTE mejorado"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Usar datos LTE para mejorar la voz y las comunicaciones (recomendado)"</string>
-    <string name="preferred_network_type_title" msgid="3431041717309776341">"Tipo de red preferido"</string>
+    <string name="preferred_network_type_title" msgid="3431041717309776341">"Tipo de red preferida"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (recomendado)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"SIM de trabajo"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"Acceso a contenido y aplicaciones"</string>
     <string name="user_rename" msgid="8523499513614655279">"CAMBIAR NOMBRE"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Definir restricciones de aplicación"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Esta aplicación no se puede utilizar en perfiles restringidos"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Esta aplicación puede acceder a tus cuentas"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Esta aplicación puede acceder a tus cuentas. Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi y redes móviles"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permitir modificar los ajustes de Wi‑Fi y redes móviles"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2310,19 +2366,19 @@
     <string name="sim_cellular_data_unavailable" msgid="9018555543451203035">"Datos móviles no disponibles"</string>
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Toca para seleccionar una SIM de datos"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Usar siempre esta para llamadas"</string>
-    <string name="select_sim_for_data" msgid="2366081042162853044">"Seleccionar una SIM de datos"</string>
+    <string name="select_sim_for_data" msgid="2366081042162853044">"Selecciona una SIM de datos"</string>
     <string name="data_switch_started" msgid="2040761479817166311">"Cambiando SIM de datos. Este proceso puede tardar hasta un minuto..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Llamar con"</string>
-    <string name="sim_select_card" msgid="211285163525563293">"Seleccionar una tarjeta SIM"</string>
+    <string name="sim_select_card" msgid="211285163525563293">"Selecciona una tarjeta 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 vacía"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nombre de la SIM"</string>
     <string name="sim_name_hint" msgid="7038643345238968930">"Introduce el nombre de SIM"</string>
-    <string name="sim_editor_title" msgid="4034301817366627870">"Ranura de SIM %1$d"</string>
+    <string name="sim_editor_title" msgid="4034301817366627870">"Ranura de la SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operador"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
     <string name="sim_editor_color" msgid="2542605938562414355">"Color de la SIM"</string>
-    <string name="sim_card_select_title" msgid="6668492557519243456">"Seleccionar tarjeta SIM"</string>
+    <string name="sim_card_select_title" msgid="6668492557519243456">"Selecciona una tarjeta SIM"</string>
     <string name="color_orange" msgid="4417567658855022517">"Naranja"</string>
     <string name="color_purple" msgid="3888532466427762504">"Violeta"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"No se ha insertado ninguna tarjeta SIM"</string>
@@ -2339,7 +2395,7 @@
     <string name="sim_notification_summary" msgid="5024470200658902406">"Toca para configurar"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida para"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Preguntar siempre"</string>
-    <string name="sim_selection_required_pref" msgid="3446721423206414652">"Es necesario seleccionar una opción"</string>
+    <string name="sim_selection_required_pref" msgid="3446721423206414652">"Debes seleccionar una opción"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ajustes"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ajustes"</string>
     <string name="search_menu" msgid="7053532283559077164">"Buscar"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi, red, conexión"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensaje texto, mensajes texto, mensajes"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular, móvil, conexión inalámbrica, datos, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi llamada llamadas"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar, patalla, pantalla táctil, batería"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"atenuar, patalla, pantalla táctil, batería"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano, personalizar, customizar, pantalla"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tema oscuro, modo nocturno, atenuar pantalla, invertir brillo"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"segundo plano, personalizar pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño del texto"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyecto"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"proyectar, enviar"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espacio, disco, disco duro, dispositivo, uso"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"carga, consumo, energía"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografía, diccionarios, corrector ortográfico, corrección automática"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"cuenta"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restricción, restringir, restringido"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"corrección texto, corregir, sonido, vibración automática, idioma, gesto, sugerencia, tema, palabra ofensiva, escribir, emoji, internacional"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"restablecer preferencias predeterminadas"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"aplicación predeterminada en caso de emergencia"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplicación, descargar, aplicaciones, sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"seguridad de permisos de aplicaciones"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplicaciones predeterminadas"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar, contraseña, patrón, pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Editar"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volumen de alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volumen del tono"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumen de notificaciones"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupciones"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Al recibir llamadas o notificaciones"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Interrumpir siempre"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permitir solo interrupciones de prioridad"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"No interrumpir"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permitir solo con prioridad"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas automáticas"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Solo prioritarias"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo alarmas"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Sin interrupciones"</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="ringtone_title" msgid="5379026328015343686">"Tono del teléfono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Tono de notificación predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar también en llamadas"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificaciones"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Las aplicaciones no pueden leer notificaciones"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplicación puede leer notificaciones."</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplicaciones pueden leer notificaciones."</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d aplicaciones pueden leer notificaciones</item>
+      <item quantity="one">%d aplicación puede leer notificaciones</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"No hay detectores de notificaciones instalados."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"¿Quieres habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrá leer todas las notificaciones que el sistema o cualquier aplicación instalada publique. Estas notificaciones pueden incluir información personal, como nombres de contactos y texto de mensajes que hayas recibido. También podrás ignorar estas notificaciones o tocar botones de acción."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveedores de condiciones"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ninguna aplicación proporciona condiciones"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"La aplicación %d proporciona condiciones"</item>
-    <item quantity="other" msgid="358057362115673258">"Las aplicaciones %d proporcionan condiciones"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No se ha instalado ningún proveedor de condiciones."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"¿Quieres habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> podrá añadir condiciones de salida al modo No molestar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Bloquear"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostrar nunca notificaciones de esta aplicación"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioridad"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Mostrar notificaciones en la parte superior de la lista y seguir recibiéndolas cuando el dispositivo esté configurado únicamente para interrupciones de prioridad"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensible"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Cuando el dispositivo esté bloqueado, ocultar contenido de carácter sensible en las notificaciones de esta aplicación"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratar como prioritaria"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Permitir que se escuchen las notificaciones de esta aplicación cuando la opción Solo prioritarias del modo No molestar esté activada"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permitir vista"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permitir que esta aplicación destaque algunas notificaciones deslizándolas para que aparezcan en la pantalla actual"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ocultar contenido confidencial"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Cuando el dispositivo esté bloqueado, ocultar el contenido de las notificaciones de esta aplicación que pueda revelar información privada"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueada"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridad"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Listo"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Hasta apagar el dispositivo"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupciones de prioridad"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Tiempo de inactividad"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Días"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ninguno"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interrupciones permitidas"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Solo prioridad"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ninguno"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automático"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activar automáticamente"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nombre de la regla"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Añadir regla"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Eliminar regla"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"¿Quieres eliminar la regla \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Eliminar"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de regla"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Desconocida"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurar regla"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Regla de programación"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"No se ha encontrado esa regla."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Días"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ninguno"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Todos los días"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</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">"De <xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Llamadas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Llamadas y mensajes de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Todo el mundo"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Solo contactos"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Solo contactos destacados"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Eventos y recordatorios"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Las alarmas son siempre interrupciones de prioridad"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Llamadas seleccionadas"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Llamadas repetidas"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Permitir llamada que proceda de la misma persona si no han pasado más de <xliff:g id="MINUTES">%d</xliff:g> 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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noches entre semana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Día siguiente a las <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> o cualquier alarma antes de"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Día siguiente a las <xliff:g id="FORMATTED_TIME">%s</xliff:g> o cualquier alarma antes de"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Día siguiente a las <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interrupciones"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Al recibir llamadas o notificaciones"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"¿Cuándo quieres que se te interrumpa?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"¿Durante cuánto tiempo?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Interrumpir siempre"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"desactivadas, todas"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Permitir solo interrupciones de prioridad"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Permitir solo alarmas"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"No interrumpir"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidamente"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Cambiar para ver solo notificaciones prioritarias de forma indefinida"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Cambiar para ver solo notificaciones prioritarias durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar para ver solo notificaciones prioritarias durante un minuto (hasta las <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Cambiar para ver solo notificaciones prioritarias durante <xliff:g id="DURATION">%1$d</xliff:g> horas (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar para ver solo notificaciones prioritarias durante una hora (hasta las <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Cambiar para ver solo alarmas de forma indefinida"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Cambiar para ver solo alarmas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar para ver solo alarmas durante un minuto (hasta las <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">Cambiar para ver solo alarmas durante <xliff:g id="DURATION">%1$d</xliff:g> horas (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar para ver solo alarmas durante una hora (hasta las <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Cambiar a no interrumpir de forma indefinida"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Cambiar a no interrumpir durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar a no interrumpir durante un minuto (hasta las <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Cambiar a no interrumpir durante <xliff:g id="DURATION">%1$d</xliff:g> horas (hasta las <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambiar a no interrumpir durante una hora (hasta las <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"siempre"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Dar tu opinión sobre el dispositivo"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Información del IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con el IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(N.º <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Abrir de forma predeterminada"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> utilizados en <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Enlaces de dominio"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Abrir URLs de dominio"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Permitir que la aplicación abra directamente URLs de dominio"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL de dominio admitidas"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Otras aplicaciones predeterminadas"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> utilizados en <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"memoria interna"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"memoria externa"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Almacenamiento interno"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Almacenamiento externo"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Uso de datos de aplicación"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> de uso desde <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Almacenamiento utilizado"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Activadas"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloquear"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensible"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioridad"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioridad y sensible"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permisos concedidos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permiso concedido</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> permisos concedidos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> permiso concedido</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Se han establecido algunos valores predeterminados"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"No se han establecido valores predeterminados"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Todas las aplicaciones"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Habilitadas"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Trabajo"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioridad"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensible"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URLs de dominio"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Inhabilitado por el administrador"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Opciones avanzadas"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicaciones"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Más acceso permitido a <xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones permitidas"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URLs de dominio"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"No abrir ninguna URL de dominio"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Abrir <xliff:g id="DOMAIN">%s</xliff:g>"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Abrir <xliff:g id="DOMAIN">%s</xliff:g> y URL relacionadas"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicaciones pueden abrir sus URL de dominio</item>
+      <item quantity="one">Una aplicación puede abrir sus URL de dominio</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"No reconocido"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicaciones predeterminadas"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicación Navegador"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Sin navegador predeterminado"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predeterminada)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Almacenamiento de aplicaciones"</string>
 </resources>
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et-rEE/arrays.xml
index b9adad2..b3139b7 100644
--- a/res/values-et-rEE/arrays.xml
+++ b/res/values-et-rEE/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Vajutusnupp"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"mikrofoni vaigistamine või vaigistuse tühistamine"</item>
     <item msgid="1148142988678569310">"meediumi projitseerimine"</item>
     <item msgid="9130014005474445273">"VPN-i aktiveerimine"</item>
+    <item msgid="1165192162975045562">"taustapilt kirjutamiseks"</item>
+    <item msgid="7129487923652967258">"abistruktuur"</item>
+    <item msgid="1069023208100114540">"abistav ekraanipilt"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Asukoht"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Mikrofoni vaigistamine või vaigistuse tühistamine"</item>
     <item msgid="5906017727368097853">"Meediumi projitseerimine"</item>
     <item msgid="2486614710846178542">"VPN-i aktiveerimine"</item>
+    <item msgid="5586547561693629602">"Taustapilt kirjutamiseks"</item>
+    <item msgid="32794179825485062">"Abistruktuur"</item>
+    <item msgid="7872852746938272552">"Abistav ekraanipilt"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lühike"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"madal"</item>
     <item msgid="4212263919458209842">"kriitiline"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Väljas"</item>
-    <item msgid="5656544177755411222">"Piiratud katkestustega"</item>
-    <item msgid="8735337502532332056">"Katkestusteta"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Tavaline"</item>
     <item msgid="866544120205026771">"Mõõdukas"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Roosa"</item>
     <item msgid="6131821495505931173">"Punane"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Heliallikas"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 721364b..4191cd6 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Luba"</string>
     <string name="deny" msgid="6947806159746484865">"Keela"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tundmatu"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> sammu veel ja olete arendaja."</item>
-    <item quantity="other" msgid="6722953419953594148">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> sammu veel ja olete arendaja."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Olete nüüd <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> sammu kaugusel arendajastaatusest.</item>
+      <item quantity="one">Olete nüüd <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> sammu kaugusel arendajastaatusest.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Olete nüüd arendaja!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ei ole vaja, olete juba arendaja."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Traadita ühendus ja võrgud"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Lülitage SMS üle IMS-i välja"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Lülitage vajalik IMS-i registreerimine sisse"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Lülitage vajalik IMS-i registreerimine välja"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE märgendi ettevalmistatud sisselülitamine"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE märgendi ettevalmistatud väljalülitamine"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Lülita LTE mälutõmmis sisse"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Lülita LTE mälutõmmis välja"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Kuva SIM-i aadressiraamat"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Edastamine"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Kas profiil keelata?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"See keelab:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;seadmest:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Ühendatud"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ühendatud (telefoni pole)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ühendatud (meediat pole)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Ühendatud (sõnumita juurdepääs)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ühendatud (pole telefoni ega meediat)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ühendus katkestatud"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Ühenduse katkestamine ..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Ühendamine ..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Sidumine ..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Nimetu Bluetooth-seade"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Otsimine"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Läheduses ei leitud Bluetooth-seadmeid."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näita vastuvõetud faile"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth-seadme valimine"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetoothi loa taotlus"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Rakendus soovib Bluetoothi sisse lülitada."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Rakendus tahab selles seadmes Bluetoothi SISSE lülitada."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Rakendus soovib muuta <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks teie tahvelarvuti teistele Bluetoothi seadmetele nähtavaks."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Rakendus soovib muuta <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks teie telefoni teistele Bluetoothi seadmetele nähtavaks."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Rakendus soovib muuta tahvelarvuti nähtavaks teistele Bluetoothi seadmetele. Saate seda hiljem muuta Bluetoothi seadetes."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kaart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Puhverserveri seaded"</string>
     <string name="cancel" msgid="6859253417269739139">"Tühista"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"TÜHISTA"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"JÄTKA"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JAH"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"EI"</string>
-    <string name="forget" msgid="7267115980248732932">"UNUSTA"</string>
+    <string name="forget" msgid="1400428660472591263">"Unusta"</string>
+    <string name="save" msgid="879993180139353333">"Salvesta"</string>
+    <string name="done" msgid="6942539184162713160">"Valmis"</string>
     <string name="settings_label" msgid="1626402585530130914">"Seaded"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Seaded"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Seadete otsetee"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sordi ajavööndi alusel"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Kuupäev"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Kellaaeg"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Paranda näosobitust"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Elavuse kontroll"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Avamiseks on nõutav silma pilgutamine"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Lukusta automaatselt"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pärast unerežiimi"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pärast unerežiimile lülitumist, välja arvatud siis, kui <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> hoiab seadet avatuna"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Määrake Minu asukoht, ekraani avamine, SIM-kaardi lukk, mandaadi talletuslukk"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Määrake oma asukoht, ekraani avamine, mandaadi talletuslukk"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Paroolid"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sõrmejälg"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Sõrmejälgede haldamine"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sõrmej. kasutatakse:"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Lisa"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ekraanilukk"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other">Registreeriti <xliff:g id="COUNT_1">%1$d</xliff:g> sõrmejälge</item>
+      <item quantity="one">Registreeriti <xliff:g id="COUNT_0">%1$d</xliff:g> sõrmejälg</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Sõrmejälje seadistus"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Kui soovite ekraani avamiseks või ostude kinnitamiseks kasutada sõrmejälge, peame tegema järgmist. \n\n✓ Seadistama teie ekraaniluku varumeetodi. \n\n✓ Lisama teie sõrmejälje."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Leidke andur"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Leidke telefoni tagaküljel olev sõrmejäljeandur."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nimi"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Kustuta"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Alustame!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Asetage sõrm sõrmejäljeandurile. Tõstke see üles, kui tunnete vibreerimist."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Hästi! Nüüd korrake."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Asetage sama sõrm sõrmejäljeandurile ja tõstke see üles, kui tunnete vibreerimist."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Sõrmejälg lisati."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alati kui seda ikooni näete, saate tuvastamiseks või ostu volitamiseks kasutada oma sõrmejälge."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Lisa"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Järgmine"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Krüpteerimine"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tahvelarvuti krüpteerimine"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoni krüpteerimine"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Ühendage laadija ja proovige uuesti."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekraaniluku PIN-koodi või parooli ei ole"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Enne krüpteerimist peate määrama lukustusekraani PIN-koodi või parooli."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Seadme krüpteerimise kinnitamiseks tuleb teil joonistada luku avamismuster."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Kas krüpteerida?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krüpteerimistoiming on pöördumatu ja katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, mille jooksul tahvelarvuti taaskäivitub mitu korda."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Krüpteerimistoiming on pöördumatu ja selle katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, selle aja jooksul taaskäivitub telefon mitu korda."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Pühkimine"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Turvamata"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Madal turvalisus, katseline"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Muster"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Keskmine turvalisus"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-kood"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keskmine kuni kõrge turvalisus"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parool"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Kõrge turvalisus"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Praegune ekraanilukk"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Seadme kaitsefunktsioonid lakkavad toimimast."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Keelanud admin., krüptimiseeskiri või mand. mälu"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Puudub"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pühkimine"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Muster"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-kood"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parool"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Kui olete ekraaniluku seadistanud, saate menüüs Seaded &gt; Turvalisus seadistada ka oma sõrmejälje."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Lülita ekraanilukk välja"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eemalda avamismuster"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eemalda avamise PIN-kood"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Parool peab sisaldama vähemalt üht tähte."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Parool peab sisaldama vähemalt üht numbrit."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Parool peab sisaldama vähemalt üht sümbolit."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Parool peab sisaldama vähemalt üht tähte."</item>
-    <item quantity="other" msgid="8186027808415585970">"Parool peab sisaldama vähemalt %d tähte."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Parool peab sisaldama vähemalt üht väiketähte."</item>
-    <item quantity="other" msgid="2693910942679679225">"Parool peab sisaldama vähemalt %d väiketähte."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Parool peab sisaldama vähemalt üht suurtähte."</item>
-    <item quantity="other" msgid="3030801209112209245">"Parool peab sisaldama vähemalt %d suurtähte."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Parool peab sisaldama vähemalt üht numbrit."</item>
-    <item quantity="other" msgid="4703982391407595924">"Parool peab sisaldama vähemalt %d numbrit."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Parool peab sisaldama vähemalt üht erisümbolit."</item>
-    <item quantity="other" msgid="1221290525051187757">"Parool peab sisaldama vähemalt %d erisümbolit."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Parool peab sisaldama vähemalt üht mittetähelist märki."</item>
-    <item quantity="other" msgid="3952508584649046404">"Parool peab sisaldama vähemalt %d mittetähelist märki."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Parool peab sisaldama vähemalt %d tähte.</item>
+      <item quantity="one">Parool peab sisaldama vähemalt üht tähte.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Parool peab sisaldama vähemalt %d väiketähte.</item>
+      <item quantity="one">Parool peab sisaldama vähemalt üht väiketähte.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Parool peab sisaldama vähemalt %d suurtähte.</item>
+      <item quantity="one">Parool peab sisaldama vähemalt üht suurtähte.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Parool peab sisaldama vähemalt %d numbrit.</item>
+      <item quantity="one">Parool peab sisaldama vähemalt üht numbrit.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Parool peab sisaldama vähemalt %d erisümbolit.</item>
+      <item quantity="one">Parool peab sisaldama vähemalt üht erisümbolit.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Parool peab sisaldama vähemalt %d mittetähelist märki.</item>
+      <item quantity="one">Parool peab sisaldama vähemalt üht mittetähelist märki.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Seadme administraator ei luba viimast parooli kasutada."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Kasvavad, kahanevad või korduvad numbrijadad on keelatud"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Sidumine seadmega&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Veenduge, et see kuvaks järgmist parooli:&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">"Seadmelt: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Kas siduda seadmega?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Siduda seadmega:<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>Sisestage:<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>, seejärel vajutage naasmis- või sisestusklahvi."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Seo"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SEO"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Tühista"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Sidumine annab ühenduse ajal juurdepääsu kontaktidele ja kõneajaloole."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Ei saanud seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> siduda."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Ei saanud seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> siduda vale PIN-koodi või parooli tõttu."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei saa sidet luua."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> hülgas sidumise."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei saanud ühendust."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Otsi seadmeid"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Värskenda"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Täpsemad"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Täpsemad Bluetoothi seaded"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kui Bluetooth on sisse lülitatud, saab seade suhelda teiste lähikonna Bluetooth-seadmetega."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Asukoha täpsuse parandamiseks skannivad rakendused ja teenused Bluetoothi seadmeid, isegi kui Bluetooth on välja lülitatud. Saate seda muuta <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>skannimisseadetes<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Ühendamine ..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Meedia heli"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefoni heli"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Failiedastus"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Sisendseade"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetti juurdepääs"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontakti jagamine"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Kasutamine kontaktide jagamiseks"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneti-ühenduse jagamine"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Juurdepääs sõnumile"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühendus meediumiheliga katkestatakse."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühendus vabakäeseadme heliga katkestatakse."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühendus sisendseadmega katkestatakse."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Kasutus:"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Nimeta ümber"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Luba sissetul. failiedastused"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ühendatud meediumiheliga"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ühendatud telefoniheliga"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ühendatud failiedastuse serveriga"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Ühendatud kaardiga"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ei ole failiedastuse serveriga ühendatud"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ühendatud sisendseade"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ühendatud seadmega Internetti juurdepääsuks"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Kohaliku Interneti-ühenduse jagamine seadmega"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Kasuta meediumiheli jaoks"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Kasuta telefoniheli jaoks"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Kasutage failide edastamiseks"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Kasutage sisendi jaoks"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Interneti-juurdepääsuks kasutamine"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Kasuta kaardi jaoks"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Doki seaded"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Kasutage heli jaoks dokki"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kõlartelefonina"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muusika ja meediumi jaoks"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Jäta seaded meelde"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"WiFi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Ühendatud WiFi-abi kaudu"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast-ekraan"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Ülekandmine"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Luba juhtmeta ekraaniühendus"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Läheduses seadmeid ei leitud."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Ühendamine"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Unusta"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Valmis"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nimi"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Lubab andmete vahetust, kui tahvelarvuti puudutab teist seadet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lubab andmete vahetust, kui telefon puudutab teist seadet"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"WiFi väljalülitamine ..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Viga"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Lennurežiimis"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Võrke ei saa kontrollida"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Võrguteatis"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Teavita, kui avalik võrk on saadaval"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Väldi halbu ühendusi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Ära kasuta WiFi-võrku, kui selle Interneti-ühendus on halb"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Kasuta ainult võrke, millel on hea Interneti-ühendus"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skannimine on alati saadaval"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Luba alati skannimine"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Lubab Google\'i asukohateenusel ja muudel rakendustel võrke skannida ka juhul, kui WiFi on välja lülitatud"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Kasuta avatud WiFi-t automaatselt"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Lase WiFi-abil automaatselt ühenduda kvaliteetsetesse avatud võrkudesse"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Abi valimine"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikaatide installimine"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Asukoha täpsuse parandamiseks ning muudel eesmärkidel võivad Google ja teised rakendused otsida läheduses olevaid võrke ka siis, kui WiFi on väljas. Kui te seda ei soovi, tehke valikud Täpsem &gt; Otsimine alati saadaval."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Rakendused võivad otsida läheduses olevaid võrke ka siis, kui WiFi on väljas. Kui te seda ei soovi, tehke valikud Täpsem &gt; Otsimine alati saadaval."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Asukoha täpsuse parandamiseks skannivad rakendused ja teenused WiFi-võrke, isegi kui WiFi on välja lülitatud. Saate seda muuta <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>skannimisseadetes<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ära kuva uuesti"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hoia WiFi unerežiimis sees"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"WiFi on unerež. sisselülitatud"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Veel ühe võrgu lisamine"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Rohkem"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaatseadistus (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Seadistuse lõpetamiseks vajab teie tahvelarvuti WiFi-ühendust. Pärast seadistust saate lülituda ümber mobiilse andmeside ja WiFi vahel."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Täpsemad valikud"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Kaitstud WiFi seadistamine"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS-i käivitamine …"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Vajutage ruuteril nuppu Seadista kaitstud Wi‑Fi. Selle nimi võib olla ka „WPS” või see võib sisaldada sümbolit:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Vajutage marsruuteril nuppu WiFi kaitstud seadistamine. Selle nimi võib olla ka „WPS” või see võib olla märgitud sellise sümboliga:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Sisestage WiFi-ruuteril PIN-kood <xliff:g id="NUMBER">%1$s</xliff:g>. Seadistuse lõpuleviimiseks võib kuluda kuni kaks minutit."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS õnnestus. Võrguga ühenduse loomine …"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Ühendus on loodud WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonüümne identiteet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Parool"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Kuva parool"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"AP-riba seadistamine"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GHz riba"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz riba"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-seaded"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(muutmata)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(määramata)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Salvestatud"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Keelatud"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP seadistamise ebaõnnestumine"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi-ühenduse viga"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentimise probleem"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Pole vahemikus"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Interneti-ühendust ei tuvastatud, seadet ei ühendata automaatselt."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS on saadaval"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS on saadaval"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Sisestage võrgu parool"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Puudub"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Kas logida sisse, et ühendada?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> nõuab, et peate enne võrguga ühendamist veebis sisse logima."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ÜHENDA"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Sellel võrgul puudub juurdepääs Internetile. Kas soovite siiski seda võrku kasutada?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ära selle võrgu puhul uuesti küsi"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK kaasask. WiFi-leviala"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> kaasaskantav WiFi-tugijaam"</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_mode_title" msgid="2164073796253284289">"Kõne-eelistus"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"WiFi-kõnerežiim"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"WiFi eelistusega"</item>
+    <item msgid="5267397515594230396">"Mobiilside eelistusega"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Avaekraan"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Kuva"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Heli"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Reguleeri ekraani heledust"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kohanduv heledus"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Heleduse optimeerimine valgustingimuste järgi"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Teema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Hele"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Tume"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automaatne"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Unerežiim"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekraan lülitub välja"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Kas värskendada SIM-kaarti?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> on seadme ainus SIM-kaart. Kas soovite kasutada seda SIM-kaarti mobiilse andmeside, kõnede ja SMS-sõnumite jaoks?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Vale SIM-i PIN-kood, seadme avamiseks peate nüüd ühendust võtma oma operaatoriga."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Vale SIM-i PIN-kood, teil on jäänud veel <xliff:g id="NUMBER">%d</xliff:g> katse, enne kui peate seadme avamiseks operaatoriga ühendust võtma."</item>
-    <item quantity="other" msgid="77103619544346451">"Vale SIM-i PIN-kood, teil on jäänud veel <xliff:g id="NUMBER">%d</xliff:g> katset."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Vale SIM-kaardi PIN-kood, teil on jäänud veel <xliff:g id="NUMBER_1">%d</xliff:g> katset.</item>
+      <item quantity="one">Vale SIM-kaardi PIN-kood, jäänud on <xliff:g id="NUMBER_0">%d</xliff:g> katse enne, kui peate seadme avam. operaatoriga ühendust võtma.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM-i PIN-koodi toiming ebaõnnestus."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tahvelarvuti olek"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefoni olek"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Saadaval (kirjutuskaitstud)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Kogu ruum"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Arvutamine ..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Rakendused (rakenduse andmed ja meediasisu)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Rakendused ja rakenduste andmed"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Meedium"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Allalaadimised"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Pildid, videod"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Heli (muusika, helinad, Interneti-saated jne)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Muu"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Muud failid"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Vahemälus olevad andmed"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Lahuta jagatud mälu"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Lahutage SD-kaart"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Eemaldamine pooleli"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Talletusruum saab täis"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Mõned süsteemifunktsioonid, nt sünkroonimine, ei pruugi õigesti toimida. Proovige vabastada ruumi, kustutades üksusi, nt rakendusi või meediasisu, või eemaldades neid."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Ümbernimetamine"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Ühendamine"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Eemaldamine"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Kustutamine ja vormindamine"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Kustut. ja vormind. sisem. salvestusr."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-arvutiühendus"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-arvutiühendus"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Ühenda kui"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Võimaldab teisaldada meediafaile Windowsis või rakendusega Android File Transfer Macis (vt www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kaamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Võimaldab edastada fotosid kaamera tarkvara abil ja edastada mis tahes faile arvutitest, mis ei toeta MTP-d."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installi faili teisaldamise tööriistad"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Võimaldab MIDI toega rakendustel teie arvutis oleva MIDI-tarkvara abil töötada USB kaudu."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Teised kasutajad"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Seadme salvestusruum"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Irdmälu"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> on vaba (kokku <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Üksus <xliff:g id="NAME">%1$s</xliff:g> ühendati"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Üksust <xliff:g id="NAME">%1$s</xliff:g> ei saanud ühendada"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Üksus <xliff:g id="NAME">%1$s</xliff:g> eemaldati ohutult"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Üksust <xliff:g id="NAME">%1$s</xliff:g> ei saanud ohutult eemaldada"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Üksus <xliff:g id="NAME">%1$s</xliff:g> vormindati"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Üksust <xliff:g id="NAME">%1$s</xliff:g> ei saanud vormindada"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Salvestusruumi ümbernimetamine"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Pärast vormindamist saate üksust <xliff:g id="NAME_0">^1</xliff:g> kasutada teistes seadmetes. \n\nKõik üksuses <xliff:g id="NAME_1">^1</xliff:g> olevad andmed kustutatakse. Kaaluge esmalt nende varundamist. \n\n"<b>"Fotode ja muu meedia varundamine"</b>" \nTeisaldage oma meediafailid selle seadme teise salvestusruumi või kandke need USB-kaabli abil üle arvutisse. \n\n"<b>"Rakenduste varundamine"</b>" \nKõik üksusesse <xliff:g id="NAME_6">^1</xliff:g> salvestatud rakendused desinstallitakse ja nende andmed kustutatakse. Nende rakenduste säilitamiseks teisaldage need selle seadme teise salvestusruumi."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kui üksuse <xliff:g id="NAME_0">^1</xliff:g> eemaldate, lõpetavad sellesse salvestatud rakendused töö ja selles olevad meediafailid pole saadaval, kuni selle uuesti sisestate."</b>" \n\nÜksus <xliff:g id="NAME_1">^1</xliff:g> on vormindatud ainult selles seadmes töötamiseks. See ei tööta teistes seadmetes."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Seadista üksus <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Kasuta kaasaskantava salvestusruumina"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Fotode ja muu meedia teisaldamiseks seadmete vahel."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Kasuta sisemise salvestusruumina"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Üksuste (sh rakendused ja fotod) ainult sellesse seadmesse salvestamiseks. Vajalik on vormindamine, mis takistab selle töötamist teistes seadmetes."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Vorminda sisem. salvestusruumina"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Üksuse <xliff:g id="NAME_0">^1</xliff:g> turvaliseks muutmiseks tuleb see vormindada. \n\nPärast vormindamist töötab üksus <xliff:g id="NAME_1">^1</xliff:g> ainult selles seadmes. \n\n"<b>"Vormindamisel kustutatakse kõik praegu üksusesse <xliff:g id="NAME_2">^1</xliff:g> salvestatud andmed."</b>" Andmete kaotamise vältimiseks kaaluge nende varundamist."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Kustuta ja vorminda"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Üksuse <xliff:g id="NAME">^1</xliff:g> vormindamine …"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ärge eemaldage üksust <xliff:g id="NAME">^1</xliff:g> vormindamise ajal."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Teis. andmed uude salvestusruumi"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Saate fotod, failid ja rakenduste andmed teisaldada uude üksusesse <xliff:g id="NAME">^1</xliff:g>. \n\nTeisaldamine võtab umbes <xliff:g id="TIME">^2</xliff:g> ja vabastab sisemises salvestusruumis <xliff:g id="SIZE">^3</xliff:g>. Selle toimingu ajal mõned rakendused ei tööta."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Teisalda kohe"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Teisalda hiljem"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Teisalda andmed kohe"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Teisaldamine võtab umbes <xliff:g id="TIME">^1</xliff:g>. See vabastab sisemises salvestusruumis <xliff:g id="SIZE">^2</xliff:g>."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Teisalda"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Andmete teisaldamine …"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Teisaldamise ajal: \n• ärge eemaldage üksust <xliff:g id="NAME">^1</xliff:g>; \n• ei tööta mõned rakendused korralikult; \n• hoidke seadet laetuna."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Üksus <xliff:g id="NAME">^1</xliff:g> on valmis"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Üksus <xliff:g id="NAME">^1</xliff:g> on valmis fotode ja muu meediaga kasutamiseks."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Uus üksus <xliff:g id="NAME">^1</xliff:g> töötab. \n\nFotode, failide ja rakenduse andmete teisaldamiseks seadmesse avage menüü Seaded &gt; Salvestusruum."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Teisalda rakendus <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Rakenduse <xliff:g id="APP">^1</xliff:g> ja selle andmete teisaldamine üksusesse <xliff:g id="NAME_0">^2</xliff:g> võtab vaid mõne hetke. Te ei saa rakendust kasutada enne, kui teisaldamine on lõpetatud. \n\nTeisaldamise ajal ärge eemaldage üksust <xliff:g id="NAME_1">^2</xliff:g>."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Rakenduse <xliff:g id="APP">^1</xliff:g> teisaldamine …"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ärge eemaldage teisaldamise ajal üksust <xliff:g id="NAME">^1</xliff:g>. \n\nRakendus <xliff:g id="APP">^2</xliff:g> pole seadmes saadaval enne, kui teisaldamine on lõpetatud."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Tühista teisaldamine"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Aku olek"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Aku tase"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Pääsupunktinimed"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"APN-i vaikeseadete taastamine."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Lähtesta vaikeseadetele"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN-i vaikeseadete lähtestamine on lõpule viidud."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Võrguseadete lähtestamine"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"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>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Kas lähtestada kõik võrguseaded? Seda toimingut ei saa tagasi võtta."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Lähtesta seaded"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Kas lähtestada?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Võrguseaded lähtestati"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Lähtesta seade"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Tehaseandmete lähtestamine"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Kustutab kõik tahvelarvutis olevad andmed"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Kustutab kõik andmed telefonis"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"See kustutab kõik andmed telefoni "<b>"sisemälust"</b>", sh:\n\n"<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduse 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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD-kaardilt kõigi andmete (nt muusika või fotode) kustutamine"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Lähtesta tahvelarvuti"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Lähtesta telefon"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Kas kustutada kogu teie isiklik teave ja allalaaditud rakendused? Seda toimingut ei saa tagasi võtta."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Kas kustutada kõik teie isiklikud andmed ja allalaaditud rakendused? Seda toimingut ei saa tagasi võtta."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Kustuta kõik"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Tehaseandmetele lähtestamise kinnitamiseks peate joonistama avamismustri."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Lähtestust ei tehtud, sest süsteemi kustutamise teenus pole saadaval."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Kas lähtestada?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tehaseseadetele lähtestamine pole selle kasutaja puhul saadaval"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Kas tühjendada USB-mäluseade, kustutades kõik salvestatud failid? Toimingut ei saa tagasi võtta."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Kas soovite SD-kaardi tühjendada, kustutades kõik sinna salvestatud failid? Toimingut ei saa tagasi võtta."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Kustuta kõik"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB-salvestusruumi kustutamise kinnitamiseks peate joonistama avamismustri."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD-kaardi kustutamise kinnitamiseks peate joonistama avamismustri."</string>
     <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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Abi"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobiilsidevõrgud"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiilipakett"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"SMS-i vaikerakendus"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-i rakendus"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Kas muuta SMS-i rakendust?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Kas kasutada SMS-i rakendusena rakenduse <xliff:g id="NEW_APP">%1$s</xliff:g> asemel rakendust <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Kas kasutada SMS-i rakendusena rakendust <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Asukoharežiim"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Asukoha määramine GPS-i, WiFi- ja mobiilsidevõrgu abil"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Asukoha määramine WiFi- ja mobiilsidevõrgu abil"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Asukoha määramine GPS-i abil"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Kasutage asukoha määramiseks GPS-i"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skannimine"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skannimine"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WiFi skannimine"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Parandab asukoha täpsust, lubades rakendustel ja teenustel skannida WiFi-võrke, isegi kui WiFi on välja lülitatud"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetoothi skannimine"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Parandab asukoha täpsust, lubades süsteemiteenustel skannida Bluetoothi seadmeid, isegi kui Bluetooth on välja lülitatud"</string>
     <string name="location_network_based" msgid="6010456018401296590">"WiFi/mobiilsidevõrgu asukoht"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Lubage rakendustel kasutada Google\'i asukohateenust, et asukohta kiiremini määrata. Kogutud anonüümsed asukohaandmed saadetakse Google\'ile."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"WiFi järgi määratud asukoht"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parool on määratud"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-kood on määratud"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Muster on määratud"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Ekraani turvalisus"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Jätkamiseks kasutage seadme mustrit."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Jätkamiseks sisestage seadme PIN-kood."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Jätkamiseks sisestage seadme parool."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Seadme turvalisus"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Muuda avamismustrit"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Muuda avamise PIN-koodi"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kinnitage salvestatud muster"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Proovige uuesti:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Joonistage avamismuster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Abi saamiseks vajutage valikut Menüü."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Kui olete valmis, siis tõstke sõrm"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Määra avamismuster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Muuda avamismustrit"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kuidas joonistada avamismustrit"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Liiga palju valesid katseid."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Proovige uuesti <xliff:g id="NUMBER">%d</xliff:g> sekundi pärast."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Liiga palju valesid katseid. Proovige uuesti <xliff:g id="NUMBER">%d</xliff:g> sekundi pärast."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Rakendus pole teie telefoni installitud."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Halda rakendusi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installitud rakenduste haldamine ja eemaldamine"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sordi suuruse järgi"</string>
     <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_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>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Rakenduse tööd"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Töötab"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Pole kasutatud)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Vaikerakendusi pole."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Kasutatud mälu"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vaadake rakenduste kasutatavat mälu"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Käitatud teenused"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Teave tahvelarvuti kohta"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoni andmed"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Akuteave"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Kiirkäivitus"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Määra rakenduste käivitamiseks klaviatuuri otseteed"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Määra rakendus"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Otsetee puudub"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Otsing + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Kustutamine"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Teie otsetee <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) jaoks kustutatakse."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Tühista"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Rakendused"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Otseteed"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Tekstisisestus"</string>
     <string name="input_method" msgid="5434026103176856164">"Sisestusmeetod"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Praegune klaviatuur"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Hõiva kõik faili Bluetoothi HCI paketid"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-i avamine"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Luba buudilaadur avada"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Sisestage PIN-kood"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM-i avamise lubamiseks sisestage seadme PIN-kood"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Kas lubada OEM-i avamine?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"HOIATUS! Kui see seade on sisse lülitatud, ei toimi seadme turvafunktsioonid."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logija puhvri suurused"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vali logija suur. logipuhvri kohta"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Luba võltsasukohti"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Luba võltsasukohti"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Luba kuva atribuudi hindamine"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Võrgustik"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Juhtmeta ekraaniühenduse sertifitseerimine"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Luba WiFi paljusõnaline logimine"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agressiivne WiFi-lt mobiilile üleminek"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Luba alati WiFi-rändluse skannimine"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"DHCP pärandkliendi kasutamine"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Juhtmeta ekraaniühenduse sertifitseerimisvalikute kuvamine"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Suurenda WiFi logimistaset, kuva WiFi valijas SSID RSSI järgi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Kui see on lubatud, siis püüab WiFi nõrga WiFi-signaali korral agressiivsemalt anda andmeside ühenduse üle mobiilsele andmesidele"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Luba/keela WiFi-rändluse skannimine liidese andmeliikluse põhjal"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Logija puhvri suurused"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vali logija suur. logipuhvri kohta"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB-seadistuse valimine"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB-seadistuse valimine"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Luba võltsasukohti"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Luba võltsasukohti"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Luba kuva atribuudi hindamine"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Kasutage uue Androidi DHCP-kliendi asemel Lollipopi DHCP-klienti."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Luban USB silumise?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-silumine on mõeldud ainult arendamiseks. Kasutage seda andmete kopeerimiseks oma arvuti ja seadme vahel, seadmesse rakenduste installimiseks ilma teatisteta ning logiandmete lugemiseks."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Kas tühistada juurdepääs USB silumisele kõikides arvutites, mille olete varem volitanud?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Fuksia"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> peab:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Seaded ei saa teie vastust kinnitada, sest rakendus varjab loataotlust."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Kui lülitate sisse teenuse <xliff:g id="SERVICE">%1$s</xliff:g>, ei kasuta seade andmete krüpteerimise täiustamiseks ekraanilukku."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Kuna lülitasite sisse juurdepääsetavuse teenuse, siis ei kasuta teie seade andmete krüpteerimise täiustamiseks ekraanilukku."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Kuna teenuse <xliff:g id="SERVICE">%1$s</xliff:g> sisselülitamine mõjutab andmete krüpteerimist, peate kinnitama oma mustri."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Protsessi statistika"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Tehnilised üksikasjad protsesside käitamise kohta"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Mälu kasutamine"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Tüüpi <xliff:g id="TYPE">%1$s</xliff:g> rakendused perioodi <xliff:g id="TIME">%2$s</xliff:g> jooksul"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Kasutatud on <xliff:g id="USEDRAM">%1$s</xliff:g>/<xliff:g id="TOTALRAM">%2$s</xliff:g> <xliff:g id="TIMEDURATION">%3$s</xliff:g> jooksul"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Taust"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Esiplaan"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Vahemälus"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Seadme mälu on olekus <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM-i keskmine kasutus"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM-i maksimaalne kasutus"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Omaprotsessid"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Tuum"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Vahemälud"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM-i kasutus"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM-i kasutus (taustal)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tööaeg"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Protsessid"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Teenused"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Kestus"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Mälu üksikasjad"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 tundi"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 päev"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Süsteemi kuvamine"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Süsteemi peitmine"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS-i kasutamine"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistika tüüp"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Taust"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Allolevad vaikeseaded alistavad rakenduse seaded"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Vaikeseaded"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Vaikemootor"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Määrab räägitud teksti jaoks kasutatava kõnesünteesimootori"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Kõneldava teksti jaoks kõnesünteesi mootori määramine"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Kõnekiirus"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Teksti rääkimise kiirus"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Helikõrgus"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Riistvaratoega"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Ainult tarkvara"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Mandaadid pole selle kasutaja jaoks saadaval"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Mandaadi installimise kinnitamiseks tuleb teil joonistada luku avamise muster."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Sisestage mandaadi salvestamise parool."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kehtiv parool:"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Minu andmete varundamine"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Varundage rakenduse andmed, WiFi-paroolid ja muud seaded Google\'i serverites"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Varukonto"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ühelegi kontole ei ole praegu salvestatud varundatud andmeid"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Kaasa rakenduse andmed"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaatne taastamine"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Rakenduse uuesti installimisel taasta varundatud seaded ja andmed"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Varundamisteenus ei ole aktiivne."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Selle määravad teie seadmereeglid."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Arvutivarunduse parool"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Täielikud arvutivarundused pole praegu kaitstud"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Puudutage, et muuta või eemaldada täielike arvutivarunduste parool"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Ülemineku animats. skaala"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animaatori kestuse skaala"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Modelleeri teisi ekraane"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Mitme akna režiim"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Ekraanil mitu toimingut korraga."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Kas lubada mitme akna režiim?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"HOIATUS. See on algusjärgus olev katseline funktsioon, mis võimaldab hiljutiste rakenduste kasutajaliidese kaudu ekraanil teha korraga mitut toimingut. Mõned rakendused võivad selle funktsiooniga kasutamisel kokku joosta või valesti töötada."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Rakendused"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ära hoia tegevusi alles"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Kõigi tegev. hävit. kohe, kui kasutaja neist lahk."</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Kasutaja"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Piiratud profiil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Kas lisada uus kasutaja?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Võite jagada seadet teiste kasutajatega, 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_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_message" msgid="1004068621380867148">"Veenduge, et isik saaks seadet kasutada ja oma ruumi seadistada"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Kas eemaldada külaline?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Seansi kõik rakendused ja andmed kustutatakse."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Eemalda"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Telefonikõnede lubamine"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Telefonikõnede ja SMS-ide lubamine"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Telefonikõnede sisselülitamine"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Telefonikõnede ja SMS-ide sisselülitamine"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Kasutaja eemaldamine"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Kas lubada telefonikõnesid?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Kas lülitada sisse telefonikõned?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Selle kasutajaga jagatakse kõneajalugu."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Kas lubada telefonikõnesid ja SMS-e?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Selle kasutajaga jagatakse kõne- ja SMS-ajalugu."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Kas lülitada sisse telefonikõned ja SMS-id?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Selle kasutajaga jagatakse kõne- ja SMS-ajalugu."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Rakenduste ja sisu lubamine"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Piirangutega rakendused"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Laienda rakenduste seadeid"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"NIMETA ÜMBER"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Rakendusele piirangute määramine"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Juhib: <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Seda rakendust ei toetata piiratud profiilides"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"See rakendus pääseb teie kontode juurde"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Sellel rakendusel on juurdepääs teie kontodele. Juhib: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"WiFi ja mobiilne andmeside"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"WiFi ja mobiilse andmeside seadete muutmise lubamine"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wifi-võrgu ühendus"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekstisõnum SMS-i saatmine sõnumid sõnumside"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiil mobiilioperaator traadita andmed 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi kõne helistamine"</string>
     <string name="keywords_home" msgid="3626170808219458848">"käivitaja"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekraan puutetundlik ekraan"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ekraani hämardamine puuteekraan aku"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ekraani hämardamine puuteekraan aku"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"tausta isikupärastamine kuva kohandamine"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tume teema öö režiim tuhmistamine ekraan ümberpööramine eredus"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"taust isikupärastamine kohandamine kuvamine"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksti suurus"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projekti ülekandmine"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ruum ketas kõvaketas seadme kasutus"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"toite tarbimine laadimine"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"õigekiri sõnastik õigekirjakontroll automaatne parandamine"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"piirang piira piiratud"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekstiparandus paranda heli vibreeri automaatne keel liigutus soovita soovitus teema solvav sõna tüüp emotikon rahvusvaheline"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"lähtestamine eelistused vaikeseade"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"hädaabi ICE rakendus vaikimisi"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"rakendused allalaadimine rakendus süsteem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"rakendused load turvalisus"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"rakendused vaikimisi"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"lohistamine parool muster PIN-kood"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WiFi NFC-kiibi seadistamine"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjuta"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmi helitugevus"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Helina helitugevus"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Märguande helitugevus"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Katkestused"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Kõnede ja märguannete saabumisel"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Katkesta alati"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Luba ainult prioriteetsed katkestused"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ära katkesta"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioriteetne lubab ainult"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automaatsed reeglid"</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_no_interruptions" msgid="1168212070233080706">"Katkestusi pole"</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="ringtone_title" msgid="5379026328015343686">"Telefoni helin"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Märguande vaikehelin"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreeri ka kõnede puhul"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibratsioon"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Juurdepääs märguannetele"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Rakendused ei suuda märguandeid lugeda"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d rakendus suudab lugeda märguandeid"</item>
-    <item quantity="other" msgid="980049191810249052">"%d rakendust suudab lugeda märguandeid"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d rakendust saavad lugeda märguandeid</item>
+      <item quantity="one">%d rakendus saab lugeda märguandeid</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Märguannete kuulamisteenuseid pole installitud."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Kas lubada <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Teenus <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> suudab lugeda kõiki süsteemi või installitud rakenduse postitatud märguandeid. Sinna hulka võivad kuuluda ka isiklikud andmed, nagu kontaktide nimed ja teile saadetud sõnumite tekst. See võib nendest märguannetest ka loobuda või nendes olevaid toimingunuppe puudutada."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Tingimuste esitajad"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ükski rakendus ei esita tingimusi"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d rakendus esitab tingimused"</item>
-    <item quantity="other" msgid="358057362115673258">"%d rakendust esitavad tingimused"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ühtki tingimuste esitajat ei ole installitud."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Kas luban teenuse <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> võib režiimile Mitte segada väljumistingimusi lisada."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Rakenduste laadimine ..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blokeeri"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeeri kõik"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ära kuva kunagi selle rakenduse märguandeid"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioriteet"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Kuva märguanded loendi ülaservas ja kuva need ka siis, kui seadmes on määratud seade Ainult prioriteetsed katkestused"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Tundlik"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Kui seade on lukus, peida rakenduse märguannetes tundlik sisu"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Käsitle prioriteetsena"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Lubatakse selle rakenduse märguandeid kuulda, kui funktsioon Mitte segada on lülitatud valikule Ainult prioriteetsed"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Luba piilumine"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Lubatakse sellel rakendusel teatud märguanded esile tuua, lohistades need praegusel ekraanil korraks kuvale"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Peida tundlik sisu"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Kui seade on lukus, peidetakse selle rakenduse märguannete sisu, mis võib avaldada privaatset teavet"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeeritud"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioriteet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Tundlik"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Valmis"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Kuni lülitate selle välja"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriteetsed katkestused"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Puhkeaeg"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Päevad"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ühtegi"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Katkestused on lubatud"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Ainult prioriteetsed"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Puudub"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automaatne"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automaatne sisselülitus"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Reegli nimi"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Reegli lisamine"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Reegli kustutamine"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Kas kustutada reegel „<xliff:g id="RULE">%1$s</xliff:g>”?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Kustuta"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Reegli tüüp"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Teadmata"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Reegli seadistamine"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Ajakava reegel"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Reeglit ei leitud."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Päevad"</string>
+    <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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mitte kunagi"</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>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Kõned"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Sõnumid"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Kõned/sõnumid kasutajalt"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Igaüks"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Ainult kontaktid"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Ainult tärniga kontaktid"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Sündmused ja meeldetuletused"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmid on alati prioriteetsed katkestused"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmid"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Meeldetuletused"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Sündmused"</string>
+    <string name="zen_mode_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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Argiõhtuti"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Algusaeg"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Lõppaeg"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> järgmisel päeval"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> või mõne varasema alarmi puhul"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> järgmisel päeval või mõne varasema alarmi puhul"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> järgmisel päeval"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Katkestused"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Kõnede ja märguannete saabumisel"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Millal soovite, et teid katkestatakse?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Kui kauaks?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Katkesta alati"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"väljas, kõik, iga üksus"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Luba ainult prioriteetsed katkestused"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Luba ainult alarmid"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Ära katkesta"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Määramata ajaks"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutit</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tundi</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tund</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Muudetakse määramata ajaks valikule Ainult prioriteetsed märguanded"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Muudetakse valikule Ainult prioriteetsed märguanded <xliff:g id="DURATION">%1$d</xliff:g> minutiks kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Muudetakse valikule Ainult prioriteetsed märguanded üheks minutiks kellani <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Muudetakse valikule Ainult prioriteetsed märguanded <xliff:g id="DURATION">%1$d</xliff:g> tunniks (kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Muudetakse valikule Ainult prioriteetsed märguanded üheks tunniks kellani <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Muudetakse määramata ajaks valikule Ainult alarmid"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Muudetakse valikule Ainult alarmid <xliff:g id="DURATION">%1$d</xliff:g> minutiks (kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Muudetakse valikule Ainult alarmid üheks minutiks kellani <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">Muudetakse valikule Ainult alarmid <xliff:g id="DURATION">%1$d</xliff:g> tunniks kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Muudetakse valikule Ainult alarmid üheks tunniks kellani <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Muudetakse määramata ajaks valikule Ära katkesta"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Muudetakse valikule Ära katkesta <xliff:g id="DURATION">%1$d</xliff:g> minutiks (kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Muudetakse valikule Ära katkesta üheks minutiks kellani <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Muudetakse valikule Ära katkesta <xliff:g id="DURATION">%1$d</xliff:g> tunniks kellani <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Muudetakse valikule Ära katkesta üheks tunniks kellani <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Muudetakse valikule Katkesta alati"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"igavesti"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Rakenduse märguanded"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Märguandeseaded"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Seadme kohta tagasiside saatmine"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI teave"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI suhteline teave"</string>
     <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. pesa)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Vaikekäivitus"</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="app_launch_domain_links_title" msgid="458956710410857777">"Domeeni lingid"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Domeeni URL-ide avamine"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Rakendusel domeeni URL-ide otse avamise lubamine"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Toetatud domeenide URL-id"</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_type_internal" msgid="410824961149037234">"sisemälu"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"väline mälu"</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>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> kasut. alates <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Kasutatud salvestusruum"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Sees"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blokeerimine"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Tundlik"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioriteetne"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioriteetne ja tundlik"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> luba on antud</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> luba on antud</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g>/<xliff:g id="COUNT_3">%d</xliff:g> loast on antud</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> loast on antud</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Määratud on mõned vaikevalikud"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Ühtegi vaikevalikut pole määratud"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Kõik rakendused"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Lubatud"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Isiklik"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Töö"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeeritud"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioriteetne"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Tundlik"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domeeni URL-idega"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Administraator on keelanud"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Täpsemad"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Tundmatu rakendus"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profiili valimine"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Rakenduse load"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> rakendusel <xliff:g id="COUNT_1">%d</xliff:g>-st on täiendav juurdepääs"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> rakendust <xliff:g id="COUNT_1">%d</xliff:g>-st on lubatud"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domeeni URL-id"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Ära ava ühtegi domeeni URL-i"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Ava domeen „<xliff:g id="DOMAIN">%s</xliff:g>”"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Ava domeen „<xliff:g id="DOMAIN">%s</xliff:g>” ja seotud URL-id"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> rakendust saavad avada oma domeeni URL-id</item>
+      <item quantity="one">Üks rakendus saab avada oma domeeni URL-id</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Ei tuvastatud"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Vaikerakendused"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Brauserirakendus"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Vaikebrauserit pole"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Vaikeseade)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Rakenduste salvestusruum"</string>
 </resources>
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu-rES/arrays.xml
index 2bceb45..9a5d048 100644
--- a/res/values-eu-rES/arrays.xml
+++ b/res/values-eu-rES/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Sakatu botoia"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"aktibatu edo desaktibatu mikrofonoa"</item>
     <item msgid="1148142988678569310">"proiektatu multimedia-edukia"</item>
     <item msgid="9130014005474445273">"aktibatu VPN konexioa"</item>
+    <item msgid="1165192162975045562">"idatzi horma-paperean"</item>
+    <item msgid="7129487923652967258">"lagundu egiturarekin"</item>
+    <item msgid="1069023208100114540">"lagundu pantaila-argazkiarekin"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Kokapena"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Aktibatu edo desaktibatu mikrofonoa"</item>
     <item msgid="5906017727368097853">"Proiektatu multimedia-edukia"</item>
     <item msgid="2486614710846178542">"Aktibatu VPN konexioa"</item>
+    <item msgid="5586547561693629602">"Idatzi horma-paperean"</item>
+    <item msgid="32794179825485062">"Lagundu egiturarekin"</item>
+    <item msgid="7872852746938272552">"Lagundu pantaila-argazkiarekin"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Laburra"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"gutxi"</item>
     <item msgid="4212263919458209842">"oso gutxi"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desaktibatuta"</item>
-    <item msgid="5656544177755411222">"Etenaldi mugatuak"</item>
-    <item msgid="8735337502532332056">"Etenaldirik ez"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normala"</item>
     <item msgid="866544120205026771">"Ertaina"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Arrosa"</item>
     <item msgid="6131821495505931173">"Gorria"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (multimedia-elementuak transferitzeko protokoloa)"</item>
+    <item msgid="8856820259201251036">"PTP (irudiak transferitzeko protokoloa)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB bidezko Ethernet konexioa)"</item>
+    <item msgid="2686051673589572111">"Audio-iturburua"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 44e224f..39f0534 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Baimendu"</string>
     <string name="deny" msgid="6947806159746484865">"Ukatu"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ezezaguna"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> urrats falta zaizu garatzaile izateko."</item>
-    <item quantity="other" msgid="6722953419953594148">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> urrats falta zaizkizu garatzaile izateko."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> urrats falta zaizkizu garatzaile izateko.</item>
+      <item quantity="one"><xliff:g id="STEP_COUNT_0">%1$d</xliff:g> urrats falta zaizu garatzaile izateko.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Garatzailea zara!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ez dago zertan, dagoeneko garatzailea zara."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Hari gabekoak eta sareak"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Desaktibatu IMS bidezko SMSak"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Aktibatu IMS erregistratzearen eskaera."</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Desaktibatu IMS erregistratzearen eskaera"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Aktibatu VoLTE hornituta egotearen marka"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Desaktibatu VoLTE hornituta egotearen marka"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Aktibatu LTE RAM iraulketa."</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Desaktibatu LTE RAM iraulketa"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ikusi SIMaren helbide-agenda"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Igorpena"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profila desgaitu?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Hau desgaituko da:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Hemendik:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Konektatuta"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Konektatuta (ez dago telefonorik)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Konektatuta (ez dago euskarririk)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Konektatuta (mezuetarako sarbiderik ez)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Konektatuta (ez dago telef./euskarririk)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Deskonektatuta"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Deskonektatzen…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Konektatzen…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Parekatzen…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Izenik gabeko Bluetooth gailua"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Bilatzen"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Ez da Bluetooth gailurik aurkitu inguruan."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Erakutsi jasotako fitxategiak"</string>
     <string name="device_picker" msgid="4978696506172252813">"Aukeratu Bluetooth gailua"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth baimen-eskaera"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikazio batek Bluetootha aktibatu nahi du."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Aplikazio batek gailu honen Bluetooth konexioa aktibatu nahi du."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikazio batek tableta ikusgai ezarri nahi du beste Bluetooth gailuetarako <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikazio batek telefonoa ikusgai ezarri nahi du beste Bluetooth gailuetarako <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikazio batek tableta beste Bluetooth gailuetarako ikusgai ezarri nahi du. Hori Bluetooth ezarpenetan geroago aldatzeko aukera duzu."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD txartela"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-ezarpenak"</string>
     <string name="cancel" msgid="6859253417269739139">"Utzi"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"UTZI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"JARRAITU"</string>
     <string name="okay" msgid="1997666393121016642">"Ados"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"BAI"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"EZ"</string>
-    <string name="forget" msgid="7267115980248732932">"AHAZTU"</string>
+    <string name="forget" msgid="1400428660472591263">"Ahaztu"</string>
+    <string name="save" msgid="879993180139353333">"Gorde"</string>
+    <string name="done" msgid="6942539184162713160">"Eginda"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ezarpenak"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ezarpenak"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Ezarpenen lasterbidea"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenatu ordu-zonaren arabera"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ordua"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Hobetu aurpegien antzematea"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Bizitza-egiaztapena"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Eskatu begiak kliskatzea desblokeatu bitartean"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Blokeatu automatikoki"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> inaktibo ezarri ondoren"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> inaktibo egon ondoren, <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> fidagarritasun-agenteak desblokeatuta mantentzen duenean izan ezik"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ezarri Nire kokapena, pantailaren desblokeoa, SIM txartelaren blokeoa, kredentzialen biltegiaren blokeoa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ezarri Nire kokapena, pantailaren desblokeoa, kredentzialen biltegiaren blokeoa."</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Pasahitzak"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Hatz-marka digitala"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Kudeatu hatz-markak"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Hatz-marken erabilera"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Gehitu"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"pantailaren blokeoa"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> hatz-marka digital erregistratu dira</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> hatz-marka digital erregistratu da</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Konfigurazioa"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Pantaila desblokeatzeko edo erosketak berresteko hatz-marka digitala erabili nahi baduzu, hau egin beharko dugu: \n\n✓ Atzeko planoan pantaila blokeatzeko metodoa konfiguratu \n\n✓ Zure hatz-marka digitala gehitu"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Bilatu sentsorea"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Bilatu hatz-marken sentsorea; telefonoaren atzealdean dago."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Izena"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ados"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ezabatu"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Ekiogun!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Jarri hatza hatz-marka digitalen sentsorean. Altxa ezazu dardara sentitzean."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Egizu beste behin."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Jarri hatz bera hatz-marka digitalen sentsorean eta altxa ezazu dardara sentitzean."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Gehitu da hatz-marka!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ikono hau ikusten duzunean, hatz-marka digitala erabil dezakezu zeure burua identifikatzeko edo erosketak baimentzeko."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Gehitu"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Hurrengoa"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkriptatzea"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkriptatu tableta"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkriptatu telefonoa"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Entxufatu kargagailua eta saiatu berriro."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Pantaila blokeatuaren PIN edo pasahitzik ez"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Enkriptatzen hasi aurretik, pantaila blokeatzeko PIN kode edo pasahitz bat zehaztu behar duzu."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Gailua enkriptatu nahi duzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Enkriptatu nahi duzu?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Enkriptatze-eragiketa atzeraezina da eta eteten baduzu, datuak galduko dituzu. Enkriptatzeko ordubete edo gehiago behar izaten da eta, prozesuak dirauen bitartean, tableta hainbat aldiz berrabiaraziko da."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Enkriptatze-eragiketa atzeraezina da eta eteten baduzu, datuak galduko dituzu. Enkriptatzeko ordubete edo gehiago behar izaten da eta, prozesuak dirauen bitartean, telefonoa hainbat aldiz berrabiaraziko da."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Pasatu hatza"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Segurtasunik gabe"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Aurpegiaren bidez desblokeatzea"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Segurtasun gutxi, esperimentala"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Eredua"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Segurtasun ertaina"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PINa"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurtasun ertaina-handia"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Pasahitza"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Segurtasun handia"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Uneko pantailaren blokeoa"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Gailua babesteko eginbideek funtzionatzeari utziko diote."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Administr./Gidalerroak/Kredentz.-biltegiak desgaituta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Bat ere ez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pasatu hatza"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Aurpegiaren bidez desblokeatzea"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Eredua"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kodea"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Pasahitza"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Pantaila blokeatzeko aukera ezarri ondoren, hatz-marka konfigura dezakezu Ezarpenak &gt; Segurtasuna atalean."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desakt. pant.-blokeoa"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Kendu desblokeatzeko eredua"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Kendu desblokeatzeko PINa"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Pasahitzak letra bat eduki behar du gutxienez."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Pasahitzak digitu bat eduki behar du gutxienez."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Pasahitzak ikur bat eduki behar du gutxienez."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Pasahitzak letra bat eduki behar du gutxienez."</item>
-    <item quantity="other" msgid="8186027808415585970">"Pasahitzak %d letra eduki behar ditu gutxienez."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Pasahitzak letra minuskula bat eduki behar du gutxienez."</item>
-    <item quantity="other" msgid="2693910942679679225">"Pasahitzak %d letra minuskula eduki behar ditu gutxienez."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Pasahitzak letra maiuskula bat eduki behar du gutxienez."</item>
-    <item quantity="other" msgid="3030801209112209245">"Pasahitzak %d letra maiuskula eduki behar ditu gutxienez."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Pasahitzak zenbaki-karaktere bat eduki behar du gutxienez."</item>
-    <item quantity="other" msgid="4703982391407595924">"Pasahitzak %d zenbaki izan behar ditu gutxienez."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Pasahitzak ikur berezi bat eduki behar du gutxienez."</item>
-    <item quantity="other" msgid="1221290525051187757">"Pasahitzak %d ikur berezi eduki behar ditu gutxienez."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Pasahitzak letra ez den karaktere bat eduki behar du gutxienez."</item>
-    <item quantity="other" msgid="3952508584649046404">"Pasahitzak letrak ez diren %d karaktere eduki behar ditu gutxienez."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Pasahitzak %d hizki izan behar ditu gutxienez.</item>
+      <item quantity="one">Pasahitzak hizki bat izan behar du gutxienez.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Pasahitzak %d hizki minuskula izan behar ditu gutxienez.</item>
+      <item quantity="one">Pasahitzak hizki minuskula bat izan behar du gutxienez.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Pasahitzak %d hizki maiuskula izan behar ditu gutxienez.</item>
+      <item quantity="one">Pasahitzak hizki maiuskula bat izan behar du gutxienez.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Pasahitzak %d zenbakizko karaktere izan behar ditu gutxienez.</item>
+      <item quantity="one">Pasahitzak zenbakizko karaktere bat izan behar du gutxienez.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Pasahitzak %d ikur berezi izan behar ditu gutxienez.</item>
+      <item quantity="one">Pasahitzak ikur berezi bat izan behar du gutxienez.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Pasahitzak hizkiak ez diren %d karaktere izan behar ditu gutxienez.</item>
+      <item quantity="one">Pasahitzak hizkia ez den karaktere bat izan behar du gutxienez.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Gailuaren administratzaileak ez du pasahitz berri bat erabiltzeko baimenik eman."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Ezin da goranzko, beheranzko edo errepikatutako digitu-sekuentziarik erabili"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Ados"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Gailu honekin parekatzeko:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ziurtatu pasakode hau erakusten duela:&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">"Igorlea:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Gailuarekin parekatu?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Honekin parekatzeko:<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>Idatzi hau bertan:<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>, eta sakatu Itzuli edo Sartu."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Parekatu"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PAREKATU"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Utzi"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Gailuak parekatzen badituzu, batetik besteko kontaktuak eta deien historia atzitu ahal izango dituzu."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Ezin izan da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatu."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Ezin izan da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatu PIN edo pasakode okerra idatzi delako."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Ezin da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin komunikatu."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuak bikotetzea ukatu du."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Ezin izan da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailura konektatu."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Bilatu gailuak"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Freskatu"</string>
@@ -515,16 +518,8 @@
     <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">"Bluetootha gaituta dagoenean, inguruko Bluetooth gailuekin komunika daiteke gailua."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Kokapenaren zehaztasuna hobetzeko, aplikazioek eta zerbitzuek Bluetooth gailuak bilatuko dituzte, baita Bluetooth konexioa desaktibatuta dagoenean ere. Aukera hori aldatu nahi baduzu, zoaz <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>bilaketen ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Konektatu hona…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Euskarriaren audioa"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefonoaren audioa"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Fitxategi-transferentzia"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Sarrerako gailua"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Interneterako sarbidea"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktuak partekatzea"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Erabili kontaktuak partekatzeko"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneteko konexioa partekatzea"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Mezuetarako sarbidea"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatuko da euskarriaren audiotik."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatuko da esku libreko audiotik."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatuko da sarrerako gailutik."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Erabilera"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Aldatu izena"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Onartu sarrerako fitxategi-transferentziak"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Euskarriaren audiora konektatuta"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefonoaren audiora konektatuta"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Fitxategi-transferentziako zerbitzarira konektatuta"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Mapara konektatuta"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Fitxategi-transferentziako zerbitzarira konektatu gabe"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Sarrerako gailura konektatuta"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Gailura konektatuta Interneteko sarbiderako"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Tokiko Interneteko konexioa gailu batekin partekatzea"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Erabili euskarriaren audiorako"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Erabili telefonoaren audiorako"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Erabili fitxategi-transferentziarako"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Erabili idazketarako"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Erabili Interneteko sarbiderako"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Erabili maparako"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Oinarriaren ezarpenak"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Erabili oinarria audiorako"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Bozgorailu gisa"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musikarako eta multimedia-edukirako"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Gogoratu ezarpenak"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi laguntzailea"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi laguntzailearen bidez konektatuta"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Igorri pantaila beste gailu batera"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Igorpena"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Gaitu hari gabeko bistaratzea"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Ez da gailurik aurkitu inguruan."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Konektatzen"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Ahaztu"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Eginda"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Izena"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Eman datuak trukatzeko baimena tabletak beste gailu bat ukitzean."</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Onartu datuen trukea telefonoak beste gailu bat ukitzen duenean"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fia desaktibatzen…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Errorea"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Hegaldi moduan"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ezin dira sareak bilatu"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Sare erabilgarrien jakinarazpenak"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Jakinarazi sare publiko bat erabilgarri dagoenean"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Saihestu konexio ahulak"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Ez erabili Wi-Fi sareak ez badute Interneteko konexio onik"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Erabili Interneteko konexio ona duten sareak soilik"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Bilaketa beti erabilgarri"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Baimendu beti eskaneatzea"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Utzi Google kokapen-zerbitzuei eta beste aplikazioei sareak bilatzen, Wi-Fi konexioa desaktibatuta egon arren"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Erabili Wi‑Fi sare irekiak automatikoki"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Utzi Wi‑Fi laguntzaileari kalitate handiko gisa identifikatutako sare irekietara automatikoki konektatzen"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Aukeratu laguntzailea"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalatu ziurtagiriak"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Kokapenaren zehaztasuna hobetzeko eta beste helburu batzuetarako, Google-k eta beste aplikazio batzuek inguruko sareak bila ditzakete, Wi-Fia desaktibatuta egonda ere. Ez baduzu hori gertatzerik nahi, joan Ezarpen aurreratuak &gt; Bilaketa beti erabilgarri atalera."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikazioek inguruko sareak bila ditzakete, Wi-Fi desaktibatuta egonda ere. Ez baduzu hori gertatzerik nahi, joan Ezarpen aurreratuak &gt; Bilaketa beti erabilgarri atalera."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Kokapenaren zehaztasuna hobetzeko, aplikazioek eta zerbitzuek Wi-Fi sareak bilatuko dituzte, baita Wi-Fi konexioa desaktibatuta dagoenean ere. Aukera hori aldatu nahi baduzu, zoaz <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>bilaketen ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ez erakutsi berriro"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Izan Wi-Fia aktibatuta egoera inaktiboan"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi aktibatuta inaktibo moduan"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Gehitu beste sare bat"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Gehiago"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Konf. automatikoa (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Konfigurazioa osatzeko, tabletak Wi-Fi sarerako sarbidea behar du. Konfiguratu ondoren, datu mugikorren eta Wi-Fi sarearen artean aldatu ahal izango duzu."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Aukera aurreratuak"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi konfigurazio babestua"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS hasten…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Sakatu Wi-Fi konfigurazio babestuaren botoia bideratzailean. Baliteke \"WPS\" izena edo ikur hau izatea:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Sakatu Wi-Fi konfigurazio babestuaren botoia bideratzailean. Baliteke \"WPS\" izena edo ikur hau izatea:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Idatzi <xliff:g id="NUMBER">%1$s</xliff:g> PIN kodea Wi-Fi bideratzailean. Bi minutura arte behar izan daitezke konfiguratzen bukatzeko."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS behar bezala egin da. Sarera konektatzen…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi sarera konektatuta"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitate anonimoa"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Pasahitza"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Erakutsi pasahitza"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfiguratu sarbide-puntuaren banda"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz-ko banda"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz-ko banda"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP ezarpenak"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(aldatu gabea)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(zehaztugabea)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Gordeta"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desgaituta"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Ezin izan da konfiguratu IP helbidea"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Ezin izan da konektatu Wi-Fi sarera"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentifikazio-arazoa"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Urrunegi"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Ez da hauteman Interneterako sarbiderik. Ez da automatikoki berriro konektatuko."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSa erabilgarri"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSa erabilgarri)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Idatzi sarearen pasahitza"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Bat ere ez"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Saioa hasi nahi duzu konektatzeko?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak saioa hastea eskatzen du konektatu ahal izateko."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KONEKTATU"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Sare honek ezin du Internet atzitu. Sare hau erabili nahi duzu hala ere?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ez galdetu berriro sarea hau bada"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK Wi‑Fi publiko eramangarria"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> Wi-Fi sare publiko eramangarria"</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_mode_title" msgid="2164073796253284289">"Deitzeko aukera lehenetsiak"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi bidez deitzeko modua"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi sarea hobetsia"</item>
+    <item msgid="5267397515594230396">"Sare mugikorra hobetsia"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Hasiera"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Bistaratzea"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Soinua"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Doitu pantailaren distira"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Distira doigarria"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizatu pantailaren distira inguruko argitasunaren arabera"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Gaia"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Argia"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Iluna"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatikoa"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ezarri egonean moduan"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pantaila itzaltzen da"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"SIM txartel hobetsia eguneratu?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> da gailuan daukazun SIM bakarra. SIM hori erabili nahi duzu dei, testu-mezu zein datu-trafikorako?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIMaren PIN kodea okerra da. Gailua desblokeatzeko, operadorearekin harremanetan jarri beharko duzu."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIMaren PIN kodea okerra da. <xliff:g id="NUMBER">%d</xliff:g> saiakera geratzen zaizkizu gailua desblokeatzeko operadorearekin harremanetan jarri behar izan aurretik."</item>
-    <item quantity="other" msgid="77103619544346451">"SIMaren PIN kodea okerra da, <xliff:g id="NUMBER">%d</xliff:g> saiakera geratzen zaizkizu."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM txartelaren PIN kodea okerra da. <xliff:g id="NUMBER_1">%d</xliff:g> saiakera geratzen zaizkizu gailua desblokeatzeko.</item>
+      <item quantity="one">SIM txartelaren PIN kodea okerra da. <xliff:g id="NUMBER_0">%d</xliff:g> saiakera geratzen zaizu gailua desblokeatzeko.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIMaren PIN kodearen eragiketak huts egin du!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletaren egoera"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonoaren egoera"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Erabilgarri (irakurtzeko soilik)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Memoria, guztira"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Kalkulatzen…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikazioak (datuak eta multimedia-edukia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikazioak eta aplikazioen datuak"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia-edukia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Deskargak"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Irudiak, bideoak"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audioa (musika, tonuak, podcastak eta abar)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Askotarikoak"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Beste fitxategi batzuk"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cachean gordetako datuak"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desmuntatu partekatutako memoria"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmuntatu SD txartela"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmuntatzea abian da"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Memoria agortzen ari da"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Baliteke sistemaren funtzio batzuk behar bezala ez funtzionatzea, esaterako, sinkronizazioa. Saiatu memorian tokia egiten elementu batzuk ezabatuta edo desainguratuta, adibidez, aplikazioak edo multimedia-edukia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Aldatu izena"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Muntatu"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Atera"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Ezabatu edukia eta formateatu"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Ezabatu eta formateatu memoria"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB ordenagailu-konexioa"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-ordenagailu konexioa"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Konektatu honela"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Multimedia-fitxategiak Windows-en transferitzeko aukera ematen dizu, edo Mac-en Android fitxategi-transferentzia erabilita (ikusi www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Argazkiak kamera-softwarea erabilita transferitzea ahalbidetzen dizu, baita MTP onartzen ez duten ordenagailuetan fitxategiak transferitzea ere"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalatu fitxategiak transferitzeko tresnak"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI gaitasuna duten aplikazioei ordenagailuko MIDI softwarearekin USB bidez lan egitea baimentzen die."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Beste erabiltzaileak"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Gailuaren memoria"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Memoria aldagarria"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> libre (<xliff:g id="TOTAL">%2$s</xliff:g> guztira)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Muntatu da <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Ezin izan da muntatu <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Atera da segurtasunez <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Ezin izan da atera segurtasunez <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Formateatu da <xliff:g id="NAME">%1$s</xliff:g> memoria-unitatea"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Ezin izan da formateatu <xliff:g id="NAME">%1$s</xliff:g> memoria-unitatea"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Aldatu memoriaren izena"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Formateatu ondoren, beste gailu batzuetan erabili ahal izango duzu <xliff:g id="NAME_0">^1</xliff:g>. \n\n<xliff:g id="NAME_1">^1</xliff:g> memoriako datu guztiak ezabatu egingo dira; beraz, aurretik babeskopia bat egitea gomendatzen dizugu. \n\n"<b>"Egin argazkien eta bestelako multimedia-fitxategien babeskopia"</b>\n"Eraman multimedia-fitxategiak gailu honetako beste memoria batzuetara, edo transferitu ordenagailu batera USB kable baten bidez. \n\n"<b>"Egin aplikazioen babeskopia"</b>\n"<xliff:g id="NAME_6">^1</xliff:g> memorian gordeta dauden aplikazio guztiak desinstalatu egingo dira eta horien datuak ezabatu egingo dira. Aplikazioak gordetzeko, eraman gailu honetako beste memoria batera."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"<xliff:g id="NAME_0">^1</xliff:g> memoria ateratzen duzunean, han gordetako aplikazioek funtzionatzeari utziko diote eta gordetako multimedia-fitxategiak ez dira erabilgarri egongo memoria berriro sartzen duzun arte."</b>\n\n"<xliff:g id="NAME_1">^1</xliff:g> memoria gailu honetan soilik funtzionatzeko formateatuta dago, eta ez du beste inon funtzionatuko."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfiguratu <xliff:g id="NAME">^1</xliff:g> memoria"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Erabili biltegiratze-gailu eramangarri gisa"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Argazkiak eta bestelako multimedia-fitxategiak gailu batetik bestera eramateko."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Erabili barneko memoria gisa"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Edozein gauza gailu honetan soilik gordetzeko, aplikazioak eta argazkiak barne. Erabilera hau emateko, beste gailu batzuetan funtzionatzea galarazten duen formateatze bat egin behar da memorian."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formateatu barneko memoria gisa"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g> formateatu egin behar da segurua izan dadin. \n\nFormateatu ostean, <xliff:g id="NAME_1">^1</xliff:g> memoriak gailu honetan bakarrik funtzionatuko du. \n\n"<b>"Formateatzean, unean <xliff:g id="NAME_2">^1</xliff:g> memorian gordetako datu guztiak ezabatzen dira."</b>" Daturik ez galtzeko, babeskopia bat egitea gomendatzen dizugu."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ezabatu eta formateatu"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> formateatzen…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Formateatzen ari den bitartean, ez kendu <xliff:g id="NAME">^1</xliff:g>."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Eraman datuak memoria berrira"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Argazkiak, fitxategiak eta aplikazioen datuak <xliff:g id="NAME">^1</xliff:g> memoria berri honetara ekar ditzakezu. \n\nTransferentzia-prozesuak <xliff:g id="TIME">^2</xliff:g> irauten du gutxi gorabehera, eta <xliff:g id="SIZE">^3</xliff:g> askatuko ditu barneko memoriatik. Aplikazio batzuek ez dute funtzionatuko transferentzia egiten ari den bitartean."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mugitu orain"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Mugitu geroago"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Mugitu datuak"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Transferentzia-prozesuak <xliff:g id="TIME">^1</xliff:g> irauten du gutxi gorabehera, eta <xliff:g id="SIZE">^2</xliff:g> askatuko ditu barneko memoriatik."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Mugitu"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Datuak mugitzen…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Transferentzia egiten den bitartean: \n• Ez kendu <xliff:g id="NAME">^1</xliff:g> memoria. \n• Aplikazio batzuek ez dute ongi funtzionatuko. \n• Gailuak kargatuta egon behar du."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> prest dago"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> argazkiekin eta bestelako multimedia-fitxategiekin erabiltzeko behar bezala konfiguratu da."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> memoria berria abian da. \n\nArgazkiak, fitxategiak eta aplikazioaren datuak gailu honetara ekartzeko, zoaz Ezarpenak &gt; Memoria atalera."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mugitu <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> aplikazioa eta bere datuak <xliff:g id="NAME_0">^2</xliff:g> memoriara eramateak denboratxo bat behar du. Ezin izango duzu aplikazioa erabili transferentzia osatzen den arte. \n\n Ez kendu <xliff:g id="NAME_1">^2</xliff:g> transferentzia egiten den bitartean."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> mugitzen…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ez kendu <xliff:g id="NAME">^1</xliff:g> transferentzia egiten den bitartean. \n\nGailuko <xliff:g id="APP">^2</xliff:g> aplikazioa ez da erabilgarri egongo transferentzia osatzen den arte."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Utzi transferentzia"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Bateriaren egoera"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Bateria-maila"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNak"</string>
@@ -1007,12 +1044,17 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"APN ezarpen lehenetsiak leheneratzen."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Berrezarri balio lehenetsiak"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN ezarpen lehenetsiak berrezarri dira."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Sareko ezarpenak berrezarri dira"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Sareko ezarpen guztiak berrezarriko dira, besteak beste:\n\n"<li>"Wi‑Fi konexioa"</li>\n<li>"Mugikorreko datuak"</li>\n<li>"Bluetooth konexioa"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Berrezarri ezarpenak"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"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="reset_network_complete_toast" msgid="787829973559541880">"Berrezarri dira sareko ezarpenak"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Berrezarri gailua"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Berrezarri jatorrizko datuak"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Tabletako datu guztiak ezabatzen ditu."</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Telefonoko datu guztiak ezabatzen ditu."</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazio-datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazio-datuak nahiz ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ezabatu SD txarteleko datu guztiak, besteak beste, musika edo argazkiak."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Berrezarri tableta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Berrezarri telefonoa"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Informazio pertsonal guztia eta deskargatutako aplikazioak ezabatu? Ezin duzu ekintza hori desegin!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Informazio pertsonal guztia eta deskargatutako aplikazioak ezabatu nahi dituzu? Ekintza hori ezin da desegin."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ezabatu guztia"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Jatorrizko datuak berrezarri nahi dituzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Ez da berrezartzerik gauzatu, sistema garbitzeko zerbitzua ez dagoelako erabilgarri."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Berrezarri?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Erabiltzaileak ez du jatorrizko datuak berrezartzeko baimenik"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB memoria eta bertan gordetako fitxategi guztiak ezabatu? Ezin duzu ekintza hori desegin!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD txartela eta bertan gordetako fitxategi guztiak ezabatu? Ezin duzu ekintza hori desegin!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ezabatu guztia"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB memoria ezabatu nahi duzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD txartela ezabatu nahi duzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Dei-ezarpenak"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Konfiguratu erantzungailua, dei-desbideratzea, deia zain uzteko eginbidea, deien identifikazio-zerbitzua."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Konexioa partekatzea (USB)"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Laguntza"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Sare mugikorrak"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mugikorraren plana"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"SMSetarako aplikazio lehenetsia"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMSetarako aplikazioa"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS mezuetarako aplikazioa aldatu?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="NEW_APP">%1$s</xliff:g> aplikazioaren ordez, <xliff:g id="CURRENT_APP">%2$s</xliff:g> aplikazioa erabili SMS mezuetarako?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Erabili <xliff:g id="NEW_APP">%s</xliff:g> SMS mezuetarako aplikazio gisa?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Kokapen modua"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Erabili GPS antena, Wi‑Fi sarea eta sare mugikorrak kokapena zehazteko"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Erabili Wi‑Fi sarea eta sare mugikorrak kokapena zehazteko"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Erabili GPSa kokapena zehazteko"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Erabili GPS sistema kokapena zehazteko"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Bilatzea"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Bilatzea"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi sareak bilatzea"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Hobetu kokapenaren zehaztasuna aplikazioei eta zerbitzuei Wi-Fi sareak bilatzea baimenduta, baita Wi-Fi konexioa desaktibatuta dagoenean ere"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth gailuak bilatzea"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Hobetu kokapenaren zehaztasuna sistemaren zerbitzuei Bluetooth gailuak bilatzea baimenduta, baita Bluetooth konexioa desaktibatuta dagoenean ere"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi eta sare mugikor bidezko kokapena"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Utzi aplikazioei zure kokapena bizkorrago zehazteko Google-ren kokapen-zerbitzua erabiltzen. Kokapen-datu anonimoak bildu eta Google-ra bidaliko dira."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Kokapena Wi-Fi bidez zehaztuta"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Pasahitza ezarri da."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PINa ezarri da"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Eredua ezarri da."</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Pantailaren segurtasuna"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Jarraitzeko, marraztu gailuaren eredua."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Jarraitzeko, idatzi gailuaren PIN kodea."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Jarraitzeko, idatzi gailuaren 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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Gailuaren segurtasuna"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Aldatu desblokeatzeko eredua"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Aldatu desblokeatzeko PINa"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Berretsi gordetako eredua"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Saiatu berriro:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Marraztu desblokeatzeko eredua"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Laguntza lortzeko, sakatu Menua."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Bukatutakoan, jaso hatza"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ezarri desblokeatzeko eredua"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Aldatu desblokeatzeko eredua"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Desblokeatzeko eredua nola marraztu"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Saiakera oker gehiegi egin dituzu!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Saiatu berriro <xliff:g id="NUMBER">%d</xliff:g> segundo barru."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Saiakera oker gehiegi egin dituzu. Saiatu berriro <xliff:g id="NUMBER">%d</xliff:g> segundo barru."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Ez duzu aplikazioa telefonoan instalatu."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Kudeatu aplikazioak"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Kudeatu eta kendu instalatutako aplikazioak"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenatu tamainaren arabera"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Abian diren zerbitzuak"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Erakutsi cachean gordetako prozesuak"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Larrialdietarako aplikazioa"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Berrezarri aplikazioaren hobespenak"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Aplikazioaren hobespenak berrezarri nahi dituzu?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Honen hobespen guztiak berrezarriko dira:\n\n"<li>"Desgaitutako aplikazioak"</li>\n<li>"Desgaitutako aplikazio-jakinarazpenak"</li>\n<li>"Ekintza jakinetarako aplikazio lehenetsiak"</li>\n<li>"Atzeko planoko datuen murrizketak aplikazioetarako"</li>\n<li>"Edozein baimen-murrizketa"</li>\n\n"Ez dituzu aplikazioen datuak galduko."</string>
@@ -1248,17 +1297,17 @@
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB memoria"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD txartelaren memoria"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Tamaina berriro kalkulatzen…"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Aplikazio-datuak ezabatu?"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Aplikazioen datuak ezabatu?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"Aplikazioaren datu guztiak betiko ezabatuko dira; besteak beste, fitxategi, ezarpen, kontu, datu-base eta abar guztiak."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Ados"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Utzi"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="8333723538280257243">"Ez da aplikazioa aurkitu instalatutako aplikazioen zerrendan."</string>
-    <string name="clear_data_failed" msgid="1907582169616856698">"Ezin izan dira aplikazio-datuak garbitu."</string>
+    <string name="clear_data_failed" msgid="1907582169616856698">"Ezin izan dira aplikazioen datuak garbitu."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Eguneratzeak desinstalatu?"</string>
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Android sistemaren aplikazioari egindako eguneratzeak desinstalatu egingo dira."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Garbitu datuak"</string>
-    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Ezin izan dira aplikazio-datuak garbitu."</string>
+    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Ezin izan dira aplikazioen datuak garbitu."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Aplikazioak tabletaren elementu hauek atzi ditzake:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Aplikazioak telefonoaren elementu hauek atzi ditzake:"</string>
     <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Aplikazioak zure tabletaren elementu hauek atzi ditzake. Errendimendua hobetzeko eta memoria-erabilera murrizteko, baimen horietako batzuk <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> aplikaziorako ere erabilgarri daude, <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> aplikazioen prozesu bera exekutatzen duelako:"</string>
@@ -1290,15 +1339,16 @@
     <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"Ezin izan da aplikazioa eraman. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Instalazioaren kokapen hobetsia"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Aldatu aplikazio berrien instalazio-kokapen hobetsia"</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Barneratutako aplikazioa desgaitu?"</string>
-    <string name="app_disable_dlg_text" msgid="3562567756362627323">"Barneratutako aplikazioa desgaitzen baduzu, beste aplikazioek portaera okerra izan dezakete."</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Aplikazio integratua desgaitu?"</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"Aplikazio integratua desgaitzen baduzu, beste aplikazioek portaera okerra izan dezakete."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Datuak ezabatu eta aplikazioa desgaitu?"</string>
-    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Aplikazio barneratu bat desgaitzen baduzu, beste aplikazio batzuek funtzionamendu okerra izan dezakete. Zure datuak ere ezabatuko dira."</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Aplikazio integratu bat desgaitzen baduzu, beste aplikazio batzuek funtzionamendu okerra izan dezakete. Zure datuak ere ezabatuko dira."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Jakinarazpenak desaktibatu nahi dituzu?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Aplikazioaren jakinarazpenak desaktibatzen badituzu, alerta eta eguneratze garrantzitsuak gal ditzakezu."</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Aplikazioen eragiketak"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Abian"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Ez da inoiz erabili)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Aplikazio lehenetsirik ez"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Memoria-erabilera"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ikusi aplikazioek erabiltzen duten memoria"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Abian diren zerbitzuak"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tabletari buruzko informazioa"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefonoari buruzko informazioa"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Bateriari buruzko informazioa"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Abiarazte bizkorra"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Ezarri aplikazioak abiarazteko laster-teklak"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Esleitu aplikazioa"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Ez dago lasterbiderik"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Bilatu + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Garbitu"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) lasterbidea garbituko da."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Ados"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Utzi"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplikazioak"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Laster-teklak"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Testu-idazketa"</string>
     <string name="input_method" msgid="5434026103176856164">"Idazketa-metodoa"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Uneko teklatua"</string>
@@ -1433,31 +1472,39 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB arazketa"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Gaitu arazketa modua USBa konektatzean"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Baliogabetu USB arazketarako baimenak"</string>
-    <string name="bugreport_in_power" msgid="7923901846375587241">"Programa-akatsen txostenerako lasterbidea"</string>
-    <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Bateriaren menuan, erakutsi programa-akatsen txostena sortzeko botoia"</string>
+    <string name="bugreport_in_power" msgid="7923901846375587241">"Akatsen txostenerako lasterbidea"</string>
+    <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Bateriaren menuan, erakutsi akatsen txostena sortzeko botoia"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Mantendu aktibo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Pantaila ez da inoiz inaktibo ezarriko kargatu bitartean"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Gaitu Bluetooth HCI miatze-erregistroa"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bildu Bluetooth HCI pakete guztiak fitxategi batean"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM desblokeoa"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Onartu abiarazlea desblokeatzea"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Idatzi PIN kodea"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM desblokeoa gaitzeko, idatzi gailuaren PIN kodea"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM desblokeoa onartu nahi duzu?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ABISUA: ezarpen hau aktibatuta dagoen bitartean, gailuaren babes-eginbideek ez dute gailu honetan funtzionatuko."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Erregistroen buffer-tamainak"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Hautatu erregistroen buffer-tamainak"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Onartu kokapen faltsuak"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Onartu kokapen faltsuak"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Gaitu ikuspegiaren atributuak ikuskatzeko aukera"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Sareak"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Hari gabeko bistaratze-egiaztatzea"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Gaitu Wi-Fi sareetan saioa hasteko modu xehatua"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Behartu Wi-Fi konexiotik datuenera aldatzera"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Onartu beti ibiltaritzan Wi-Fi sareak bilatzea"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Erabili aurreko bertsioko DHCP bezeroa"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Erakutsi hari gabeko bistaratze-egiaztapenaren aukerak"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Erakutsi datu gehiago Wi-Fi sareetan saioa hasterakoan. Erakutsi sarearen identifikatzailea eta seinalearen indarra Wi‑Fi sareen hautagailuan."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Aukera hori gaituz gero, gailua errazago aldatuko da datu mugikorren konexiora Wi-Fi seinalea ahultzen dela nabaritutakoan"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Onartu edo debekatu ibiltaritzan Wi-Fi sareak bilatzea, interfazeko datu-trafikoaren arabera"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Erregistroen buffer-tamainak"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Hautatu erregistroen buffer-tamainak"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Hautatu USB konfigurazioa"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Hautatu USB konfigurazioa"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Onartu kokapen faltsuak"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Onartu kokapen faltsuak"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Gaitu ikuspegiaren atributuak ikuskatzeko aukera"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Erabili Lollipop bertsioko DHCP bezeroa eta ez Android DHCP bezero berria."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB arazketa onartu?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB arazketa garapen-xedeetarako soilik dago diseinatuta. Erabil ezazu ordenagailuaren eta gailuaren artean datuak kopiatzeko, aplikazioak gailuan jakinarazi gabe instalatzeko eta erregistro-datuak irakurtzeko."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Aurretik baimendutako ordenagailu guztiei USB arazketarako sarbidea baliogabetu nahi diezu?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> erabili nahi duzu?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuak hau egin behar du:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikazio bat baimen-eskaera oztopatzen ari denez, ezarpenek ezin dute egiaztatu erantzuna."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> aktibatzen baduzu, gailuak ez du pantailaren blokeoa erabiliko datuen enkriptatzea hobetzeko."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Erabilerraztasun-zerbitzua aktibatu duzunez, gailuak ez du pantailaren blokeoa erabiliko datuen enkriptatzea hobetzeko."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzua aktibatzeak datu-enkriptatzeari eragiten dionez, eredua berretsi behar duzu."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Prozesu-estatistikak"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Exekutatzen ari diren prozesuei buruzko estatistika zehatzak"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memoriaren erabilera"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> aplikazioak denbora honetan: <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g>/<xliff:g id="TOTALRAM">%2$s</xliff:g> erabili da (<xliff:g id="TIMEDURATION">%3$s</xliff:g>)"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Atzeko planoa"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Aurreko planoa"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Cachean gordeta"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Gailuaren memoriaren uneko egoera: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Batez besteko RAM erabilera"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM memoriaren gehienezko erabilera"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android sistema eragilea"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Jatorrizkoa"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kernela"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Cacheak"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM erabilera"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM erabilera (atzeko planoan)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Exekuzio-denbora:"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Prozesuak"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Zerbitzuak"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Iraupena"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Memoriaren xehetasunak"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ordu"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 egun"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Erakutsi sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ezkutatu sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Erabili USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Estatistika mota"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Atzeko planoa"</string>
@@ -1739,7 +1794,7 @@
     <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_interactor_preference_summary" msgid="1801414022026937190">"Erabateko interakzioa eta gako-hitzen erabilera"</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>
     <string name="tts_settings" msgid="8186971894801348327">"Testua ahots bihurtzeko eginbidearen ezarpenak"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Ezarpen lehenetsi hauek aplikazio-ezarpenak gainidazten dituzte"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Ezarpen lehenetsiak"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor lehenetsia"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Esandako testurako erabiliko den hizketaren sintesi-motorra ezartzen du."</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Konfiguratu ahots bidezko idazketarako erabili nahi duzun ahots-sintetizagailua"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Hizketa-abiadura"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Testua zer abiaduran esaten den"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonua"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarean gordetakoa"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Softwarean soilik"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Erabiltzaile honek ez dauka kredentzialik"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kredentzialak instalatu nahi dituzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Idatzi kredentzialen biltegiaren pasahitza."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Uneko pasahitza:"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Egin nire datuen babeskopia"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Egin datuen, Wi-Fi pasahitzen eta beste ezarpenen babeskopia Google zerbitzarietan."</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Babeskopien kontua"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ez dago babeskopiak gordetzen dituen aplikaziorik"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Sartu aplikazioen datuak"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Leheneratze automatikoa"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Aplikazioak berriro instalatzean, leheneratu babeskopia egindako ezarpenak eta datuak."</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Babeskopia-zerbitzua ez dago aktibo."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Gailu-gidalerroak ezartzen du hau."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Tokiko babeskop. pasahitza"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Une honetan, ordenagailuko babeskopia osoak ez daude babestuta."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Ukitu ordenagailuko babeskopia osoak egiteko pasahitza aldatzeko edo kentzeko"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Trantsizio-animazio eskala"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animatzailearen iraupena"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulatu bigarren mailako bistaratzeak"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Leiho anitzeko modua"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Hainbat jarduera pantailan aldi berean."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Leiho anitzeko modua gaitu nahi duzu?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ABISUA: eginbide hau oso esperimentala da eta pantailan aldi berean hainbat jarduera egitea ahalbidetzen du, Azken aplikazioak interfazearen bidez. Baliteke aplikazio batzuek huts egitea edo behar bezala ez funtzionatzea eginbide honetan erabili bitartean."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikazioak"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ez mantendu jarduerak"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Ezabatu jarduerak erabiltzailea haietatik irtetean"</string>
@@ -2040,7 +2096,7 @@
     <string name="data_usage_cycle" msgid="5652529796195787949">"Datu-erabileraren zikloa"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Aplikazioen erabilera"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Ibiltaritzako datuak"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Murriztu atzeko planoko datuak"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Mugatu atzeko planoko datuak"</string>
     <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"Onartu atz. planoko datuak"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G erabilera bereizia"</string>
     <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Erakutsi Wi‑Fi sareen erabilera"</string>
@@ -2078,10 +2134,10 @@
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Aurreko planoan:"</string>
     <string name="data_usage_background_label" msgid="2722008379947694926">"Atzeko planoa:"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"Aplikazioaren ezarpenak"</string>
-    <string name="data_usage_app_restrict_background" msgid="7510046552380574925">"Murriztu atzeko planoko datuak"</string>
+    <string name="data_usage_app_restrict_background" msgid="7510046552380574925">"Mugatu atzeko planoko datuak"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="3720075732277934106">"Desgaitu atzeko planoko datuen erabilera sare mugikorretan."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="1446565717342917727">"Aplikazioak atzeko planoan daturik erabil ez dezan, ezarri muga."</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Atzeko planoko datuak murriztu?"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Atzeko planoko datuak mugatu?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="5871168521456832764">"Ezarpen hau erabiltzen bada, atzeko planoko datuetan oinarritzen diren aplikazioek  ez dute funtzionatuko erabilgarri dauden sare bakarrak mugikorrenak direnean.\n\nDatuen erabilera kontrolatzeko aukera egokiagoak aurki ditzakezu aplikazioen ezarpenetan."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="4674085030810350875">"Datu mugikorren muga ezarrita baduzu soilik murritz ditzakezu atzeko planoko datuak."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Sink. auto. datuak aktibatu?"</string>
@@ -2097,10 +2153,10 @@
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Datu-erabilera mugatzea"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5788774061143636263">"Datuen mugara heltzen denean, tabletak datu mugikorrak desaktibatuko ditu.\n\nTabletak datuen erabilera neurtzen du, baina baliteke operadoreak erabilera hori beste era batera neurtzea. Horregatik, muga zuhurra ezartzea gomendatzen dugu."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3511301596446820549">"Datuen mugara heltzen denean, telefonoak datu mugikorrak desaktibatuko ditu.\n\nTelefonoak datuen erabilera neurtzen du, baina baliteke operadoreak erabilera hori beste era batera neurtzea. Horregatik, muga zuhurra ezartzea gomendatzen dugu."</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Atzeko planoko datuak murriztu?"</string>
-    <string name="data_usage_restrict_background" msgid="8210134218644196511">"Atzeko planoan datu mugikorrak erabiltzeko aukera murrizten baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko Wi-Fi sare batera konektatu ezean."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="3262993384666280985">"Atzeko planoan datu mugikorrak erabiltzeko aukera murrizten baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko Wi-Fi sare batera konektatu ezean.\n\nEzarpen horrek tabletaren erabiltzaile guztiei eragiten die."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="4352615206362479722">"Atzeko planoan datu mugikorrak erabiltzeko aukera murrizten baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko Wi-Fi sare batera konektatu ezean.\n\nEzarpen horrek telefonoaren erabiltzaile guztiei eragiten die."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Atzeko planoko datuak mugatu?"</string>
+    <string name="data_usage_restrict_background" msgid="8210134218644196511">"Atzeko planoan datu mugikorrak erabiltzeko aukera mugatzen baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko Wi-Fi sare batera konektatu ezean."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="3262993384666280985">"Atzeko planoan datu mugikorrak erabiltzeko aukera mugatzen baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko Wi-Fi sare batera konektatu ezean.\n\nEzarpen horrek tabletaren erabiltzaile guztiei eragiten die."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="4352615206362479722">"Atzeko planoan datu mugikorrak erabiltzeko aukera mugatzen baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko Wi-Fi sare batera konektatu ezean.\n\nEzarpen horrek telefonoaren erabiltzaile guztiei eragiten die."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"abisua"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"muga"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Kendutako aplikazioak"</string>
@@ -2191,11 +2247,11 @@
     <string name="user_nickname" msgid="5148818000228994488">"Goitizena"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Gehitu"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Erabiltzaileek euren aplikazioak eta edukia dituzte."</string>
-    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Aplikazioetarako eta edukirako sarbidea murritz dezakezu zure kontutik."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Aplikazioetarako eta edukirako sarbidea muga dezakezu zure kontutik."</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Erabiltzailea"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil murriztua"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Beste erabiltzaile bat gehitu nahi duzu?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Gailu hau beste pertsona batzuekin parteka dezakezu, erabiltzaile osagarriak sortuta. Erabiltzaile bakoitzak bere eremua izango du eta, bertan, aplikazioak, horma-papera eta antzekoak pertsonaliza ditzakete. Horrez gain, erabiltzaile guztiei eragin diezaieketen ezarpen batzuk ere doi ditzakete, adibidez, Wi-Fi konexioarena.\n\nErabiltzaile bat gehitzen duzunean, erabiltzaile horrek bere eremua konfiguratu beharko du.\n\nEdozein erabiltzailek egunera ditzake beste erabiltzaile guztien aplikazioak."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Gailu hau beste pertsona batzuekin parteka dezakezu, erabiltzaile gehiago sortuta. Erabiltzaile bakoitzak bere eremua izango du eta, bertan, aplikazioak, horma-papera eta antzekoak pertsonalizatu ahal izango dituzte. Horrez gain, erabiltzaile guztiei eragin diezaieketen ezarpen batzuk ere doitu ahal izango dituzte, adibidez, Wi-Fi konexioarena.\n\nErabiltzaile bat gehitzen duzunean, erabiltzaileak berak konfiguratu beharko du bere eremua.\n\nEdozein erabiltzailek egunera ditzake beste erabiltzaile guztien aplikazioak."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Erabiltzaile bat gehitzen duzunean, erabiltzaile horrek bere eremua konfiguratu beharko du.\n\nEdozein erabiltzailek egunera ditzake beste erabiltzaile guztien aplikazioak."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Erabiltzailea konfiguratu?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Ziurtatu pertsona horrek gailua hartu eta bere eremua konfigura dezakeela"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Gonbidatua kendu nahi duzu?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Saioko aplikazio eta datu guztiak ezabatuko dira."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Kendu"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Baimendu telefono-deiak"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Baimendu telefono-deiak eta SMSak"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Aktibatu telefono-deiak"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Aktibatu telefono-deiak eta SMS mezuak"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Kendu erabiltzailea"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Telefono-deiak baimendu nahi dituzu?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Telefono-deiak aktibatu nahi dituzu?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Deien historia erabiltzaile honekin partekatuko da."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Telefono-deiak eta SMSak baimendu nahi dituzu?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Deien eta SMSen historia erabiltzaile honekin partekatuko da."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefono-deiak eta SMSak aktibatu nahi dituzu?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Deien eta SMS mezuen historia erabiltzaile honekin partekatuko da."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Baimendu aplikazioak eta edukia"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Murrizketak dituzten aplikazioak"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Zabaldu aplikazio-ezarpenak"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"ALDATU IZENA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Ezarri murrizketak aplikazioei"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> aplikazioak kontrolatua"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Aplikazio hau ez da profil murriztuekin bateragarria"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Aplikazioak zure kontuak atzi ditzake"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Aplikazio honek zure kontuak atzi ditzake. <xliff:g id="APP">%1$s</xliff:g> aplikazioak kontrolatua."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi eta datu mugikorrak"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Baimendu Wi‑Fi ezarpenak eta datu mugikorren ezarpenak aldatzea."</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sareko konexioa"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"testu-mezua, testu-mezuak, mezuak"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mugikorra, operadorea, eramailea, hari gabeko datuak, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi deia deitzea"</string>
     <string name="keywords_home" msgid="3626170808219458848">"abiarazlea"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ukipen pantaila"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ilundu pantaila, ukipen-pantaila, bateria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ilundu pantaila, ukipen-pantaila, bateria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"atzeko planoa, pertsonalizatu, pantaila"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"gai iluna, gau modua, ilundu pantaila, alderantzikatu distira"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"atzeko planoa, pertsonalizatu, doitu, pantaila"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"testuaren tamaina"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proiektu"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"proiektuaren igorpena"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"tokia, diskoa, disko gogorra, gailua, erabilera"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"energia, kontsumoa, karga"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografia, hiztegia, zuzentzaile ortografikoa, zuzenketa automatikoa"</string>
@@ -2370,8 +2428,13 @@
     <string name="keywords_location" msgid="782326973714313480">"inguruan kokapen historia hautemate"</string>
     <string name="keywords_location_mode" msgid="8584992704568356084">"zehaztasun"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"kontu"</string>
-    <string name="keywords_users" msgid="4673901601478559100">"murrizketa murriztu debekatu"</string>
+    <string name="keywords_users" msgid="4673901601478559100">"muga mugatu debekatu"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"testua, zuzenketa, zuzendu, soinua, dardara, automatikoa, hizkuntza, keinua, iradoki, iradokizuna, gaia, iraingarria, hitza, mota, emotikonoa, nazioartekoa"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"berrezarri hobespenak lehenetsia"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"larrialdietarako aplikazio lehenetsia"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplikazioak deskargatu aplikazioa sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikazioak baimenak segurtasuna"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplikazio lehenetsi"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"lerratu pasahitz eredu pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfiguratu Wi-Fi NFC etiketa"</string>
     <string name="write_tag" msgid="8571858602896222537">"Idatzi"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Etenaldiak"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Deiak eta jakinarazpenak jasotzean"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Eten beti"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Baimendu lehentasun-etenaldiak soilik"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ez eten"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Lehentasunezkoak soilik"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Arau automatikoak"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Lehentasunezkoak"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmak soilik"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Etenaldirik gabe"</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="ringtone_title" msgid="5379026328015343686">"Telefonoaren tonu-jotzailea"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Jakinarazpenen tonu lehenetsia"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Egin dar-dar deietan ere"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dar-dar"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Jakinarazpenetarako sarbidea"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikazioek ezin dituzte jakinarazpenak irakurri"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplikaziok irakur ditzake jakinarazpenak"</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplikaziok irakur ditzakete jakinarazpenak"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d aplikaziok jakinarazpenak irakur ditzakete</item>
+      <item quantity="one">%d aplikaziok jakinarazpenak irakur ditzake</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Ez da jakinarazpen-entzulerik instalatu."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> gaitu?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> eginbidea sistemak edo instalatutako aplikazioek bidaltzen dituzten jakinarazpen guztiak irakurtzeko gai izango da, informazio pertsonala barne; adibidez, kontaktuen izenak eta jaso dituzun testu-mezuak. Gainera, jakinarazpen horiek baztertu edo horien barruko ekintza-botoiak sakatu ahal izango ditu."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Baldintza-hornitzaileak"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ez dago baldintzak hornitzen dituen aplikaziorik"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplikaziok baldintzak hornitzen ditu"</item>
-    <item quantity="other" msgid="358057362115673258">"%d aplikaziok baldintzak hornitzen dituzte"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ez dago baldintza-hornitzailerik instalatuta."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> gaitu nahi duzu?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> hornitzaileak irteteko baldintzak gehitu ahal izango ditu Ez molestatu moduan."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Aplikazioak kargatzen…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blokeatu"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeatu guztiak"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ez erakutsi inoiz aplikazio honen jakinarazpenak"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Lehentasuna"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Erakutsi jakinarazpenak zerrendaren goiko aldean, eta jarraitu jakinarazpenak jasotzen gailuak lehentasun-etenaldiak bakarrik ezarrita dituenean"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Isilpekoa"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Gailua blokeatuta dagoenean, ezkutatu aplikazioaren jakinarazpenetako isilpeko edukia"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Hartu lehentasunezkotzat"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Baimendu aplikazioari jakinarazpenak entzunaraztea \"Ez molestatu\" aukera aukeratuta dagoenean, baina lehentasunezko jakinarazpenen salbuespenarekin."</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Baimendu agerraraztea"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Baimendu aplikazioari jakinarazpenetako batzuk nabarmentzea, uneko pantailan une batez agerrarazita."</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ezkutatu isilpeko informazioa"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Gailua blokeatuta dagoenean, ezkutatu aplikazio honen jakinarazpenak, isilpeko edukia badute"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeatuta"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Lehentasuna"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Isilpekoa"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Eginda"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Hau itzali arte"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Lehentasun-etenaldiak"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Jarduerarik gabeko denbora"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Egunak"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Bat ere ez"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Etenaldiak onartzen dira"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Lehentasunezkoak soilik"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Bat ere ez"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizazioa"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Aktibatu automatikoki"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Arauaren izena"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Gehitu araua"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ezabatu araua"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" araua ezabatu nahi duzu?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Ezabatu"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Arau mota"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Ezezaguna"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfiguratu araua"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Antolatu araua"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Ez da aurkitu araua."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Egunak"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Bat ere ez"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Egunero"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Inoiz ez"</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">"Deiak"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mezuak"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Honen deiak/mezuak"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Edonor"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Kontaktuak soilik"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kontaktu izardunak soilik"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Gertaerak eta abisuak"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmak lehentasun-etenaldiak dira beti"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmak"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Abisuak"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Gertaerak"</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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Lanegunetako gauak"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hasiera-ordua"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Amaiera-ordua"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Hurrengo eguneko <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> edo horren aurreko beste edozein alarma"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Hurrengo eguneko <xliff:g id="FORMATTED_TIME">%s</xliff:g> edo horren aurreko beste edozein alarma"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Hurrengo eguneko <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Etenaldiak"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Deiak eta jakinarazpenak jasotzean"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Noiz nahi duzu etetea?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Zenbat denboran?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Eten beti"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"desaktibatuta,dena,guztia"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Baimendu lehentasun-etenaldiak soilik"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Onartu alarmak soilik"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Ez eten"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Mugagabea"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutu</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minutu</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ordu</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ordu</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Aldatu \"Lehentasunezkoak soilik\" modura besterik esan arte"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Aldatu \"Lehentasunezkoak soilik\" modura <xliff:g id="DURATION">%1$d</xliff:g> minutuz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Lehentasunezkoak soilik\" modura minutu batez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Aldatu \"Lehentasunezkoak soilik\" modura <xliff:g id="DURATION">%1$d</xliff:g> orduz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Lehentasunezkoak soilik\" modura ordubetez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Aldatu \"Alarmak soilik\" modura besterik esan arte"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Aldatu \"Alarmak soilik\" modura <xliff:g id="DURATION">%1$d</xliff:g> minutuz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Alarmak soilik\" modura minutu batez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Aldatu \"Alarmak soilik\" modura <xliff:g id="DURATION">%1$d</xliff:g> orduz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Alarmak soilik\" modura ordubetez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Aldatu \"Ez eten\" modura besterik esan arte"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Aldatu \"Ez eten\" modura <xliff:g id="DURATION">%1$d</xliff:g> minutuz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Ez eten\" modura minutu batez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Aldatu \"Ez eten\" modura <xliff:g id="DURATION">%1$d</xliff:g> orduz, <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> arte</item>
+      <item quantity="one">Aldatu \"Ez eten\" modura ordubetez, <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> arte</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Aldatu \"Eten beti\" modura"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"betiko"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Aplikazioen jakinarazpenak"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Jakinarazpen-ezarpenak"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bidali gailu honi buruzko iritzia"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEIari buruzko informazioa"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEIari buruzko informazioa"</string>
     <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. zirrikitua)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Abiarazi modu lehenetsian"</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="app_launch_domain_links_title" msgid="458956710410857777">"Domeinuaren estekak"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Ireki domeinuaren URLak"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Baimendu aplikazioari domeinuaren URLak zuzenean irekitzea"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Onartutako domeinuaren URLak"</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_type_internal" msgid="410824961149037234">"barneko memoria"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"kanpoko memoria"</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>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g>, <xliff:g id="DATE">%2$s</xliff:g> eta gero"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Erabilitako memoria"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Aktibatuta"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blokeatu"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Isilpekotasuna"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Lehentasuna"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Lehentasuna eta isilpekotasuna"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> baimen eman dira</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> baimen eman da</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g>/<xliff:g id="COUNT_3">%d</xliff:g> baimen eman dira</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> baimen eman da</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Hobespen lehenetsi batzuk ezarrita daude"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Ez dago hobespen lehenetsirik ezarrita"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Aplikazio guztiak"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Gaitutakoak"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Pertsonalak"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Lanekoak"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeatutakoak"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Lehentasunezkoak"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Isilpekoak"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domeinuaren URLekin"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Administratzaileak desgaitu du"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Ezarpen aurreratuak"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Aplikazio ezezaguna"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Aukeratu profila"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Aplikaziorako baimenak"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> aplikaziok sarbide gehigarria dute"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> aplikazio baimenduta"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domeinuaren URLak"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Ez ireki domeinuaren URLrik"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Ireki \"<xliff:g id="DOMAIN">%s</xliff:g>\""</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Ireki \"<xliff:g id="DOMAIN">%s</xliff:g>\" eta erlazionatutako URLak"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikaziok euren domeinuaren URLak ireki ditzakete</item>
+      <item quantity="one">Aplikazio batek bere domeinuaren URLak ireki ditzake</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Ez da ezagutzen"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplikazio lehenetsiak"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Arakatzailearen aplikazioa"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Ez dago arakatzailerik lehenetsita"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Lehenetsia)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Aplikazioen biltegiratzea"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index a5cfce4..17b04d0 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"فشار دکمه"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"صدادار/بی‌صدا کردن میکروفن"</item>
     <item msgid="1148142988678569310">"فرستادن رسانه"</item>
     <item msgid="9130014005474445273">"‏فعال‌سازی VPN"</item>
+    <item msgid="1165192162975045562">"نوشتن کاغذ دیواری"</item>
+    <item msgid="7129487923652967258">"دستیار ساختار"</item>
+    <item msgid="1069023208100114540">"دستیار عکس صفحه‌نمایش"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"موقعیت مکانی"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"صدادار/بی‌صدا کردن میکروفن"</item>
     <item msgid="5906017727368097853">"فرستادن رسانه"</item>
     <item msgid="2486614710846178542">"‏فعال‌سازی VPN"</item>
+    <item msgid="5586547561693629602">"نوشتن کاغذ دیواری"</item>
+    <item msgid="32794179825485062">"دستیار ساختار"</item>
+    <item msgid="7872852746938272552">"دستیار عکس‌ صفحه‌نمایش"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"کوتاه"</item>
@@ -345,7 +354,7 @@
     <item msgid="7247838127505318669">"‏Sans-serif با عرض ثابت"</item>
     <item msgid="4478414822462359763">"Serif"</item>
     <item msgid="7502451783483660829">"‏Serif با عرض ثابت"</item>
-    <item msgid="639503332147461010">"معمولی"</item>
+    <item msgid="639503332147461010">"غیررسمی"</item>
     <item msgid="7967169925231332424">"شکسته"</item>
     <item msgid="561832997193039673">"حروف بزرگ با اندازه کوچک"</item>
   </string-array>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"کم"</item>
     <item msgid="4212263919458209842">"بحرانی"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"خاموش"</item>
-    <item msgid="5656544177755411222">"وقفه‌های محدود"</item>
-    <item msgid="8735337502532332056">"بدون وقفه"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"عادی"</item>
     <item msgid="866544120205026771">"متوسط"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"صورتی"</item>
     <item msgid="6131821495505931173">"قرمز"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"‏MTP (پروتکل انتقال رسانه)"</item>
+    <item msgid="8856820259201251036">"‏PTP (پروتکل انتقال تصویر)"</item>
+    <item msgid="216135047298423770">"‏RNDIS (اترنت USB)"</item>
+    <item msgid="2686051673589572111">"منبع صوتی"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 5547090..9655d42 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"اجازه دادن"</string>
     <string name="deny" msgid="6947806159746484865">"ردکردن"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ناشناس"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"شما در حال حاضر، <xliff:g id="STEP_COUNT">%1$d</xliff:g> قدم تا برنامه‌نویس شدن فاصله دارید."</item>
-    <item quantity="other" msgid="6722953419953594148">"شما در حال حاضر، <xliff:g id="STEP_COUNT">%1$d</xliff:g> قدم تا برنامه‌نویس شدن فاصله دارید."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">اکنون <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> قدم با برنامه‌نویس شدن فاصله دارید.</item>
+      <item quantity="other">اکنون <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> قدم با برنامه‌نویس شدن فاصله دارید.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"شما اکنون یک برنامه‌نویس هستید!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"نیازی نیست، شما در حال حاضر یک برنامه‌نویس هستید."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"بی‌سیم و شبکه‌ها"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"‏غیرفعال کردن پیامک در IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"‏لازم است که ثبت‌ IMS را فعال کنید"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"‏لازم است که ثبت‌ IMS را غیرفعال کنید"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"‏روشن کردن پرچم مشروط VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"‏خاموش کردن پرچم مشروط VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"‏روشن کردن رونوشت رمپ lte"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"‏غیرفعال کردن رونوشت رم lte"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"مشاهده دفترچه آدرس سیم کارت"</string>
@@ -91,7 +93,7 @@
     <string name="battery_info_awake_plugged" msgid="176716874713478188">"زمان بیداری هنگام شارژ کردن:"</string>
     <string name="battery_info_screen_on" msgid="376277447175613889">"زمان روشن بودن صفحه:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"ناشناس"</string>
-    <string name="battery_info_status_charging" msgid="1705179948350365604">"شارژ کردن"</string>
+    <string name="battery_info_status_charging" msgid="1705179948350365604">"در حال شارژ شدن"</string>
     <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"شارژ با جریان متناوب"</string>
     <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"‏شارژ از طریق USB"</string>
     <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"شارژ به صورت بی‌سیم"</string>
@@ -135,16 +137,7 @@
     <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;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt; را غیرفعال می‌کند"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"متصل"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"متصل شد (بدون تلفن)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"متصل شد (بدون رسانه)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"متصل (عدم دسترسی به پیام)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"متصل شد (بدون تلفن یا رسانه)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"اتصال قطع شد"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"در حال قطع اتصال..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"در حال اتصال…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"در حال مرتبط‌سازی..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"دستگاه بلوتوث بدون نام"</string>
     <string name="progress_scanning" msgid="192587958424295789">"در حال جستجو"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"هیچ دستگاه بلوتوثی در این اطراف پیدا نشد."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"نمایش فایل‌های دریافتی"</string>
     <string name="device_picker" msgid="4978696506172252813">"انتخاب دستگاه بلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"درخواست مجوز بلوتوث"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"برنامه‌ای می‌خواهد بلوتوث را روشن کند."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"برنامه‌ای می‌خواهد بلوتوث این دستگاه را روشن کند."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"برنامه‌ای می‌خواهد رایانه لوحی شما را برای سایر دستگاه‌های بلوتوث به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"برنامه‌ای می‌خواهد تلفن شما را برای سایر دستگاه‌های بلوتوث به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"برنامه‌ای می‌خواهد رایانه لوحی شما را برای سایر دستگاه‌های بلوتوث قابل مشاهده کند. شما می‌توانید این حالت را بعداً در تنظیمات بلوتوث تغییر دهید."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"لغو"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ادامه"</string>
     <string name="okay" msgid="1997666393121016642">"تأیید"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"بله"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"خیر"</string>
-    <string name="forget" msgid="7267115980248732932">"فراموش شود"</string>
+    <string name="forget" msgid="1400428660472591263">"فراموش کردن"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"بهبود مطابقت چهره"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"بررسی پخش واقعی و زنده چهره"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"هنگام بازکردن قفل باید چشمک بزنید"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تنظیم مکان من، بازگشایی قفل صفحه، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"گذرواژه‌ها"</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="3453670509485083962">"افزودن"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"قفل صفحه"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"تنظیم اثر انگشت"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"برای استفاده از اثر انگشتتان جهت باز کردن قفل صفحه‌نمایش یا تأیید خرید، باید: \n\n‏✓ روش قفل صفحه پشتیبانتان را تنظیم کنید \n\n‏✓ اثر انگشتتان را اضافه کنید"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"پیدا کردن حسگر"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"محل حسگر اثر انگشت را در پشت تلفنتان پیدا کنید."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"بیایید شروع کنیم."</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"انگشتتان را روی حسگر اثر انگشت بگذارید. بعد از احساس لرزش آن را بردارید."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"عالی است! اکنون دوباره تکرار کنید."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"همان انگشت را روی حسگر اثر انگشت بگذارید و بعد از احساس لرزش آن را بردارید."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"اثر انگشت اضافه شد."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"هر زمان این نماد را ببینید، می‌توانید از اثر انگشتتان برای شناسایی یا تأیید خرید استفاده کنید."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"افزودن"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"بعدی"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"باید الگوی بازگشایی‌تان را ترسیم کنید تا رمزگذاری دستگاه‌تان را تأیید کنید."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"رمزگذاری؟"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"عملیات رمزگذاری غیر قابل بازگشت است و در صورت ایجاد وقفه در آن، داده‌های خود را از دست خواهید داد. رمزگذاری یک ساعت یا بیشتر طول می‌کشد که در طول آن، رایانهٔ لوحی چندین بار راه‌اندازی مجدد می‌شود."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"عملیات رمزگذاری غیر قابل بازگشت است و در صورت ایجاد وقفه در آن، داده‌های خود را از دست خواهید داد. رمزگذاری یک ساعت یا بیشتر طول می‌کشد که در طول آن، تلفن چندین بار راه‌اندازی مجدد می‌شود."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"امنیت پایین، تجربی"</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>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"رمز ورود"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"امنیت بالا"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"قفل صفحه فعلی"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"قابلیت‌های محافظت دستگاه دیگر کار نمی‌کنند."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"توسط سرپرست، سیاست رمزگذاری یا حافظه اطلاعات کاربردی غیرفعال شده است"</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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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="7579210814842056547">"‏پس از تنظیم قفل صفحه، همچنین می‌توانید اثر انگشتتان را در «تنظیمات» &gt; «امنیت» تنظیم کنید."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"خاموش کردن قفل صفحه"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"حذف الگوی بازگشایی قفل"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"حذف پین بازگشایی قفل"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"گذرواژه باید حداقل دارای یک حرف باشد."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"گذرواژه باید دارای حداقل یک رقم باشد."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"گذرواژه باید دارای حداقل یک نماد باشد."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"گذرواژه باید دارای حداقل 1 حرف باشد."</item>
-    <item quantity="other" msgid="8186027808415585970">"‏گذرواژه باید دارای حداقل %d حرف باشد."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"گذرواژه باید دارای حداقل 1 حرف کوچک باشد."</item>
-    <item quantity="other" msgid="2693910942679679225">"‏گذروازه باید دارای حداقل %d حرف کوچک باشد."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"گذرواژه باید دارای حداقل 1 حرف بزرگ باشد."</item>
-    <item quantity="other" msgid="3030801209112209245">"‏گذرواژه باید دارای حداقل %d حرف بزرگ باشد."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"گذرواژه باید دارای حداقل 1 رقم باشد."</item>
-    <item quantity="other" msgid="4703982391407595924">"‏گذرواژه باید دارای حداقل %d رقم باشد."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"گذرواژه باید دارای حداقل 1 نماد ویژه باشد."</item>
-    <item quantity="other" msgid="1221290525051187757">"‏گذرواژه باید دارای حداقل %d نماد ویژه باشد."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"گذرواژه باید حداقل دارای 1 نویسه غیرحرفی باشد."</item>
-    <item quantity="other" msgid="3952508584649046404">"‏گذرواژه باید دارای حداقل %d نویسه غیرحرفی باشد."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">‏گذرواژه باید دارای حداقل %d حرف باشد.</item>
+      <item quantity="other">‏گذرواژه باید دارای حداقل %d حرف باشد.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">‏ گذرواژه باید دارای حداقل %d حرف کوچک باشد.</item>
+      <item quantity="other">‏ گذرواژه باید دارای حداقل %d حرف کوچک باشد.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">‏گذرواژه باید دارای حداقل %d حرف بزرگ باشد.</item>
+      <item quantity="other">‏گذرواژه باید دارای حداقل %d حرف بزرگ باشد.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">‏گذرواژه باید دارای حداقل %d رقم باشد.</item>
+      <item quantity="other">‏گذرواژه باید دارای حداقل %d رقم باشد.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">‏گذرواژه باید دارای حداقل %d نماد ویژه باشد.</item>
+      <item quantity="other">‏گذرواژه باید دارای حداقل %d نماد ویژه باشد.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">‏گذرواژه باید حداقل دارای %d نویسه غیرحرفی باشد.</item>
+      <item quantity="other">‏گذرواژه باید حداقل دارای %d نویسه غیرحرفی باشد.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"سرپرست دستگاه اجازه استفاده از گذرواژه اخیر را نمی‌دهد."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ترتیب صعودی، نزولی یا تکراری ارقام ممنوع است"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"تأیید"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"مرتبط سازی"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"مرتبط‌سازی"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"لغو"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"وقتی وصل باشید، مرتبط‌سازی اجازه دسترسی به مخاطبین و سابقه تماستان را فراهم می‌کند."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"جفت کردن با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> امکان‌پذیر نیست."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"به خاطر یک پین یا کلیدواژه نادرست، مرتبط‌سازی با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> انجام نشد."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ارتباط با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> امکان‌پذیر نیست."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرتبط‌سازی را رد کرد."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"اتصال به <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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"برای بهبود دقت مکان، حتی وقتی بلوتوث خاموش است، سرویس‌ها و برنامه‌ها، دستگاه‌های بلوتوث را اسکن می‌کنند. می‌توانید این مورد را در <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_specific_profiles_title" msgid="6952214406025825164">"اتصال به..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"رسانه صوتی"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"صدای تلفن"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"انتقال فایل"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"دستگاه ورودی"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"دسترسی به اینترنت"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"اشتراک‌گذاری مخاطب"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"استفاده برای اشتراک‌گذاری مخاطب"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"اشتراک‌گذاری اتصال اینترنت"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"دسترسی به پیام"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"به رسانه صوتی متصل شد"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"به تلفن صوتی متصل شد"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"به سرور انتقال فایل متصل شد"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"به نقشه متصل شد"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"به سرور انتقال فایل متصل نیست"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"به دستگاه ورودی متصل شد"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"استفاده برای رسانه صوتی"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"استفاده برای تلفن صوتی"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"استفاده برای انتقال فایل"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"استفاده برای چاپ"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"استفاده برای دسترسی به اینترنت"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"استفاده برای نقشه"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"‏متصل شده از طریق دستیار Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"فرستادن صفحه‌نمایش"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"‏خاموش کردن Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"خطا"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"در حالت هواپیما"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"اسکن شبکه‌ها امکان‌پذیر نیست"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"اعلان شبکه"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"زمانی که یک شبکه عمومی در دسترس است، اطلاع داده شود"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"اجتناب از اتصالات ضعیف"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"‏از شبکه Wi-Fi استفاده نکنید، مگر آنکه اتصال اینترنتی مناسب باشد"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"فقط از شبکه‌هایی استفاده می‌شود که اتصال اینترنتی خوبی دارند"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"اسکن کردن همواره در دسترس باشد"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"مجاز بودن همیشگی جستجوی شبکه"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"‏به سرویس‌ مکان Google و دیگر برنامه‌ها اجازه می‌دهد حتی هنگامی که Wi-Fi خاموش است، برای یافتن شبکه‌ها جستجو کنند"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"‏استفاده خودکار از Wi-Fi باز"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"‏به دستیار Wi-Fi اجازه داده شود به صورت خودکار به شبکه‌های باز با کیفیت بالا متصل شود"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"انتخاب دستیار"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"نصب گواهی‌ها"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"‏برای بهبود میزان دقت موقعیت مکانی و به منظور اهداف دیگر، Google و سایر برنامه‌ها ممکن است شبکه‌های اطراف را اسکن کنند، حتی وقتی Wi-Fi خاموش است. اگر نمی‌خواهید چنین شود، به پیشرفته &gt; همیشه اسکن موجود باشد، بروید."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"‏برنامه‌ها ممکن است شبکه‌های اطراف را اسکن کنند، حتی زمانی که Wi-Fi خاموش است. اگر نمی‌خواهید چنین شود، به پیشرفته &gt; همیشه اسکن موجود باشد، بروید."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"‏برای بهبود دقت مکان، حتی وقتی Wi-Fi خاموش است، برنامه‌ها و سرویس‌ها، دستگاه‌های 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="5340097010842405981">"دوباره نشان داده نشود"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"افزودن شبکه‌ای دیگر"</string>
     <string name="wifi_more" msgid="3195296805089107950">"بیشتر"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"‏تنظیم خودکار (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"‏برای تکمیل راه‌اندازی، رایانه لوحی شما باید به Wi-Fi دسترسی داشته باشد. پس از راه‌اندازی، می‌توانید بین داده‌های شبکه تلفن همراه و Wi-Fi جابه‌جا شوید."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"گزینه‌های پیشرفته"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"‏راه‌اندازی WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"‏دکمه Wi‑Fi Protected Setup را در مسیریاب خود فشار دهید. این دکمه ممکن است «WPS» نامیده شود یا دارای این نماد باشد:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"‏دکمه 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>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"‏پیکربندی باند AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"باند ۲٫۴ گیگاهرتزی"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"باند ۵ گیگاهرتزی"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"‏تنظیمات IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(بدون تغییر)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(مشخص نشده)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"ذخیره‌شده"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"غیرفعال شد"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏پیکربندی IP انجام نشد"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏اتصال Wi-Fi برقرار نشد"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"مشکل تأیید اعتبار"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"در محدوده نیست"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"دسترسی به اینترنت شناسایی نشد، به صورت خودکار وصل نمی‌شود."</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_security_none" msgid="7985461072596594400">"هیچکدام"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"این شبکه فاقد دسترسی اینترنت است. با این وجود از این شبکه استفاده می‌کنید؟"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"دیگر درباره این شبکه سؤال نشود"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"اتصال به شبکه برقرار نشد"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"فراموش کردن"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"‏نقطه اتصال WiFi قابل حمل AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"‏<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> نقطه اتصال قابل حمل Wi-Fi"</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_mode_title" msgid="2164073796253284289">"تنظیمات ترجیحی تماس"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"‏حالت تماس از طریق Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"‏Wi-Fi ترجیحی"</item>
+    <item msgid="5267397515594230396">"شبکه همراه ترجیحی"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"۲"</item>
+    <item msgid="1171822231056612021">"۱"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"‏وقتی تماس Wi-Fi روشن است، تلفن شما می‌تواند بنابر تنظیمات ترجیحی‌تان و اینکه چه سیگنالی قدرتمندتر است، تماس‌ها را از طریق شبکه‌های Wi-Fi یا شبکه شرکت مخابراتی‌تان هدایت کند. قبل از روشن کردن این قابلیت، هزینه‌ها و سایر جزئیات را با شرکت مخابراتی‌تان بررسی کنید."</string>
     <string name="home_settings" msgid="212375129455718176">"صفحه اصلی"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"صفحهٔ نمایش"</string>
     <string name="sound_settings" msgid="5534671337768745343">"صدا"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"طرح‌زمینه"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"روشن"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"تیره"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"خودکار"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"سیم‌کارت ترجیجی به‌روز شود؟"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> تنها سیم‌کارت روی دستگاه شماست. می‌خواهید از این سیم‌کارت برای داده‌های شبکه تلفن همراه، تماس‌ها و پیامک استفاده کنید؟"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"کد پین سیم کارت اشتباه است، اکنون برای گشودن قفل دستگاهتان باید با شرکت مخابراتی تماس بگیرید."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"کد پین سیم کارت اشتباه است، <xliff:g id="NUMBER">%d</xliff:g> بار دیگر می‌توانید تلاش کنید و پس از آن برای گشودن قفل دستگاهتان باید با شرکت مخابراتی تماس بگیرید."</item>
-    <item quantity="other" msgid="77103619544346451">"کد پین سیم کارت اشتباه است، <xliff:g id="NUMBER">%d</xliff:g> بار دیگر می‌توانید تلاش کنید."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">کد پین سیم‌کارت اشتباه است، <xliff:g id="NUMBER_1">%d</xliff:g> بار دیگر می‌توانید تلاش کنید.</item>
+      <item quantity="other">کد پین سیم‌کارت اشتباه است، <xliff:g id="NUMBER_1">%d</xliff:g> بار دیگر می‌توانید تلاش کنید.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"عملیات پین سیم کارت ناموفق بود!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"وضعیت رایانهٔ لوحی"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"وضعیت تلفن"</string>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"برنامه‌ها (داده‌های برنامه و محتوای رسانه)"</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_dcim_usage" msgid="558887013613822577">"عکس‌ها، ویدئوها"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"صوتی (موسیقی، آهنگ‌های زنگ، پادکست‌ها و موارد دیگر)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"متفرقه"</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="default" msgid="6915293408836853020">"‏جدا کردن کارت SD"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"قرار دادن"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"خارج کردن"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"پاک‌سازی و قالب‌بندی"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"پاک‌سازی و قالب‌بندی حافظه‌‌داخلی"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"‏اتصال به کامپیوتر با USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"‏اتصال به کامپیوتر با USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"اتصال به‌عنوان"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"‏به شما امکان می‌دهد که فایل‌های رسانه‌ای را در Windows یا با استفاده از عملکرد انتقال فایل Android در Mac انتقال دهید (به www.android.com/filetransfer مراجعه کنید)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"‏دوربین (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"‏به شما اجازه می‌دهد عکس‌ها را با استفاده از برنامه دوربین انتقال دهید و هر فایلی را به رایانه‌هایی که از MTP پشتیبانی نمی‌کنند منتقل کنید"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"نصب ابزارهای انتقال فایل"</string>
+    <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_external_title" msgid="2723851748972673696">"حافظه جداشدنی"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> آزاد (کل فضا <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> قرار داده شد"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> قالب‌بندی نشد"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"تغییرنام حافظه"</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="3677827796634199714"><b>"وقتی این <xliff:g id="NAME_0">^1</xliff:g> را جدا می‌کنید، عملکرد برنامه‌های ذخیره شده در آن متوقف می‌شود و فایل‌های رسانه ذخیره شده در آن تا وقتی دوباره جاگذاری نشود، در دسترس نخواهند بود."</b>" \n\nاین <xliff:g id="NAME_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_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_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="1259216693690378749">"در طول قالب‌بندی، <xliff:g id="NAME">^1</xliff:g> را جدا نکنید."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"انتقال اطلاعات به حافظه جدید"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"می‌توانید عکس‌ها، فیلم‌ها و اطلاعات برنامه را به این <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="5035719146373359329"><b>"انتقال حدود <xliff:g id="TIME">^1</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="8641916179067596592">"در طول انتقال: \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_move_confirm_title" msgid="292782012677890250">"انتقال <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"انتقال <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="4288580957960820740">"در طول انتقال، <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="battery_status_title" msgid="9159414319574976203">"وضعیت باتری"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"مقدار شارژ باتری"</string>
     <string name="apn_settings" msgid="3743170484827528406">"‏APNها"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"بازنشانی تنظیمات شبکه"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"‏با این کار همه تنظیمات شبکه بازنشانی می‌شود، از جمله:\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="4874737348054213767">"همه تنظیمات شبکه بازنشانی شود؟ این اقدام دیگر قابل واگرد نیست!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"بازنشانی تنظیمات"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"بازنشانی شود؟"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"تنظیمات شبکه بازنشانی شد"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"بازنشانی دستگاه"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"بازنشانی به داده‌های کارخانه"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"پاک کردن تمام داده‌های موجود در رایانهٔ لوحی"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"پاک کردن تمام داده‌های موجود در گوشی"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های دانلود شده"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"‏با این کار همه داده‌های "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏پاک کردن همه داده‌های موجود در کارت SD مانند موسیقی یا عکس‌ها"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"بازنشانی رایانهٔ لوحی"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"بازنشانی تلفن"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"همه اطلاعات شخصی و برنامه‌های دانلود شده پاک شود؟ این عملکرد دیگر قابل بازگشت نیست!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"همه اطلاعات شخصی و برنامه‌های دانلودشده پاک شود؟ این اقدام دیگر قابل واگرد نیست!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"پاک کردن همهٔ موارد"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"برای تأیید بازنشانی به داده‌های کارخانه، باید الگوی قفل گشایی خود را بکشید."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"هیچ بازنشانی انجام نشد زیرا سرویس پاکسازی سیستم در دسترس نیست."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"بازنشانی؟"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"بازنشانی به تنظیمات کارخانه برای این کاربر در دسترس نیست"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"‏حافظهٔ USB و همه فایل‌های ذخیره شده در آن پاک شود؟ این عملکرد دیگر قابل بازگشت نیست!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"‏با پاک کردن کارت SD، همه فایل‌های ذخیره شده در آنجا حذف می‌شود؟ این عملکرد دیگر قابل بازگشت نیست!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"پاک کردن همهٔ موارد"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"‏برای تأیید پاک کردن حافظهٔ USB، باید الگوی قفل گشایی خود را بکشید."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"‏برای تأیید پاک کردن کارت SD، باید الگوی قفل گشایی خود را بکشید."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"راهنمایی"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"شبکه‌های تلفن همراه"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"طرح تلفن همراه"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"برنامه پیامک پیش‌فرض"</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_no_previous_dialog_text" msgid="602683880284921998">"از <xliff:g id="NEW_APP">%s</xliff:g> به‌جای برنامه پبامک‌تان استفاده می‌کنید؟"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"حالت مکان"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏استفاده از GPS،‏ Wi-Fi و شبکه‌های تلفن همراه برای تعیین مکان"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏استفاده از Wi-Fi و شبکه‌های تلفن همراه برای تعیین مکان"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"‏استفاده از GPS برای تعیین مکان شما"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏استفاده از GPS برای تعیین موقعیت مکانی"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"اسکن کردن"</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="2070686681074461301">"‏بهبود مکان با امکان دادن به برنامه‌ها و سرویس‌ها برای اسکن شبکه‌های Wi‑Fi، حتی وقتی Wi‑Fi خاموش است"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"اسکن کردن بلوتوث"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"بهبود مکان با امکان دادن به سرویس‌های سیستم برای اسکن دستگاه‌های بلوتوث، حتی وقتی بلوتوث خاموش است"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏مکان شبکه تلفن همراه و Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏به برنامه‌ها اجازه داده شود با استفاده از خدمات مکانی Google مکان شما را سریع‌تر تخمین بزنند. داده‌های مکان به‌طور ناشناس جمع‌آوری شده و به Google ارسال خواهد شد."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"ایمنی صفحه"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"برای ادامه، از الگوی دستگاهتان استفاده کنید."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"برای ادامه، کد پین دستگاهتان را وارد کنید."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"برای ادامه گذرواژه دستگاهتان را وارد کنید."</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_need_to_unlock" msgid="757935356911054465">"تأیید الگوی ذخیره شده"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"دوباره امتحان کنید:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"تلاش‌های اشتباه زیادی انجام شده است!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"در <xliff:g id="NUMBER">%d</xliff:g> ثانیه دوباره امتحان کنید."</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="manageapplications_settings_title" msgid="7041951105633616745">"مدیریت برنامه‌ها"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"مدیریت و حذف برنامه‌های نصب شده"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"استفاده از حافظه"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"مشاهده حافظه مورد استفاده برنامه‌ها"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"سرویس‌های در حال اجرا"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"اطلاعات رایانهٔ لوحی"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"اطلاعات تلفن"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"اطلاعات باتری"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"راه‌اندازی سریع"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"تنظیم میانبرهای صفحه‌کلید برای راه‌اندازی برنامه‌ها"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"اختصاص برنامه"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"بدون میانبر"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"جستجو + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"پاک کردن"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"میانبر شما برای <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) پاک می‌شود."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"تأیید"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"لغو"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"برنامه‌ها"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"میانبرها"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"‏ذخیره تمامی بسته‌های HCI بلوتوث در یک فایل"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"باز کردن قفل سازنده تجهیزات اصلی"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"اجازه دهید قفل بوت‌لودر باز شود"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"پین خودتان را وارد کنید"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"پین دستگاهتان را وارد کنید تا بازکردن قفل سازنده محصول اصلی را فعال کنید"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"اجازه می‌هید قفل سازنده تجهیزات اصلی باز شود؟"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"اخطار: وقتی این تنظیم روشن باشد، ویژگی‌های حفاظتی دستگاه در این دستگاه کار نمی‌کند."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"اندازه‌های حافظه موقت ثبت‌کننده"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"انتخاب اندازه‌ ثبت‌کننده در حافظه موقت ثبت"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"مکان‌های کاذب مجاز هستند"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"مکان‌های کاذب مجاز هستند"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"فعال کردن بازبینی ویژگی بازدید"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"شبکه"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"گواهینامه نمایش بدون سیم"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏فعال کردن گزارش‌گیری طولانی Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏Wi‑Fi فعال برای واگذاری به شبکه سلولی"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"‏همواره به اسکن‌های رومینگ Wi‑Fi اجازه داده شود"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"‏استفاده از کلاینت DHCP قدیمی"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"نمایش گزینه‌ها برای گواهینامه نمایش بدون سیم"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"‏افزایش سطح گزارش‌گیری Wi‑Fi، نمایش به ازای SSID RSSI در انتخاب‌کننده Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"‏وقتی فعال است، در شرایط پایین بودن سیگنال، Wi‑Fi برای واگذار کردن اتصال داده به شبکه سلولی فعال‌تر خواهد بود."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"‏فعال/غیرفعال کردن اسکن‌های رومینگ Wi‑Fi براساس مقدار داده ترافیک حاضر در واسط"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"اندازه‌های حافظه موقت ثبت‌کننده"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"انتخاب اندازه‌ ثبت‌کننده در حافظه موقت ثبت"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"‏انتخاب پیکربندی USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"‏انتخاب پیکربندی USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"مکان‌های کاذب مجاز هستند"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"مکان‌های کاذب مجاز هستند"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"فعال کردن بازبینی ویژگی بازدید"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"‏به جای کلاینت Android DHCP جدید، از کلاینت Lollipop DHCP استفاده کنید."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏رفع عیب USB انجام شود؟"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"‏رفع عیب USB فقط برای اهداف برنامه‌نویسی در نظر گرفته شده است. از آن برای رونوشت‌برداری داده بین رایانه و دستگاه خود، نصب برنامه‌ها در دستگاه خود بدون اعلان و خواندن داده‌های گزارش استفاده کنید."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"‏دسترسی به اشکال‌زدایی USB از تمام رایانه‌هایی که قبلاً مجاز دانسته‌اید لغو شود؟"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"زرشکی"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"استفاده از <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> باید:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"چون برنامه‌ای در حال ایجاد تداخل در درخواست مجوز است، «تنظیمات» نمی‌تواند پاسخ شما را تأیید کند."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"اگر <xliff:g id="SERVICE">%1$s</xliff:g> را روشن کنید، دستگاه شما از قفل صفحه شما جهت بهبود رمزگذاری اطلاعات استفاده نخواهد کرد."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"از آنجا که یک سرویس دسترس‌پذیری را روشن کرده‌اید، دستگاه شما از قفل صفحه شما جهت بهبود رمزگذاری اطلاعات استفاده نخواهد کرد."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"از آنجایی که روشن کردن <xliff:g id="SERVICE">%1$s</xliff:g> بر رمزگذاری اطلاعات تأثیر می‌گذارد، باید الگویتان را تأیید کنید."</string>
@@ -1616,7 +1664,7 @@
     <string name="battery_since_reset" msgid="7464546661121187045">"استفاده از باتری از زمان بازنشانی"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> در باتری"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> از زمان جدا کردن"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"شارژ کردن"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"در حال شارژ شدن"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"صفحه روشن"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"‏GPS در"</string>
     <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"برنامه‌های <xliff:g id="TYPE">%1$s</xliff:g> در طول <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> از <xliff:g id="TOTALRAM">%2$s</xliff:g> در طول <xliff:g id="TIMEDURATION">%3$s</xliff:g> استفاده شد"</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_memory_status" msgid="4251599550196193093">"حافظه دستگاه در حال حاضر <xliff:g id="MEMSTATE">%1$s</xliff:g> است"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"‏میانگین استفاده از RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"‏حداکثر استفاده از RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"‏سیستم عامل Android"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"پردازش‌ها"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"خدمات"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"مدت"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"جزئیات حافظه"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"پنهان کردن سیستم"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"تنظیمات پیش‌فرض زیر تنظیمات برنامه را لغو می‌کنند"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"تنظیمات پیش‌فرض"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"موتور پیش‌فرض"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"موتور تولید صدا را بری استفاده با متن گفتاری تنظیم می‌کند"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"موتور ترکیب گفتار را تنظیم کنید تا برای پیامک گفتاری استفاده شود"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"سرعت گفتار"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"سرعتی که متن بیان می‌شود"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"زیر و بمی صدا"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"باید الگوی بازگشایی را رسم کنید تا نصب مدارک صلاحیت تأیید شود."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"گذرواژه را برای حافظه اطلاعات کاربری تایپ کنید."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"رمز ورود فعلی:"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"هیچ حسابی در حال حاضر داده‌های پشتیبانی نشده را ذخیره نمی‌کند"</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="5355557151569037197">"سرویس پشتیبان‌گیری غیرفعال است."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"این مورد توسط خط‌مشی دستگاهتان تنظیم شده است."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"گذرواژه نسخهٔ پشتیبان دسک‌تاپ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"نسخه‌های پشتیبان کامل دسک‌تاپ در حال حاضر محافظت نمی‌شوند"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"برای تغییر یا حذف گذرواژه برای نسخه‌های پشتیبان کامل دسک‌تاپ لمس کنید"</string>
@@ -1945,7 +1997,7 @@
     <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>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"مقیاس پویانمایی انتقالی"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"مقیاس طول مدت انیماتور"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"شبیه‌سازی نمایش‌های ثانویه"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"حالت چندپنجره"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"چند فعالیت به طور هم‌زمان روی صفحه."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"حالت چندپنجره فعال شود؟"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"اخطار: این یک ویژگی کاملاً آزمایشی است که به شما امکان می‌دهد چند فعالیت را هم‌زمان روی صفحه از طریق رابط کاربری برنامه‌های «اخیر» انجام دهید. ممکن است برخی برنامه‌ها هنگام استفاده با این ویژگی، خراب شوند یا به درستی کار نکنند."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"برنامه‌ها"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"فعالیت‌ها را ادامه ندهید"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"از بین بردن هر فعالیت به محض خروج کاربر از آن"</string>
@@ -2195,7 +2251,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="718192651887726259">"‏با ایجاد کاربران دیگر می‌توانید این دستگاه را با دیگران اشتراک‌گذاری کنید. هر کاربر فضای خاص خودش را دارد که می‌تواند با کاغذدیواری، برنامه‌های خودش و موارد دیگر سفارشی کند. همچنین کاربران می‌توانند تنظیمات دستگاه را انجام دهند مانند تنظیمات 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"مجاز بودن تماس‌های تلفنی"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"مجاز بودن پیامک و تماس‌های تلفنی"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"روشن کردن تماس‌های تلفنی"</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="440218975766968124">"تماس‌های تلفنی مجاز باشند؟"</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_sms_confirm_title" msgid="188164598768941316">"پیامک و تماس‌های تلفنی مجاز باشند؟"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"سابقه پیامک و تماس با این کاربر اشتراک‌گذاری می‌شود."</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="application_restrictions" msgid="8207332020898004394">"اجازه به برنامه‌ها و محتوا"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"برنامه‌های دارای محدودیت"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسعه تنظیمات برای برنامه"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"این برنامه در نمایه‌های محدود پشتیبانی نمی‌شود"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi ‏اتصال شبکه wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"پیام نوشتاری ارسال پیامک پیام‌ها پیام‌رسانی"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏شبکه تلفن همراه تلفن همراه شرکت مخابراتی بی‌سیم داده 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"‏wifi، تماس wifi، تماس"</string>
     <string name="keywords_home" msgid="3626170808219458848">"راه‌انداز"</string>
     <string name="keywords_display" msgid="6709007669501628320">"صفحه نمایش صفحه لمسی"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"باتری صفحه‌لمسی صفحه کم نور"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"باتری صفحه‌لمسی صفحه کم نور"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"پس‌زمینه شخصی‌سازی سفارشی‌سازی نمایشگر"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"طرح‌زمینه تیره حالت شب تار کردن صفحه‌نمایش معکوس کردن روشنایی"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"شخصی‌سازی پس‌زمینه سفارشی کردن نمایشگر"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"اندازه نوشتار"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"پروژه"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"فرستادن پروژه"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"فضا دیسک دیسک سخت دستگاه استفاده"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"مصرف نیرو شارژ"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"املا فرهنگ لغت غلط‌گیر املا تصحیح خودکار"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"حساب"</string>
     <string name="keywords_users" msgid="4673901601478559100">"محدودیت محدود محدود شده"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"تصحیح نوشتار تصحیح صدا لرزش خودکار زبان اشاره پیشنهاد دادن پیشنهاد طرح زمینه کلمه توهین‌آمیز نوع ایموجی بین‌المللی"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"بازنشانی پیش‌فرض تنظیمات ترجیحی"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"پیش‌فرض برنامه اضطراری در موارد اضطراری"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"برنامه‌ها دانلود برنامه‌ها سیستم"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"امنیت مجوزهای برنامه‌ها"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"پیش‌فرض برنامه‌ها"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"لغزاندن گذرواژه الگو پین"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏تنظیم برچسب NFC برای Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"نوشتن"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"وقفه‌ها"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"هنگام ورود تماس‌ها و اعلان‌ها"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"همیشه وقفه داشته باشد"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"فقط وقفه‌های اولویت‌دار مجاز باشند"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"وقفه نداشته باشد"</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_option_important_interruptions" msgid="3903928008177972500">"فقط اولویت‌دار"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"فقط زنگ‌های هشدار"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"بدون وقفه"</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="ringtone_title" msgid="5379026328015343686">"آهنگ زنگ تلفن"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"آهنگ زنگ پیش‌فرض اعلان"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"برای تماس‌ هم لرزش داشته باشد"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"لرزش"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"دسترسی به اعلان"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"برنامه‌ها نمی‌توانند اعلان‌ها را بخوانند"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"‏%d برنامه می‌تواند اعلان‌ها را بخواند"</item>
-    <item quantity="other" msgid="980049191810249052">"‏%d برنامه‌‌ می‌توانند اعلان‌ها را بخوانند"</item>
-  </plurals>
+    <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="2767405417723149879">"هیچ شنونده اعلانی نصب نشده است."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> فعال‌ شود؟"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> می‌تواند تمام اعلان‌های پست شده از طرف سیستم یا هر یک از برنامه‌های نصب شده را بخواند، که ممکن است حاوی اطلاعات شخصی مانند نام مخاطبین و متن پیام‌های ارسال شده به شما باشد. همچنین می‌تواند این اعلان‌ها را رد کند یا امکان لمس دکمه‌های عملکردی موجود در آنها را فراهم کند."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"ارائه‌دهندگان شرایط"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"هیچ برنامه‌ای ارائه‌دهنده شرایط نیست"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"‏برنامه %d ارائه‌دهنده شرایط است"</item>
-    <item quantity="other" msgid="358057362115673258">"‏برنامه‌های %d ارائه‌دهنده شرایط هستند"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"هیچ ارائه‌دهنده شرایطی نصب نیست."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> فعال‌ شود؟"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> قادر خواهد بود شرایط خروج را به حالت «مزاحم نشوید» اضافه کند."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"در حال بارگیری برنامه..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"مسدود کردن"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"مسدود کردن همه"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"هرگز از این برنامه اعلان نشان داده نمی‌شود"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"اولویت‌دار"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"هنگامی که دستگاه روی «فقط وقفه‌های اولویت‌دار» تنظیم شده باشد، اعلان‌ها در بالای لیست نشان داده می‌شوند و دریافت آنها ادامه می‌یابد"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"حساس"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"زمانی که دستگاه قفل است، هر گونه محتوای حساس از اعلان‌های این برنامه مخفی شود"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"رفتار به عنوان اولویت‌دار"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"به این برنامه اجازه داده شود هنگامی که «مزاحم نشوید» روی «فقط اولویت‌دار» تنظیم شده، اعلان‌هایش شنیده شود"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"اجازه خواندن محتوای حافظه"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"به برنامه اجازه داده شود با کشیدن برخی از اعلان‌ها به داخل نمای روی صفحه کنونی، روی آن‌ها تأکید کند"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"پنهان کردن محتوای حساس"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"زمانی که دستگاه قفل است، محتوایی که ممکن است اطلاعات خصوصی را افشا کند از اعلان‌های این برنامه مخفی شود"</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="zen_mode_default_option" msgid="6940069025071935243">"تا وقتی آن را خاموش کنید"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"وقفه‌های اولویت‌دار"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"فرویش"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"روزها"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"هیچ‌کدام"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"وقفه مجاز است"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"فقط اولویت‌دار"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"هیچ‌کدام"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"اتوماسیون"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"روشن کردن خودکار"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"نام قانون"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"افزودن قانون"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"حذف قانون"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"قانون «<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="3201273040477861538">"قانون زمان‌بندی"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"قانون پیدا نشد."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">"، "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"هرگز"</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_from" msgid="1033337300289871697">"تماس‌ها/پیام‌ها از"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"همه"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"فقط مخاطبین"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"فقط مخاطبین ستاره‌دار"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"رویدادها و یادآوری‌ها"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"هشدارها همیشه وقفه‌های اولویت‌دار هستند"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"هشدارها"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"یادآوری‌ها"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"رویدادها"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"تماس‌گیرنده‌های انتخاب شده"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"تکرار تماس‌گیرنده‌ها"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"اگر همان شخص در طول یک دوره <xliff:g id="MINUTES">%d</xliff:g> دقیقه‌ای، برای بار دوم تماس بگیرد، به آن اجازه داده شود"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"روشن شدن خودکار"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"هرگز"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> روز بعد"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> یا هر هشداری قبل از آن"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"وقفه‌ها"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"هنگام ورود تماس‌ها و اعلان‌ها"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"چه موقع می‌خواهید وقفه ایجاد شود؟"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"برای چه مدت؟"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"همواره با وقفه"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"خاموش، همه، همه چیز"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"اجازه فقط به وقفه‌های اولویت‌دار"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"اجازه فقط به هشدارها"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"بدون وقفه"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"نامحدود"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <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="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"تغییر در اعلان‌های اولویت‌دار تنها به مدت نامحدود"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"تغییر در هشدارها به طور نامحدود"</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>
+    </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>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"تغییر در «وقفه نداشته باشد» به صورت نامحدود"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"تغییر در «همیشه وقفه»"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"همیشه"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"اعلان‌های برنامه"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ارسال بازخورد درباره این دستگاه"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"راه‌اندازی به صورت پیش‌فرض"</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="app_launch_domain_links_title" msgid="458956710410857777">"پیوندهای دامنه"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"باز کردن نشانی‌های اینترنتی دامنه"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"اجازه به برنامه برای باز کردن مستقیم نشانی‌های اینترنتی دامنه"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"نشانی‌های اینترنتی دامنه‌های پشتیبانی شده"</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="410824961149037234">"حافظهٔ داخلی"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"حافظه خارجی"</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="storage_used" msgid="7128074132917008743">"فضای ذخیره استفاده شده"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"روشن"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"مسدود"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"حساس"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"اولویت‌دار"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"اولویت‌دار و حساس"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <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="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">‏<xliff:g id="COUNT_2">%d</xliff:g> از <xliff:g id="COUNT_3">%d</xliff:g> اجازه اعطا شد</item>
+      <item quantity="other">‏<xliff:g id="COUNT_2">%d</xliff:g> از <xliff:g id="COUNT_3">%d</xliff:g> اجازه اعطا شد</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"برخی پیش‌تنظیم‌ها تنظیم شدند"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"هیچ پیش‌فرضی تنظیم نشده است"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"همه برنامه‌ها"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"فعال"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"شخصی"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"کاری"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"مسدود شده"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"اولویت‌دار"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"حساس"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"با نشانی‌های اینترنتی دامنه"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"توسط سرپرست سیستم غیرفعال شد"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"پیشرفته"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"برنامه ناشناخته"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"انتخاب نمایه"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"مجوزهای برنامه"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> برنامه اجازه دسترسی اضافی دارد"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> برنامه مجاز است"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"نشانی‌های اینترنتی دامنه"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"هیچ نشانی اینترنتی دامنه‌ای باز نشود"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"باز کردن «<xliff:g id="DOMAIN">%s</xliff:g>»"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"باز کردن «<xliff:g id="DOMAIN">%s</xliff:g>» و نشانی‌های اینترنتی مرتبط"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <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="fingerprint_not_recognized" msgid="1739529686957438119">"شناخته نشد"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"برنامه‌های پیش‌فرض"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"برنامه مرورگر"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"بدون مرورگر پیش‌فرض"</string>
+    <string name="default_app" msgid="6864503001385843060">"(پیش‌فرض)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"فضای ذخیره‌سازی برنامه‌ها"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 4e8ca41..de2a112 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Paina painiketta"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"mykistä mikrofoni / poista mykistys"</item>
     <item msgid="1148142988678569310">"lähetä media"</item>
     <item msgid="9130014005474445273">"aktivoi VPN"</item>
+    <item msgid="1165192162975045562">"kirjoita taustakuva"</item>
+    <item msgid="7129487923652967258">"apurakenne"</item>
+    <item msgid="1069023208100114540">"apukuvakaappaus"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Sijainti"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Mykistä mikrofoni / poista mykistys"</item>
     <item msgid="5906017727368097853">"Lähetä media"</item>
     <item msgid="2486614710846178542">"Aktivoi VPN"</item>
+    <item msgid="5586547561693629602">"Kirjoita taustakuva"</item>
+    <item msgid="32794179825485062">"Apurakenne"</item>
+    <item msgid="7872852746938272552">"Apukuvakaappaus"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lyhyt"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"matala"</item>
     <item msgid="4212263919458209842">"kriittinen"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Ei käytössä"</item>
-    <item msgid="5656544177755411222">"Mahdollisimman vähän häiriöitä"</item>
-    <item msgid="8735337502532332056">"Ei häiriöitä"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normaali"</item>
     <item msgid="866544120205026771">"Keskitaso"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Vaaleanpunainen"</item>
     <item msgid="6131821495505931173">"Punainen"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (median siirtoprotokolla)"</item>
+    <item msgid="8856820259201251036">"PTP (kuvan siirtoprotokolla)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB-ethernet)"</item>
+    <item msgid="2686051673589572111">"Äänilähde"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 837d4e6..349f91d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Salli"</string>
     <string name="deny" msgid="6947806159746484865">"Hylkää"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tuntematon"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Kehittäjäasetukset otetaan käyttöön <xliff:g id="STEP_COUNT">%1$d</xliff:g> vaiheen päästä."</item>
-    <item quantity="other" msgid="6722953419953594148">"Kehittäjäasetukset otetaan käyttöön <xliff:g id="STEP_COUNT">%1$d</xliff:g> vaiheen päästä."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Enää <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> vaihetta, niin sinusta tulee kehittäjä.</item>
+      <item quantity="one">Enää <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> vaihe, niin sinusta tulee kehittäjä.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Olet nyt kehittäjä!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ei tarvitse klikata, olet jo kehittäjä."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Langaton verkko ja verkot"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Poista tekstiviestit käytöstä IMS:n kautta"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS-rekisteröinnin käyttöönotto vaaditaan"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS-rekisteröinnin poistaminen käytöstä vaaditaan"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Ota VoLTEn hallinnoimat merkinnät käyttöön."</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Poista VoLTEn hallinnoimat merkinnät käytöstä."</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Ota lte ram dump käyttöön"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Poista lte ram dump käytöstä"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Näytä SIM-kortin osoitekirja"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Lähetys"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Poistetaanko profiili?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Tämä poistaa profiilin&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;laitteesta&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Yhdistetty"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Yhdistetty (ei puhelimen ääntä)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Yhdistetty (ei median ääntä)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Yhdistetty (ei MAP)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Yhdistetty (ei puhelimen/median ääntä)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Yhteys katkaistu"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Katkaistaan yhteyttä..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Yhdistetään…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Laiteparia muodostetaan..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Nimetön Bluetooth-laite"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Haetaan"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Bluetooth-laitteita ei löydy lähistöltä."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näytä vastaanotetut tiedostot"</string>
     <string name="device_picker" msgid="4978696506172252813">"Valitse Bluetooth-laite"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-yhteyspyyntö"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Sovellus haluaa ottaa Bluetoothin käyttöön."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Sovellus tarvitsee luvan Bluetoothin KÄYTTÖÖN tällä laitteella."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Sovellus haluaa asettaa puhelimen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kortti"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Välityspalvelimen asetukset"</string>
     <string name="cancel" msgid="6859253417269739139">"Peruuta"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"PERUUTA"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"JATKA"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"KYLLÄ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"EI"</string>
-    <string name="forget" msgid="7267115980248732932">"UNOHDA"</string>
+    <string name="forget" msgid="1400428660472591263">"Unohda"</string>
+    <string name="save" msgid="879993180139353333">"Tallenna"</string>
+    <string name="done" msgid="6942539184162713160">"Valmis"</string>
     <string name="settings_label" msgid="1626402585530130914">"Asetukset"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Asetukset"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Asetukset-pikakuvake"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Lajittelu aikavyöhykkeen mukaan"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Päiväys"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Aika"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Paranna kasvojen tunnistusta"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Eläväisyystarkistus"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Vaadi silmänräpäytys poistettaessa lukitusta"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Lukitse automaattisesti"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> virransäästötilan jälkeen"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> virransäästötilan jälkeen, paitsi kun lukitusta pitää avattuna <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,21 +336,44 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Aseta Oma sijainti, näytön lukituksen poisto, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Salasanat"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sormenjälki"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Sormenjälkien hallinta"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sormenj. käyttökohde"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Lisää"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"näytön lukitus"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> sormenjälkeä rekisteröity.</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> sormenjälki rekisteröity.</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Sormenjäljen määritys"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Ennen kuin voit käyttää sormenjälkeä näytön lukituksen avaamiseen ja ostoksien vahvistamiseen, sinun täytyy \n\n✓ määrittää näytön lukituksen vaihtoehtoinen menetelmä \n\n✓ lisätä sormenjälki."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Etsi anturi"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Etsi sormenjälkianturi puhelimen takapuolelta."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nimi"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ok"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Poista"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Aloitetaan!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Aseta sormesi tunnistimelle. Nosta sormi, kun tunnet värinän."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Hyvä! Toista kosketus."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Aseta sama sormi tunnistimelle. Nosta sormi, kun tunnet värinän."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Sormenjälki lisättiin!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kun tämä kuvake on näkyvissä, voit tunnistautua tai vahvistaa ostoksen sormenjälkesi avulla."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Lisää"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seuraava"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Salaus"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Salaa tablet-laite"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Salaa tabletti"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Salaa puhelin"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Salattu"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"Voit salata tilisi, asetukset, ladatut sovellukset tietoineen, median ja muut tiedostot. Jos olet salannut puhelimesi ja kytkenyt näytön lukituksen (kuvion, PIN-koodin tai salasanan avulla), sinun pitää vapauttaa lukitus salauksen purkamiseksi aina virran kytkemisen jälkeen. Ainoa vaihtoehtoinen tapa poistaa salaus on suorittaa palautus tehdasasetuksiin, jolloin kaikki tiedot katoavat.\n\nSalaaminen kestää ainakin tunnin. Akun täytyy olla alussa ladattu, ja puhelimen pitää olla pistorasiaan kiinnitettynä koko prosessin ajan. Jos keskeytät sen, tiedot häviävät kokonaan tai osittain."</string>
     <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"Voit salata tilisi, asetukset, ladatut sovellukset tietoineen, median ja muut tiedostot. Jos olet salannut puhelimesi ja kytkenyt näytön lukituksen (kuvion, PIN-koodin tai salasanan avulla), sinun pitää vapauttaa lukitus salauksen purkamiseksi aina virran kytkemisen jälkeen. Ainoa vaihtoehtoinen tapa poistaa  salaus on suorittaa palautus tehdasasetuksiin, jolloin kaikki tiedot katoavat.\n\nSalaaminen kestää ainakin tunnin. Akun täytyy olla alussa ladattu, ja puhelimen pitää olla pistorasiaan kiinnitettynä koko prosessin ajan. Jos keskeytät sen, tiedot häviävät kokonaan tai osittain."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Salaa tablet-laite"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Salaa tabletti"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Salaa puhelin"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lataa akku ja yritä uudelleen."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Yhdistä laturi ja yritä uudelleen."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ei näytönlukitus-PIN-koodia tai -salasanaa"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Sinun on asetettava lukitusnäytön PIN-koodi tai salasana ennen salauksen aloittamista."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Avaa laitteen lukitus piirtämällä lukituksenpoistokuvio."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Salataanko?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Salausta ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana tablet-laite käynnistyy uudelleen useita kertoja."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Salausta ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana tabletti käynnistyy uudelleen useita kertoja."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Salausta ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana puhelin käynnistyy uudelleen useita kertoja."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Salaus käynnissä"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Odota, tablet-laitetta salataan. <xliff:g id="PERCENT">^1</xliff:g> % valmiina."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Pyyhkäisy"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Ei suojausta"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Matala suojaus, kokeellinen"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Kuvio"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Keskitason suojaus"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-koodi"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keskitason tai korkea suojaus"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Salasana"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Korkea suojaus"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Nykyinen näytön lukitus"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Laitteen suojausominaisuudet eivät toimi enää."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Ei käytössä (järj.valv/salauskäyt./tunnuks. hall.)"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ei mitään"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pyyhkäisy"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Kuvio"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-koodi"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Salasana"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Kun olet määrittänyt näytön lukituksen, voit määrittää myös sormenjälkesi kohdassa Asetukset &gt; Tietoturva."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Poista näytön lukitus käytöstä"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Poista lukituksenpoistokuvio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Poista lukituksen poistoon käytettävä PIN-koodi"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Salasanan tulee sisältää vähintään yksi kirjain."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Salasanan tulee sisältää vähintään yksi numero."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Salasanan tulee sisältää vähintään yksi symboli."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Salasanan tulee sisältää vähintään yksi kirjain."</item>
-    <item quantity="other" msgid="8186027808415585970">"Salasanan tulee sisältää vähintään %d kirjainta."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Salasanan tulee sisältää vähintään yksi pieni kirjain."</item>
-    <item quantity="other" msgid="2693910942679679225">"Salasanan tulee sisältää vähintään %d pientä kirjainta."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Salasanan tulee sisältää vähintään yksi iso kirjain."</item>
-    <item quantity="other" msgid="3030801209112209245">"Salasanan tulee sisältää vähintään %d isoa kirjainta."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Salasanan tulee sisältää vähintään yksi numero."</item>
-    <item quantity="other" msgid="4703982391407595924">"Salasanan tulee sisältää vähintään %d numeroa."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Salasanan tulee sisältää vähintään yksi erikoismerkki."</item>
-    <item quantity="other" msgid="1221290525051187757">"Salasanan tulee sisältää vähintään %d erikoismerkkiä."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Salasanan tulee sisältää vähintään yksi merkki, joka ei ole kirjain."</item>
-    <item quantity="other" msgid="3952508584649046404">"Salasanan tulee sisältää vähintään %d merkkiä, jotka eivät ole kirjaimia."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Salasanan tulee sisältää vähintään %d kirjainta.</item>
+      <item quantity="one">Salasanan tulee sisältää vähintään yksi kirjain.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Salasanan tulee sisältää vähintään %d pientä kirjainta.</item>
+      <item quantity="one">Salasanan tulee sisältää vähintään yksi pieni kirjain.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Salasanan tulee sisältää vähintään %d isoa kirjainta.</item>
+      <item quantity="one">Salasanan tulee sisältää vähintään yksi iso kirjain.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Salasanan tulee sisältää vähintään %d numeroa.</item>
+      <item quantity="one">Salasanan tulee sisältää vähintään yksi numero.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Salasanan tulee sisältää vähintään %d erikoismerkkiä.</item>
+      <item quantity="one">Salasanan tulee sisältää vähintään yksi erikoismerkki.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Salasanan tulee sisältää vähintään %d merkkiä, jotka eivät ole kirjaimia.</item>
+      <item quantity="one">Salasanan tulee sisältää vähintään yksi merkki, joka ei ole kirjain.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Järjestelmänv. ei salli viimeaik. salasanan käyttöä."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Nouseva, laskeva tai toistuva numerosarja on kielletty"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Parin muodostus seuraavan laitteen kanssa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Varmista, että laite esittää tämän koodin:&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">"Laitteesta&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Muodostetaanko pari tämän laitteen kanssa?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Jos haluat muodostaa laiteparin laitteen <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> kanssa, kirjoita laitteelle <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> ja paina Rivinvaihto tai Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Muodosta laitepari"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"MUODOSTA LAITEPARI"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Peruuta"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Laiteparin muodostaminen mahdollistaa yhteystietojen ja soittohistorian käyttämisen yhteyden aikana."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Laiteparin muodostaminen laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> epäonnistui."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Laiteparia laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kanssa ei voitu muodostaa, koska PIN-koodi tai avain oli virheellinen."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Ei yhteyttä laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Laite <xliff:g id="DEVICE_NAME">%1$s</xliff:g> torjui laitepariyhteyden."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Yhteyden muodostaminen laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> epäonnistui."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Etsi laitteita"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Päivitä"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Lisäasetukset"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth-lisäasetukset"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kun Bluetooth on käytössä, laite voi viestiä lähiympäristön Bluetooth-laitteiden kanssa."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Parantaakseen sijainnin tarkkuutta sovellukset ja palvelut voivat etsiä Bluetooth-laitteita myös silloin, kun Bluetooth ei ole käytössä. Voit muuttaa tätä <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>etsintäasetuksissa<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Yhdistä profiiliin..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Median ääni"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Puhelimen ääni"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Tiedostonsiirto"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Syöttölaite"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetyhteys"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Yhteystietojen jakaminen"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Käytä yhteystietojen jakamiseen"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetyhteyden jakaminen"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"MAP"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan median äänentoistosta."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan handsfree-äänentoistosta."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan syöttölaitteesta."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Käyttö:"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Nimeä uudelleen"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Salli saapuvat tiedostonsiirrot"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Yhdistetty median ääneen"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Yhdistetty puhelimen ääneen"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Yhdistetty tiedostonsiirtopalvelimeen"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"MAP-yhteys"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ei yhdistetty tiedostonsiirtopalvelimeen"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Yhdistetty syöttölaitteeseen"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Yhdistetty laitteen internetyhteyteen"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Paikallinen internetyhteys jaetaan laitteen kanssa"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Käytä median äänille"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Käytä puhelimen äänille"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Käytä tiedostojen siirtoon"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Käytä syöttöön"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Käytä internetyhteyteen"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Käytä MAP-profiilille"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Telakointiasetukset"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Käytä telakointia äänelle"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaiuttimena"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiikille ja medialle"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muista asetukset"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Yhteys muodostettu Wi‑Fi-apurin kautta"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Lähetysnäyttö"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Lähetä"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ota langaton näyttö käyttöön"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Bluetooth-laitteita ei löydy lähistöltä."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Yhdistetään"</string>
@@ -570,8 +552,10 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Unohda"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Valmis"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nimi"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Salli tiedonsiirto, kun tablet-laite koskettaa toista laitetta"</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="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Valmis lähettämään sovelluksen sisältöä NFC:n kautta"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Poistetaan Wi-Fi-yhteyttä käytöstä…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Virhe"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Lentokonetilassa"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Verkkoja ei voi etsiä."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Verkkoilmoitus"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Ilmoita käytettävissä olevista julkisista verkoista"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vältä huonoja yhteyksiä"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Älä käytä Wi-Fi-verkkoa, jos sillä on huono internetyhteys"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Käytä vain verkkoja, joiden yhteyslaatu on hyvä"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Haku aina käytettävissä"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Salli verkkojen etsiminen"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Anna Googlen sijaintipalvelun ja muiden sovellusten etsiä verkkoja, vaikka Wi-Fi-yhteys on pois käytöstä"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Käytä avointa Wi‑Fiä automaattisest"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Salli Wi‑Fi-apurin yhdistää automaattisesti korkealaatuisiksi määritettyihin avoimiin verkkoihin"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Valitse apuri"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Asenna varmenteet"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Voit mm. parantaa Googlen ja muiden sovellusten sijaintitietojen tarkkuutta antamalla luvan etsiä Wi-Fi-verkkoja myös silloin, kun Wi-Fi ei ole käytössä. Jos et halua sallia sitä, valitse Lisäasetukset &gt; Etsiminen aina käytössä."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Sovellukset voivat etsiä läheisiä verkkoja vaikka Wi-Fi ei olisi käytössä. Jos et halua sallia sitä, valitse Lisäasetukset &gt; Etsiminen aina käytössä."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Parantaakseen sijainnin tarkkuutta sovellukset ja palvelut voivat etsiä Wi-Fi-verkkoja myös silloin, kun Wi-Fi ei ole käytössä. Voit muuttaa tätä <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>etsintäasetuksissa<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Älä näytä uudelleen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Pidä Wi-Fi käytössä virransäästötilassa"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi virransäästön aikana"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Lisää toinen verkko"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lisää"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaattiset aset. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Asetusten viimeistelyyn tarvitaan Wi-Fi-yhteys. Asetusten määrittämisen jälkeen voit käyttää tablet-laitteen Wi-Fi- tai matkapuhelinverkkoyhteyttä."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Lisäasetukset"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup -asetukset"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Käynnistetään WPS:ää..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Paina reitittimen Wi-Fi Protected Setup -painiketta. Siinä voi lukea WPS tai näkyä seuraava symboli:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Paina reitittimen Wi-Fi Protected Setup -painiketta. Siinä voi lukea WPS tai näkyä seuraava symboli:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Näppäile Wi-Fi-reitittimen pin-koodi <xliff:g id="NUMBER">%1$s</xliff:g>. Asennus voi kestää kaksi minuuttia."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS onnistui. Muodostetaan yhteyttä verkkoon..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Yhdistetty Wi-Fi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyymi identiteetti"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Salasana"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Näytä salasana"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Määritä AP-taajuus"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GHz:n taajuus"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz:n taajuus"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-asetukset"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ei muutettu)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ei määritetty)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Tallennettu"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Pois käytöstä"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-kokoonpanovirhe"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-yhteysvirhe"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Todennusvirhe"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ei kantoalueella"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Internetyhteyttä ei havaittu, yhteyttä ei muodosteta automaattisesti uudelleen."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS käytettävissä"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS käytettävissä)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Anna verkkosalasana"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Ei mitään"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Kirjaudutaanko sisään yhteyttä varten?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> edellyttää kirjautumista online-tilassa ennen verkkoon yhdistämistä."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"YHDISTÄ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Tässä verkossa ei ole internetyhteyttä. Käytetäänkö tätä verkkoa silti?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Älä kysy uudelleen tässä verkossa"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Kann. Wi‑Fi-hotspot (AndroidAP WPA2 PSK)"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> kannettava Wi-Fi-hotspot"</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_mode_title" msgid="2164073796253284289">"Puheluasetus"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-puhelutila"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi ensisijainen"</item>
+    <item msgid="5267397515594230396">"Matkapuhelinverkko ensisijainen"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Etusivu"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ääni"</string>
@@ -791,12 +778,12 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Puhelinta ei telakoitu"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Yhdistetyn telakan asetukset"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Telakkaa ei löydy"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Telakoi tablet-laite, jos haluat määrittää telineen äänet."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Telakoi tabletti, jos haluat määrittää telineen äänet."</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Telakoi puhelin, jos haluat määrittää telineen äänet."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Telineeseen asettamisääni"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Toista ääni, kun tablet-laite asetetaan telakkaan tai poistetaan telakasta"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Toista ääni, kun tabletti asetetaan telakkaan tai poistetaan telakasta"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Toista ääni, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Älä toista ääntä, kun tablet-laite asetetaan telakkaan tai poistetaan telakasta"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Älä toista ääntä, kun tabletti asetetaan telakkaan tai poistetaan telakasta"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Älä toista ääntä, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
     <string name="account_settings" msgid="6403589284618783461">"Tilit"</string>
     <string name="category_personal" msgid="1299663247844969448">"Henkilökohtainen"</string>
@@ -813,13 +800,18 @@
     <string name="brightness_title" msgid="5746272622112982836">"Kirkkaus"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Säädä näytön kirkkautta"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kirkkauden säätö"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimoi kirkkaustaso valotilanteen mukaan"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"Virransäästö"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"Näytön kirkkaus määräytyy valoisuuden mukaan."</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Teema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Vaalea"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Tumma"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automaattinen"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Siirtyminen virransäästöön"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Näyttö sammuu"</string>
-    <string name="screen_timeout_summary" msgid="327761329263064327">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Laitteen oltua käyttämättä: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustakuva"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Valitse taustakuva"</string>
-    <string name="screensaver_settings_title" msgid="3349790120327233241">"Unelmat"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Päiväunet"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Telakoituna tai virransäästötilassa ja ladattaessa"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Kumpi vain"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Latauksen aikana"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Päivitä ensisij. SIM-kortti?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> on laitteesi ainoa SIM-kortti. Haluatko käyttää korttia tiedonsiirrolle, puheluille ja tekstiviesteille?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Virheellinen SIM-kortin PIN-koodi. Sinun on nyt otettava yhteys operaattoriin laitteen lukituksen avaamiseksi."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Virheellinen SIM-kortin PIN-koodi. Sinulla on <xliff:g id="NUMBER">%d</xliff:g> yritys jäljellä, ennen kuin sinun on otettava yhteys operaattoriin laitteen lukituksen avaamiseksi."</item>
-    <item quantity="other" msgid="77103619544346451">"Virheellinen SIM-kortin PIN-koodi. Sinulla on <xliff:g id="NUMBER">%d</xliff:g> yritystä jäljellä."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Virheellinen SIM-kortin PIN-koodi. Sinulla on <xliff:g id="NUMBER_1">%d</xliff:g> yritystä jäljellä.</item>
+      <item quantity="one">Virheellinen SIM-kortin PIN-koodi. Sinulla on <xliff:g id="NUMBER_0">%d</xliff:g> yritys jäljellä, ennen kuin sinun on otettava yhteyttä operaattoriin laitteen lukituksen avaamiseksi.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM-kortin PIN-toiminto epäonnistui!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet-laitteen tila"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Puhelimen tila"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Saatavilla (vain luku)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Tallennustilaa yhteensä"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Lasketaan…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Sovellukset (sovellusten tiedot ja mediasisältö)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Sovellukset ja sovellustiedot"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Lataukset"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Kuvat, videot"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Ääni (musiikki, soittoäänet, podcastit jne.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Muut"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Muut tiedostot"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Välimuistitiedot"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Poista jaettu tila käyt."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Poista SD-kortti käytöstä"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Poistetaan käytöstä"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Tallennustila on loppumassa"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Jotkin järjestelmän toiminnot, kuten synkronointi, eivät välttämättä toimi oikein. Vapauta tilaa poistamalla tai irrottamalla kohteita kuten sovelluksia tai mediasisältöä."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Nimeä uudelleen"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Ota käyttöön"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Poista"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Poista tiedot ja alusta"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Tyhjennä ja alusta sis. tallennustilana"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-tietokoneyhteys"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tietokoneyhteys"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Yhdistä tyyppinä"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Voit siirtää mediatiedostoja Windowsissa tai Android File Transferin avulla Macissa (katso www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Voit käyttää kameraohjelmistoa kuvien siirtämiseen ja siirtää tiedostoja tietokoneilta, jotka eivät tue MTP:tä"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Asenna tiedostonsiirtotyökalut"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Antaa MIDI-yhteensopivien sovellusten toimia USB:n kautta MIDI-ohjelmiston sisältävässä tietokoneessa."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Muut käyttäjät"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Laitteen tallennustila"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Siirrettävä tallennustila"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> vapaana (yhteensä <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> on otettu käyttöön."</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Käyttöönotto epäonnistui: <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> on poistettu turvallisesti."</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Turvallinen poistaminen epäonnistui: <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> on alustettu."</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Alustaminen epäonnistui: <xliff:g id="NAME">%1$s</xliff:g>."</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Nimeä tallennustila uudelleen"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Alustuksen jälkeen tämä <xliff:g id="NAME_0">^1</xliff:g> on käytettävissä muissa laitteissa. \n\nKaikki kohteen <xliff:g id="NAME_1">^1</xliff:g> tiedot poistetaan. Suosittelemme, että varmuuskopioit tiedot ensin. \n\n"<b>"Valokuvien ja muiden mediatiedostojen varmuuskopiointi"</b>" \nSiirrä mediatiedostosi toiseen tässä laitteessa olevaan tallennustilaan, tai siirrä ne tietokoneelle USB-johdon avulla. \n\n"<b>"Sovellusten varmuuskopiointi"</b>" \nKaikki kohteeseen <xliff:g id="NAME_6">^1</xliff:g> tallennetut sovellukset poistetaan ja niiden tiedot tyhjennetään. Jos haluat säilyttää nämä sovellukset, siirrä ne toiseen tämän laitteen tallennustilaan."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kun tämä <xliff:g id="NAME_0">^1</xliff:g> poistetaan, siihen tallennetut sovellukset lakkaavat toimimasta eivätkä mediatiedostot ole käytettävissä, ennen kuin se asetetaan takaisin paikalleen."</b>" \n\nTämä <xliff:g id="NAME_1">^1</xliff:g> on alustettu niin, että se toimii vain tässä laitteessa, ei muissa."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Määritä <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Käytä kannettavana tallennustilana"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Kuvien ja muiden mediatiedostojen siirtämiseen laitteiden välillä"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Käytä sisäisenä tallennustilana"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Jos haluat tallentaa kaiken, mukaan lukien sovellukset ja kuvat, vain tälle laitteelle. Vaatii alustuksen, joka estää sen toimimisen muissa laitteissa."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Alusta sisäisenä tallennustilana"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Jotta <xliff:g id="NAME_0">^1</xliff:g> olisi turvallinen, se on alustettava. \n\nAlustamisen jälkeen tämä <xliff:g id="NAME_1">^1</xliff:g> toimii vain tässä laitteessa. \n\n"<b>"Alustaminen tyhjentää kaikki kohteeseen <xliff:g id="NAME_2">^1</xliff:g> tallennetut tiedot."</b>" Suosittelemme sen varmuuskopiointia, jotta et menetä kyseisiä tietoja."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Poista tiedot ja alusta"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Alustetaan kohdetta <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Älä poista kohdetta <xliff:g id="NAME">^1</xliff:g> alustuksen aikana."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Siirrä tiedot uuteen paikkaan"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Uusi <xliff:g id="NAME">^1</xliff:g> on nyt käytettävissä, ja voit siirtää kuvasi, tiedostosi ja sovellustietosi siihen. \n\nSiirto vie noin <xliff:g id="TIME">^2</xliff:g> ja vapauttaa <xliff:g id="SIZE">^3</xliff:g> sisäistä tallennustilaa. Jotkin sovellukset eivät toimi siirron aikana."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Siirrä nyt"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Siirrä myöhemmin"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Siirrä tiedot nyt"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Siirto vie noin <xliff:g id="TIME">^1</xliff:g>. Se vapauttaa <xliff:g id="SIZE">^2</xliff:g> sisäistä tallennustilaa."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Siirrä"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Siirretään tietoja…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Siirron aikana: \n• Jätä <xliff:g id="NAME">^1</xliff:g> paikoilleen. \n• Kaikki sovellukset eivät toimi oikein. \n• Pidä laite ladattuna."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> on valmis"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> on valmis kuvien ja muiden mediatiedostojen tallennukseen."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Uusi <xliff:g id="NAME">^1</xliff:g> toimii oikein. \n\nJos haluat siirtää kuvia, tiedostoja ja sovellustietoja tähän laitteeseen, siirry kohtaan Asetukset &gt; Tallennustila."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Siirrä <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Sovelluksen <xliff:g id="APP">^1</xliff:g> ja sen tietojen siirtäminen kohteeseen <xliff:g id="NAME_0">^2</xliff:g> vie vain hetken. Et voi käyttää sovellusta, ennen kuin siirto on valmis. \n\nJätä <xliff:g id="NAME_1">^2</xliff:g> paikalleen siirron ajaksi."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Siirretään <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Jätä <xliff:g id="NAME">^1</xliff:g> paikalleen siirron ajaksi. \n\nTämän laitteen <xliff:g id="APP">^2</xliff:g>-sovellus ei ole käytettävissä, ennen kuin siirto on valmis."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Peruuta siirto"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akun tila"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akun taso"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN:t"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Palautetaan APN-oletusasetuksia"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Palauta oletukset"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN-oletusasetuksien palauttaminen valmis."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Verkkoasetusten nollaus"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Tämä nollaa kaikki verkkoasetukset, mukaan lukien seuraavat:\n\n"<li>"Wi‑Fi"</li>\n<li>"mobiilitiedonsiirto"</li>\n<li>"Bluetooth"</li>"."</string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Nollaa asetukset"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Nollataanko kaikki verkkoasetukset? Toimintoa ei voi peruuttaa."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Nollaa asetukset"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Nollataanko?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Verkkoasetuksesi on nollattu."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Palauta tehdasasetukset"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Tehdasasetuksien palauttaminen"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Poistaa kaikki tablet-laitteen tiedot"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Poistaa kaikki puhelimen tiedot"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Poista kaikki SD-kortin tiedot, kuten musiikki tai valokuvat."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Palauta tablet-laitteen tehdasasetukset"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Palauta puhelimen asetukset"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Haluatko poistaa kaikki henkilökohtaiset tietosi ja lataamasi sovellukset? Toimintoa ei voi peruuttaa!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Haluatko poistaa kaikki henkilökohtaiset tietosi ja lataamasi sovellukset? Toimintoa ei voi peruuttaa."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Poista kaikki"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Vahvista tehdasasetusten palautus piirtämällä lukituksenpoistokuviosi."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Palauttamista ei suoritettu, koska System Clear -palvelu ei ole käytettävissä."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Palautetaanko?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tämä käyttäjä ei voi palauttaa tehdasasetuksia"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Haluatko tyhjentää USB-tilan ja poistaa kaikki siellä olevat tiedostot? Toimintoa ei voi peruuttaa!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Haluatko tyhjentää SD-kortin ja poistaa kaikki siellä olevat tiedostot? Toimintoa ei voi peruuttaa!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Poista kaikki"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vahvista USB-tallennustilan tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Varmista SD-kortin tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Puheluasetukset"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ota käyttöön puhelinvastaaja, soitonsiirrot, koputuspalvelu, soittajan tunnus"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Jaettu yhteys USB:n kautta"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ohje"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Matkapuhelinverkot"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiilisopimus"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Oletusarvoinen tekstiviestisovellus"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Tekstiviestisovellus"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vaihdetaanko tekstiviestisovellus?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Haluatko, että oletussovellus on <xliff:g id="NEW_APP">%1$s</xliff:g> eikä enää <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Käytetäänkö tekstiviestisovellusta <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Paikannustila"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Paikanna GPS:n ja Wi-Fi- ja mobiiliverkkojen avulla"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Paikanna Wi-Fi- ja mobiiliverkkojen avulla"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Paikanna GPS:n avulla"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Paikanna sijaintisi GPS:n avulla"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Analysoidaan"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analysoidaan"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-haku"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Paranna sijaintipalveluita antamalla sovellusten ja palveluiden etsiä verkkoja myös silloin, kun Wi‑Fi ei ole käytössä."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-haku"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Paranna sijainnin tarkkuutta sallimalla järjestelmäpalveluiden etsiä Bluetooth-laitteita myös silloin, kun Bluetooth ei ole käytössä."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi- ja mobiiliverkkosijainti"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Anna sovellusten arvioida sijaintisi Googlen sijaintipalvelulla. Anonyymejä sijaintitietoja kerätään ja lähetetään Googlelle."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Sijainti on määritetty Wi-Fi-yhteyden perusteella"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Salasana on asetettu"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-koodi asetettu"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Kuvio on asetettu"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Ruudun suojaus"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Jatka antamalla laitteesi kuvio."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Jatka antamalla laitteesi PIN-koodi."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Jatka antamalla laitteesi 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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Laitteen suojaus"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Vaihda lukituksenpoistokuvio"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Vahvista tallennettu kuvio"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Yritä uudelleen:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Piirrä lukituksenpoistokuvio"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Saat ohjeita painamalla Valikko-painiketta."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Nosta sormi, kun olet valmis"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Aseta lukituksenpoistokuvio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Vaihda lukituksenpoistokuvio."</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Lukituksenpoistokuvion piirtäminen"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Liikaa virheellisiä yrityksiä!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Yritä uudelleen <xliff:g id="NUMBER">%d</xliff:g> sekunnin kuluttua."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Liian monta virheellistä yritystä. Yritä uudelleen <xliff:g id="NUMBER">%d</xliff:g> sekunnin kuluttua."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Sovellusta ei ole asennettu puhelimeesi."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hallinnoi sovelluksia"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hallinnoi ja poista asennettuja sovelluksia"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Lajittelu koon mukaan"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Käynnissä olevat palvelut"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Näytä välimuistiprosessit"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Hätäsovellus"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Nollaa sovellusasetukset"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nollaa sovellusasetukset?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tämä palauttaa kaikki asetukset seuraaville:\n\n "<li>"Käytöstä poistetut sovellukset"</li>\n" "<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n" "<li>"Toimintojen oletussovellukset"</li>\n" "<li>"Sovellusten taustatietorajoitukset"</li>\n" "<li>"Kaikki oikeuksien rajoitukset"</li>\n\n" Et menetä mitään sovellustietoja."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Sovellusten toiminta"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Käynnissä"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Ei käytetä)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Ei oletussovelluksia"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Tallennustilan käyttö"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Näytä sovellusten käyttämä tallennustila."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Käynnissä olevat palvelut"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet-laitteen tiedot"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Puhelimen tiedot"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Akun tiedot"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Pikakäynnistys"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Aseta pikanäppäimiä, joiden avulla käynnistät sovelluksia"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Määritä sovellukselle"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Ei pikakuvaketta"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Haku + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Tyhjennä"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Pikanäppäimesi <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) tyhjennetään."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Peruuta"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Sovellukset"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Pikakuvakkeet"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Tekstisyöttö"</string>
     <string name="input_method" msgid="5434026103176856164">"Syöttötapa"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Nykyinen näppäimistö"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tallenna kaikki Bluetoothin HCl-paketit tiedostoon"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM:n lukituksen avaus"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Salli käynnistysohjelman lukituksen avaaminen"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Syötä PIN-koodisi"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Anna laitteen PIN-koodi OEM-lukituksen avauksen käyttöön ottamiseksi"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Sallitaanko OEM:n lukituksen avaus?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"VAROITUS: laitteen suojaustoiminnot eivät toimi tämän asetuksen ollessa käytössä."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Lokipuskurien koot"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Valitse puskurikohtaiset lokikoot"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Salli sijaintien imitointi"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Salli sijaintien imitointi"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Ota attribuuttinäkymän tarkistus käyttöön"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Yhteysominaisuudet"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Langattoman näytön sertifiointi"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Käytä Wi-Fin laajennettua lokikirjausta"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiivinen handover: Wi-Fi-matkapuh."</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Salli Wi-Fi-verkkovierailuskannaus aina"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Käytä vanhaa DHCP-asiakassovellusta"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Näytä langattoman näytön sertifiointiin liittyvät asetukset"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Lisää Wi‑Fin lokikirjaustasoa, näytä SSID RSSI -kohtaisesti Wi‑Fi-valitsimessa."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Kun asetus on käytössä, Wi-Fi siirtää datayhteyden aggressiivisemmin matkapuhelinverkolle, jos Wi-Fi-signaali on heikko."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Salli/estä Wi-Fi-verkkovierailuskannaus liittymässä esiintyvän dataliikenteen perusteella."</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Lokipuskurien koot"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Valitse puskurikohtaiset lokikoot"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Valitse USB-määritykset"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Valitse USB-määritykset"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Salli sijaintien imitointi"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Salli sijaintien imitointi"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Ota attribuuttinäkymän tarkistus käyttöön"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Käytä Lollipopin DHCP-asiakassovellusta Androidin uuden DHCP-asiakassovelluksen sijasta."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Sallitaanko USB-vianetsintä?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-vianetsintä on tarkoitettu vain kehittäjien käyttöön. Sen avulla voidaan kopioida tietoja tietokoneesi ja laitteesi välillä, asentaa laitteeseesi sovelluksia ilmoittamatta siitä sinulle ja lukea lokitietoja."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Haluatko peruuttaa USB-vianetsinnän käyttöoikeuden kaikilta tietokoneilta, joille olet antanut luvan aiemmin?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Otetaanko palvelu <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> haluaa seuraavat luvat:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Sovellus peittää lupapyynnön, joten Asetukset ei voi vahvistaa valintaasi."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jos <xliff:g id="SERVICE">%1$s</xliff:g> otetaan käyttöön, laitteesi ei käytä näytön lukitusta tiedon salauksen parantamiseen."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Laite ei käytä näytön lukitusta tiedon salauksen parantamiseen, koska otit käytettävyyspalvelun käyttöön."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Koska palvelun <xliff:g id="SERVICE">%1$s</xliff:g> ottaminen käyttöön vaikuttaa tietojen salaukseen, sinun pitää vahvistaa kuvio."</string>
@@ -1605,13 +1653,13 @@
     <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> jäljellä"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> latausaikaa jäljellä"</string>
-    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – jäljellä n. <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – noin <xliff:g id="TIME">%2$s</xliff:g> jäljellä"</string>
     <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string>
     <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> kunnes täynnä"</string>
     <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> kunnes täynnä (laturilataus)"</string>
     <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> kunnes täynnä (USB-lataus)"</string>
     <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> kunnes täynnä (WiFi-lataus)"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Käyttö edellisen täyden latauksen jälk."</string>
+    <string name="power_usage_list_summary" msgid="2409288197839512482">"Kulutus täyteen lataamisen jälkeen"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akun käyttö laturin irrottamisen jälkeen"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akun käyttö tilastojen tyhjentämisen jälkeen"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> akkuvirralla"</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Käsittelytiedot"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Käsittelyn tarkat tiedot"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Muistin käyttö"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> sovellusta aikajakson <xliff:g id="TIME">%2$s</xliff:g> kuluessa"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g>/<xliff:g id="TOTALRAM">%2$s</xliff:g> käytetty aikajaksolla <xliff:g id="TIMEDURATION">%3$s</xliff:g>."</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Tausta"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Etuala"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Välimuistissa"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Laitteen muistin nykyinen tila: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Keskimääräinen RAM-muistin käyttö"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM-muistin käytön enimmäismäärä"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android-käyttöjärjestelmä"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Käyttöjärjestelmän mukana tulleet"</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">"Välimuistit"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM-muistin käyttö"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM-muistin käyttö (tausta)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Käyttöaika"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Prosessit"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Palvelut"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Kesto"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Muistitiedot"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 tuntia"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 päivä"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Näytä järjestelmä"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Piilota järjestelmä"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Käytä USS-muistimääritystä"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tilastojen tyyppi"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Tausta"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Alla olevat oletusasetukset ohittavat sovelluksen asetukset."</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Oletusasetukset"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Oletusmoottori"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Asettaa puhutulle tekstille käytettävän puhesynteesimoottorin."</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Aseta puhesynteesimoottori puhuttua tekstiä varten"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Puheen nopeus"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Tekstin puhumisnopeus"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Äänenkorkeus"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Laitteiston tukema"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Vain ohjelmisto"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kirjautumistunnukset eivät ole tämän käyttäjän käytettävissä"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Vahvista kirjautumistunnuksien asennus piirtämällä lukituksenpoistokuviosi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Anna käyttöoikeustietojen tallennustilan salasana."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nykyinen salasana:"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Varmuuskopioi tiedot"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Varmuuskopioi sovelluksen tiedot, Wi-Fi-salasanat ja muut asetukset Googlen palvelimille"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Varmuuskopiotili"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Mikään tili ei tällä hetkellä tallenna varmuuskopioituja tietoja"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Sisällytä sovellustiedot"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaattinen palauttaminen"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Palauta varmuuskopioidut asetukset ja tiedot, kun sovellus asennetaan uudelleen."</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Varmuuskopiopalvelu ei ole käytössä."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tämä on määritetty laitteen käytännöissä."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Varmuuskop. salasana"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Tietokoneen kaikkien tietojen varmuuskopiointia ei ole tällä hetkellä suojattu."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Muuta tai vaihda tietokoneen kaikkien tietojen varmuuskopioinnin salasana koskettamalla"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Siirtymän anim.asteikko"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animatorin keston mittakaava"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuloi toissijaiset näytöt"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Usean ikkunan tila"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Useita toimintoja ruudulla samaan aikaan."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Otetaanko usean ikkunan tila käyttöön?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"Varoitus: Tämä on kokeellinen ominaisuus, joka mahdollistaa useiden toimintojen näyttämisen ruudulla Viimeaikaiset sovellukset -käyttöliittymän avulla. Jotkin sovellukset voivat kaatua tai toimia virheellisesti."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Sovellukset"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Älä säilytä toimintoja"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Tuhoa kaikki toiminnot, kun käyttäjä poistuu"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Käyttäjä"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Rajoitettu profiili"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Lisätäänkö uusi käyttäjä?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Voit jakaa tämän laitteen muiden kanssa luomalla lisää käyttäjiä. Kullakin käyttäjällä on oma tilansa, jota he voivat muokata esimerkiksi omilla sovelluksilla ja taustakuvilla. Käyttäjät voivat myös muokata laiteasetuksia, kuten Wi‑Fi-asetuksia, jotka vaikuttavat laitteen kaikkiin käyttäjiin.\n\nKun lisäät uuden käyttäjän, hänen tulee määrittää oman tilansa asetukset.\n\nKaikki käyttäjät voivat päivittää sovelluksia muille käyttäjille."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Voit jakaa tämän laitteen muiden kanssa luomalla lisää käyttäjiä. Kullakin käyttäjällä on oma tilansa, jota he voivat muokata esimerkiksi omilla sovelluksilla ja taustakuvilla. Käyttäjät voivat myös muokata laiteasetuksia, kuten Wi‑Fi-asetuksia, jotka vaikuttavat laitteen kaikkiin käyttäjiin.\n\nKun lisäät uuden käyttäjän, hänen tulee määrittää oman tilansa asetukset.\n\nKaikki käyttäjät voivat päivittää sovelluksia muille käyttäjille."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kun lisäät uuden käyttäjän, hänen tulee määrittää oman tilansa asetukset.\n\nKaikki käyttäjät voivat päivittää sovelluksia muille käyttäjille."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Määritetäänkö käyttäjän asetukset nyt?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Varmista, että käyttäjä voi vastaanottaa laitteen ja määrittää oman tilansa"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Poistetaanko vieras?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Kaikki sovellukset ja tämän istunnon tiedot poistetaan."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Poista"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Salli puhelut"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Salli puhelut ja tekstiviestit"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Ota puhelut käyttöön"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Ota puhelut ja tekstiviestit käyttöön"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Poista käyttäjä"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Sallitaanko puhelut?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Otetaanko puhelut käyttöön?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Soittohistoria jaetaan tämän käyttäjän kanssa."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Sallitaanko puhelut ja tekstiviestit?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Soitto- ja tekstiviestihistoria jaetaan tämän käyttäjän kanssa."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Otetaanko puhelut ja tekstiviestit käyttöön?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Soitto- ja tekstiviestihistoria jaetaan tämän käyttäjän kanssa."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Sovellusten ja sisällön salliminen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Rajoitetut sovellukset"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Laajenna sovelluksen asetuksia"</string>
@@ -2283,15 +2339,15 @@
     <string name="user_rename" msgid="8523499513614655279">"NIMEÄ UUDELLEEN"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Aseta sovelluksen rajoituksia"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Ohjaaja: <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Tätä sovellusta ei tueta rajoitetuissa profiileissa"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Tämä sovellus saa käyttää tilejäsi"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Tämä sovellus voi käyttää tilejäsi. Hallinnoija: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi- ja mobiiliverkko"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Salli Wi-Fi- ja mobiiliverkkoasetuksien muokkaaminen"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Salli Bluetooth-parien ja -asetuksien muokkaaminen"</string>
     <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 tablet-laite koskettaa toista 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_location_enable_title" msgid="5020268888245775164">"Sijainti"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Anna sovellusten käyttää sijaintitietojasi"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"Wi-Fi wi-fi verkko yhteys"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekstiviesti tekstiviestien lähetys viestit viestien lähetys"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"matkapuhelin kännykkä operaattori langaton tiedonsiirto 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi puhelu soittaa"</string>
     <string name="keywords_home" msgid="3626170808219458848">"käynnistysohjelma"</string>
     <string name="keywords_display" msgid="6709007669501628320">"näyttö kosketusnäyttö"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"näytön himmennys kosketusnäyttö akku"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"näytön himmennys kosketusnäyttö akku"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"tausta räätälöi muokkaa näyttö"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tumma teema yötila himmennä näyttö käänteinen kirkkaus"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"tausta räätälöidä muokata näyttö"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekstin koko"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"lähetys"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projektin suoratoisto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"levytila levy kiintolevy laite käyttö"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"virta käyttö lataus"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"oikeinkirjoitus sanakirja oikoluku automaattikorjaus"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"tili"</string>
     <string name="keywords_users" msgid="4673901601478559100">"rajoitus rajoittaa rajoitettu"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teksti korjaus korjaa ääni värinä automaattinen kieli ele ehdottaa ehdotus teema loukkaava sana kirjoita emoji kansainvälinen"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"nollaa asetukset oletus"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"hätätilanne ice sovellus oletus"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"sovellukset lataus järjestelmä"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"sovellusten käyttöoikeuksien suojaus"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"oletussovellukset"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"liu\'uta salasana lukituksenpoistokuvio PIN-koodi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Määritä Wi-Fi ja NFC-tagi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjoita"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hälytyksen voimakkuus"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Soittoäänen voimakkuus"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ilmoituksen äänenvoimakkuus"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Häiriöt"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Kun puheluita ja ilmoituksia saapuu"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Häiritse aina"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Salli vain tärkeät häiriöt"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Älä häiritse"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Sallittavat tärkeät ilmoitukset"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automaattiset säännöt"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Vain tärkeät"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Vain herätykset"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Ei keskeytyksiä"</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="ringtone_title" msgid="5379026328015343686">"Puhelimen soittoääni"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ilmoitusten oletussoittoääni"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Värinä myös puheluille"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Värinä"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Pääsy ilmoituksiin"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Sovellukset eivät voi lukea ilmoituksia"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d sovellus voi lukea ilmoituksia"</item>
-    <item quantity="other" msgid="980049191810249052">"%d sovellusta voi lukea ilmoituksia"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d sovellusta voi lukea ilmoituksia</item>
+      <item quantity="one">%d sovellus voi lukea ilmoituksia</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Ilmoituskuuntelijoita ei ole asennettu."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pystyy lukemaan kaikki järjestelmän tai asennetun sovelluksen julkaisemat ilmoitukset, joihin voi sisältyä henkilökohtaisia tietoja, kuten kontaktien nimiä ja sinulle lähetettyjen viestien tekstiä. Se voi myös ohittaa nämä ilmoitukset tai niiden toimintopainikkeet."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Ehtojen toimituspalvelut"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ei ehtojen toimituspalveluja"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d toimii ehtojen toimituspalveluna"</item>
-    <item quantity="other" msgid="358057362115673258">"%d toimivat ehtojen toimituspalveluina"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ehtojen toimituspalveluja ei ole asennettu."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> voi lisätä lopetusehtoja Älä häiritse -tilaan."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ladataan sovelluksia…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Estä"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Estä kaikki"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Älä koskaan näytä ilmoituksia tästä sovelluksesta"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Tärkeät"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Näytä ilmoitukset luettelon kärjessä ja jatka niiden näyttämistä kun laite on asetettu näyttämään vain tärkeät häiriöt"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Yksityisluontoinen"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Piilota arkaluonteinen sisältö tämän sovelluksen ilmoituksista, kun laite on lukittu"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Merkitse tärkeäksi"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Anna sovelluksen toistaa ilmoituksia, kun älä häiritse -tila on vain tärkeät -asetuksella."</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Salli kurkistaminen"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Anna sovelluksen korostaa tiettyjä ilmoituksia näyttämällä ne nykyisellä näytöllä hetkellisesti."</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Piilota arkaluontoinen sisältö"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Piilota mahdollisesti yksityisluontoinen sisältö tämän sovelluksen ilmoituksista, kun laite on lukittu."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Estetty"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Tärkeät"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Yksityisluontoinen"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Valmis"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Kunnes poistat tämän käytöstä"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Tärkeät häiriöt"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Vapaalla"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Päivät"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ei mitään"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Keskeytykset sallittu"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Vain tärkeät"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ei mitään"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automaattinen"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ota automaattisesti käyttöön"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Säännön nimi"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Lisää sääntö"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Poista sääntö"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Poistetaanko sääntö <xliff:g id="RULE">%1$s</xliff:g>?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Poista"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Säännön tyyppi"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Tuntematon"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Määritä sääntö"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Aikataulusääntö"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Sääntöä ei löydy."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Päivät"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ei mitään"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Joka päivä"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ei koskaan"</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">"Puhelut"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Viestit"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Saapuneet puhelut/viestit:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Kuka tahansa"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Vain yhteystiedot"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Vain tähdellä merkityt yhteystiedot"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Tapahtumat ja muistutukset"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Herätykset ovat aina tärkeitä"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Herätykset"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Muistutukset"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Tapahtumat"</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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Arki-illat"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Aloitusaika"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Päättymisaika"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> seuraavana päivänä"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> tai hälytyksen yhteydessä"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> seuraavana päivänä tai hälytyksen yhteydessä"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> seuraavana päivänä"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Häiriöt"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Kun puheluita ja ilmoituksia saapuu"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Milloin sallit keskeytykset?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Kuinka kauan?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Häiritse aina"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"pois,kaikki,jokainen"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Salli vain tärkeät häiriöt"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Salli vain herätykset"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Älä häiritse"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Toistaiseksi"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuuttia</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuutti</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tuntia</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tunti</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Ota vain tärkeät ilmoitukset käyttöön toistaiseksi."</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Ota vain tärkeät ilmoitukset käyttöön <xliff:g id="DURATION">%1$d</xliff:g> minuutiksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota vain tärkeät ilmoitukset käyttöön yhdeksi minuutiksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Ota vain tärkeät ilmoitukset käyttöön <xliff:g id="DURATION">%1$d</xliff:g> tunniksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota vain tärkeät ilmoitukset käyttöön yhdeksi tunniksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Ota vain herätykset käyttöön toistaiseksi."</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Ota vain herätykset käyttöön <xliff:g id="DURATION">%1$d</xliff:g> minuutiksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota vain herätykset käyttöön yhdeksi minuutiksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Ota vain herätykset käyttöön <xliff:g id="DURATION">%1$d</xliff:g> yhdeksi tunniksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota vain herätykset käyttöön yhdeksi tunniksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Ota älä häiritse -tila käyttöön toistaiseksi."</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Ota älä häiritse -tila käyttöön <xliff:g id="DURATION">%1$d</xliff:g> minuutiksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota älä häiritse -tila käyttöön yhdeksi minuutiksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Ota älä häiritse -tila käyttöön <xliff:g id="DURATION">%1$d</xliff:g> tunniksi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> asti.</item>
+      <item quantity="one">Ota älä häiritse -tila käyttöön yhdeksi tunniksi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> asti.</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Salli keskeytykset aina."</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ikuisesti"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Sovellusilmoitukset"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Lähetä palautetta tästä laitteesta"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-koodin tiedot"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-koodiin liittyvät tiedot"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Paikka <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Käynnistä oletuksena"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> käytössä kohteessa <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Verkkotunnuksen linkit"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Avaa verkkotunnuksen URL-osoitteet."</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Salli sovelluksen avata verkkotunnuksen URL-osoitteita."</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Tuetut verkkotunnuksen URL-osoitteet"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Muut oletusarvot"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> käytössä kohteessa <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"sisäinen muisti"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"ulkoinen muisti"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Sisäinen tallennustila"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Ulkoinen tallennustila"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Sovelluksen tiedonsiirto"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> käytetty <xliff:g id="DATE">%2$s</xliff:g> jälkeen"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Käytetty tallennustila"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Käytössä"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Estä"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Yksityisluontoinen"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Tärkeät"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Tärkeät ja yksityisluontoiset"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> käyttöoikeutta myönnetty</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> käyttöoikeus myönnetty</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g>/<xliff:g id="COUNT_3">%d</xliff:g> lupaa myönnetty.</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> lupaa myönnetty.</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Joitakin oletuksia on asetettu."</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Oletuksia ei asetettu."</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Kaikki sovellukset"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Käytössä"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Henkilökohtaiset"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Työ"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Estetyt"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Tärkeät"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Yksityisluontoiset"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Sis. verkkotun. URL-osoitteita"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Järjestelmänvalvojan käytöstä poistama"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Lisäasetukset"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Tuntematon sovellus"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Valitse profiili"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Sovelluksen käyttöoikeudet"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> sovelluksella on ylimääräinen käyttöoikeus"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Sallitut sovellukset: <xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Verkkotunnuksen URL-osoitteet"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Älä avaa verkkotunnuksen URL-osoitteita."</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Avaa <xliff:g id="DOMAIN">%s</xliff:g>"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Avaa <xliff:g id="DOMAIN">%s</xliff:g> ja siihen liittyvät URL-osoitteet."</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> sovellusta voi avata verkkotunnuksensa URL-osoitteita</item>
+      <item quantity="one">Yksi sovellus voi avata verkkotunnuksensa URL-osoitteita</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Ei tunnistettu"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Oletussovellukset"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Selainsovellus"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Ei oletusselain"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Oletus)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Sovellusten tallennustila"</string>
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index a3e83c1..65ddcf4 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Bouton de commande"</item>
@@ -263,7 +266,7 @@
     <item msgid="1545733463471924009">"dessiner par dessus"</item>
     <item msgid="3609046903962454582">"accéder aux notifications"</item>
     <item msgid="4671646036128214513">"caméra"</item>
-    <item msgid="1097324338692486211">"enregistrer fichier audio"</item>
+    <item msgid="1097324338692486211">"enregistrer des fichiers audio"</item>
     <item msgid="5031552983987798163">"lire le fichier audio"</item>
     <item msgid="8374996688066472414">"lire le presse-papiers"</item>
     <item msgid="3045529469061083747">"modifier le presse-papiers"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"activer/désactiver le micro"</item>
     <item msgid="1148142988678569310">"projeter des contenus multimédias"</item>
     <item msgid="9130014005474445273">"activer le RPV"</item>
+    <item msgid="1165192162975045562">"définir le fond d\'écran"</item>
+    <item msgid="7129487923652967258">"structure d\'assistance"</item>
+    <item msgid="1069023208100114540">"saisie d\'écran d\'assistance"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Position"</item>
@@ -312,7 +318,7 @@
     <item msgid="736541391767350377">"Dessiner par dessus"</item>
     <item msgid="5530815681721654194">"Accéder aux notifications"</item>
     <item msgid="781213371706962767">"Caméra"</item>
-    <item msgid="1720492593061838172">"Enregistrer fichier audio"</item>
+    <item msgid="1720492593061838172">"Enregistrer des fichiers audio"</item>
     <item msgid="3493046322001257041">"Lire le fichier audio"</item>
     <item msgid="136815868796597058">"Lire le presse-papiers"</item>
     <item msgid="5238692940326972503">"Modifier le presse-papiers"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Activer/Désactiver le micro"</item>
     <item msgid="5906017727368097853">"Projeter des contenus multimédias"</item>
     <item msgid="2486614710846178542">"Activer le RPV"</item>
+    <item msgid="5586547561693629602">"Définir le fond d\'écran"</item>
+    <item msgid="32794179825485062">"Structure d\'assistance"</item>
+    <item msgid="7872852746938272552">"Saisie d\'écran d\'assistance"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Court-métrage"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"faible"</item>
     <item msgid="4212263919458209842">"critique"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Désactivé"</item>
-    <item msgid="5656544177755411222">"Interruptions limitées"</item>
-    <item msgid="8735337502532332056">"Aucune interruption"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normale"</item>
     <item msgid="866544120205026771">"Modérée"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rose"</item>
     <item msgid="6131821495505931173">"Rouge"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol, protocole de transfert de fichiers multimédias)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol, protocole de transfert d\'images)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet USB)"</item>
+    <item msgid="2686051673589572111">"Source audio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index b7821ce..067e931 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Autoriser"</string>
     <string name="deny" msgid="6947806159746484865">"Refusers"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Plus que <xliff:g id="STEP_COUNT">%1$d</xliff:g> étape pour devenir un développeur."</item>
-    <item quantity="other" msgid="6722953419953594148">"Plus que <xliff:g id="STEP_COUNT">%1$d</xliff:g> étapes pour devenir un développeur."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Plus qu’<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir un développeur.</item>
+      <item quantity="other">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étapes pour devenir un développeur.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Vous êtes désormais un développeur!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Inuti, vous êtes déjà un développeur."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Sans fil et réseaux"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Désactiver SMS over IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Activation de l\'enregistrement IMS requise"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Désactivation de l\'enregistrement IMS requise"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Activer l\'indicateur de configuration VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Désactiver l\'indicateur de configuration VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Activer le vidage de la mémoire RAM du LTE"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Désactiver le vidage de la mémoire RAM du LTE"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Afficher le carnet d\'adresses de la carte SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Le profil :&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;va être désactivé sur :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Connecté"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connecté (sans audio pour appels tél.)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connecté (sans audio contenu mutimédia)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connecté (sans accès aux messages)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connecté (sans audio tel./multimédia)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Déconnecté"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Déconnexion…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Connexion en cours…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Association…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Appareil Bluetooth sans nom"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Searching"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Aucun appareil Bluetooth détecté."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afficher les fichiers reçus"</string>
     <string name="device_picker" msgid="4978696506172252813">"Sélectionner un appareil Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Demande d\'autorisation Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Une application requiert l\'activation du Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Une application veut activer la connectivité Bluetooth de cet appareil."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre tablette. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Carte SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Paramètres du serveur mandataire"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuler"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANNULER"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUER"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"OUI"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NON"</string>
-    <string name="forget" msgid="7267115980248732932">"SUPPRIMER"</string>
+    <string name="forget" msgid="1400428660472591263">"Supprimer"</string>
+    <string name="save" msgid="879993180139353333">"Enregistrer"</string>
+    <string name="done" msgid="6942539184162713160">"Terminé"</string>
     <string name="settings_label" msgid="1626402585530130914">"Paramètres"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Paramètres"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Raccourci vers les paramètres"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Trier par fuseau horaire"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Heures"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Améliorer la correspondance faciale"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Détection des mouvements"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Exiger un clin d\'œil lors du déverrouillage"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Verrouiller automatiquement"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Après <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> de veille"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> après la mise en veille, sauf lorsque l\'appareil est maintenu en activité par <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Lecteur d\'empreintes digitales"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gérer les empreintes digitales"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Util. empr. dig. pour"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Ajouter"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"verrouillage de l\'écran"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> empreinte digitale enregistrée</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empreintes digitales enregistrées</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Configuration d\'empreinte digitale"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Pour utiliser votre empreinte digitale afin de déverrouiller l\'écran ou de confirmer des achats, nous devons effectuer les opérations suivantes : \n\n✓ Configurer le mode de verrouillage de secours de l\'écran \n\n✓ Ajouter votre empreinte digitale"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Trouvez le capteur"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localisez le capteur d\'empreintes digitales sur le dos de votre téléphone."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Commençons!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Mettez votre doigt sur le capteur d\'empreinte digitale. Enlevez-le après avoir senti une vibration."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Excellent! Maintenant, refaites-le."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Mettez le même doigt sur le capteur d\'empreinte digitale et enlevez-le après avoir senti une vibration."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empreinte digitale ajoutée!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que vous voyez cette icône, vous pouvez utiliser votre empreinte digitale pour vous identifier ou pour autoriser un achat."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Ajouter"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement (ou cryptage)"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Crypter le téléphone"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Veuillez brancher votre chargeur, puis réessayer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Aucun NIP ni mot de passe saisi pour le verrouillage de l\'écran"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Vous devez définir un NIP ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Vous devez dessiner votre schéma de déverrouillage pour confirmer le chiffrement de votre appareil."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Chiffrer?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle le téléphone sera redémarré à plusieurs reprises."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Balayer l\'écran"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Aucune sécurité"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Sécurité faible, expérimental"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Schéma"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Sécurité moyenne"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"NIP"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Sécurité moyenne à élevée"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Sécurité élevée"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Verrouillage actuel de l\'écran"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Les fonctions de protection de l\'appareil ne fonctionneront plus."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Désactivé par admin., règles chiffrement ou stockage des identifiants"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Balayer l\'écran"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Schéma"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"NIP"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Mot de passe"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Une fois que vous avez défini un verrouillage de l\'écran, vous pouvez également configurer une empreinte digitale dans le menu Paramètres &gt; Sécurité."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Désactiver le verrouillage de l\'écran"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Supprimer le schéma de déverrouillage"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Supprimer le NIP de déverrouillage"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Le mot de passe doit comporter au moins une lettre."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Le mot de passe doit comporter au moins un chiffre."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Le mot de passe doit comporter au moins un symbole."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Le mot de passe doit comporter au moins une lettre."</item>
-    <item quantity="other" msgid="8186027808415585970">"Le mot de passe doit comporter au moins %d lettres."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Le mot de passe doit comporter au moins une lettre minuscule."</item>
-    <item quantity="other" msgid="2693910942679679225">"Le mot de passe doit comporter au moins %d lettres minuscules."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Le mot de passe doit comporter au moins une lettre majuscule."</item>
-    <item quantity="other" msgid="3030801209112209245">"Le mot de passe doit comporter au moins %d lettres majuscules."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Le mot de passe doit comporter au moins un chiffre."</item>
-    <item quantity="other" msgid="4703982391407595924">"Le mot de passe doit comporter au moins %dchiffres."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Le mot de passe doit comporter au moins un caractère spécial."</item>
-    <item quantity="other" msgid="1221290525051187757">"Le mot de passe doit comporter au moins %d caractères spéciaux."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Le mot de passe doit comporter au moins un caractère autre qu\'une lettre."</item>
-    <item quantity="other" msgid="3952508584649046404">"Le mot de passe doit comporter au moins %d caractères autres que des lettres."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Le mot de passe doit contenir au moins %d lettre.</item>
+      <item quantity="other">Le mot de passe doit contenir au moins %d lettres.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Le mot de passe doit contenir au moins %d lettre minuscule.</item>
+      <item quantity="other">Le mot de passe doit contenir au moins %d lettres minuscules.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Le mot de passe doit contenir au moins %d lettre majuscule.</item>
+      <item quantity="other">Le mot de passe doit contenir au moins %d lettres majuscules.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Le mot de passe doit contenir au moins %d chiffre.</item>
+      <item quantity="other">Le mot de passe doit contenir au moins %d chiffres.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Le mot de passe doit contenir au moins un caractère spécial.</item>
+      <item quantity="other">Le mot de passe doit contenir au moins un caractères spéciaux.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Le mot de passe doit contenir au moins %d caractère qui n\'est pas une lettre.</item>
+      <item quantity="other">Le mot de passe doit contenir au moins %d caractères qui ne sont pas une lettre.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"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="6830610582179569631">"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>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assurez-vous que le mot de passe &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; s\'affiche."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Associer à cet appareil?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Pour l\'association à :<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>Saisissez <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>, puis appuyez sur « Retour » ou sur « Entrée »."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Associer"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ASSOCIER"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuler"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"L\'association vous permet d\'accéder à vos contacts et à l\'historique des appels lorsque vous êtes connecté."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Impossible d\'associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Impossible d\'établir l\'association avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> en raison d\'un NIP ou d\'une clé d\'accès incorrects."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Impossible d\'établir la communication avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Association refusée par <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Impossible de se connecter à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Recherche d\'appareils"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Actualiser"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Options avancées"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Paramètres Bluetooth avancés"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Si Bluetooth activé, appareil peut communiquer avec autres appareils Bluetooth à proximité."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Pour améliorer la précision de la localisation, les application et les services rechercheront les appareils Bluetooth à proximité, même si Bluetooth est désactivé. Vous pouvez modifier cette option dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Se connecter à…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Paramètres audio du support"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Paramètres audio du téléphone"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfert de fichier"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Périphérique d\'entrée"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accès Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Partage de contact"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utiliser pour le partage de contacts"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partage de connexion Internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accès aux messages"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio du support."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio en mains libres."</string>
     <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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté aux paramètres audio du média"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté à l\'audio du téléphone"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connecté à la carte"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Connexion au serveur de transfert de fichiers non établie"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connecté au périphérique d\'entrée"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utiliser pour les paramètres audio du support"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utiliser pour les paramètres audio du téléphone"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utiliser pour le transfert de fichiers"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utiliser comme entrée"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utiliser pour l\'accès à Internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utiliser pour la carte"</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>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistant Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Connecté à l\'aide de l\'assistant Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Écran de diffusion"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Diffuser"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connexion en cours…"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Supprimer"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Terminé"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"nom"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Autoriser l\'échange de données lorsque la tablette est en contact avec un autre appareil"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Autoriser l\'échange de données lorsque le téléphone est en contact avec un autre appareil"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Désactivation du Wi-Fi en cours…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Erreur"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"En mode Avion"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Impossible de rechercher des réseaux."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notification de réseau"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Me notifier lorsqu\'un réseau public est disponible"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Éviter les connexions instables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"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_scan_always_available" msgid="3470564139944368030">"Recherche toujours disponible"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Toujours autoriser la recherche"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Autoriser le service de localisation de Google et les autres applications à rechercher des réseaux, même si le Wi-Fi est désactivé"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utiliser automatiquement le Wi-Fi ouvert"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Laisser un assistant Wi‑Fi se connecter automatiquement aux réseaux ouverts jugés de bonne qualité"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Sélectionner un assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer les certificats"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pour améliorer la précision, entre autres, le service de localisation de Google et d\'autres applications peuvent rechercher des réseaux Wi-Fi à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les applications peuvent rechercher des réseaux à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Pour améliorer la précision de la localisation, les application et les services rechercheront les réseaux Wi-Fi, même si le Wi-Fi est désactivé. Vous pouvez modifier cette option 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="5340097010842405981">"Ne plus afficher"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi actif en veille"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi activé pendant la veille"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Ajouter un autre réseau"</string>
     <string name="wifi_more" msgid="3195296805089107950">"More"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuration auto (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Pour terminer la configuration de votre tablette, vous devez disposer d\'un accès Wi-Fi. Une fois la configuration effectuée, vous pouvez choisir d\'utiliser un réseau de données cellulaires ou le Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Options avancées"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Configuration Wi-Fi protégée"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Démarrage de la configuration WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Appuyez sur le bouton « Configuration Wi-Fi protégée » de votre routeur. Celui-ci peut s\'appeler « WPS » ou contenir ce symbole :"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Appuyez sur le bouton « Configuration Wi-Fi protégée » de votre routeur. Celui-ci peut s\'appeler « WPS » ou contenir ce symbole :"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Saisissez le code d\'accès « <xliff:g id="NUMBER">%1$s</xliff:g> » sur votre routeur Wi-Fi. La configuration peut prendre jusqu\'à deux minutes."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"Configuration WPS réussie. Connexion au réseau en cours…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Connecté au réseau Wi-Fi « <xliff:g id="NETWORK_NAME">%s</xliff:g> »"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Mot de passe"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Afficher le mot de passe"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Configurer la bande AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Bande de 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Bande de 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Paramètres IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(aucune modification)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non spécifié)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Enregistré"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Désactivés"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Échec de configuration de l\'adresse IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Échec de connexion Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problème d\'authentification"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Hors de portée"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Aucun accès à Internet détecté, reconnexion automatique impossible"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Entrez votre mot de passe réseau"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Aucun"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"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="5963015664551707981">"Ne plus me demander pour ce réseau"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Point acc. Wi‑Fi port. AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Point d\'accès Wi-Fi mobile <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_mode_title" msgid="2164073796253284289">"Préférences d\'appel"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Mode d\'appel Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Réseau Wi-Fi de préférence"</item>
+    <item msgid="5267397515594230396">"Réseau cellulaire de préférence"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Accueil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosité adaptative"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise le niveau de luminosité en fonction de l\'éclairage ambiant"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Thème"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Clair"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Foncé"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatique"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"M. à jour la carte SIM préf.?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> est la seule carte SIM dans votre appareil. Voulez-vous utiliser cette carte SIM pour les données cellulaires, les appels et les textos?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"NIP de carte SIM incorrect. Vous devez maintenant communiquer avec votre fournisseur de services pour déverrouiller votre appareil."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"NIP de carte SIM incorrect. Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentative. Après cela, vous devrez communiquer avec votre fournisseur de services pour déverrouiller votre appareil."</item>
-    <item quantity="other" msgid="77103619544346451">"NIP de carte SIM incorrect. Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentative(s)."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Le NIP de la carte SIM incorrect. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentative.</item>
+      <item quantity="other">Le NIP de la carte SIM incorrect. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentatives.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Le déverrouillage par NIP de carte SIM a échoué."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"État de la tablette"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"État du téléphone"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (en lecture seule)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espace total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcul en cours"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Applis (données des applis et contenu multimédia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Applications et données des applications"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Médias"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"téléchargements"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Images, vidéos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musique, sonneries, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Divers"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Autres fichiers"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Données mises en cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Démonter le stockage partagé"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Désinstaller la carte SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Désinstallation en cours"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Espace de stockage bientôt saturé"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Il est possible que certaines fonctionnalités du système, comme la synchronisation, ne soient pas opérationnelles. Libérez de l\'espace en supprimant certains éléments (applications ou contenu multimédia, par exemple) ou en annulant leur épinglage."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Renommer"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Monter"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Éjecter"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Effacer et formater"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Eff. et format. comme mém. int."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Connexion USB à l\'ordinateur"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Connexion USB à l\'ordinateur"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connecter en tant que"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Permet de transférer des fichiers multimédias sous Windows ou à l\'aide de l\'application Android File Transfer pour Mac (voir www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Appareil photo (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Permet de transférer des photos à l\'aide du logiciel photo et de transférer des fichiers sur les ordinateurs non compatibles avec le protocole MTP."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installer des outils de transfert de fichiers"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Permettre aux applications compatibles avec le protocole MIDI de fonctionner par USB avec des logiciels MIDI sur votre ordinateur"</string>
     <string name="storage_other_users" msgid="808708845102611856">"Autres utilisateurs"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Mémoire interne de l\'appareil"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Stockage amovible"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> libre (total : <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> est monté"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Impossible de monter <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> a été éjecté en toute sécurité"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Impossible d\'éjecter <xliff:g id="NAME">%1$s</xliff:g> en toute sécurité"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> n\'est pas formaté"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Impossible de formater <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Renommer le stockage"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Après le formatage, vous pouvez utiliser la mémoire de stockage « <xliff:g id="NAME_0">^1</xliff:g> » avec d\'autres appareils. \n\nToutes les données enregistrées sur « <xliff:g id="NAME_1">^1</xliff:g> » seront effacées. Nous vous conseillons de sauvegarder vos données avant de continuer. \n\n"<b>"Sauvegardez vos photos et vos autres fichiers"</b>\n"Déplacez vos fichiers multimédias vers une autre mémoire de stockage sur cet appareil, ou transférez-les sur un ordinateur à l\'aide d\'un câble USB. \n\n"<b>"Sauvegardez vos applications"</b>\n"Toutes les applications enregistrées sur « <xliff:g id="NAME_6">^1</xliff:g> » seront désinstallées, et les données correspondantes seront effacées. Pour conserver ces applications, déplacez-les vers une autre mémoire de stockage sur cet appareil."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Lorsque vous éjectez la mémoire de stockage « <xliff:g id="NAME_0">^1</xliff:g> », les applications qui y sont enregistrées cessent de fonctionner, et les fichiers qu\'elle contient ne sont plus accessibles jusqu\'à ce que vous la réinsériez de nouveau."</b>\n\n"La mémoire de stockage « <xliff:g id="NAME_1">^1</xliff:g> » a été configurée pour ne fonctionner que sur cet appareil. Vous ne pouvez pas l\'utiliser sur d\'autres appareils."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurer votre « <xliff:g id="NAME">^1</xliff:g> »"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utiliser en tant que mémoire de stockage externe"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Pour déplacer des photos et d\'autres fichiers entre différents appareils"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utiliser comme mémoire de stockage interne"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Pour enregistrer tout type de contenu, y compris des applications et des photos, sur cet appareil uniquement. Cette option nécessite de formater la mémoire de stockage pour l\'empêcher de fonctionner avec d\'autres appareils."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formater comme mémoire interne"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Cette option nécessite de formater la mémoire de stockage « <xliff:g id="NAME_0">^1</xliff:g> » pour qu\'elle soit sécurisée. \n\nAprès le formatage, « <xliff:g id="NAME_1">^1</xliff:g> » ne fonctionnera que sur cet appareil. \n\n"<b>"Le formatage entraîne la suppression de toutes les données enregistrées sur « <xliff:g id="NAME_2">^1</xliff:g> »."</b>" Pour ne pas de perdre vos données, nous vous conseillons de les sauvegarder."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Effacer et formater"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatage de « <xliff:g id="NAME">^1</xliff:g> » en cours..."</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ne retirez pas « <xliff:g id="NAME">^1</xliff:g> » durant le formatage."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Déplacer vers une autre mémoire"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Vous pouvez déplacer vos photos, vos fichiers et les données de vos applications vers la nouvelle mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> ». \n\nCette opération prend environ <xliff:g id="TIME">^2</xliff:g> et permet de libérer <xliff:g id="SIZE">^3</xliff:g> sur la mémoire de stockage interne. Certaines applications ne fonctionneront pas pendant l\'opération."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Déplacer maintenant"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Déplacer plus tard"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Déplacer les données maintenant"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Le déplacement des données dure <xliff:g id="TIME">^1</xliff:g> environ et permet de libérer <xliff:g id="SIZE">^2</xliff:g> sur la mémoire de stockage interne."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Déplacer"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Déplacement des données..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Pendant le déplacement des données : \n• Ne retirez pas la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> ». \n• Certaines applications ne fonctionneront pas correctement. \n• Assurez-vous que l\'appareil reste chargé."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"« <xliff:g id="NAME">^1</xliff:g> » est prêt à utiliser"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Votre mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » est maintenant configurée pour que vous puissiez y enregistrer des photos et d\'autres fichiers."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Votre nouvelle mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » fonctionne correctement. \n\nPour déplacer des photos, des fichiers et des données d\'application sur cet appareil, sélectionnez Paramètres &gt; Stockage."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Déplacer <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Le déplacement de l\'application « <xliff:g id="APP">^1</xliff:g> » et des données correspondantes vers « <xliff:g id="NAME_0">^2</xliff:g> » ne prend que quelques minutes. Vous ne pourrez pas utiliser l\'application tant que l\'opération n\'est pas terminée. \n\nNe retirez pas la mémoire de stockage « <xliff:g id="NAME_1">^2</xliff:g> » pendant le déplacement."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Déplacement de <xliff:g id="APP">^1</xliff:g> en cours..."</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ne retirez pas la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » pendant le déplacement. \n\nL\'application « <xliff:g id="APP">^2</xliff:g> » ne sera pas disponible tant que l\'opération n\'est pas terminée."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annuler le déplacement"</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="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restauration des paramètres APN par défaut en cours..."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir les valeurs par défaut"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Réinitialisation des paramètres réseau"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Cette action permet de réinitialiser tous les paramètres réseau, y compris : \n\n"<li>"Wi-Fi"</li>\n<li>"Données cellulaires"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Réinitialiser les paramètres"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Réinitialiser tous les paramètres réseau? Cette action est irréversible."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Réinitialiser les paramètres"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Réinitialiser?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Les paramètres réseau ont été réinitialisés"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Réinitialiser l\'appareil"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Rétablir configuration d\'usine"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Effacer toutes les données de la tablette"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Effacer toutes les données du téléphone"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Réinitialiser la tablette"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Réinitialiser le téléphone"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Effacer toutes vos informations personnelles et les applications téléchargées? Cette action est irréversible."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Effacer toutes vos données personnelles et les applications téléchargées? Cette action est irréversible."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Tout effacer"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Vous devez dessiner votre schéma de déverrouillage pour confirmer le rétablissement de la configuration d\'usine."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Réinitialiser?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Le rétablissement de la configuration d\'usine n\'est pas possible pour cet utilisateur"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Effacer la mémoire de stockage USB en supprimant tous les fichiers qu\'elle contient? Cette action est irréversible."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Effacer la carte SD en supprimant tous les fichiers qu\'elle contient? Cette action est irréversible."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Tout effacer"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la mémoire de stockage USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la carte SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Paramètres d\'appel"</string>
     <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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Réseaux cellulaires"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Forfait de données cellulaires"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Application de texto par défaut"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Application de messagerie texte"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Modifier l\'application de messagerie texte?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme application de messagerie texte?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme application de messagerie texte?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode de localisation"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utiliser le GPS, le Wi‑Fi et les réseaux cellulaires pour déterminer la position"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utiliser le Wi‑Fi et les réseaux cellulaires pour déterminer la position"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utiliser le GPS pour déterminer la position"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utiliser le GPS pour déterminer la position"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Analyse en cours…"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analyse en cours…"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Recherche de réseaux Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Améliorez la précision de la localisation en permettant aux applications et aux services de rechercher des réseaux Wi-Fi, même lorsque le Wi-Fi est désactivé"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Recherche d\'appareils Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Améliorez la précision de la localisation en permettant aux services système de rechercher les appareils Bluetooth, même lorsque Bluetooth est désactivé"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Local. par Wi-Fi et rés. cell."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Position déterminée par le Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <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>
-    <string name="lock_settings_title" msgid="335025124489630932">"Sécurité de l\'écran"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Entrez le schéma de l\'appareil pour continuer."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Entrez le NIP de l\'appareil pour continuer."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Entrez le mot de passe de l\'appareil pour continuer."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Sécurité de l\'appareil"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Modifier le schéma"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Modifier le NIP de déverrouillage"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmer le schéma enregistré"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Réessayer :"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dessiner un schéma de déverrouillage"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Appuyez sur Menu pour obtenir de l\'aide."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Retirez le doigt lorsque vous avez terminé."</string>
@@ -1176,8 +1225,7 @@
     <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>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Comment dessiner un schéma de déverrouillage :"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Trop de tentatives échouées!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Veuillez réessayer dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Trop de tentatives incorrectes. Réessayez dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"L\'application n\'est pas installée sur votre téléphone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gérer et supprimer les applications installées"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Trier par taille"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Afficher les services en cours"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Afficher processus en cache"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Application d\'urgence"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser préf. applis"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Cette opération a pour effet de réinitialiser toutes les préférences relatives aux éléments suivants :\n\n "<li>"Applications désactivées"</li>\n" "<li>"Notifications associées aux applications désactivées"</li>\n" "<li>"Applications par défaut pour les actions"</li>\n" "<li>"Restrictions de données en arrière-plan pour les applications"</li>\n" "<li>"Toutes les restrictions d\'autorisations"</li>\n\n" Vous ne perdrez aucune donnée liée aux applications."</string>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisation de la mémoire"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Afficher l\'espace de stockage utilisé par les applications"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Services en cours d\'exécution"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informations sur la tablette"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informations sur le téléphone"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informations sur la batterie"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Lancement rapide"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Configurer des raccourcis clavier pour lancer des applications"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Attribuer l\'application"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Aucun raccourci"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Rechercher + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Effacer"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Vos raccourcis pour <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) vont être effacés."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Annuler"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Applications"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Raccourcis"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Saisie de texte"</string>
     <string name="input_method" msgid="5434026103176856164">"Mode de saisie"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Clavier actuel"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturer tous les paquets HCI Bluetooth dans un fichier"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Déverrouillage par le fabricant"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Autoriser le déverrouillage du fichier d\'amorce"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Entrez votre NIP"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Entrez votre NIP d\'appareil pour activer le déverrouillage OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Permettre le déverrouillage par le fabricant?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISSEMENT : Les fonctions de protection de l\'appareil ne fonctionneront pas sur cet appareil lorsque ce paramètre est activé."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tailles des mémoires tampons d\'enregistreur"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Tailles enreg. par tampon journal"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Autoriser les positions fictives"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Activer l\'inspection d\'attribut d\'affichage"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Réseautage"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Autoriser enreg. données Wi-Fi détaillées"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Passage forcé du Wi-Fi aux données cellulaires"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Toujours autoriser la détection de réseaux Wi-Fi en itinérance"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Utiliser l\'ancien client DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afficher les options pour la certification d\'affichage sans fil"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Détailler davantage les données Wi-Fi, afficher par SSID RSSI dans sélect. Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Si cette option est activée, le passage du Wi-Fi aux données cellulaires est forcé lorsque le signal Wi-Fi est faible"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Autoriser ou non la détection de réseaux Wi-Fi en itinérance en fonction de l\'importance du transfert de données dans l\'interface"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Tailles des mémoires tampons d\'enregistreur"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Tailles enreg. par tampon journal"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Sélectionnez une configuration USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Sélectionnez une configuration USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Autoriser les positions fictives"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Activer l\'inspection d\'attribut d\'affichage"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliser le client DHCP de Lollipop au lieu du nouveau client DHCP Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Le débogage USB est conçu uniquement pour le développement. Utilisez-le pour copier des données entre votre ordinateur et votre appareil, installer des applications sur votre appareil sans notification et lire les données de journal."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Voulez-vous vraiment désactiver l\'accès au débogage USB de tous les ordinateurs précédemment autorisés?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Une application obscurcit une demande d\'autorisation, alors Paramètres ne peut pas vérifier votre réponse."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si vous activez <xliff:g id="SERVICE">%1$s</xliff:g>, votre appareil n\'utilisera pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Vous avez activé un service d\'accessibilité. Votre appareil n\'utilisera donc pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Étant donné que l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> touche le chiffrement de données, vous devez confirmer votre motif."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiques des processus"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiques détaillées sur les processus en cours d\'exécution"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Mémoire utilisée"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Applications <xliff:g id="TYPE">%1$s</xliff:g> en <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> de <xliff:g id="TOTALRAM">%2$s</xliff:g> utilisé sur <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Arrière-plan"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Avant-plan"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"En cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"L\'état de la mémoire de l\'appareil est actuellement : <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Taux d\'utilisation moyen de la mémoire vive"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Taux d\'utilisation maximal de la mémoire vive"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Système d\'exploitation Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Natif"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Noyau"</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">"Utilisation de mémoire vive"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Utilisation de mémoire vive (en arrière-plan)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Durée d\'exécution"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Processus"</string>
     <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>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 heures"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 jour"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Afficher le système"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Masquer le système"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utiliser USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Type de statistiques"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Arrière-plan"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Remplacer les paramètres de l\'application par les paramètres ci-dessous"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Paramètres par défaut"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Moteur par défaut"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Définir le moteur de synthèse vocale à utiliser"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Définir le moteur de synthèse vocale à utiliser pour le texte énoncé"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Cadence"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Vitesse à laquelle le texte est énoncé"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Intégré au matériel"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Uniquement logiciel"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Les identifiants ne sont pas accessibles pour cet utilisateur"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Pour confirmer l\'installation des certificats, vous devez dessiner votre schéma de déverrouillage."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Sauvegarder mes données"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sauvegarder les données d\'applications, les mots de passe Wi-Fi et d\'autres paramètres sur les serveurs Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Compte de sauvegarde"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Actuellement, aucun compte n\'enregistre de données de sauvegarde"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Inclure données applications"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauration automatique"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Lors de la réinstallation d\'une application, restaurer les paramètres et les données sauvegardées"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Le service de sauvegarde est inactif."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Cela est défini par la politique de votre appareil."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Mot de passe sauvegarde PC"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les sauvegardes complètes sur PC ne sont pas protégées actuellement."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Appuyez pour modifier ou supprimer le mot de passe utilisé pour les sauvegardes complètes sur PC."</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Échelle anim. transitions"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Échelle durée animation"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simul. affich. secondaires"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Mode multi-fenêtre"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"De multiples activités à l\'écran simultanément."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Activer le mode multi-fenêtre?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"AVERTISSEMENT : Il s\'agit d\'une fonctionnalité très expérimentale qui permet d\'effectuer de multiples activités à l\'écran simultanément à l\'aide de l\'interface utilisateur des applications récentes. Certaines applications peuvent planter ou ne pas fonctionner correctement lorsqu\'elles sont utilisées avec cette fonctionnalité."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Applications"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ne pas conserver activités"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Supprimer immédiatement les activités abandonnées"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilisateur"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limité"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Ajouter un utilisateur?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"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\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
+    <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\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>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Supprimer l\'invité?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Toutes les applications et les données de cette session seront supprimées."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Supprimer"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Autoriser les appels téléphoniques"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Autoriser les appels et les textos"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Activer les appels téléphoniques"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Activer les appels téléphoniques et les textos"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Supprimer l\'utilisateur"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Autoriser les appels téléphoniques?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Activer les appels téléphoniques?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"L\'historique des appels sera partagé avec cet utilisateur."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Autoriser les appels et les textos?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"L\'historique des appels et des textos sera partagé avec cet utilisateur."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activer les appels téléphoniques et les textos?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historique des appels et des textos sera partagé avec cet utilisateur."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"RENOMMER"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Définir des restrictions d\'applis"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Contrôlées par <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Cette application n\'accepte pas les profils limités."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Cette application peut accéder à vos comptes."</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Cette application peut accéder à vos comptes. Contrôlée par <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi et données mobiles"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Autoriser les modifications des paramètres du Wi‑Fi et des données mobiles"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi connexion réseau wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"message texte envoyer des messages messages messagerie"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellulaire fournisseur de services données sans fil 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi appel appeler"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanceur d\'applications"</string>
     <string name="keywords_display" msgid="6709007669501628320">"écran tactile"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"assombrir l\'écran écran tactile pile"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"assombrir l\'écran écran tactile pile"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"personnaliser arrière-plan personnaliser écran"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"thème sombre mode nuit baisser luminosité d\'écran inverser luminosité"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"fond d\'écran personnaliser affichage"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"taille du texte"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projet"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"diffusion de projet"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espace disque disque dur utilisation appareil"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"frais de consommation d\'énergie"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"orthographe dictionnaire correcteur orthographique correction automatique"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"compte"</string>
     <string name="keywords_users" msgid="4673901601478559100">"limitation limiter limité"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correction de texte corriger son vibreur automatique langue geste suggérer suggestion thème choquant type de mot emoji international"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"réinitialiser préférences par défaut"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"application par défaut en cas d\'urgence"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"applis télécharger applications système"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"applications autorisations sécurité"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"applications par défaut"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"glisser mot de passe schéma nip"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer une balise NFC par Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Écrire"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume de l\'alarme"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume de la sonnerie"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume des notifications"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interruptions"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"À la réception d\'appels et de notifications"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Toujours interrompre"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"N\'autoriser que les interruptions prioritaires"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne pas interrompre"</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_option_important_interruptions" msgid="3903928008177972500">"Priorités seulement"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"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="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Sonnerie de notification par défaut"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreur aussi pour les appels"</string>
@@ -2416,62 +2480,112 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreur"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Accès aux notifications"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Les applications ne peuvent pas lire les notifications."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d application peut lire les notifications."</item>
-    <item quantity="other" msgid="980049191810249052">"%d applications peuvent lire les notifications."</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d application peut lire les notifications</item>
+      <item quantity="other">%d application peuvent lire les notifications</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Aucun outil d\'écoute des notifications installé."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra lire toutes les notifications publiées par le système ou toute application installée. Ces notifications peuvent comporter des informations personnelles, telles que des noms de contacts et le texte de messages qui vous ont été envoyés. L\'application pourra également masquer ces notifications ou sélectionner les boutons d\'action qu\'elles contiennent."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fournisseurs de conditions"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Aucune application ne fournit de conditions"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d application fournit des conditions"</item>
-    <item quantity="other" msgid="358057362115673258">"%d applications fournissent des conditions"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Aucun fournisseur de conditions n\'est installé."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> pourra ajouter des conditions de sortie au mode Ne pas déranger."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Bloquer"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ne jamais afficher les notifications de cette application"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Priorité"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Afficher des notifications dans le haut de la liste et continuer de les afficher tant que l\'appareil n\'est pas configuré de manière à n\'afficher que les interruptions prioritaires"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensible"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Lorsque l\'appareil est verrouillé, masquer tout le contenu sensible des notifications de cette application"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Traiter comme prioritaire"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"N\'activer les notifications sonores de cette application que lorsque l\'option « Ne pas déranger » est définie sur « Prioritaires uniquement »"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Autoriser l\'aperçu"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permettre à cette application de mettre certaines notifications en évidence en les faisant glisser pour les afficher brièvement sur l\'écran actuel"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Masquer le contenu sensible"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Lorsque l\'appareil est verrouillé, masquer tout contenu figurant dans les notifications de cette application et susceptible de révéler des données privées"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqué"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorité"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Terminé"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Jusqu\'à la désactivation"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Interruptions prioritaires"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Temps d\'arrêt"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Jours"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Aucun"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interruptions autorisées"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Priorités seulement"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Aucun"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisation"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activation automatique"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nom de la règle"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Ajouter une règle"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Supprimer la règle"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Supprimer la règle « <xliff:g id="RULE">%1$s</xliff:g> »?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Supprimer"</string>
+    <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="3201273040477861538">"Programmer la règle"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Règle non trouvée."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Jours"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Aucun"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Tous les jours"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Jamais"</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">"De <xliff:g id="START">%1$s</xliff:g> à <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Appels"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Appels/Messages de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"N\'importe qui"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Contacts seulement"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Contacts favoris seulement"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Événements et rappels"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Les alarmes sont toujours des interruptions prioritaires."</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Les soirs de semaine"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Heure de début"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Heure de fin"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou toute alarme avant"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain ou toute alarme avant"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interruptions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"À la réception d\'appels et de notifications"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quand voulez-vous recevoir les interruptions?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Pendant combien de temps?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Toujours interrompre"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"désactivé,toutes,tout"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"N\'autoriser que les interruptions prioritaires"</string>
+    <string name="zen_mode_option_voice_important_synonyms" msgid="2727831854148694795">"importants,priorité,prioritaires seulement,uniquement les priorités,notifications prioritaires"</string>
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Autoriser uniquement les alarmes"</string>
+    <string name="zen_mode_option_voice_alarms_synonyms" msgid="4049356986371569950">"alarmes,alarmes seulement,seulement les alarmes"</string>
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Ne pas interrompre"</string>
+    <string name="zen_mode_option_voice_no_interruptions_synonyms" msgid="8368549512275129844">"aucune,jamais,rien,aucune interruption"</string>
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indéfiniment"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> heure</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> heures</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Activer indéfiniment le mode Notifications prioritaires seulement"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Notifications prioritaires seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minute, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Notifications prioritaires seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Notifications prioritaires seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heure, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Notifications prioritaires seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heures, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Activer indéfiniment le mode Alarmes uniquement"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minute, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes, jusqu\'à <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">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heure, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heures, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Activer le mode Ne pas interrompre indéfiniment"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Aucune interruption pendant <xliff:g id="DURATION">%1$d</xliff:g> minute, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Aucune interruption pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Aucune interruption pendant <xliff:g id="DURATION">%1$d</xliff:g> heure, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Aucune interruption pendant <xliff:g id="DURATION">%1$d</xliff:g> heures, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Activer le mode Toujours interrompre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"à perpétuité"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. application"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Commentaires sur cet appareil"</string>
@@ -2512,4 +2626,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Information concernant le code IIEM"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Information concernant le code IIEM"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Fente <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Lancement par défaut"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> utilisé dans <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Liens de domaine"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"URL de domaine ouvert"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Autoriser l\'application à ouvrir directement les URL de domaine"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL des domaines pris en charge"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Autres défauts"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> utilisé dans <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"mémoire interne"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"mémoire externe"</string>
+    <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="storage_used" msgid="7128074132917008743">"Espace de stockage utilisé"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Activé"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloquer"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensible"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Priorité"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Priorité et Sensible"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> autorisation accordée sur <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorisations accordées sur <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Certaines préférences par défaut définies"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Aucune préférence par défaut définie"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Toutes les applications"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Activé"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personnel"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Travail"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqué"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priorité"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensible"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Avec les URL de domaine"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Désactivé par l\'administrateur"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Sélectionnez un profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Autorisations de l\'application"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> applis autorisées avec accès supplém. sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> applications autorisées sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL de domaine"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Ne pas ouvrir d\'URL de domaine"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Ouvrir « <xliff:g id="DOMAIN">%s</xliff:g> »"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Ouvrir « <xliff:g id="DOMAIN">%s</xliff:g>  » et les URL connexes"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut ouvrir ses URL de domaine</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent ouvrir leurs URL de domaine</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Doigt non reconnu"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Applications par défaut"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Application de navigateur"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Aucun navigateur par défaut"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Par défaut)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Stockage des applications"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 9a8811f..628917e 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Appuyer sur le bouton"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"activer/désactiver le micro"</item>
     <item msgid="1148142988678569310">"projeter des contenus multimédias"</item>
     <item msgid="9130014005474445273">"activer le VPN"</item>
+    <item msgid="1165192162975045562">"modifier le fond d\'écran"</item>
+    <item msgid="7129487923652967258">"soutien structurel"</item>
+    <item msgid="1069023208100114540">"aide à la capture d\'écran"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Position"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Activer/Désactiver le micro"</item>
     <item msgid="5906017727368097853">"Projeter des contenus multimédias"</item>
     <item msgid="2486614710846178542">"Activer le VPN"</item>
+    <item msgid="5586547561693629602">"Modifier le fond d\'écran"</item>
+    <item msgid="32794179825485062">"Soutien structurel"</item>
+    <item msgid="7872852746938272552">"Aide à la capture d\'écran"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Court"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"faible"</item>
     <item msgid="4212263919458209842">"critique"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Désactivé"</item>
-    <item msgid="5656544177755411222">"Sonneries limitées"</item>
-    <item msgid="8735337502532332056">"Aucune sonnerie"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normale"</item>
     <item msgid="866544120205026771">"Moyenne"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rose"</item>
     <item msgid="6131821495505931173">"Rouge"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet USB)"</item>
+    <item msgid="2686051673589572111">"Source audio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d39de01..60c8510 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Autoriser"</string>
     <string name="deny" msgid="6947806159746484865">"Refuser"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Plus que <xliff:g id="STEP_COUNT">%1$d</xliff:g> étape pour devenir un développeur."</item>
-    <item quantity="other" msgid="6722953419953594148">"Plus que <xliff:g id="STEP_COUNT">%1$d</xliff:g> étapes pour devenir un développeur."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir développeur</item>
+      <item quantity="other">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étapes pour devenir développeur</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Vous êtes désormais un développeur !"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Inutile, vous êtes déjà un développeur."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Sans fil et réseaux"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Désactiver SMS over IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Activation de l\'enregistrement IMS requise"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Désactivation de l\'enregistrement IMS requise"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Activer l\'indicateur de configuration VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Désactiver l\'indicateur de configuration VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Activer le vidage de la mémoire RAM du LTE"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Désactiver le vidage de la mémoire RAM du LTE"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Afficher le carnet d\'adresses de la carte SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil ?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Le profil :&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;va être désactivé sur :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Connecté"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connecté (sans audio pour appels tél.)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connecté (sans audio contenu mutimédia)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connecté (sans accès aux messages)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connecté (sans audio tel./multimédia)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Déconnecté"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Déconnexion…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Connexion…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Association…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Appareil Bluetooth sans nom"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Recherche en cours"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Aucun appareil Bluetooth détecté."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afficher les fichiers reçus"</string>
     <string name="device_picker" msgid="4978696506172252813">"Sélectionner un appareil Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Demande d\'autorisation Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Une application requiert l\'activation du Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Une application requiert l\'activation du Bluetooth sur cet appareil."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre tablette. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Carte SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Paramètres proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuler"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANNULER"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUER"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"OUI"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NON"</string>
-    <string name="forget" msgid="7267115980248732932">"SUPPRIMER"</string>
+    <string name="forget" msgid="1400428660472591263">"Supprimer"</string>
+    <string name="save" msgid="879993180139353333">"Enregistrer"</string>
+    <string name="done" msgid="6942539184162713160">"OK"</string>
     <string name="settings_label" msgid="1626402585530130914">"Paramètres"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Paramètres"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Raccourci vers les paramètres"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Trier par fuseau horaire"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Heure"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Améliorer la correspondance faciale"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Détection des mouvements"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Exiger un clin d\'œil lors du déverrouillage"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Verrouiller automatiquement"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Après <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> de veille"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> après la mise en veille, sauf lorsque l\'appareil est maintenu en activité par <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Empreinte digitale"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gérer empreintes num."</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Utiliser empr. num. pour"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Ajouter"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"verrouillage de l\'écran"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> empreinte digitale enregistrée</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empreintes digitales enregistrées</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Configurer empreinte"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Pour utiliser votre empreinte numérique afin de déverrouiller l\'écran ou de confirmer des achats, nous devons effectuer les opérations suivantes : \n\n✓ Configurer le mode de verrouillage de secours de l\'écran \n\n✓ Ajouter votre empreinte numérique"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localiser le capteur"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localisez le capteur d\'empreinte numérique à l\'arrière du téléphone."</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="1063375657071124812">"Commencer"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Placez votre doigt sur le capteur d\'empreintes digitales, puis retirez-le dès que vous sentez une vibration."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Bravo ! Recommencez"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Placez le même doigt sur le capteur d\'empreintes digitales, puis retirez-le dès que vous sentez une vibration."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empreinte ajoutée"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que cette icône apparaît, vous pouvez utiliser votre empreinte pour vous identifier ou autoriser un achat."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Ajouter"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Chiffrer le téléphone"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Veuillez brancher votre chargeur, puis réessayer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Aucun code PIN ni mot de passe saisi pour le verrouillage de l\'écran"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Vous devez définir un code PIN ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Vous devez dessiner votre schéma de déverrouillage pour confirmer le chiffrement de votre appareil."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Chiffrer ?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle le téléphone sera redémarré à plusieurs reprises."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Balayer l\'écran"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Aucune sécurité"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Sécurité faible, expérimental"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Schéma"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Sécurité moyenne"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Code PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Sécurité moyenne à élevée"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Sécurité élevée"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Verrouillage de l\'écran actuel"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Les fonctionnalités de protection de l\'appareil ne fonctionneront plus."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Désactivé par admin., règles chiffrement ou stockage des identifiants"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Balayer l\'écran"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Schéma"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Code PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Mot de passe"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Une fois que vous avez configuré un verrouillage de l\'écran, vous pouvez également configurer votre empreinte numérique dans Paramètres &gt; Sécurité."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Désactiver le verrouillage de l\'écran"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Supprimer le schéma de déverrouillage"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Supprimer le code PIN de déverrouillage"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Le mot de passe doit comporter au moins une lettre."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Le mot de passe doit comporter au moins un chiffre."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Le mot de passe doit comporter au moins un symbole."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Le mot de passe doit comporter au moins une lettre."</item>
-    <item quantity="other" msgid="8186027808415585970">"Le mot de passe doit comporter au moins %d lettres."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Le mot de passe doit comporter au moins une lettre minuscule."</item>
-    <item quantity="other" msgid="2693910942679679225">"Le mot de passe doit comporter au moins %d lettres minuscules."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Le mot de passe doit comporter au moins une lettre majuscule."</item>
-    <item quantity="other" msgid="3030801209112209245">"Le mot de passe doit comporter au moins %d lettres majuscules."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Le mot de passe doit comporter au moins un chiffre."</item>
-    <item quantity="other" msgid="4703982391407595924">"Le mot de passe doit comporter au moins %d chiffres."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Le mot de passe doit comporter au moins un caractère spécial."</item>
-    <item quantity="other" msgid="1221290525051187757">"Le mot de passe doit comporter au moins %d caractères spéciaux."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Le mot de passe doit comporter au moins un caractère autre qu\'une lettre."</item>
-    <item quantity="other" msgid="3952508584649046404">"Le mot de passe doit comporter au moins %d caractères autres que des lettres."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Le mot de passe doit comporter au moins %d lettre.</item>
+      <item quantity="other">Le mot de passe doit comporter au moins %d lettres.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Le mot de passe doit comporter au moins %d lettre minuscule.</item>
+      <item quantity="other">Le mot de passe doit comporter au moins %d lettres minuscules.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Le mot de passe doit comporter au moins %d lettre majuscule.</item>
+      <item quantity="other">Le mot de passe doit comporter au moins %d lettres majuscules.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Le mot de passe doit comporter au moins %d chiffre.</item>
+      <item quantity="other">Le mot de passe doit comporter au moins %d chiffres.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Le mot de passe doit comporter au moins %d caractère spécial.</item>
+      <item quantity="other">Le mot de passe doit comporter au moins %d caractères spéciaux.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Le mot de passe doit comporter au moins %d caractère qui n\'est pas une lettre.</item>
+      <item quantity="other">Le mot de passe doit comporter au moins %d caractères qui ne sont pas des lettres.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"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="6830610582179569631">"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>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assurez-vous que le mot de passe &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; s\'affiche."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Associer à cet appareil ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Pour l\'association à :<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>Saisissez <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>, puis appuyez sur \"Retour\" ou sur \"Entrée\"."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Se connecter"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ASSOCIER"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuler"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"L\'association vous permet d\'accéder à vos contacts et à l\'historique des appels lorsque vous êtes connecté."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Impossible d\'associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Impossible d\'établir l\'association avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> en raison d\'un code PIN ou d\'une clé d\'accès incorrects."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Impossible d\'établir la communication avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Association refusée par <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Impossible de se connecter à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Rechercher des appareils"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Actualiser"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Paramètres avancés"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Paramètres Bluetooth avancés"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"L\'activation du Bluetooth permet à votre appareil de communiquer avec les appareils Bluetooth à proximité."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Pour améliorer la précision de la localisation, les applications et les services recherchent les appareils Bluetooth, même lorsque le Bluetooth est désactivé. Vous pouvez modifier ce paramètre dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Se connecter à…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Paramètres audio du support"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Paramètres audio du téléphone"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfert de fichier"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Périphérique d\'entrée"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accès Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Partage de contacts"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utiliser pour le partage de contacts"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partage de connexion Internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accès aux messages"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio du support."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio en mains libres."</string>
     <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>
@@ -537,28 +532,15 @@
     <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 les fichiers entrants"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté aux paramètres audio du média"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté aux paramètres audio du téléphone"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connecté à la carte"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Connexion au serveur de transfert de fichiers non établie"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connecté au périphérique d\'entrée"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utiliser pour les paramètres audio du média"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utiliser pour les paramètres audio du téléphone"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utiliser pour le transfert de fichiers"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utiliser comme entrée"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utiliser pour l\'accès à Internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utiliser pour la carte"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Paramètres de la station d\'accueil"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utiliser station d\'accueil pour l\'audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistant Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Connecté via l\'assistant Wi‑Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Caster l\'écran"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Diffuser"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connexion en cours…"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Supprimer"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"OK"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nom"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Autoriser l\'échange de données lorsque la tablette est en contact avec un autre appareil"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Autoriser l\'échange de données lorsque le téléphone touche un autre appareil"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Désactivation du Wi-Fi en cours…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Erreur"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"En mode Avion"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Impossible de rechercher des réseaux."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notification de réseau"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Me notifier lorsqu\'un réseau public est disponible"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Éviter les connexions instables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"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_scan_always_available" msgid="3470564139944368030">"Recherche toujours disponible"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Toujours autoriser la recherche"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Autoriser le service de localisation de Google et les autres applications à rechercher des réseaux, même si le Wi-Fi est désactivé"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utiliser automatiquement le Wi-Fi ouvert"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Laisser un assistant Wi‑Fi se connecter automatiquement aux réseaux ouverts jugés de bonne qualité"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Sélectionner un assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer les certificats"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pour améliorer la précision et à d\'autres fins, le service de localisation de Google et d\'autres applications peuvent rechercher des réseaux Wi-Fi à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les applications peuvent rechercher des réseaux à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Avancé &gt; Recherche toujours disponible."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Pour améliorer la précision de la localisation, les applications et les services recherchent les réseaux Wi-Fi, même si le Wi-Fi est désactivé. 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_remember_choice" msgid="5340097010842405981">"Ne plus afficher"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi actif en veille"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi activé pendant la veille"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Ajouter un autre réseau"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Plus"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuration auto (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Pour terminer la configuration de votre tablette, vous devez disposer d\'un accès Wi-Fi. Une fois la configuration effectuée, vous pouvez choisir d\'utiliser un réseau de données mobiles ou le Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Options avancées"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Configuration Wi-Fi protégée"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Démarrage de la configuration WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Appuyez sur le bouton \"Configuration Wi-Fi protégée\" de votre routeur. Celui-ci peut s\'appeler \"WPS\" ou contenir ce symbole :"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Appuyez sur le bouton \"Configuration Wi-Fi protégée\" de votre routeur. Celui-ci peut s\'appeler \"WPS\" ou présenter ce symbole :"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Saisissez le code d\'accès \"<xliff:g id="NUMBER">%1$s</xliff:g>\" sur votre routeur Wi-Fi. La configuration peut prendre jusqu\'à deux minutes."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"Configuration WPS réussie. Connexion au réseau en cours…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Connecté au réseau Wi-Fi \"<xliff:g id="NETWORK_NAME">%s</xliff:g>\""</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Mot de passe"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Afficher le mot de passe"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Configurer la bande du point d\'accès"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Bande 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Bande 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Paramètres IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(aucune modification)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non spécifié)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Enregistré"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Désactivé"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Échec de configuration de l\'adresse IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Échec de la connexion Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problème d\'authentification."</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Hors de portée"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Aucun accès à Internet détecté, reconnexion automatique impossible"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Saisissez votre mot de passe réseau."</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Aucune"</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>
@@ -686,6 +659,8 @@
     <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 une connexion en ligne pour autoriser la connexion au réseau."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"SE CONNECTER"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"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="5963015664551707981">"Ne plus demander pour ce réseau"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Point d\'acc. Wi-Fi port. AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Point d\'accès Wi-Fi mobile <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_mode_title" msgid="2164073796253284289">"Préférence d\'appel"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Mode d\'appel Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi préféré"</item>
+    <item msgid="5267397515594230396">"Mobile préféré"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Accueil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptation de la luminosité"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise le niveau de luminosité en fonction de l\'éclairage ambiant"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Thème"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Clair"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Foncé"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatique"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Modifier carte SIM préférée ?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> est la seule carte SIM dans votre appareil. Voulez-vous utiliser cette carte SIM pour les données mobiles, les appels et les SMS ?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Code PIN de la carte SIM incorrect. Vous devez désormais contacter votre opérateur pour déverrouiller votre appareil."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Code PIN de la carte SIM incorrect. Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentative. Après cela, vous devrez contacter votre opérateur pour déverrouiller votre appareil."</item>
-    <item quantity="other" msgid="77103619544346451">"Code PIN de la carte SIM incorrect. Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentatives."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Code PIN de la carte SIM erroné. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentative.</item>
+      <item quantity="other">Code PIN de la carte SIM erroné. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentatives.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Échec du déverrouillage à l\'aide du code PIN de la carte SIM."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"État de la tablette"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"État du téléphone"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (en lecture seule)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espace total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcul en cours"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Applis (données des applis et contenu multimédia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Applications et données associées"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Support"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Téléchargements"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Images, vidéos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musique, sonneries, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Divers"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Autres fichiers"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Données mises en cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Désinstal. mémoire partagée"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Désinstaller la carte SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Désinstallation en cours"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Espace de stockage bientôt saturé"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Il est possible que certaines fonctionnalités du système, comme la synchronisation, ne soient pas opérationnelles. Libérez de l\'espace en supprimant certains éléments (applications ou contenu multimédia, par exemple) ou en annulant leur épinglage."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Renommer"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Installer"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Éjecter"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Effacer et formater"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Effacer et formater mém. stock. interne"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Connexion USB à l\'ordinateur"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Connexion USB à l\'ordinateur"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connecter en tant que"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Permet de transférer des fichiers multimédias sous Windows ou à l\'aide de l\'application Android File Transfer pour Mac (voir www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Appareil photo (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Permet de transférer des photos à l\'aide du logiciel photo et de transférer des fichiers sur les ordinateurs non compatibles avec le protocole MTP."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installer des outils de transfert de fichiers"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Permettre aux applications compatibles avec le protocole MIDI de fonctionner via USB avec des logiciels MIDI sur votre ordinateur"</string>
     <string name="storage_other_users" msgid="808708845102611856">"Autres utilisateurs"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Mémoire de l\'appareil"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Périphérique stockage amovible"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Espace libre : <xliff:g id="FREE">%1$s</xliff:g> (espace total : <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"La mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\" a bien été installée."</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Impossible d\'installer la mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\"."</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"La mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\" a bien été éjectée de manière sécurisée."</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Impossible d\'éjecter la mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\" de manière sécurisée."</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"La mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\" a bien été formatée."</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Impossible de formater la mémoire de stockage \"<xliff:g id="NAME">%1$s</xliff:g>\"."</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Renommer la mémoire de stockage"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Après le formatage, vous pouvez utiliser la mémoire de stockage \"<xliff:g id="NAME_0">^1</xliff:g>\" avec d\'autres appareils. \n\nToutes les données enregistrées sur \"<xliff:g id="NAME_1">^1</xliff:g>\" vont être effacées. Nous vous conseillons de sauvegarder vos contenus avant de continuer. \n\n"<b>"Sauvegardez vos photos et vos autres fichiers"</b>" \nDéplacez vos fichiers multimédias vers une autre mémoire de stockage sur cet appareil, ou transférez-les sur un ordinateur à l\'aide d\'un câble USB. \n\n"<b>"Sauvegardez vos applications"</b>" \nToutes les applications enregistrées sur \"<xliff:g id="NAME_6">^1</xliff:g>\" vont être désinstallées, et les données correspondantes vont être effacées. Pour conserver ces applications, déplacez-les vers une autre mémoire de stockage sur cet appareil."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Lorsque vous éjectez la mémoire de stockage \"<xliff:g id="NAME_0">^1</xliff:g>\", les applications qui y sont enregistrées cessent de fonctionner, et les fichiers qu\'elle contient ne sont plus disponibles jusqu\'à ce que vous la réinsériez de nouveau."</b>" \n\nLa mémoire de stockage \"<xliff:g id="NAME_1">^1</xliff:g>\" a été configurée pour ne fonctionner que sur cet appareil. Vous ne pouvez pas l\'utiliser sur d\'autres appareils."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurer la mémoire \"<xliff:g id="NAME">^1</xliff:g>\""</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utiliser en tant que mémoire de stockage externe"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Pour déplacer des photos et d\'autres fichiers entre différents appareils"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utiliser en tant que mémoire de stockage interne"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Pour enregistrer tout type de contenus, y compris des applications et des photos, sur cet appareil uniquement. Cette option nécessite de formater la mémoire de stockage pour l\'empêcher de fonctionner avec d\'autres appareils."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formater mémoire stockage interne"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Cette option nécessite de formater la mémoire de stockage \"<xliff:g id="NAME_0">^1</xliff:g>\" pour qu\'elle soit sécurisée. \n\nAprès le formatage, \"<xliff:g id="NAME_1">^1</xliff:g>\" ne fonctionnera que sur cet appareil. \n\n"<b>"Le formatage entraîne la suppression de toutes les données enregistrées sur \"<xliff:g id="NAME_2">^1</xliff:g>\"."</b>" Pour ne pas risquer de perdre vos données, nous vous conseillons de les sauvegarder."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Effacer et formater"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatage de mémoire \"<xliff:g id="NAME">^1</xliff:g>\" en cours"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ne retirez pas \"<xliff:g id="NAME">^1</xliff:g>\" pendant le formatage."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Déplacer vers une autre mémoire"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Vous pouvez déplacer vos photos, vos fichiers et les données de vos applications vers la nouvelle mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\". \n\nCette opération prend environ <xliff:g id="TIME">^2</xliff:g> et permet de libérer <xliff:g id="SIZE">^3</xliff:g> sur la mémoire de stockage interne. Certaines applications ne fonctionneront pas pendant l\'opération."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Déplacer les données maintenant"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Déplacer les données plus tard"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Déplacer les données maintenant"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Le déplacement des données dure <xliff:g id="TIME">^1</xliff:g> environ et permet de libérer <xliff:g id="SIZE">^2</xliff:g> sur la mémoire de stockage interne."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Déplacer"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Déplacement des données en cours"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Pendant le déplacement des données : \n• Ne retirez pas la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\". \n• Certaines applications ne fonctionneront pas correctement. \n• Assurez-vous que l\'appareil reste chargé."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"La mémoire \"<xliff:g id="NAME">^1</xliff:g>\" est prête"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Votre mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\" est désormais configurée pour que vous puissiez y enregistrer des photos et d\'autres fichiers."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Votre nouvelle mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\" fonctionne correctement. \n\nPour déplacer des photos, des fichiers et des données d\'application sur cet appareil, sélectionnez Paramètres &gt; Stockage."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Déplacer <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Le déplacement de l\'application \"<xliff:g id="APP">^1</xliff:g>\" et des données correspondantes vers \"<xliff:g id="NAME_0">^2</xliff:g>\" ne prend que quelques minutes. Vous ne pourrez pas utiliser l\'application jusqu\'à la fin de l\'opération. \n\nNe retirez pas la mémoire de stockage \"<xliff:g id="NAME_1">^2</xliff:g>\" pendant le déplacement."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Déplacement de l\'appli \"<xliff:g id="APP">^1</xliff:g>\" en cours"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ne retirez pas la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\" pendant le déplacement. \n\nL\'application \"<xliff:g id="APP">^2</xliff:g>\" ne sera pas disponible jusqu\'à la fin de l\'opération."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annuler le déplacement"</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="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restauration des paramètres APN par défaut en cours..."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir param. par défaut"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Réinitialisation des paramètres des réseaux"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Tous les paramètres des réseaux 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>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Réinitialiser tous les paramètres des réseaux ? Cette action est irréversible."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Réinitialiser les paramètres"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Réinitialiser ?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Les paramètres des réseaux ont bien été réinitialisés."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Réinitialiser l\'appareil"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Rétablir la configuration d\'usine"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Effacer toutes les données de la tablette"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Effacer toutes les données du téléphone"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Réinitialiser la tablette"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Réinitialiser le téléphone"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Effacer toutes vos informations personnelles et les applications téléchargées ? Cette action est irréversible."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Effacer toutes vos informations personnelles et les applications téléchargées ? Cette action est irréversible."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Tout effacer"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Vous devez dessiner votre schéma de déverrouillage pour confirmer le rétablissement de la configuration d\'usine."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Réinitialiser ?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Le rétablissement de la configuration d\'usine n\'est pas disponible pour cet utilisateur."</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Effacer la mémoire de stockage USB en supprimant tous les fichiers qu\'elle contient ? Cette action est irréversible."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Effacer la carte SD en supprimant tous les fichiers qu\'elle contient ? Cette action est irréversible."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Tout effacer"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la mémoire de stockage USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la carte SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Paramètres d\'appel"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Messagerie vocale, transferts d\'appel, mise en attente, numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Partage connexion Bluetooth par USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Réseaux mobiles"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Forfait mobile"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Application SMS par défaut"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Application de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Changer d\'application pour les SMS ?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme application SMS ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme application SMS ?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode de localisation"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utiliser le GPS, le Wi‑Fi et les réseaux mobiles pour déterminer la position"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utiliser le Wi‑Fi et les réseaux mobiles pour déterminer la position"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utiliser le GPS pour déterminer la position"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utiliser le GPS pour déterminer la position"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Recherche"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Recherche"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Recherche Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Améliorez la précision de la localisation en autorisant les applications et les services à rechercher des réseaux Wi-Fi même si le Wi-Fi est désactivé."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Recherche Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Améliorez la précision de la localisation en autorisant les services système à rechercher les appareils Bluetooth, même lorsque le Bluetooth est désactivé."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localisation via Wi-Fi et réseau mob."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Position déterminée par le Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <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 code PIN a été défini."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Le schéma a été défini."</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Sécurité de l\'écran"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Utilisez le motif de l\'appareil pour continuer."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Saisissez le code d\'accès de l\'appareil pour continuer."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Saisissez le mot de passe de l\'appareil pour continuer."</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">"Motif incorrect."</string>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Sécurité de l\'appareil"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Modifier le schéma"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Modifier le code PIN de déverrouillage"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmer le schéma enregistré"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Réessayer :"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dessinez un schéma de déverrouillage :"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Appuyez sur Menu pour obtenir de l\'aide."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Relevez le doigt lorsque vous avez terminé."</string>
@@ -1176,8 +1225,7 @@
     <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 de déverrouillage"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Comment dessiner un schéma de déverrouillage :"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Trop de tentatives échouées !"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Réessayer dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Trop de tentatives incorrectes. Veuillez réessayer dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"L\'application n\'est pas installée sur votre téléphone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gérer et supprimer les applications installées"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Trier par taille"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Afficher les services"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Voir processus en cache"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Application pour les urgences"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser préf. applis"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences ?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Cette opération a pour effet de réinitialiser toutes les préférences relatives aux éléments suivants :\n\n "<li>"Applications désactivées"</li>\n" "<li>"Notifications associées aux applications désactivées"</li>\n" "<li>"Applications par défaut pour les actions"</li>\n" "<li>"Restrictions de données en arrière-plan pour les applications"</li>\n" "<li>"Toutes les restrictions d\'autorisations"</li>\n\n" Vous ne perdez aucune donnée liée aux applications."</string>
@@ -1299,6 +1348,7 @@
     <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">"Aucune appli par défaut"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisation du stockage"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Afficher l\'espace de stockage utilisé par les applications"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Services en cours d\'exécution"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informations sur la tablette"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informations sur le téléphone"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informations sur la batterie"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Lancement rapide"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Configurer des raccourcis clavier pour lancer des applications"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Attribuer l\'application"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Aucun raccourci"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Rechercher + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Effacer"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Vos raccourcis pour <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) vont être effacés."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Annuler"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Applications"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Raccourcis"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Saisie de texte"</string>
     <string name="input_method" msgid="5434026103176856164">"Mode de saisie"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Clavier actuel"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Enregistrer tous les paquets HCI Bluetooth dans un fichier"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Déverrouillage OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Autoriser le déverrouillage du chargeur d\'amorçage"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Saisissez votre code d\'accès."</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Saisir le code d\'accès de l\'appareil pour activer le déverrouillage OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Autoriser le déverrouillage OEM ?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISSEMENT : Les fonctionnalités de protection de l\'appareil sont désactivées tant que ce paramètre est activé."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tailles des mémoires tampons Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Tailles Logger par tampon journal"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Activer l\'inspection d\'attribut d\'affichage"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Mise en réseau"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Autoriser enreg. infos Wi-Fi détaillées"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Passage forcé du Wi-Fi aux données mobiles"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Toujours autoriser la détection de réseaux Wi-Fi en itinérance"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Utiliser l\'ancien client DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afficher les options de la certification de l\'affichage sans fil"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Détailler plus infos Wi-Fi, afficher par RSSI de SSID dans outil sélection Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Si cette option est activée, le passage du Wi-Fi aux données mobiles est forcé lorsque le signal Wi-Fi est faible."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Autoriser ou non la détection de réseaux Wi-Fi en itinérance en fonction de l\'importance du trafic de données dans l\'interface"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Tailles des mémoires tampons Logger"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Tailles Logger par tampon journal"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Sélectionner une configuration USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Sélectionner une configuration USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Activer l\'inspection d\'attribut d\'affichage"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliser le client DHCP de Lollipop au lieu du nouveau client DHCP Android"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Le débogage USB est conçu uniquement pour le développement. Utilisez-le pour copier des données entre votre ordinateur et votre appareil, installer des applications sur votre appareil sans notification et lire les données de journal."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Voulez-vous vraiment désactiver l\'accès au débogage USB de tous les ordinateurs précédemment autorisés ?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Une application masque la demande d\'autorisation. Impossible de valider votre réponse via l\'application Paramètres."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si vous activez <xliff:g id="SERVICE">%1$s</xliff:g>, votre appareil n\'utilisera pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Vous avez activé un service d\'accessibilité. Votre appareil n\'utilisera donc pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Vous devez confirmer le motif, car l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> influe sur le chiffrement des données."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiques relatives aux processus"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiques détaillées relatives aux processus en cours d\'exécution"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Utilisation de la mémoire"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Applications de type \"<xliff:g id="TYPE">%1$s</xliff:g>\" sur <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Utilisation de <xliff:g id="USEDRAM">%1$s</xliff:g> sur <xliff:g id="TOTALRAM">%2$s</xliff:g> en <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Arrière-plan"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Premier plan"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"En cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Utilisation actuelle de la mémoire de l\'appareil : <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Taux d\'utilisation moyen de la RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Taux d\'utilisation maximal de la RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Plate-forme Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Natif"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Noyau"</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">"Utilisation de la mémoire RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Utilisation de la mémoire RAM (en arrière-plan)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Durée d\'exécution"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Processus"</string>
     <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>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 heures"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 jour"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Afficher les processus système"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Masquer les processus système"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utiliser l\'USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Type de statistiques"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Arrière-plan"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Remplacer les paramètres de l\'application par les paramètres ci-dessous"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Paramètres par défaut"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Moteur par défaut"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Définir le moteur de synthèse vocale à utiliser"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Définir le moteur de synthèse vocale à utiliser pour le texte énoncé"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Cadence"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Vitesse à laquelle le texte est énoncé"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Intégré au matériel"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Uniquement logiciel"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Les identifiants ne sont pas disponibles pour cet utilisateur."</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Pour confirmer l\'installation des certificats, vous devez dessiner votre schéma de déverrouillage."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Sauvegarder mes données"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sauvegarder les données d\'applications, les mots de passe Wi-Fi et d\'autres paramètres sur les serveurs Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Compte de sauvegarde"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Aucun compte ne stocke actuellement des données sauvegardées."</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Inclure données application"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurer automatiquement"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Lors de la réinstallation d\'une application, restaurer les paramètres et les données sauvegardées"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Le service de sauvegarde n\'est pas activé."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Cette préférence est définie par les règles de votre appareil."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Mot de passe sauvegarde PC"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les sauvegardes complètes sur PC ne sont pas protégées actuellement."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Appuyez pour modifier ou supprimer le mot de passe utilisé pour les sauvegardes complètes sur PC."</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Échelle anim. transitions"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Échelle durée animation"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuler des écrans secondaires"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Mode multifenêtre"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Afficher simultanément plusieurs activités à l\'écran"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Activer le mode multifenêtre ?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"AVERTISSEMENT : Il s\'agit d\'une fonctionnalité hautement expérimentale qui autorise l\'affichage simultané de plusieurs activités à l\'écran via l\'interface utilisateur Applications récentes. Certaines applications peuvent planter ou ne pas fonctionner correctement lorsqu\'elles sont utilisées avec cette fonctionnalité."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Applications"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ne pas conserver activités"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Supprimer immédiatement les activités abandonnées"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilisateur"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limité"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Ajouter un utilisateur ?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"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, tels que le Wi-Fi, qui affectent tous les utilisateurs.\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_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, tels que le Wi-Fi, qui affectent tous les utilisateurs.\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>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Supprimer l\'invité ?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Toutes les applications et les données de cette session seront supprimées."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Supprimer"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Autoriser les appels"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Autoriser les appels et les SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Activer les appels téléphoniques"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Activer les appels téléphoniques et les SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Supprimer le compte utilisateur"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Autoriser les appels ?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Activer les appels téléphoniques ?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"L\'historique des appels sera partagé avec cet utilisateur."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Autoriser les appels et les SMS ?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"L\'historique des appels et des SMS sera partagé avec cet utilisateur."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activer les appels téléphoniques et les SMS ?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historique des appels et des SMS sera partagé avec cet utilisateur."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"RENOMMER"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Définir des restrictions d\'applis"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Contrôlées par <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Cette application n\'accepte pas les profils limités."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Cette application peut accéder à vos comptes."</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Cette application peut accéder à vos comptes. Contrôlée par <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi et données mobiles"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Autoriser les modifications des paramètres du Wi‑Fi et des données mobiles"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi réseau connexion"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS SMS/MMS messages messagerie"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellulaire opérateur mobile données sans fil 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi appel appels"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanceur d\'applications"</string>
     <string name="keywords_display" msgid="6709007669501628320">"écran écran tactile"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"assombrir l\'écran écran tactile batterie"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"assombrir l\'écran écran tactile batterie"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"personnaliser arrière-plan personnaliser écran"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"thème foncé mode Nuit écran sombre inverser luminosité"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"arrière-plan personnalisé personnaliser écran"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"taille du texte"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projet"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projeter caster"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espace disque disque dur utilisation appareil"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"consommation batterie charge"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"orthographe dictionnaire correcteur orthographique correction automatique"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"compte"</string>
     <string name="keywords_users" msgid="4673901601478559100">"limitation limiter limité"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correction de texte corriger son vibreur automatique langue geste suggérer suggestion thème choquant type de mot emoji international"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"réinitialiser préférences valeur par défaut"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"application par défaut en cas d\'urgence"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"applis télécharger applications système"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"sécurité des autorisations des applications"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"applications par défaut"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"faire glisser mot de passe schéma code d\'accès"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer un tag NFC pour Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifier"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume de l\'alarme"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume de la sonnerie"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume des notifications"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Sonneries"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"À la réception d\'appels et de notifications"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Toujours sonner"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"N\'autoriser que les sonneries prioritaires"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne pas interrompre"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritaires uniquement"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Interruptions prioritaires uniquement"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"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="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Sonnerie de notification par défaut"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreur aussi pour les appels"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreur"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Accès aux notifications"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Les applications ne peuvent pas lire les notifications."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d application peut lire les notifications."</item>
-    <item quantity="other" msgid="980049191810249052">"%d applications peuvent lire les notifications."</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d application peut lire les notifications.</item>
+      <item quantity="other">%d applications peuvent lire les notifications.</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Aucun outil d\'écoute des notifications installé."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activer <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra lire toutes les notifications publiées par le système ou par toute application installée. Ces notifications peuvent comporter des informations personnelles, telles que des noms de contacts et le texte de messages qui vous ont été envoyés. Ce service permet également de masquer ces notifications ou de sélectionner les boutons d\'action qu\'elles contiennent."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fournisseurs de conditions"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Aucune application ne fournit de conditions."</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d application fournit des conditions."</item>
-    <item quantity="other" msgid="358057362115673258">"%d applications fournissent des conditions."</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Aucun fournisseur de conditions n\'est installé."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activer <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> pourra ajouter des conditions de sortie au mode Ne pas déranger."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Bloquer"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ne jamais afficher les notifications de cette application"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritaire"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Afficher les notifications en haut de la liste et continuer à les recevoir lorsque l\'appareil est configuré pour les sonneries prioritaires uniquement"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensible"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Lorsque l\'appareil est verrouillé, masquer tout contenu sensible figurant dans les notifications de cette application"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Considérer comme prioritaire"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"N\'activer les notifications sonores de cette application que lorsque l\'option \"Ne pas déranger\" est définie sur \"Prioritaires uniquement\""</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Autoriser l\'aperçu"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permettre à cette application de mettre certaines notifications en évidence en les faisant glisser pour les afficher brièvement sur l\'écran actuel"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Masquer le contenu sensible"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Lorsque l\'appareil est verrouillé, masquer tout contenu figurant dans les notifications de cette application et susceptible de révéler des informations privées"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqué"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritaire"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"OK"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Jusqu\'à désactivation"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Sonneries prioritaires"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Temps d\'arrêt"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Jours"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Aucun"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interruptions autorisées"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Prioritaires uniquement"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Aucun"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisation"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activation automatique"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nom de la règle"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Ajouter une règle"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Supprimer la règle"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Supprimer la règle \"<xliff:g id="RULE">%1$s</xliff:g>\" ?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Supprimer"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Type de règle"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Inconnu"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurer une règle"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Règle de planification"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Règle introuvable."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Jours"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Aucun"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Tous les jours"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Jamais"</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">"Du <xliff:g id="START">%1$s</xliff:g> au <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Appels"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Appels/Messages de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Tout le monde"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Contacts uniquement"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Favoris uniquement"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Événements et rappels"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Les alarmes sont toujours des interruptions prioritaires."</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Les soirs de semaine"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Heure de début"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Heure de fin"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou toute alarme définie avant cette heure"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain ou toute alarme définie avant cette heure"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interruptions"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"À la réception d\'appels et de notifications"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quand souhaitez-vous être interrompu ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Pour combien de temps ?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Toujours interrompre"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"désactivées,toutes,tout"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"N\'autoriser que les interruptions prioritaires"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"N\'autoriser que les alarmes"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Ne pas interrompre"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indéfiniment"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> heure</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> heures</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Ne recevoir que les notifications prioritaires indéfiniment"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Ne recevoir que les notifications prioritaires pendant <xliff:g id="DURATION">%1$d</xliff:g> minute jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne recevoir que les notifications prioritaires pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Ne recevoir que les notifications prioritaires pendant <xliff:g id="DURATION">%1$d</xliff:g> heure jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne recevoir que les notifications prioritaires pendant <xliff:g id="DURATION">%1$d</xliff:g> heures jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Ne recevoir que les alarmes sans limite de temps"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> minute jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes jusqu\'à <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">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> heure jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> heures jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Ne pas interrompre indéfiniment"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Ne pas interrompre pendant <xliff:g id="DURATION">%1$d</xliff:g> minute jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne pas interrompre pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Ne pas interrompre pendant <xliff:g id="DURATION">%1$d</xliff:g> heure jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Ne pas interrompre pendant <xliff:g id="DURATION">%1$d</xliff:g> heures jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Toujours interrompre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"toujours"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifications appli."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envoyer commentaires sur appareil"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Informations sur le code IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Informations relatives au code IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Emplacement <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Lancer par défaut"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"Utilisation de la <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> : <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Liens de domaine"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Ouvrir les URL de domaine"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Autoriser l\'application à ouvrir directement les URL de domaine"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL de domaine compatibles"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Autres valeurs par défaut"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"Utilisation de la <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> : <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"mémoire interne"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"mémoire externe"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Stockage interne"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Stockage externe"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Consommation données application"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> utilisés depuis <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Espace de stockage utilisé"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Activé"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloquer"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensibles"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritaires"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritaires et sensibles"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisation accordée</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> autorisation accordée sur <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorisations accordées sur <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Certains paramètres par défaut définis"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Aucun paramètre par défaut défini"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Toutes les applications"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Activées"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personnelles"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Professionnelles"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloquées"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritaires"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensibles"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Avec des URL de domaine"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Désactivé par l\'administrateur"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Sélectionner un profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Autorisations des applications"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> applis autorisées avec accès supplém. sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> applications autorisées sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL de domaine"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"N\'ouvrir aucune URL de domaine"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Ouvrir \"<xliff:g id="DOMAIN">%s</xliff:g>\""</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Ouvrir \"<xliff:g id="DOMAIN">%s</xliff:g>\" et les URL associées"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut ouvrir les URL de son domaine.</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent ouvrir les URL de leur domaine.</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Non reconnu"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Applications par défaut"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Application de navigateur"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Aucun navigateur par défaut"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Par défaut)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Stockage pour les applications"</string>
 </resources>
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl-rES/arrays.xml
index c513957..5c3fbe6 100644
--- a/res/values-gl-rES/arrays.xml
+++ b/res/values-gl-rES/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Pulsar o botón"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"desactivar/activar o micrófono"</item>
     <item msgid="1148142988678569310">"multimedia do proxecto"</item>
     <item msgid="9130014005474445273">"activar VPN"</item>
+    <item msgid="1165192162975045562">"fondo de pantalla de escritura"</item>
+    <item msgid="7129487923652967258">"estrutura do asistente"</item>
+    <item msgid="1069023208100114540">"captura de pantalla do asistente"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Localización"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Desactivar/activar o micrófono"</item>
     <item msgid="5906017727368097853">"Multimedia do proxecto"</item>
     <item msgid="2486614710846178542">"Activar VPN"</item>
+    <item msgid="5586547561693629602">"Fondo de pantalla de escritura"</item>
+    <item msgid="32794179825485062">"Estrutura do asistente"</item>
+    <item msgid="7872852746938272552">"Captura de pantalla do asistente"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curto"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"baixa"</item>
     <item msgid="4212263919458209842">"crítica"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desactivado"</item>
-    <item msgid="5656544177755411222">"Interrupcións limitadas"</item>
-    <item msgid="8735337502532332056">"Ningunha interrupción"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderado"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Vermello"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (protocolo de transferencia multimedia)"</item>
+    <item msgid="8856820259201251036">"PTP (protocolo de transferencia de imaxes)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet USB)"</item>
+    <item msgid="2686051673589572111">"Fonte de audio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 2077be4..5f39eb1 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Permitir"</string>
     <string name="deny" msgid="6947806159746484865">"Rexeitar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Descoñecido"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Agora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso de converterte en programador."</item>
-    <item quantity="other" msgid="6722953419953594148">"Agora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de converterte en programador."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Agora estás a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser programador.</item>
+      <item quantity="one">Agora estás a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> paso de ser programador.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Agora xa es programador."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Non é necesario, xa es un programador."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Sen fíos e redes"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Desactivar SMS a través de IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"É necesario activar o rexistro IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"É necesario desactivar o rexistro IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Activar marca de fornecemento VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Desactivar marca de fornecemento VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Activar o baleirado da RAM lte"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Desactivar o baleirado da RAM lte"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ver axenda de enderezos da SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Difusión"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desactivar o perfil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Esta acción desactivará:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (ningún teléfono)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sen ficheiros multimedia)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectado (sen acceso ás mensaxes)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (ningún teléfono nin soporte)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Conectando..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Sincronizando..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sen nome"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Buscando"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Non hai ningún dispositivo próximo."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar ficheiros recibidos"</string>
     <string name="device_picker" msgid="4978696506172252813">"Escolle un dispositivo de Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitude de permiso de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Unha aplicación quere activar o Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Unha aplicación quere activar o Bluetooth para este dispositivo."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Unha aplicación quere que o teu tablet estea visible para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Unha aplicación quere que o teu teléfono estea visible para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Unha aplicación quere que o teu tablet estea visible para outros dispositivos Bluetooth. Máis adiante poderás cambiar a configuración do Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Tarxeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configuración do proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCELAR"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAR"</string>
     <string name="okay" msgid="1997666393121016642">"Aceptar"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SI"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NON"</string>
-    <string name="forget" msgid="7267115980248732932">"BORRAR"</string>
+    <string name="forget" msgid="1400428660472591263">"Borrar"</string>
+    <string name="save" msgid="879993180139353333">"Gardar"</string>
+    <string name="done" msgid="6942539184162713160">"Feito"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configuración"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configuración"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atallo de configuración"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Mellorar coincidencia de caras"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Comprobación de movemento"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Solicitar pestanexo ao desbloquear"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> despois de entrar en suspensión"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> despois de entrar en repouso, excepto se <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> mantén o dispositivo desbloqueado"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Define A miña localización, o desbloqueo da pantalla, o bloqueo da tarxeta SIM e o bloqueo do almacenamento de credenciais"</string>
     <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="2930627259125138363">"Contrasinais"</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="3453670509485083962">"Engadir"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueo da pantalla"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impresións dixitais inscritas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impresión dixital inscrita</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Config. identificación"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Para usar a túa impresión dixital para desbloquear a pantalla ou confirmar compras, teremos que: \n\n✓ Configurar o método de bloqueo da pantalla alternativa \n\n✓ Engadir a túa impresión dixital"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Buscar o sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localiza o sensor de impresións dixitais na parte posterior do teléfono."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Aceptar"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Comecemos"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Coloca o dedo no sensor de impresión dixital. Levántao despois de sentir unha vibración."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Ben! Agora repite."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Coloca o mesmo dedo no sensor de impresión dixital e levántao despois de sentir unha vibración."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Identificac. engadida"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cando vexas esta icona, podes usar a túa impresión dixital para a identificación ou para autorizar unha compra."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Engadir"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar teléfono"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conecta o cargador e téntao de novo."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Non hai ningún PIN nin contrasinal de pantalla de bloqueo"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Precisas definir un PIN ou un contrasinal para a pantalla de bloqueo para poder iniciar o encriptado."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Debes debuxar o padrón de desbloqueo para confirmar o cifrado do dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encriptar?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"A operación de encriptado é irreversible e, se a interrompes, perderás os datos. O encriptado tarda como mínimo unha hora en completarse e o tablet reiniciarase varias veces."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"A operación de encriptado é irreversible e, se a interrompes, perderás os datos. O encriptado tarda como mínimo unha hora en completarse e o teléfono reiniciarase varias veces."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Desbloqueo facial"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Seguridade baixa, experimental"</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_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_password_title" msgid="8775603825675090937">"Contrasinal"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta seguridade"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueo de pantalla actual"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"As funcións de protección do dispositivo deixarán de funcionar."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivado por admin, política encriptación ou almacenamento credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ningunha"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pasar o dedo"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueo facial"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Padrón"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Contrasinal"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Unha vez configurado un bloqueo de pantalla, tamén podes configurar a túa impresión dixital en Configuración &gt; Seguranza."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Activar bloqueo pant."</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Elimina o padrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Elimina o PIN de desbloqueo"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"O contrasinal debe conter polo menos unha letra."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"O contrasinal debe conter polo menos un díxito."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"O contrasinal debe conter polo menos un símbolo."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"O contrasinal debe conter polo menos 1 letra."</item>
-    <item quantity="other" msgid="8186027808415585970">"O contrasinal debe conter polo menos %d letras."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"O contrasinal debe conter polo menos 1 letra minúscula."</item>
-    <item quantity="other" msgid="2693910942679679225">"O contrasinal debe conter polo menos %d letras minúsculas."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"O contrasinal debe conter polo menos 1 letra maiúscula."</item>
-    <item quantity="other" msgid="3030801209112209245">"O contrasinal debe conter polo menos %d letras maiúsculas."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"O contrasinal debe conter polo menos 1 díxito numérico."</item>
-    <item quantity="other" msgid="4703982391407595924">"O contrasinal debe conter polo menos %d díxitos numéricos."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"O contrasinal debe conter polo menos 1 símbolo especial."</item>
-    <item quantity="other" msgid="1221290525051187757">"O contrasinal debe conter polo menos %d símbolos especiais."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"O contrasinal debe conter polo menos 1 carácter que non sexa unha letra."</item>
-    <item quantity="other" msgid="3952508584649046404">"O contrasinal debe conter polo menos %d caracteres que non sexan letras."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">O contrasinal debe conter polo menos %d letras.</item>
+      <item quantity="one">O contrasinal debe conter polo menos unha letra.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">O contrasinal debe conter polo menos %d letras minúsculas.</item>
+      <item quantity="one">O contrasinal debe conter polo menos unha letra minúscula.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">O contrasinal debe conter polo menos %d letras maiúsculas.</item>
+      <item quantity="one">O contrasinal debe conter polo menos unha letra maiúscula.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">O contrasinal debe conter polo menos %d díxitos numéricos.</item>
+      <item quantity="one">O contrasinal debe conter polo menos un díxito numérico.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">O contrasinal debe conter polo menos %d símbolos especiais.</item>
+      <item quantity="one">O contrasinal debe conter polo menos un símbolo especial.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">O contrasinal debe conter polo menos %d caracteres que non sexa letras.</item>
+      <item quantity="one">O contrasinal debe conter polo menos un carácter que non sexa unha letra.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"O administrador de dispositivos non permite o uso dun contrasinal recente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Non se permite unha secuencia de díxitos ascendente, descendente nin repetida"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Para sincronizar con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Asegúrate de que está mostrando este contrasinal:&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">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sincronizar con este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Para sincronizar con:<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>Escribe nel:<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> e, a continuación, preme Retroceso ou Intro."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Sincronizar"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SINCRONIZAR"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"A sincronización garante acceso aos teus contactos e ao historial de chamadas ao estar conectado"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Non se puido sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Non se puido sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> debido a que se introduciu un contrasinal ou PIN incorrecto."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Non se pode comunicar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Sincronización rexeitada por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Non se puido conectar a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Buscar dispositivos"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Actualizar"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"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="3719383048635344071">"Para mellorar a precisión da localización, as aplicacións e os servizos buscarán dispositivos de Bluetooth, mesmo se o Bluetooth está desactivado. Podes cambiar este axuste na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de busca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar con..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimedia"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio do teléfono"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferencia de ficheiros"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acceso a Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Compartir contactos"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utilizar para compartir contactos"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Uso compartido da conexión a Internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acceso ás mensaxes"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> desconectarase do audio multimedia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> desconectarase do audio do mans libres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> desconectarase do dispositivo de entrada."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Usar para"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Cambiar o nome"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permitir transf. entrantes"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao audio multimedia"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao audio do teléfono"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferencia de ficheiros"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectado ao mapa"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Non conectado co servidor de transferencia de ficheiros"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado ao dispositivo de entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado ao dispositivo para acceder a Internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Compartindo conexión a Internet co dispositivo"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilízase para audio multimedia"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilízase para o audio do teléfono"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilízase para a transferencia de ficheiros"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilízase para a entrada"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilízase para o acceso a Internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Usar para o mapa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configuración da base"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizar base para o audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altofalante"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e contido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configuración"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistente de wifi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado ao asistente de wifi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Enviar pantalla"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Emisión"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activar visualización sen fíos"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Non hai dispositivos cerca."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Borrar"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Feito"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permite o intercambio de datos cando o tablet toca outro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permite o intercambio de datos cando o teléfono toca outro dispositivo"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Desactivando a wifi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Erro"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"No modo avión"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Non se poden explorar redes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificación de rede"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Notifica se unha rede pública está dispoñible"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar conexións deficientes"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Non utilizar unha rede wifi se non ten unha boa conexión a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Usa só redes que teñan unha boa conexión a Internet"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Exploración sempre dispoñible"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permitir sempre a busca"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permite ao servizo de localización de Google e a outras aplicacións buscar redes, aínda que a wifi estea desactivada"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utilizar wifi aberta automaticamente"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permitir ao asistente wifi conectarse automaticamente a redes abertas de alta calidade"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Seleccionar asistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mellorar a precisión da localización e para outros fins, é posible que Google e outras aplicacións busquen redes próximas, aínda que a wifi estea desactivada. Se non queres que isto pase, accede a Avanzado &gt; Buscar redes sempre."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"É posible que as aplicacións busquen redes próximas, aínda que a wifi estea desactivada. Se non queres que isto pase, accede a Avanzado &gt; Buscar redes sempre."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Para mellorar a precisión da localización, as aplicacións e os servizos buscarán redes wifi, mesmo se a wifi está desactivada. Podes cambiar este axuste 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_remember_choice" msgid="5340097010842405981">"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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Engadir outra rede"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Máis"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Para completar a configuración, o tablet precisa acceso á wifi. Despois da configuración, podes cambiar entre datos móbiles e wifi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Opcións avanzadas"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Configuración protexida de wifi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando WPS..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Preme o botón Configuración protexida de wifi no teu router. É posible que se denomine \"WPS\" ou que conteña este símbolo:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Preme o botón Configuración protexida de wifi no teu router. É posible que se denomine \"WPS\" ou estea marcado con este símbolo:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Introduce o PIN <xliff:g id="NUMBER">%1$s</xliff:g> no teu router wifi. A configuración pode tardar ata dous minutos en completarse."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS realizada correctamente. Conectando coa rede…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Conectado coa rede wifi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anónima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Contrasinal"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contrasinal"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Configurar banda AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Configuración IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(non cambiado)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non especificado)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Gardada"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desactivadas"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Erro na configuración de IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Erro na conexión wifi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticación"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Non está dentro da zona de cobertura"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Non se detectou acceso a Internet e non se volverá conectar automaticamente."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dispoñible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dispoñible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce o contrasinal da túa rede"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Ningunha"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mellorar a precisión da localización e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> quere activar a busca de redes, aínda que a wifi estea desactivada.\n\nQueres permitilo para todas as aplicacións que queren buscar redes?"</string>
     <string name="wifi_scan_always_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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Queres iniciar sesión para conectarte?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> require inicio de sesión antes de conectar á rede"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Esta rede non ten acceso a Internet. Queres usar esta rede de todas formas?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Non volver preguntar por esta rede"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Zona wifi portátil AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona interactiva wifi portátil <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> <xliff:g id="NETWORK_SSID">%1$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_mode_title" msgid="2164073796253284289">"Preferencia de chamada"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de chamadas wifi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wifi preferida"</item>
+    <item msgid="5267397515594230396">"Móbil preferido"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Inicio"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Axusta o brillo da pantalla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo adaptable"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiza o nivel de brillo en función da luz dispoñible"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Claro"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Escuro"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensión"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A pantalla apágase"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Despois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividade"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Actualizar a SIM preferida?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> é a única tarxeta SIM do dispositivo. Queres utilizar esta tarxeta SIM para datos móbiles, chamadas e mensaxes SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN da SIM incorrecto. Agora debes contactar co operador para desbloquear o dispositivo."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Código PIN da SIM incorrecto. Quédanche <xliff:g id="NUMBER">%d</xliff:g> intentos antes de que teñas que contactar co operador para desbloquear o dispositivo."</item>
-    <item quantity="other" msgid="77103619544346451">"Código PIN da SIM incorrecto. Quédanche <xliff:g id="NUMBER">%d</xliff:g> intentos."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">O código PIN da SIM é incorrecto. Quédanche <xliff:g id="NUMBER_1">%d</xliff:g> intentos.</item>
+      <item quantity="one">O código PIN da SIM é incorrecto. Quédache <xliff:g id="NUMBER_0">%d</xliff:g> intento antes de que teñas que contactar co operador para desbloquear o dispositivo.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Fallo no funcionamento do PIN da SIM"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado do tablet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Estado do teléfono"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Dispoñible (só lectura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espazo total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicacións (datos apps e contido multimedia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicacións e datos das aplicacións"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descargas"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imaxes, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tons de chamada, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Variado"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Outros ficheiros"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datos da caché"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar almacenamento"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactivar tarxeta SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desactivación en curso"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Estase esgotando o espazo de almacenamento"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"É posible que algunhas funcións do sistema, como a sincronización, non funcionen correctamente. Tenta liberar espazo eliminando ou soltando elementos, como aplicacións ou contido multimedia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Cambiar o nome"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Inserir"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Expulsar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Borrar e formatar"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Borr. e form. como almac. int."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión USB do ordenador"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conexión USB do ordenador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectar como"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Permíteche transferir ficheiros multimedia en Windows ou mediante Transferencia de ficheiros de Android en Mac (visita a páxina www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Cámara (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Permite transferir fotos co software da cámara e transferir ficheiros en ordenadores que non admiten MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instala ferramentas de transferencia de ficheiros"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Permite que as aplicacións compatibles con MIDI utilicen software de MIDI no teu ordenador por USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Outros usuarios"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Almacenamento do dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Almacenamento extraíble"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> libres (total: <xliff:g id="TOTAL">%2$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="8928389741212129060">"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="4161722509712992231">"Non se puido expulsar <xliff:g id="NAME">%1$s</xliff:g> con seguridade"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Formatouse <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"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>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Despois de formatar, podes usar esta <xliff:g id="NAME_0">^1</xliff:g> noutros dispositivos. \n\nBorraranse todos os datos desta <xliff:g id="NAME_1">^1</xliff:g>. Primeiro considera a posibilidade de facer unha copia de seguranza. \n\n"<b>"Fai unha copia de seguranza das fotos e doutros contidos multimedia"</b>" \nMigra os teus ficheiros multimedia a un almacenamento alternativo neste dispositivo ou transfíreos a un ordenador cun cable USB. \n\n"<b>"Fai unha copia de seguranza das aplicacións"</b>" \nDesinstalaranse todas as aplicacións almacenadas nesta <xliff:g id="NAME_6">^1</xliff:g> e borraranse os seus datos. Para conservar estas aplicacións, mígraas a un almacenamento alternativo neste dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Ao expulsar esta <xliff:g id="NAME_0">^1</xliff:g>, as aplicacións almacenadas nela deixarán de funcionar e os ficheiros multimedia almacenados non estarán dispoñibles ata que se volva inserir."</b>" \n\nEsta <xliff:g id="NAME_1">^1</xliff:g> formátase para funcionar só neste dispositivo. Non funcionará noutros."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configura a túa <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como almacenamento portátil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para migrar fotos e outros contidos multimedia entre dispositivos."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Usar como almacenamento interno"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para almacenar calquera cousa só neste dispositivo, incluídas as aplicacións e as fotos. É necesario formatar para evitar que funcione con outros dispositivos."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatar como almacenam. interno"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Esta acción esixe que se formate a <xliff:g id="NAME_0">^1</xliff:g> para que estea protexida. \n\nDespois de formatala, esta <xliff:g id="NAME_1">^1</xliff:g> só funcionará neste dispositivo. \n\n"<b>"Ao formatar borraranse todos os datos almacenados actualmente na <xliff:g id="NAME_2">^1</xliff:g>."</b>" Para evitar perder os datos, considera a posibilidade de facer unha copia de seguranza."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Borrar e formatar"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatando a <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Non retires a <xliff:g id="NAME">^1</xliff:g> mentres se estea formatando."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Migrar datos a almacenamento novo"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Podes migrar as túas fotos, os ficheiros e os datos das aplicacións a esta nova <xliff:g id="NAME">^1</xliff:g>. \n\nA migración tarda arredor de <xliff:g id="TIME">^2</xliff:g> e liberará <xliff:g id="SIZE">^3</xliff:g> de almacenamento interno. Algunhas aplicacións non funcionarán mentres estea en progreso."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Migrar agora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Migrar máis tarde"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Migra os datos agora"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"A migración tarda arredor de <xliff:g id="TIME">^1</xliff:g>. Liberará <xliff:g id="SIZE">^2</xliff:g> de almacenamento interno."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Migrar"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Migrando datos…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Durante a migración: \n• Non retires a <xliff:g id="NAME">^1</xliff:g>. \n• Algunhas aplicacións non funcionarán correctamente. \n• Mantén o dispositivo cargado."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> está lista"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"A túa <xliff:g id="NAME">^1</xliff:g> está configurada para o seu uso con fotos e con outros contidos multimedia."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"A túa nova <xliff:g id="NAME">^1</xliff:g> funciona. \n\nPara migrar fotos, ficheiros e datos de aplicacións a este dispositivo, accede a Configuración &gt; Almacenamento."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Migrar <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Migrar <xliff:g id="APP">^1</xliff:g> e os seus datos á <xliff:g id="NAME_0">^2</xliff:g> só tardará un momento. Non poderás usar a aplicación ata que finalice a migración. \n\nNon retires a <xliff:g id="NAME_1">^2</xliff:g> durante a migración."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Migrando <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Non retires a <xliff:g id="NAME">^1</xliff:g> durante a migración. \n\nA aplicación <xliff:g id="APP">^2</xliff:g> deste dispositivo non estará dispoñible ata que finalice a migración."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar migración"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado da batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel da batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando a configuración do APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer aos valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Completouse o restablecemento da configuración de APN predeterminada."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Restablecemento da configuración da rede"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Esta acción restablecerá toda a configuración da rede, incluído:\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="4874737348054213767">"Queres restablecer toda a configuración da rede? Esta acción non se pode desfacer."</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="reset_network_complete_toast" msgid="787829973559541880">"Restableceuse a configuración da rede"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Restablecer dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecemento dos datos de fábrica"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos os datos do tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Borra todos os datos do teléfono"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Esta acción borrará todos os datos do "<b>"almacenamento interno"</b>" do teu tablet, 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="9165016501623540228">"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>"Os datos e configuracións do sistema e das aplicacións"</li>\n<li>"As 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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos os datos da tarxeta SD, como a música ou as fotos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer teléfono"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Queres borrar toda a túa información persoal e as aplicacións descargadas? Non podes desfacer esta acción."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Queres borrar toda a túa información persoal e as aplicacións descargadas? Non podes desfacer esta acción."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Tes que debuxar o teu padrón de desbloqueo para confirmar un restablecemento dos datos de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Non se levou a cabo ningún restablecemento debido a que o servizo de borrado do sistema non está dispoñible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Restablecer?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"O restablecemento de fábrica non está dispoñible para este usuario"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Queres borrar o almacenamento USB e todos os ficheiros almacenados nel? Non poderás desfacer esta acción."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Queres borrar a tarxeta SD e todos os ficheiros almacenados nela? Non poderás desfacer esta acción."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Borrar todo"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Tes que debuxar o teu padrón de desbloqueo para confirmar que queres borrar o almacenamento USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Tes que debuxar o teu padrón de desbloqueo para confirmar que queres borrar a tarxeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Configuración de chamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configura o correo de voz, o desvío de chamadas, a chamada en espera e o identificador de chamada"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ancoraxe de USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Axuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Redes móbiles"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móbil"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicación de SMS predeterminada"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicación de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Queres cambiar a aplicación de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Queres utilizar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como a túa aplicación de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Queres utilizar <xliff:g id="NEW_APP">%s</xliff:g> como a túa aplicación de SMS?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localización"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utiliza GPS, wifi e redes móbiles para determinar a localización"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utiliza wifi e redes móbiles para determinar a localización"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utiliza o GPS para determinar a túa localización"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usa o GPS para determinar a localización"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Analizando"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analizando"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Busca por wifi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Mellora a localización permitindo que as aplicacións e os servizos busquen redes wifi, mesmo se a wifi está desactivada"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Busca por Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Mellora a localización permitindo que os servizos do sistema busquen dispositivos de Bluetooth, mesmo se o Bluetooth está desactivado"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localización por wifi e rede móbil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"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>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Estableceuse o contrasinal"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Definiuse o PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Definiuse o padrón"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Seguridade da pantalla"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Utiliza o padrón do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Introduce o PIN do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Introduce o contrasinal do dispositivo para continuar."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Seguranza do dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambiar padrón de desbloqueo"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirma o padrón gardado"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Téntao de novo:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Debuxa un padrón de desbloqueo"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Preme Menú para obter axuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Solta o dedo cando remates"</string>
@@ -1176,8 +1225,7 @@
     <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>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como debuxar un padrón de desbloqueo"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Demasiados intentos incorrectos"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Téntao de novo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
+    <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="manageapplications_settings_title" msgid="7041951105633616745">"Xestionar aplicacións"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Xestiona e elimina as aplicacións instaladas"</string>
@@ -1228,6 +1276,7 @@
     <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 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>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Operacións das aplicacións"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Activa"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nunca utilizada)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Sen aplicacións predet."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso do almacenamento"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Visualiza o almacenamento utilizado polas aplicacións"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servizos en execución"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Información sobre o tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Información sobre o teléfono"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Información sobre a batería"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Inicio rápido"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Define os atallos do teclado para iniciar aplicacións"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Asignar aplicación"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Ningún atallo"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Busca + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Borrar"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Borrarase o teu atallo para <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Aceptar"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Cancelar"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplicacións"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Atallos"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Entrada de texto"</string>
     <string name="input_method" msgid="5434026103176856164">"Método de entrada"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Teclado actual"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os paquetes HCI Bluetooth nun ficheiro"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueo do OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir que se desbloqueo o cargador de inicio"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introduce o teu PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduce o PIN do dispositivo para activar o desbloqueo do OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Queres permitir o desbloqueo do OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVISO: As funcións de protección do dispositivo non funcionarán neste dispositivo se está activada esta configuración."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de rexistrador"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Seleccionar tamaños por búfer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Permitir localizacións falsas"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permite localizacións falsas"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Activar a inspección de atributos de visualización"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Redes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificado de visualización sen fíos"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Activar rexistro detallado da wifi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Entrega agresiva de wifi a móbil"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Permitir sempre buscas de itinerancia da wifi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Usar cliente DHCP herdado"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostra opcións para o certificado de visualización sen fíos"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumentar o nivel de rexistro da wifi, mostrar por SSID RSSI no selector de wifi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Cando está activada esta función, a wifi será máis agresiva ao entregar a conexión de datos ao móbil, cando o sinal wifi é feble"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Permitir/Non permitir buscas de itinerancia da wifi baseadas na cantidade de tráfico de datos presente na interface"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de rexistrador"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Seleccionar tamaños por búfer"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Seleccionar configuración USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Seleccionar configuración USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir localizacións falsas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permite localizacións falsas"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Activar a inspección de atributos de visualización"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliza o cliente DHCP de Lollipop en lugar do novo cliente DHCP de Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Queres permitir a depuración USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"A depuración de erros USB está deseñada unicamente para fins de programación. Utilízaa para copiar datos entre o ordenador e o dispositivo, instalar aplicacións no dispositivo sen enviar notificacións e ler os datos do rexistro."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Queres revogar o acceso á depuración USB desde todos os ordenadores que autorizaches previamente?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Maxenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Posto que unha aplicación se superpón sobre una solicitude de permiso, a configuración non pode verificar a túa resposta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se activas <xliff:g id="SERVICE">%1$s</xliff:g>, o dispositivo non utilizará o teu bloqueo da pantalla para mellorar o cifrado de datos."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Como activaches un servizo de accesibilidade, o dispositivo non utilizará o teu bloqueo da pantalla para mellorar o cifrado de datos."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"É necesario que confirmes o teu padrón xa que a activación de <xliff:g id="SERVICE">%1$s</xliff:g> afecta ao cifrado de datos."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estatísticas de procesos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estatísticas frikis sobre procesos en execución"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso da memoria"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplicacións de <xliff:g id="TYPE">%1$s</xliff:g> durante <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> de <xliff:g id="TOTALRAM">%2$s</xliff:g> usados durante <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Segundo plano"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Primeiro plano"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Almacenado na caché"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Actualmente, a memoria do dispositivo é <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Uso medio da RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso máximo da RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"SO Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Orixinais"</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">"Cachés"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Uso da RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Uso da RAM (segundo plano)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tempo de execución"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Procesos"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servizos"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duración"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Detalles da memoria"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 día"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ocultar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Usar Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estatísticas"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Segundo plano"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"A configuración predeterminada seguinte anula a configuración da aplicación"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuración predeterminada"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor predeterminado"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Define o motor de síntese de voz que queres usar para o texto falado"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Define o motor de síntese de voz que se vai utilizar no texto falado"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Velocidade da fala"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidade á que se di o texto"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Almacenado en hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Só software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"As credenciais non están dispoñibles para este usuario"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Tes que debuxar o padrón de desbloqueo para confirmar a instalación de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Realizar copia de seguranza dos meus datos"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Crea unha copia de seguranza dos datos da aplicación, dos contrasinais da wifi e doutras configuracións en servidores de Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Conta secundaria"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Actualmente ningunha conta está almacenando datos da copia de seguranza."</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluír datos de aplicacións"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Cando volvas instalar unha aplicación, restaura a configuración e os datos dos que fixeches unha copia de seguranza"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"O servizo de copias de seguranza está inactivo."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Establécese mediante a política do dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contrasinal para copias"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"As copias de seguridade de ordenador completas non están protexidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca para cambiar ou eliminar o contrasinal para as copias de seguranza completas do escritorio"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala anim. transición"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala duración animador"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simular pantallas secundarias"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Modo de varias ventás"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Varias actividades na pantalla ao mesmo tempo."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Queres activar o modo de varias ventás?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ADVERTENCIA: Trátase dunha función altamente experimental que permite varias actividades na pantalla ao mesmo tempo a través da interface de usuario de aplicacións recentes. É posible que algunhas aplicacións fallen ou non funcionen correctamente cando se usen con esta función."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicacións"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Non manter actividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruír actividades cando o usuario non as use"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrinxido"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Engadir un usuario novo?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Podes compartir este dispositivo con outras persoas a través da creación de usuarios adicionais. Cada usuario ten o seu propio espazo que pode personalizar coas súas propias aplicacións, fondos de pantalla, etc. Os usuarios tamén poden modificar as opcións de configuración do dispositivo, como a rede wifi, que afectan a todo o mundo.\n\nCando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Podes compartir este dispositivo con outras persoas a través da creación de usuarios adicionais. Cada usuario ten o seu propio espazo que pode personalizar coas súas propias aplicacións, fondos de pantalla, etc. Os usuarios tamén poden modificar as opcións de configuración do dispositivo, como a rede wifi, que afectan a todo o mundo.\n\nCando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Cando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o usuario agora?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asegúrate de que a persoa está dispoñible para acceder ao dispositivo e configurar o seu espazo"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Queres eliminar o invitado?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Eliminaranse todas as aplicacións e datos desta sesión."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Eliminar"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Permitir chamadas telefónicas"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Permitir chamadas telefónicas e SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Activar chamadas telefónicas"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Activar chamadas telefónicas e SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Eliminar o usuario"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Queres permitir as chamadas telefónicas?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Activar chamadas telefónicas?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"O historial de chamadas compartirase con este usuario."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Queres permitir chamadas telefónicas e SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"O historial de chamadas e SMS 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="application_restrictions" msgid="8207332020898004394">"Permitir aplicacións e contido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacións con restricións"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ampliar axustes aplicación"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"CAMBIAR NOME"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Axustar restricións de aplicacións"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Esta aplicación non se admite nos perfís restrinxidos"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Esta aplicación pode acceder ás túas contas"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Esta aplicación pode acceder ás túas contas. Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wifi e móbil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permite a modificación da configuración das redes wifi e de telefonía móbil"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi rede conexión"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensaxe de texto mensaxes de texto mensaxes mensaxería"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"móbil operador sen fíos datos 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi chamada wifi chamando"</string>
     <string name="keywords_home" msgid="3626170808219458848">"iniciador"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar pantalla pantalla táctil batería"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"atenuar pantalla pantalla táctil batería"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano personalizar pantalla"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"escuro tema noite modo atenuar pantalla inverter brillo"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"segundo plano personalizar pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño do texto"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proxecto"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"emisión do proxecto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espazo disco unidade de disco duro uso do dispositivo"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"carga consumo enerxía"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografía dicionario corrector ortográfico autocorrector"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restrición restrinxir restrinxido"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"texto corrección correcto son vibrar automático idioma xesto suxerir suxestión tema palabra ofensiva escribir emoji internacional"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"restablecer preferencias predeterminadas"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"emerxencia en caso de emerxencia aplicación predeterminada"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplicacións descarga aplicacións sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"seguranza dos permisos das aplicacións"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplicacións predeterminadas"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"pasar o dedo contrasinal padrón pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC wifi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
@@ -2386,11 +2449,12 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Volume das notificacións"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupcións"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Cando se reciben chamadas e notificacións"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Interromper sempre"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permitir só interrupcións prioritarias"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Non interromper"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Só permite prioridade"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Normas automáticas"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Só prioridade"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Só alarmas"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Sen interrupcións"</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="ringtone_title" msgid="5379026328015343686">"Ton de chamada do teléfono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ton de chamada de notificación predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar tamén nas chamadas"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificacións"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"As aplicacións non poden ler as notificacións"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplicación pode ler notificacións"</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplicacións poden ler notificacións"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d aplicacións poden ler notificacións</item>
+      <item quantity="one">%d aplicación pode ler notificacións</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Non hai ningún detector de notificacións instalado."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> poderá ler todas as notificacións publicadas polo sistema ou calquera aplicación instalada, o cal pode incluír información persoal como nomes de contactos e o texto das mensaxes que che envían. Tamén poderá ignorar estas notificacións ou tocar os botóns de acción que conteña."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Provedores de condicións"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ningunha aplicación fornece condicións"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplicación fornece condicións"</item>
-    <item quantity="other" msgid="358057362115673258">"%d aplicacións fornecen condicións"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Non hai ningún provedor de condicións instalado."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Queres activar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> poderá engadir condicións de saída ao modo Non molestar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicacións..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Bloquear"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Non mostrar nunca as notificacións desta aplicación"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioridade"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Mostrar as notificacións na parte superior da lista e seguir recibíndoas cando o dispositivo estea establecido unicamente para interrupcións prioritarias."</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Confidencial"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Ocultar o contido delicado nas notificacións desta aplicación cando o dispositivo estea bloqueado."</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratar como prioridade"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Permite oír as notificacións da aplicación cando a opción Non molestar está definida en Só prioridade"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permitir unha ollada"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permite que esta aplicación enfatice certas notificacións introducíndoas brevemente na visualización da pantalla actual"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ocultar contido confidencial"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Oculta o contido das notificacións desta aplicación que poida revelar información privada cando o dispositivo está bloqueado."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueada"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidencial"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Feito"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Ata que desactives isto"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupcións prioritarias"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Tempo de inactividade"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Días"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ningún"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interrupcións permitidas"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Só prioridade"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ningún"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatización"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activar automaticamente"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nome da norma"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Engadir norma"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Eliminar norma"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Queres eliminar a norma \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Eliminar"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de norma"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Descoñecida"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurar norma"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Programar norma"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Non se atopou a norma."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Días"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ningún"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Cada día"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
+    <string name="summary_range_symbol_combination" msgid="5695218513421897027">"Do <xliff:g id="START">%1$s</xliff:g> ao <xliff:g id="END">%2$s</xliff:g>"</string>
+    <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Do <xliff:g id="START">%1$s</xliff:g> ao <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Chamadas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensaxes"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Chamadas/mensaxes de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Calquera"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Só contactos"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Só contactos destacados"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Eventos e recordatorios"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"As alarmas son sempre interrupcións de prioridade"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noites pola semana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Ás <xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"Ás <xliff:g id="FORMATTED_TIME">%s</xliff:g> ou con calquera alarma anterior"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Ás <xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte ou con calquera alarma anterior"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Ás <xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interrupcións"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Cando se reciben chamadas e notificacións"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Cando queres que te interrompamos?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Durante canto tempo?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Interromper sempre"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"desactivado,todos,todo"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Permitir só interrupcións prioritarias"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Permitir só alarmas"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Non interromper"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidamente"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Cambia a notificacións con prioridade só indefinidamente"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Cambia a notificacións con prioridade tan só durante <xliff:g id="DURATION">%1$d</xliff:g> minutos ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambia a notificacións con prioridade tan só durante un minuto ata as <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Cambia a notificacións con prioridade tan só durante <xliff:g id="DURATION">%1$d</xliff:g> horas (ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia a notificacións con prioridade tan só durante unha hora ata as <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Cambia a alarmas só indefinidamente"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Cambia a alarmas tan só durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia a alarmas tan só durante un minuto ata as <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">Cambia a alarmas tan só durante <xliff:g id="DURATION">%1$d</xliff:g> horas ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambia a alarmas tan só durante unha hora ata as <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Cambia a non interromper indefinidamente"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Cambia para non interromper durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia para non interromper durante un minuto ata as <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Cambia para non interromper durante <xliff:g id="DURATION">%1$d</xliff:g> horas ata as <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Cambia para non interromper durante unha hora ata as <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambia a interromper sempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"sempre"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notific. aplicacións"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración das notificacións"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios do dispositivo"</string>
@@ -2512,4 +2629,63 @@
     <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="slot_number" msgid="3762676044904653577">"(Rañura<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Iniciar de forma predeterminada"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> en uso en <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Ligazóns de dominio"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Abrir URL de dominio"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Permitir que a aplicación abra directamente os URL de dominio"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL de dominio compatibles"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Abrir predeterminados"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> en uso en <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"memoria interna"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"memoria externa"</string>
+    <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="storage_used" msgid="7128074132917008743">"Almacenamento utilizado"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Activadas"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloqueadas"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Confidencial"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioridade"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioridade e confidencial"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permisos outorgados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permiso outorgado</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> permisos outorgados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> permiso outorgado</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Definíronse algúns valores predeterminados"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Non se definiu ningún valor predeterminado"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Todas as aplicacións"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Activadas"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Persoais"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Do traballo"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Con prioridade"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidenciais"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL de dominio"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desactivado polo administrador"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Aplicación descoñecida"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicacións"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacións con permiso de acceso adicional"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacións con permiso"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL de dominio"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Non abrir ningún URL de dominio"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Abrir <xliff:g id="DOMAIN">%s</xliff:g>\""</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Abrir \"<xliff:g id="DOMAIN">%s</xliff:g>\" e os URL relacionados"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicacións poden abrir os seus URL de dominio</item>
+      <item quantity="one">Unha aplicación pode abrir os seus URL de dominio</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Non se recoñece"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicacións predeterminadas"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicación do navegador"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Sen navegador predeterminado"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predeterminada)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Almacenamento de aplicacións"</string>
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..20a63cb
--- /dev/null
+++ b/res/values-gu-rIN/strings.xml
@@ -0,0 +1,4986 @@
+<?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">
+    <!-- no translation found for yes (4676390750360727396) -->
+    <skip />
+    <!-- no translation found for no (6731231425810196216) -->
+    <skip />
+    <!-- no translation found for create (3578857613172647409) -->
+    <skip />
+    <!-- no translation found for allow (3349662621170855910) -->
+    <skip />
+    <!-- no translation found for deny (6947806159746484865) -->
+    <skip />
+    <!-- no translation found for device_info_default (7847265875578739287) -->
+    <skip />
+    <!-- no translation found for show_dev_countdown (7201398282729229649) -->
+    <!-- no translation found for show_dev_on (1110711554982716293) -->
+    <skip />
+    <!-- no translation found for show_dev_already (2151632240145446227) -->
+    <skip />
+    <!-- no translation found for header_category_wireless_networks (5110914332313954940) -->
+    <skip />
+    <!-- no translation found for header_category_connections (6471513040815680662) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_access (7580499097416970962) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
+    <!-- no translation found for turn_on_radio (8706561489788373676) -->
+    <skip />
+    <!-- no translation found for turn_off_radio (1820294552893884115) -->
+    <skip />
+    <!-- no translation found for sms_over_ims_on (5085290395865632925) -->
+    <skip />
+    <!-- no translation found for sms_over_ims_off (8354792045992793959) -->
+    <skip />
+    <!-- no translation found for ims_reg_required_on (3885152087309614653) -->
+    <skip />
+    <!-- no translation found for ims_reg_required_off (1720570343422743943) -->
+    <skip />
+    <!-- no translation found for volte_provisioned_flag_on (6023503159480902956) -->
+    <skip />
+    <!-- no translation found for volte_provisioned_flag_off (6168612015904744405) -->
+    <skip />
+    <!-- no translation found for lte_ram_dump_on (8568568019520172177) -->
+    <skip />
+    <!-- no translation found for lte_ram_dump_off (2514507918652378283) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewADN (8743377494429930831) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewFDN (7934301566925610318) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewSDN (7130280686244955669) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_getPDP (560610293888406317) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_in (1915416319177520020) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_out (5238736759641916278) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_emergency (2485604591272668370) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_off (1434084741785525415) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_in (9045363884600341051) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_not (2851853244069662307) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_idle (7489244938838742820) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_ringing (4883724645684297895) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_offhook (4174402846862780998) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_disconnected (1959735267890719418) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connecting (8404571440697917823) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connected (7074301157399238697) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_suspended (5315325487890334196) -->
+    <skip />
+    <!-- no translation found for radioInfo_unknown (737385314432468266) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_packets (8654359809877290639) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_bytes (4018206969492931883) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_dbm (3621221793699882781) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_asu (1422248392727818082) -->
+    <skip />
+    <!-- no translation found for radioInfo_lac (8415219164758307156) -->
+    <skip />
+    <!-- no translation found for radioInfo_cid (4362599198392643138) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (6325292633327972272) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (3364184561355611897) -->
+    <skip />
+    <!-- no translation found for sdcard_format (6285310523155166716) -->
+    <skip />
+    <!-- no translation found for sdcard_format (6713185532039187532) -->
+    <skip />
+    <!-- no translation found for small_font (2295331917424072635) -->
+    <skip />
+    <!-- no translation found for medium_font (2068475425515133701) -->
+    <skip />
+    <!-- no translation found for large_font (599055175160971446) -->
+    <skip />
+    <!-- no translation found for font_size_save (3450855718056759095) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (8281011784066476192) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (5922637503871474866) -->
+    <skip />
+    <!-- no translation found for battery_info_status_label (8109155295509700309) -->
+    <skip />
+    <!-- no translation found for battery_info_power_label (7465140230991349382) -->
+    <skip />
+    <!-- no translation found for battery_info_scale_label (3649763192389778437) -->
+    <skip />
+    <!-- no translation found for battery_info_level_label (8706526709307788737) -->
+    <skip />
+    <!-- no translation found for battery_info_health_label (6416051542741886958) -->
+    <skip />
+    <!-- no translation found for battery_info_technology_label (788304533220748681) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_label (8971764146757637863) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_units (8658490792208288107) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_label (1968383098818648037) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_units (9098950587249987550) -->
+    <skip />
+    <!-- no translation found for battery_info_uptime (5548545143573527992) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_battery (2557725975486185849) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_plugged (176716874713478188) -->
+    <skip />
+    <!-- no translation found for battery_info_screen_on (376277447175613889) -->
+    <skip />
+    <!-- no translation found for battery_info_status_unknown (196130600938058547) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging (1705179948350365604) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_ac (2909861890674399949) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_usb (2207489369680923929) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_wireless (3574032603735446573) -->
+    <skip />
+    <!-- no translation found for battery_info_status_discharging (310932812698268588) -->
+    <skip />
+    <!-- no translation found for battery_info_status_not_charging (2820070506621483576) -->
+    <skip />
+    <!-- no translation found for battery_info_status_full (2824614753861462808) -->
+    <skip />
+    <!-- no translation found for battery_info_power_unplugged (5987246575519551081) -->
+    <skip />
+    <!-- no translation found for battery_info_power_ac (6808516193001604634) -->
+    <skip />
+    <!-- no translation found for battery_info_power_usb (8012931702516331797) -->
+    <skip />
+    <!-- no translation found for battery_info_power_wireless (6819163295739305097) -->
+    <skip />
+    <!-- no translation found for battery_info_power_ac_usb (6777734146838328688) -->
+    <skip />
+    <!-- no translation found for battery_info_power_unknown (7344115502868899881) -->
+    <skip />
+    <!-- no translation found for battery_info_health_unknown (5664295556921944255) -->
+    <skip />
+    <!-- no translation found for battery_info_health_good (8070356565806711806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_overheat (8442959549291368806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_dead (1725917445762829059) -->
+    <skip />
+    <!-- no translation found for battery_info_health_over_voltage (2420269351664490121) -->
+    <skip />
+    <!-- no translation found for battery_info_health_unspecified_failure (6347021103185471590) -->
+    <skip />
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
+    <!-- no translation found for bluetooth (5549625000628014477) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (2849387702249327748) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility_timeout (8002247464357005429) -->
+    <skip />
+    <!-- no translation found for bluetooth_lock_voice_dialing (3139322992062086225) -->
+    <skip />
+    <!-- no translation found for bluetooth_lock_voice_dialing_summary (4741338867496787042) -->
+    <skip />
+    <!-- no translation found for bluetooth_devices (1886018064039454227) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_name (8415828355207423800) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_details (4594773497930028085) -->
+    <skip />
+    <!-- no translation found for bluetooth_profile_details (6823621790324933337) -->
+    <skip />
+    <!-- no translation found for bluetooth_name_not_set (2653752006416027426) -->
+    <skip />
+    <!-- no translation found for bluetooth_scan_for_devices (9214184305566815727) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_device (4352483834491958740) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
+    <skip />
+    <!-- no translation found for bluetooth_empty_list_user_restricted (1185354873716211496) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_disconnect_question (5334933802445256306) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting (16583128958125247) -->
+    <skip />
+    <!-- no translation found for bluetooth_disable_profile_title (5916643979709342557) -->
+    <skip />
+    <!-- no translation found for bluetooth_disable_profile_message (2895844842011809904) -->
+    <skip />
+    <string name="bluetooth_unknown" msgid="644716244548801421"></string>
+    <!-- no translation found for bluetooth_device (5291950341750186887) -->
+    <skip />
+    <!-- no translation found for progress_scanning (192587958424295789) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (1085232930277181436) -->
+    <skip />
+    <!-- no translation found for bluetooth_notif_ticker (4726721390078512173) -->
+    <skip />
+    <!-- no translation found for bluetooth_notif_title (2485175521845371514) -->
+    <skip />
+    <!-- no translation found for bluetooth_notif_message (5300852675110479862) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
+    <skip />
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
+    <!-- no translation found for bluetooth_permission_request (1523129741266262748) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement (1712443355224737143) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_discovery (786921566047356213) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_discovery (5510358858113713272) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (8863617309580598607) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (6487606808683607975) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_start_broadcast (3535628155254187911) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (8810858601242763295) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_explaination (4249322115655011799) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (3346529092809011149) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (4724094889807196118) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (989613204829097159) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6671615712909139801) -->
+    <skip />
+    <!-- no translation found for bluetooth_turning_on (4850574877288036646) -->
+    <skip />
+    <!-- no translation found for bluetooth_turning_off (2337747302892025192) -->
+    <skip />
+    <!-- no translation found for bluetooth_auto_connect (40711424456733571) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_permission_request (4747918249032890077) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_notif_message (3687933246423942977) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_dialog_text (8455427559949998023) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
+    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (6555508756987053866) -->
+    <skip />
+    <!-- no translation found for bluetooth_remember_choice (6198284561603824931) -->
+    <skip />
+    <!-- no translation found for bluetooth_pb_remember_choice (2901499974259177202) -->
+    <skip />
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
+    <!-- no translation found for bluetooth_map_acceptance_dialog_text (8712508202081143737) -->
+    <skip />
+    <!-- no translation found for date_and_time (9062980487860757694) -->
+    <skip />
+    <!-- no translation found for choose_timezone (1362834506479536274) -->
+    <skip />
+    <!-- no translation found for display_preview_label (1127597250917274792) -->
+    <skip />
+    <!-- no translation found for display_font_size_label (8941851418397475389) -->
+    <skip />
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <!-- no translation found for intent_sender_sendbroadcast_text (1415735148895872715) -->
+    <skip />
+    <!-- no translation found for intent_sender_action_label (616458370005452389) -->
+    <skip />
+    <!-- no translation found for intent_sender_startactivity_text (5080516029580421895) -->
+    <skip />
+    <!-- no translation found for intent_sender_resource_label (6963659726895482829) -->
+    <skip />
+    <!-- no translation found for intent_sender_account_label (465210404475603404) -->
+    <skip />
+    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
+    <skip />
+    <!-- no translation found for proxy_clear_text (5555400754952012657) -->
+    <skip />
+    <!-- no translation found for proxy_port_label (5655276502233453400) -->
+    <skip />
+    <!-- no translation found for proxy_exclusionlist_label (7700491504623418701) -->
+    <skip />
+    <!-- no translation found for proxy_exclusionlist_hint (6084099226687226948) -->
+    <skip />
+    <!-- no translation found for proxy_defaultView_text (6387985519141433291) -->
+    <skip />
+    <!-- no translation found for proxy_action_text (2957063145357903951) -->
+    <skip />
+    <!-- no translation found for proxy_hostname_label (8490171412999373362) -->
+    <skip />
+    <!-- no translation found for proxy_hostname_hint (2076157057003936176) -->
+    <skip />
+    <!-- no translation found for proxy_error (8926675299638611451) -->
+    <skip />
+    <!-- no translation found for proxy_error_dismiss (4993171795485460060) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_host (8052095511862922213) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_exclusion_list (6467799485443290961) -->
+    <skip />
+    <!-- no translation found for proxy_error_empty_port (5539106187558215246) -->
+    <skip />
+    <!-- no translation found for proxy_error_empty_host_set_port (2451694104858226781) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_port (2671425042711054494) -->
+    <skip />
+    <!-- no translation found for proxy_warning_limited_support (7229337138062837422) -->
+    <skip />
+    <!-- no translation found for proxy_url_title (7185282894936042359) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_location_label (16475158265551708) -->
+    <skip />
+    <!-- no translation found for radio_info_neighboring_location_label (2385625674055934880) -->
+    <skip />
+    <!-- no translation found for radio_info_cellinfo_label (1300937728020622362) -->
+    <skip />
+    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
+    <skip />
+    <!-- no translation found for radio_info_data_attempts_label (1731106244577323381) -->
+    <skip />
+    <!-- no translation found for radio_info_gprs_service_label (2331818110375395364) -->
+    <skip />
+    <!-- no translation found for radio_info_roaming_label (6141505430275138647) -->
+    <skip />
+    <!-- no translation found for radio_info_imei_label (1220524224732944192) -->
+    <skip />
+    <!-- no translation found for radio_info_call_redirect_label (1654674226961476872) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_resets_label (3241667824729310546) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_disconnects_label (1683069665736339820) -->
+    <skip />
+    <!-- no translation found for radio_info_current_network_label (3256402602440102610) -->
+    <skip />
+    <!-- no translation found for radio_info_data_successes_label (4417894113689054945) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_received_label (3345184342444878849) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_service_label (2082332114596916985) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_strength_label (1931937920896925766) -->
+    <skip />
+    <!-- no translation found for radio_info_call_status_label (4896238900685510883) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_sent_label (5009102250704375687) -->
+    <skip />
+    <!-- no translation found for radio_info_radio_resets_label (9211343458143291617) -->
+    <skip />
+    <!-- no translation found for radio_info_message_waiting_label (6981842420058672207) -->
+    <skip />
+    <!-- no translation found for radio_info_phone_number_label (7192944627907412169) -->
+    <skip />
+    <!-- no translation found for radio_info_band_mode_label (441469694142042022) -->
+    <skip />
+    <!-- no translation found for radio_info_network_type_label (3706382548257257987) -->
+    <skip />
+    <!-- no translation found for radio_info_set_perferred_label (9039200405863503267) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_ipaddr (498747917793263530) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_hostname (3054888474808217853) -->
+    <skip />
+    <!-- no translation found for radio_info_http_client_test (5733604021077701555) -->
+    <skip />
+    <!-- no translation found for ping_test_label (7255376471490860631) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_label (6399460520126501354) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_update_label (7258686760358791539) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_refresh_label (6902302130315125102) -->
+    <skip />
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
+    <!-- no translation found for oem_radio_info_label (6163141792477958941) -->
+    <skip />
+    <!-- no translation found for band_mode_title (954174198903776205) -->
+    <skip />
+    <!-- no translation found for band_mode_loading (548764766363847336) -->
+    <skip />
+    <!-- no translation found for band_mode_set (5730560180249458484) -->
+    <skip />
+    <!-- no translation found for band_mode_failed (1495968863884716379) -->
+    <skip />
+    <!-- no translation found for band_mode_succeeded (2701016190055887575) -->
+    <skip />
+    <!-- no translation found for sdcard_changes_instructions (4482324130377280131) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_screen_mass_storage_text (3741220147296482474) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_total_bytes_label (9184160745785062144) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (1636218515775929394) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (2048419626134861599) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_available_bytes_label (763232429899373001) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (7993410985895217054) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (2742075324087038036) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (9191210735703409245) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (6462544066195404905) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (7761390725880773697) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (5145797653495907970) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_used_bytes_label (8820289486001170836) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (7503429447676219564) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (2763464949274455656) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (3624143937437417788) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (4518291824764698112) -->
+    <skip />
+    <!-- no translation found for skip_label (47510779345218297) -->
+    <skip />
+    <!-- no translation found for next_label (4693520878012668114) -->
+    <skip />
+    <!-- no translation found for language_picker_title (5349877711342869319) -->
+    <skip />
+    <!-- no translation found for activity_picker_label (6295660302548177109) -->
+    <skip />
+    <!-- no translation found for device_info_label (6551553813651711205) -->
+    <skip />
+    <!-- no translation found for battery_info_label (4132685016148679403) -->
+    <skip />
+    <!-- no translation found for display_label (8074070940506840792) -->
+    <skip />
+    <!-- no translation found for phone_info_label (7820855350955963628) -->
+    <skip />
+    <!-- no translation found for phone_info_label (2127552523124277664) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (8101475181301178428) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (5743100901106177102) -->
+    <skip />
+    <!-- no translation found for proxy_settings_label (3271174136184391743) -->
+    <skip />
+    <!-- no translation found for cancel (6859253417269739139) -->
+    <skip />
+    <!-- no translation found for okay (1997666393121016642) -->
+    <skip />
+    <string name="forget" msgid="1400428660472591263">"ભૂલી જાઓ"</string>
+    <!-- no translation found for save (879993180139353333) -->
+    <skip />
+    <string name="done" msgid="6942539184162713160">"થઈ ગયું"</string>
+    <!-- no translation found for settings_label (1626402585530130914) -->
+    <skip />
+    <!-- no translation found for settings_label_launcher (8344735489639482340) -->
+    <skip />
+    <!-- no translation found for settings_shortcut (3936651951364030415) -->
+    <skip />
+    <!-- no translation found for airplane_mode (8837269988154128601) -->
+    <skip />
+    <!-- no translation found for radio_controls_title (3447085191369779032) -->
+    <skip />
+    <!-- no translation found for wireless_networks_settings_title (3643009077742794212) -->
+    <skip />
+    <!-- no translation found for radio_controls_summary (2837395036275123133) -->
+    <skip />
+    <!-- no translation found for cellular_data_title (2525947635539415202) -->
+    <skip />
+    <!-- no translation found for calls_title (3544471959217176768) -->
+    <skip />
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
+    <!-- no translation found for cellular_data_summary (4575500999626276446) -->
+    <skip />
+    <!-- no translation found for allow_data_usage_title (2238205944729213062) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (7625933694709170887) -->
+    <skip />
+    <!-- no translation found for roaming_warning_multiuser (6458990250829214777) -->
+    <skip />
+    <!-- no translation found for roaming_warning_multiuser (6368421100292355440) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (6068100976707316772) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (3616956422251879163) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title (3350640463596716780) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title_setup_wizard (2391530758339384324) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_summary (7095318986757583584) -->
+    <skip />
+    <!-- no translation found for date_time_auto (7076906458515908345) -->
+    <skip />
+    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
+    <skip />
+    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
+    <skip />
+    <!-- no translation found for zone_auto (334783869352026648) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
+    <skip />
+    <!-- no translation found for date_time_24hour_title (3203537578602803850) -->
+    <skip />
+    <!-- no translation found for date_time_24hour (1193032284921000063) -->
+    <skip />
+    <!-- no translation found for date_time_set_time_title (6296795651349047016) -->
+    <skip />
+    <!-- no translation found for date_time_set_time (5716856602742530696) -->
+    <skip />
+    <!-- no translation found for date_time_set_timezone_title (3047322337368233197) -->
+    <skip />
+    <!-- no translation found for date_time_set_timezone (5045627174274377814) -->
+    <skip />
+    <!-- no translation found for date_time_set_date_title (6928286765325608604) -->
+    <skip />
+    <!-- no translation found for date_time_set_date (7021491668550232105) -->
+    <skip />
+    <!-- no translation found for zone_list_menu_sort_alphabetically (5683377702671088588) -->
+    <skip />
+    <!-- no translation found for zone_list_menu_sort_by_timezone (2720190443744884114) -->
+    <skip />
+    <!-- no translation found for date_picker_title (1338210036394128512) -->
+    <skip />
+    <!-- no translation found for time_picker_title (483460752287255019) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout (4590337686681194648) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout_summary (6128431871360905631) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout_summary_with_exception (5579064842797188409) -->
+    <skip />
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
+    <!-- no translation found for security_enable_widgets_title (2754833397070967846) -->
+    <skip />
+    <!-- no translation found for security_enable_widgets_disabled_summary (1557090442377855233) -->
+    <skip />
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <!-- no translation found for owner_info_settings_edit_text_hint (4608681417960923911) -->
+    <skip />
+    <!-- no translation found for show_user_info_on_lockscreen_label (8408914624925608365) -->
+    <skip />
+    <!-- no translation found for user_info_settings_title (1195015434996724736) -->
+    <skip />
+    <!-- no translation found for show_profile_info_on_lockscreen_label (2741208907263877990) -->
+    <skip />
+    <!-- no translation found for profile_info_settings_title (3518603215935346604) -->
+    <skip />
+    <!-- no translation found for Accounts_settings_title (1643879107901699406) -->
+    <skip />
+    <!-- no translation found for location_settings_title (1369675479310751735) -->
+    <skip />
+    <!-- no translation found for account_settings_title (626177544686329806) -->
+    <skip />
+    <!-- no translation found for security_settings_title (7945465324818485460) -->
+    <skip />
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
+    <!-- no translation found for cdma_security_settings_summary (6068799952798901542) -->
+    <skip />
+    <!-- no translation found for security_passwords_title (2930627259125138363) -->
+    <skip />
+    <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="3453670509485083962">"ઉમેરો"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"સ્ક્રીન લૉક"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"ફિંગરપ્રિન્ટ સેટઅપ"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"તમારી સ્ક્રિન અનલૉક કરવા અથવા ખરીદીની પુષ્ટિ કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા , અમને આની જરૂર પડશે: \n\n✓ તમારી બેકઅપ સ્ક્રીન લૉક પદ્ધતિ સેટ કરવી \n\n✓ તમારી ફિંગરપ્રિન્ટ ઉમેરવી"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"સેન્સર શોધો"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"તમારા ફોનની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર સ્થિત કરો."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"ચાલો શરૂ કરીએ!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"તમારી આંગળીને ફિંગરપ્રિન્ટ સેન્સર પર મૂકો. તમને વાઇબ્રેશનનો અનુભવ થાય તે પછી પાછી લઈ લો."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"સરસ! હવે પુનરાવર્તન કરો."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"એ જ આંગળીને ફિંગરપ્રિન્ટ સેન્સર પર મૂકો અને તમને વાઇબ્રેશનનો અનુભવ થાય તે પછી પાછી લઈ લો."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ફિંગરપ્રિન્ટ ઉમેરી!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"જ્યારે પણ તમે આ આઇકન જુઓ, તમે ઓળખ માટે અથવા ખરીદી અધિકૃત કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"ઉમેરો"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"આગલું"</string>
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (2876073029767953111) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (5573427498609458721) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_low_charge_text (2029407131227814893) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (4785376766063053901) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (4071395977297369642) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_confirm_title (5100339496381875522) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (4453629424172409792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (5682944380460921880) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (6689952371032099350) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (951918761585534875) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_time_remaining (1655047311546745695) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_time_remaining (1862964662304683072) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_force_power_cycle (556504311511212648) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_force_power_cycle (1794353635603020327) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_warn_wipe (2738374897337991667) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_enter_password (2223340178473871064) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (7133499413023075961) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (4478225241476039013) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3083477162766772532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_data_corrupt_title (8759119849089795751) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_data_corrupt_summary (3775740783651700375) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_data_corrupt_summary (6898436151871328007) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_switch_input_method (4168332125223483198) -->
+    <skip />
+    <!-- no translation found for lock_settings_picker_title (1095755849152582712) -->
+    <skip />
+    <!-- no translation found for backup_lock_settings_picker_title (8530380598637963916) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (2084576942666016993) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (5045866882028324941) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_enable_summary (4791110798817242301) -->
+    <skip />
+    <!-- no translation found for unlock_backup_info_summary (108524727803788172) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_title (7117155352183088342) -->
+    <skip />
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <!-- no translation found for unlock_set_unlock_none_title (5679243878975864640) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (8914673583104628191) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (7062696666227725593) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (907878650556383388) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (8856220848940929546) -->
+    <skip />
+    <string name="current_screen_lock" msgid="4104091715420072219">"વર્તમાન સ્ક્રીન લૉક"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (2120729867788851674) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_off (5881952274566013651) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_none (8467360084676871617) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_pattern (7837270780919299289) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_pin (3541326261341386690) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_password (1203938057264146610) -->
+    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"એકવાર તમે સ્ક્રીન લૉક સેટ કરી લો, પછી તમે સેટિંગ્સ &gt; સુરક્ષામાં ફિંગરપ્રિન્ટ પણ સેટ કરી શકો છો."</string>
+    <!-- no translation found for unlock_disable_lock_title (1427036227416979120) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_pattern_summary (6801602880568869201) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_pin_summary (8856842745366993387) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_password_summary (192161194564577025) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_pattern_title (2044092014872741130) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_pin_title (806629901095938484) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_password_title (5606298470358768865) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_too_short (7328975683669256660) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_short (1677649103470518953) -->
+    <skip />
+    <!-- no translation found for lockpassword_press_continue (122706614386757182) -->
+    <skip />
+    <!-- no translation found for lockpassword_continue_label (4602203784934526940) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_too_long (7016906583950201704) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6419879099090294052) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_contains_non_digits (1079053457942945709) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_recently_used (7909781183925861119) -->
+    <skip />
+    <!-- no translation found for lockpassword_illegal_character (8742901630116866738) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_alpha (5203836082520634764) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_digit (3958033271435659825) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_symbol (7226621405629726899) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_letters (5677371623980347934) -->
+    <!-- no translation found for lockpassword_password_requires_lowercase (5396846200894553640) -->
+    <!-- no translation found for lockpassword_password_requires_uppercase (2483949715040341677) -->
+    <!-- no translation found for lockpassword_password_requires_numeric (9156410893744210033) -->
+    <!-- no translation found for lockpassword_password_requires_symbols (5384442837439742233) -->
+    <!-- no translation found for lockpassword_password_requires_nonletter (4175064976268466293) -->
+    <!-- no translation found for lockpassword_password_recently_used (6098087796784262081) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_no_sequential_digits (6830610582179569631) -->
+    <skip />
+    <!-- no translation found for lockpassword_ok_label (313822574062553672) -->
+    <skip />
+    <!-- no translation found for lockpassword_cancel_label (8818529276331121899) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_cancel_label (6431583477570493261) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_continue_label (3559793618653400434) -->
+    <skip />
+    <!-- no translation found for lock_setup (3355847066343753943) -->
+    <!-- no translation found for lock_setup (5507462851158901718) -->
+    <skip />
+    <!-- no translation found for device_admin_title (3562216873644263804) -->
+    <skip />
+    <!-- no translation found for manage_device_admin (5059296715271077278) -->
+    <skip />
+    <!-- no translation found for manage_device_admin_summary (7672709110988761075) -->
+    <skip />
+    <!-- no translation found for manage_trust_agents (4629279457536987768) -->
+    <skip />
+    <!-- no translation found for disabled_because_no_backup_security (6877660253409580377) -->
+    <skip />
+    <!-- no translation found for manage_trust_agents_summary (6804319935640148441) -->
+    <skip />
+    <!-- no translation found for bluetooth_quick_toggle_title (1037056952714061893) -->
+    <skip />
+    <!-- no translation found for bluetooth_quick_toggle_summary (5293641680139873341) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings (1810521656168174329) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_title (1908745291161353016) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_summary (2091062709530570462) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_request (6385750334766370310) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_pin_msg (4954085254142996877) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_key_msg (333005542843637754) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (6813273136442138444) -->
+    <skip />
+    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
+    <skip />
+    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_pin_other_device (4637977124526813470) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_other_device (2798719004030279602) -->
+    <skip />
+    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
+    <skip />
+    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
+    <skip />
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (2796550001376088433) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_will_share_phonebook (4982239145676394429) -->
+    <skip />
+    <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
+    <!-- no translation found for bluetooth_connecting_error_message (229861986106185022) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_scan_title (2277464653118896016) -->
+    <skip />
+    <!-- no translation found for bluetooth_search_for_devices (2754007356491461674) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_device_settings (907776049862799122) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_title (8875124878198774180) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_name_label (8111146086595617285) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_internet_option (7112953286863428412) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_keyboard_option (2271954176947879628) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_contacts_option (7747163316331917594) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_dialog_title (1417255032435317301) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_dialog_sharing_phonebook_title (7664141669886358618) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_dialog_contants_request (5531109163573611348) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_dialog_paring_request (8451248193517851958) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_devices (1970524193086791964) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_found_devices (1647983835063249680) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_no_found_devices (7594339669961811591) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_connect (3997659895003244941) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_disconnect (8220072022970148683) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_pair_connect (7611522504813927727) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_unpair (662992425948536144) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_disconnect_unpair (7644014238070043798) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_connect_advanced (2643129703569788771) -->
+    <skip />
+    <!-- no translation found for bluetooth_menu_advanced (8572178316357220524) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_titlebar (2142159726881547669) -->
+    <skip />
+    <!-- no translation found for bluetooth_empty_list_bluetooth_off (6351930724051893423) -->
+    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"સ્થાન સચોટતા સુધારવા માટે, એપ્લિકેશન્સ અને સેવાઓ Bluetooth ઉપકરણો માટે સ્કેન કરશે, પછી ભલેને Bluetooth બંધ હોય. તમે આને <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કેનિંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g>માં બદલી શકો છો."</string>
+    <!-- no translation found for bluetooth_connect_specific_profiles_title (6952214406025825164) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_hid_profile (3282295189719352075) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_user_profile (8037627994382458698) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5455448395850929200) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5266851881175033601) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_title (6066342531927499308) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_online_mode_title (3689050071425683114) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_online_mode_summary (1204424107263248336) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_profile_header_title (102745381968579605) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_rename_device (5148578059584955791) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_enable_opp_title (8222550640371627365) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_user_profile_summary_connected (4602294638909590612) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_nap_profile_summary_connected (1561383706411975199) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings (3218335822716052885) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_title (5543069893044375188) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_headset (1001821426078644650) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_a2dp (8791004998846630574) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_remember (5551459057010609115) -->
+    <skip />
+    <!-- no translation found for wifi_assistant_title (2553267316621598101) -->
+    <skip />
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"કાસ્ટ કરો"</string>
+    <!-- no translation found for wifi_display_enable_menu_item (4883036464138167674) -->
+    <skip />
+    <!-- no translation found for wifi_display_no_devices_found (1382012407154143453) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_connecting (5688608834000748607) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_connected (8364125226376985558) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_not_available (5714978725794210102) -->
+    <skip />
+    <!-- no translation found for wifi_display_details (7791118209992162698) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_title (5740656401635054838) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_forget (9119048225398894580) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_done (5703116500357822557) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_name (4756080222307467898) -->
+    <skip />
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_title (6769159366307299004) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_summary (8302974395787498915) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_summary (5237208142892767592) -->
+    <skip />
+    <!-- no translation found for android_beam_settings_title (7832812974600338649) -->
+    <skip />
+    <!-- no translation found for android_beam_on_summary (3618057099355636830) -->
+    <skip />
+    <!-- no translation found for android_beam_off_summary (4663095428454779138) -->
+    <skip />
+    <!-- no translation found for android_beam_disabled_summary (1737782116894793393) -->
+    <skip />
+    <!-- no translation found for android_beam_label (6257036050366775040) -->
+    <skip />
+    <!-- no translation found for android_beam_explained (6981652347448777459) -->
+    <skip />
+    <!-- no translation found for nsd_quick_toggle_title (3125572815278848258) -->
+    <skip />
+    <!-- no translation found for nsd_quick_toggle_summary (155692215972781276) -->
+    <skip />
+    <!-- no translation found for wifi_quick_toggle_title (8850161330437693895) -->
+    <skip />
+    <!-- no translation found for wifi_quick_toggle_summary (2696547080481267642) -->
+    <skip />
+    <!-- no translation found for wifi_settings (29722149822540994) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (8719175790520448014) -->
+    <skip />
+    <!-- no translation found for wifi_settings_title (3103415012485692233) -->
+    <skip />
+    <!-- no translation found for wifi_settings_summary (668767638556052820) -->
+    <skip />
+    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
+    <skip />
+    <!-- no translation found for wifi_select_network (4210954938345463209) -->
+    <skip />
+    <!-- no translation found for wifi_starting (6732377932749942954) -->
+    <skip />
+    <!-- no translation found for wifi_stopping (8952524572499500804) -->
+    <skip />
+    <!-- no translation found for wifi_error (3207971103917128179) -->
+    <skip />
+    <!-- no translation found for wifi_in_airplane_mode (8652520421778203796) -->
+    <skip />
+    <!-- no translation found for wifi_notify_open_networks (3755768188029653293) -->
+    <skip />
+    <!-- no translation found for wifi_notify_open_networks_summary (3716818008370391253) -->
+    <skip />
+    <!-- no translation found for wifi_poor_network_detection (4925789238170207169) -->
+    <skip />
+    <!-- no translation found for wifi_poor_network_detection_summary (7843672905900544785) -->
+    <skip />
+    <!-- no translation found for wifi_avoid_poor_network_detection_summary (4674423884870027498) -->
+    <skip />
+    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
+    <skip />
+    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
+    <skip />
+    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
+    <skip />
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
+    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"સ્થાન સચોટતા સુધારવા માટે, એપ્લિકેશન્સ અને સેવાઓ Wi‑Fi નેટવર્ક્સ માટે સ્કેન કરશે, પછી ભલેને Wi‑Fi બંધ હોય. તમે આને <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કેનિંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g>માં બદલી શકો છો."</string>
+    <!-- no translation found for wifi_scan_notify_remember_choice (5340097010842405981) -->
+    <skip />
+    <!-- no translation found for wifi_setting_sleep_policy_title (5149574280392680092) -->
+    <skip />
+    <!-- no translation found for wifi_setting_on_during_sleep_title (8308975500029751565) -->
+    <skip />
+    <!-- no translation found for wifi_setting_sleep_policy_error (8174902072673071961) -->
+    <skip />
+    <!-- no translation found for wifi_suspend_efficiency_title (2338325886934703895) -->
+    <skip />
+    <!-- no translation found for wifi_suspend_optimizations (1220174276403689487) -->
+    <skip />
+    <!-- no translation found for wifi_suspend_optimizations_summary (4151428966089116856) -->
+    <skip />
+    <!-- no translation found for wifi_limit_optimizations_summary (9000801068363468950) -->
+    <skip />
+    <!-- no translation found for wifi_add_network (6234851776910938957) -->
+    <skip />
+    <!-- no translation found for wifi_access_points (7053990007031968609) -->
+    <skip />
+    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
+    <skip />
+    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
+    <skip />
+    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
+    <skip />
+    <!-- no translation found for wifi_menu_p2p (7619851399250896797) -->
+    <skip />
+    <!-- no translation found for wifi_menu_scan (1470911530412095868) -->
+    <skip />
+    <!-- no translation found for wifi_menu_advanced (7522252991919573664) -->
+    <skip />
+    <!-- no translation found for wifi_menu_connect (4996220309848349408) -->
+    <skip />
+    <!-- no translation found for wifi_menu_remember (8814185749388713796) -->
+    <skip />
+    <!-- no translation found for wifi_menu_forget (8736964302477327114) -->
+    <skip />
+    <!-- no translation found for wifi_menu_modify (2068554918652440105) -->
+    <skip />
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
+    <!-- no translation found for wifi_empty_list_wifi_off (8056223875951079463) -->
+    <skip />
+    <!-- no translation found for wifi_empty_list_wifi_on (8746108031587976356) -->
+    <skip />
+    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
+    <skip />
+    <!-- no translation found for wifi_other_network (1484433183857764750) -->
+    <skip />
+    <!-- no translation found for wifi_more (3195296805089107950) -->
+    <skip />
+    <!-- no translation found for wifi_setup_wps (8128702488486283957) -->
+    <skip />
+    <!-- no translation found for wifi_show_advanced (3409422789616520979) -->
+    <skip />
+    <!-- no translation found for wifi_wps_setup_title (8207552222481570175) -->
+    <skip />
+    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
+    <skip />
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"તમારા રાઉટર પર Wi‑Fi સંરક્ષિત સેટઅપ બટન દબાવો. તેને \"WPS\" પણ કહેવામાં આવી શકે છે અથવા આ પ્રતીક વડે ચિહ્નિત કરવામાં આવેલું હોઇ શકે છે:"</string>
+    <!-- no translation found for wifi_wps_onstart_pin (223344506445335358) -->
+    <skip />
+    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
+    <skip />
+    <!-- no translation found for wifi_wps_connected (7153432445748931183) -->
+    <skip />
+    <!-- no translation found for wifi_wps_in_progress (3372311348221357944) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
+    <skip />
+    <!-- no translation found for wifi_ssid (5519636102673067319) -->
+    <skip />
+    <!-- no translation found for wifi_ssid_hint (897593601067321355) -->
+    <skip />
+    <!-- no translation found for wifi_security (6603611185592956936) -->
+    <skip />
+    <!-- no translation found for wifi_signal (5514120261628065287) -->
+    <skip />
+    <!-- no translation found for wifi_status (4824568012414605414) -->
+    <skip />
+    <!-- no translation found for wifi_speed (3526198708812322037) -->
+    <skip />
+    <!-- no translation found for wifi_frequency (7791090119577812214) -->
+    <skip />
+    <!-- no translation found for wifi_ip_address (1440054061044402918) -->
+    <skip />
+    <!-- no translation found for wifi_eap_method (8529436133640730382) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for wifi_eap_ca_cert (3521574865488892851) -->
+    <skip />
+    <!-- no translation found for wifi_eap_user_cert (1291089413368160789) -->
+    <skip />
+    <!-- no translation found for wifi_eap_identity (4359453783379679103) -->
+    <skip />
+    <!-- no translation found for wifi_eap_anonymous (2989469344116577955) -->
+    <skip />
+    <!-- no translation found for wifi_password (5948219759936151048) -->
+    <skip />
+    <!-- no translation found for wifi_show_password (6461249871236968884) -->
+    <skip />
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"ગોઠવણી AP બેન્ડ"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz બેન્ડ"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz બેન્ડ"</string>
+    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
+    <skip />
+    <!-- no translation found for wifi_unchanged (3410422020930397102) -->
+    <skip />
+    <!-- no translation found for wifi_unspecified (5431501214192991253) -->
+    <skip />
+    <!-- no translation found for wifi_wps_available_first_item (4422547079984583502) -->
+    <skip />
+    <!-- no translation found for wifi_wps_available_second_item (8427520131718215301) -->
+    <skip />
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_turnon_message (203123538572122989) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_turnoff_message (5538901671131941043) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_confirm_allow (5355973075896817232) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_confirm_deny (4463982053823520710) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_title (7726205804813286950) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_message (3673833421453455747) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_connect (5065506390164939225) -->
+    <skip />
+    <string name="no_internet_access_text" msgid="1509171132175355674">"આ નેટવર્કને ઇન્ટરનેટની ઍક્સેસ નથી. કોઈપણ રીતે આ નેટવર્કનો ઉપયોગ કરીએ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"આ નેટવર્ક વિશે મને ફરીથી પૂછશો નહીં"</string>
+    <!-- no translation found for wifi_connect (1076622875777072845) -->
+    <skip />
+    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
+    <skip />
+    <!-- no translation found for wifi_forget (8168174695608386644) -->
+    <skip />
+    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
+    <skip />
+    <!-- no translation found for wifi_save (3331121567988522826) -->
+    <skip />
+    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
+    <skip />
+    <!-- no translation found for wifi_cancel (6763568902542968964) -->
+    <skip />
+    <!-- no translation found for wifi_skip_anyway (6965361454438011190) -->
+    <skip />
+    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
+    <skip />
+    <!-- no translation found for wifi_skipped_message (6761689889733331124) -->
+    <skip />
+    <!-- no translation found for wifi_skipped_message (1385490367826852775) -->
+    <skip />
+    <!-- no translation found for wifi_skipped_message (6084295135297772350) -->
+    <skip />
+    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
+    <skip />
+    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
+    <skip />
+    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
+    <skip />
+    <!-- no translation found for wifi_connect_failed_message (4474691090681670156) -->
+    <skip />
+    <!-- no translation found for wifi_connect_failed_message (8870885845666880869) -->
+    <skip />
+    <!-- no translation found for wifi_connect_failed_message (2185803140161396572) -->
+    <skip />
+    <!-- no translation found for wifi_saved_access_points_titlebar (2996149477240134064) -->
+    <skip />
+    <!-- no translation found for wifi_advanced_titlebar (4485841401774142908) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_title (3655327399028584656) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_error (837281974489794378) -->
+    <skip />
+    <!-- no translation found for wifi_advanced_mac_address_title (6571335466330978393) -->
+    <skip />
+    <!-- no translation found for wifi_advanced_ip_address_title (6215297094363164846) -->
+    <skip />
+    <!-- no translation found for wifi_saved_access_points_label (2013409399392285262) -->
+    <skip />
+    <!-- no translation found for wifi_advanced_settings_label (3654366894867838338) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_save (7296724066102908366) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_cancel (6582567330136502340) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (2513142355364274970) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (8164264988361096450) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (8744583948328391047) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (40470058023181052) -->
+    <skip />
+    <!-- no translation found for wifi_dns1 (7344118050720080045) -->
+    <skip />
+    <!-- no translation found for wifi_dns2 (1368601006824882659) -->
+    <skip />
+    <!-- no translation found for wifi_gateway (163914742461092086) -->
+    <skip />
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_settings_title (5444461191435291082) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_device_info (3191876744469364173) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_search (3436429984738771974) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_searching (2396704492143633876) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_rename (8448896306960060415) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_peer_devices (299526878463303432) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_failed_connect_message (8921447388048243547) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_failed_rename_message (2562182284946936380) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_disconnect_title (3216846049677448420) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_disconnect_message (8227342771610125771) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_disconnect_multiple_message (3283805371034883105) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_cancel_connect_title (255267538099324413) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_cancel_connect_message (7477756213423749402) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (834559380069647086) -->
+    <skip />
+    <!-- no translation found for wifi_tether_checkbox_text (1847167643625779136) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_checkbox_text (7763495093333664887) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_checkbox_text_summary (3800646230853724318) -->
+    <skip />
+    <!-- no translation found for wifi_tether_starting (1322237938998639724) -->
+    <skip />
+    <!-- no translation found for wifi_tether_stopping (4835852171686388107) -->
+    <skip />
+    <!-- no translation found for wifi_tether_enabled_subtext (8948641212931906143) -->
+    <skip />
+    <!-- no translation found for wifi_tether_failed_subtext (1484941858530919002) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_ap_text (7974681394041609308) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_configure_ap_text (5478614731464220432) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_configure_ap_text_summary (5618031116920832182) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_subtext (7957547035983257748) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_ssid_default (8467525402622138547) -->
+    <skip />
+    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi કૉલિંગ"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"કૉલિંગ પસંદગી"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi કૉલિંગ મોડ"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi પસંદ કર્યું"</item>
+    <item msgid="5267397515594230396">"સેલ્યુલર પસંદ કર્યું"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"જ્યારે Wi-Fi કૉલિંગ ચાલુ હોય, ત્યારે તમારી પસંદગી અને કયા સિગ્નલ મજબૂત છે તેને આધારે, તમારો ફોન Wi-Fi અથવા તમારા કેરીઅરના નેટવર્ક મારફતે કૉલ્સને રુટ કરી શકે છે. આ સુવિધાને ચાલુ કરતાં પહેલાં, ફી અને અન્ય વિગતો માટે તમારા કેરિઅર સાથે તપાસ કરો."</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
+    <!-- no translation found for display_settings_title (1708697328627382561) -->
+    <skip />
+    <!-- no translation found for sound_settings (5534671337768745343) -->
+    <skip />
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <!-- no translation found for all_volume_title (4296957391257836961) -->
+    <skip />
+    <!-- no translation found for musicfx_title (3415566786340790345) -->
+    <skip />
+    <!-- no translation found for ring_volume_title (7938706566797464165) -->
+    <skip />
+    <!-- no translation found for vibrate_in_silent_title (3897968069156767036) -->
+    <skip />
+    <!-- no translation found for notification_sound_title (5137483249425507572) -->
+    <skip />
+    <!-- no translation found for incoming_call_volume_title (8073714801365904099) -->
+    <skip />
+    <!-- no translation found for notification_volume_title (2012640760341080408) -->
+    <skip />
+    <!-- no translation found for checkbox_notification_same_as_incoming_call (1073644356290338921) -->
+    <skip />
+    <!-- no translation found for home_work_profile_not_supported (1357721012342357037) -->
+    <skip />
+    <!-- no translation found for notification_sound_dialog_title (3805140135741385667) -->
+    <skip />
+    <!-- no translation found for media_volume_title (3576565767317118106) -->
+    <skip />
+    <!-- no translation found for media_volume_summary (5363248930648849974) -->
+    <skip />
+    <!-- no translation found for alarm_volume_title (2285597478377758706) -->
+    <skip />
+    <!-- no translation found for dock_settings_summary (455802113668982481) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (8533399267725365088) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_title (1171590821131077296) -->
+    <skip />
+    <!-- no translation found for lock_sounds_enable_title (450098505659399520) -->
+    <skip />
+    <!-- no translation found for haptic_feedback_enable_title (2438293710530828760) -->
+    <skip />
+    <!-- no translation found for audio_record_proc_title (4271091199976457534) -->
+    <skip />
+    <!-- no translation found for volume_media_description (7949355934788807863) -->
+    <skip />
+    <!-- no translation found for volume_ring_description (5936851631698298989) -->
+    <skip />
+    <!-- no translation found for volume_notification_description (5810902320215328321) -->
+    <skip />
+    <!-- no translation found for volume_alarm_description (8322615148532654841) -->
+    <skip />
+    <!-- no translation found for volume_ring_mute (3018992671608737202) -->
+    <skip />
+    <!-- no translation found for volume_media_mute (3399059928695998166) -->
+    <skip />
+    <!-- no translation found for volume_notification_mute (7955193480006444159) -->
+    <skip />
+    <!-- no translation found for volume_alarm_mute (4452239420351035936) -->
+    <skip />
+    <!-- no translation found for dock_settings (1820107306693002541) -->
+    <skip />
+    <!-- no translation found for dock_settings_title (9161438664257429372) -->
+    <skip />
+    <!-- no translation found for dock_audio_settings_title (3324750259959570305) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_desk (6487784412371139335) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_car (6740897586006248450) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_none (8215337394914283607) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_none (289909253741048784) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_unknown (4465059868974255693) -->
+    <skip />
+    <!-- no translation found for dock_not_found_title (3290961741828952424) -->
+    <skip />
+    <!-- no translation found for dock_not_found_text (8405432495282299143) -->
+    <skip />
+    <!-- no translation found for dock_not_found_text (1460497923342627801) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_title (885839627097024110) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_on (838102386448981339) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_on (8491180514199743771) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_off (5077843049805652363) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_off (3151046599205265919) -->
+    <skip />
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
+    <!-- no translation found for category_personal (1299663247844969448) -->
+    <skip />
+    <!-- no translation found for category_work (8699184680584175622) -->
+    <skip />
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
+    <!-- no translation found for display_settings (7965901687241669598) -->
+    <skip />
+    <!-- no translation found for accelerometer_title (7854608399547349157) -->
+    <skip />
+    <!-- no translation found for accelerometer_summary_on (429982132339828942) -->
+    <skip />
+    <!-- no translation found for accelerometer_summary_on (1133737282813048021) -->
+    <skip />
+    <!-- no translation found for accelerometer_summary_off (4781734213242521682) -->
+    <skip />
+    <!-- no translation found for accelerometer_summary_off (5485489363715740761) -->
+    <skip />
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
+    <!-- no translation found for brightness_title (5746272622112982836) -->
+    <skip />
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
+    <string name="night_mode_title" msgid="6928425617491943384">"થીમ"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"પ્રકાશ"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"ઘાટું"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"સ્વચલિત"</string>
+    <!-- no translation found for screen_timeout (4351334843529712571) -->
+    <skip />
+    <!-- no translation found for screen_timeout_title (5130038655092628247) -->
+    <skip />
+    <!-- no translation found for screen_timeout_summary (327761329263064327) -->
+    <skip />
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <!-- no translation found for wallpaper_settings_fragment_title (519078346877860129) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_disabled_prompt (3857507943322777651) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_when_to_dream (8352267826043957746) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_dream_start (4998187847985120168) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
+    <skip />
+    <!-- no translation found for automatic_brightness (5014143533884135461) -->
+    <skip />
+    <!-- no translation found for lift_to_wake_title (4555378006856277635) -->
+    <skip />
+    <!-- no translation found for doze_title (2259176504273878294) -->
+    <skip />
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
+    <!-- no translation found for title_font_size (4405544325522105222) -->
+    <skip />
+    <!-- no translation found for dialog_title_font_size (2231507851258955038) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings (3392331196873564292) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_category (5136244267576697004) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_title (9018585580955414596) -->
+    <skip />
+    <!-- no translation found for sim_pin_toggle (1742123478029451888) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (5058355081270397764) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (2503536505568814324) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (2813800553917012356) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (258981978215428916) -->
+    <skip />
+    <!-- no translation found for sim_pin_change (6311414184279932368) -->
+    <skip />
+    <!-- no translation found for sim_enter_pin (6608715137008508432) -->
+    <skip />
+    <!-- no translation found for sim_enable_sim_lock (4517742794997166918) -->
+    <skip />
+    <!-- no translation found for sim_disable_sim_lock (7664729528754784824) -->
+    <skip />
+    <!-- no translation found for sim_enter_old (6074196344494634348) -->
+    <skip />
+    <!-- no translation found for sim_enter_new (8742727032729243562) -->
+    <skip />
+    <!-- no translation found for sim_reenter_new (6523819386793546888) -->
+    <skip />
+    <!-- no translation found for sim_change_pin (7328607264898359112) -->
+    <skip />
+    <!-- no translation found for sim_bad_pin (2345230873496357977) -->
+    <skip />
+    <!-- no translation found for sim_pins_dont_match (8449681619822460312) -->
+    <skip />
+    <!-- no translation found for sim_change_failed (304964924772218382) -->
+    <skip />
+    <!-- no translation found for sim_change_succeeded (8556135413096489627) -->
+    <skip />
+    <!-- no translation found for sim_lock_failed (5651596916127873626) -->
+    <skip />
+    <!-- no translation found for sim_enter_ok (6475946836899218919) -->
+    <skip />
+    <!-- no translation found for sim_enter_cancel (6240422158517208036) -->
+    <skip />
+    <!-- no translation found for sim_multi_sims_title (9159427879911231239) -->
+    <skip />
+    <!-- no translation found for sim_multi_sims_summary (7018740080801483990) -->
+    <skip />
+    <!-- no translation found for sim_change_data_title (294357201685244532) -->
+    <skip />
+    <!-- no translation found for sim_change_data_message (1313940695939674633) -->
+    <skip />
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
+    <!-- no translation found for wrong_pin_code_pukked (4003655226832658066) -->
+    <skip />
+    <!-- no translation found for wrong_pin_code (1582398808893048097) -->
+    <!-- no translation found for pin_failed (1848423634948587645) -->
+    <skip />
+    <!-- no translation found for device_info_settings (1119755927536987178) -->
+    <skip />
+    <!-- no translation found for device_info_settings (475872867864762157) -->
+    <skip />
+    <!-- no translation found for system_update_settings_list_item_title (3342887311059985961) -->
+    <skip />
+    <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
+    <!-- no translation found for firmware_version (4801135784886859972) -->
+    <skip />
+    <!-- no translation found for model_number (3765737700545384794) -->
+    <skip />
+    <!-- no translation found for fcc_equipment_id (149114368246356737) -->
+    <skip />
+    <!-- no translation found for baseband_version (1848990160763524801) -->
+    <skip />
+    <!-- no translation found for kernel_version (9192574954196167602) -->
+    <skip />
+    <!-- no translation found for build_number (3075795840572241758) -->
+    <skip />
+    <!-- no translation found for selinux_status (6212165375172061672) -->
+    <skip />
+    <!-- no translation found for device_info_not_available (8062521887156825182) -->
+    <skip />
+    <!-- no translation found for device_status_activity_title (1411201799384697904) -->
+    <skip />
+    <!-- no translation found for device_status (607405385799807324) -->
+    <skip />
+    <!-- no translation found for device_status_summary (3292717754497039686) -->
+    <skip />
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
+    <!-- no translation found for storage_settings (4211799979832404953) -->
+    <skip />
+    <!-- no translation found for storage_settings_title (8746016738388094064) -->
+    <skip />
+    <!-- no translation found for storage_settings_summary (3543813623294870759) -->
+    <skip />
+    <!-- no translation found for storage_settings_summary (9176693537325988610) -->
+    <skip />
+    <!-- no translation found for status_number (1138837891091222272) -->
+    <skip />
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_msid_number (909010114445780530) -->
+    <skip />
+    <!-- no translation found for status_prl_version (1007470446618081441) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
+    <!-- no translation found for status_icc_id (943368755577172747) -->
+    <skip />
+    <!-- no translation found for status_network_type (952552009117455166) -->
+    <skip />
+    <!-- no translation found for status_latest_area_info (7222470836568238054) -->
+    <skip />
+    <!-- no translation found for status_data_state (4578972321533789767) -->
+    <skip />
+    <!-- no translation found for status_service_state (2323931627519429503) -->
+    <skip />
+    <!-- no translation found for status_signal_strength (3732655254188304547) -->
+    <skip />
+    <!-- no translation found for status_roaming (2638800467430913403) -->
+    <skip />
+    <!-- no translation found for status_operator (2274875196954742087) -->
+    <skip />
+    <!-- no translation found for status_wifi_mac_address (2202206684020765378) -->
+    <skip />
+    <!-- no translation found for status_bt_address (4195174192087439720) -->
+    <skip />
+    <!-- no translation found for status_serial_number (2257111183374628137) -->
+    <skip />
+    <!-- no translation found for status_unavailable (7862009036663793314) -->
+    <skip />
+    <!-- no translation found for status_up_time (7294859476816760399) -->
+    <skip />
+    <!-- no translation found for status_awake_time (2393949909051183652) -->
+    <skip />
+    <!-- no translation found for internal_memory (9129595691484260784) -->
+    <skip />
+    <!-- no translation found for sd_memory (2510246194083052841) -->
+    <skip />
+    <!-- no translation found for sd_memory (151871913888051515) -->
+    <skip />
+    <!-- no translation found for memory_available (5052397223077021181) -->
+    <skip />
+    <!-- no translation found for memory_available_read_only (6497534390167920206) -->
+    <skip />
+    <!-- no translation found for memory_size (6629067715017232195) -->
+    <skip />
+    <!-- no translation found for memory_calculating_size (2188358544203768588) -->
+    <skip />
+    <!-- no translation found for memory_apps_usage (5128673488173839077) -->
+    <skip />
+    <!-- no translation found for memory_media_usage (3738830697707880405) -->
+    <skip />
+    <!-- no translation found for memory_downloads_usage (3755173051677533027) -->
+    <skip />
+    <!-- no translation found for memory_dcim_usage (558887013613822577) -->
+    <skip />
+    <!-- no translation found for memory_music_usage (1363785144783011606) -->
+    <skip />
+    <!-- no translation found for memory_media_misc_usage (6094866738586451683) -->
+    <skip />
+    <!-- no translation found for memory_media_cache_usage (6704293333141177910) -->
+    <skip />
+    <!-- no translation found for sd_eject (4988563376492400073) -->
+    <skip />
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (5009296896648072891) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3300599435073550246) -->
+    <skip />
+    <!-- no translation found for sd_insert_summary (5264016886409577313) -->
+    <skip />
+    <!-- no translation found for sd_insert_summary (2048640010381803841) -->
+    <skip />
+    <!-- no translation found for sd_mount (8966695015677343116) -->
+    <skip />
+    <!-- no translation found for sd_mount (5940523765187704135) -->
+    <skip />
+    <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
+    <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
+    <!-- no translation found for sd_format (2148179271623099054) -->
+    <skip />
+    <!-- no translation found for sd_format (2576054280507119870) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6331905044907914603) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (212703692181793109) -->
+    <skip />
+    <!-- no translation found for memory_clear_cache_title (5423840272171286191) -->
+    <skip />
+    <!-- no translation found for memory_clear_cache_message (4550262490807415948) -->
+    <skip />
+    <!-- no translation found for mtp_ptp_mode_summary (3710436114807789270) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_title (3077285629197874055) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_title (3634502237262534381) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_text (4322636662873269018) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_text (6998379994779187692) -->
+    <skip />
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
+    <!-- no translation found for dlg_error_unmount_text (4346280469528260684) -->
+    <skip />
+    <!-- no translation found for dlg_error_unmount_text (3073562815631781894) -->
+    <skip />
+    <!-- no translation found for unmount_inform_text (7120241136790744265) -->
+    <skip />
+    <!-- no translation found for unmount_inform_text (1904212716075458402) -->
+    <skip />
+    <!-- no translation found for sd_ejecting_title (8824572198034365468) -->
+    <skip />
+    <!-- no translation found for sd_ejecting_summary (2028753069184908491) -->
+    <skip />
+    <!-- no translation found for storage_low_title (1388569749716225155) -->
+    <skip />
+    <!-- no translation found for storage_low_summary (7737465774892563129) -->
+    <skip />
+    <!-- no translation found for storage_menu_rename (7141058657592615390) -->
+    <skip />
+    <!-- no translation found for storage_menu_mount (1014683672493425425) -->
+    <skip />
+    <!-- no translation found for storage_menu_unmount (681485356885955898) -->
+    <skip />
+    <!-- no translation found for storage_menu_format (8334422679047059459) -->
+    <skip />
+    <!-- no translation found for storage_menu_format_internal (6553368530402755543) -->
+    <skip />
+    <!-- no translation found for storage_menu_usb (5708207885333243384) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (679612779321689418) -->
+    <skip />
+    <!-- no translation found for usb_connection_category (7805945595165422882) -->
+    <skip />
+    <!-- no translation found for usb_mtp_title (3399663424394065964) -->
+    <skip />
+    <!-- no translation found for usb_mtp_summary (4617321473211391236) -->
+    <skip />
+    <!-- no translation found for usb_ptp_title (3852760810622389620) -->
+    <skip />
+    <!-- no translation found for usb_ptp_summary (7673397474756664929) -->
+    <skip />
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"તમારા કમ્પ્યુટર પરના MIDI સોફ્ટવેર વડે MIDI સક્ષમ એપ્લિકેશન્સને USB પર કામ કરવા દે છે."</string>
+    <!-- no translation found for storage_other_users (808708845102611856) -->
+    <skip />
+    <!-- no translation found for storage_internal_title (690771193137801021) -->
+    <skip />
+    <!-- no translation found for storage_external_title (2723851748972673696) -->
+    <skip />
+    <!-- no translation found for storage_volume_summary (476551204412943800) -->
+    <skip />
+    <!-- no translation found for storage_mount_success (687641090137253647) -->
+    <skip />
+    <!-- no translation found for storage_mount_failure (8928389741212129060) -->
+    <skip />
+    <!-- no translation found for storage_unmount_success (5737203344673441677) -->
+    <skip />
+    <!-- no translation found for storage_unmount_failure (4161722509712992231) -->
+    <skip />
+    <!-- no translation found for storage_format_success (3023144070597190555) -->
+    <skip />
+    <!-- no translation found for storage_format_failure (8343688274191391889) -->
+    <skip />
+    <!-- no translation found for storage_rename_title (8242663969839491485) -->
+    <skip />
+    <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="3677827796634199714"><b>"જ્યારે તમે આ <xliff:g id="NAME_0">^1</xliff:g> ને બહાર કાઢો છો, ત્યારે તેના પર સંગ્રહિત એપ્લિકેશન્સ કાર્ય કરવાનું બંધ કરશે અને તેના પર સંગ્રહિત મીડિયા ફાઇલો તે ફરીથી શામેલ કરવામાં  આવે ત્યાં સુધી ઉપલબ્ધ રહેશે નહીં."</b>" \n\nઆ <xliff:g id="NAME_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_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_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="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> ને તે ફોર્મેટ થઈ રહ્યું હોય તે વખતે દૂર કરશો નહીં."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ડેટાને નવા સ્ટોરેજ પર ખસેડો"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"તમે આ નવા <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="5035719146373359329"><b>"ખસેડવામાં <xliff:g id="TIME">^1</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="8641916179067596592">"ખસેડવા દરમિયાન: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ને ખસેડો"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"ખસેડવા દરમિયાન <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>
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (4974192007399968164) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <!-- no translation found for apn_auth_type (6167205395676037015) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_none (5069592676845549926) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_pap (1666934536996033383) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_chap (3369626283789068360) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_pap_chap (9102343063036134541) -->
+    <skip />
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for apn_roaming_protocol (3386954381510788422) -->
+    <skip />
+    <!-- no translation found for carrier_enabled (407655861175280806) -->
+    <skip />
+    <!-- no translation found for carrier_enabled_summaryOn (6338915271908057531) -->
+    <skip />
+    <!-- no translation found for carrier_enabled_summaryOff (4300790190221203756) -->
+    <skip />
+    <!-- no translation found for bearer (594270280031923558) -->
+    <skip />
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <!-- no translation found for menu_new (3014205883303921729) -->
+    <skip />
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <string name="error_title" msgid="7631322303341024692"></string>
+    <!-- no translation found for error_name_empty (8418502878620394756) -->
+    <skip />
+    <!-- no translation found for error_apn_empty (6056233831214537267) -->
+    <skip />
+    <!-- no translation found for error_mcc_not3 (4560171714156251661) -->
+    <skip />
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <!-- no translation found for restore_default_apn (8178010218751639581) -->
+    <skip />
+    <!-- no translation found for menu_restore (8260067415075573273) -->
+    <skip />
+    <!-- no translation found for restore_default_apn_completed (2824775307377604897) -->
+    <skip />
+    <string name="reset_network_title" msgid="4557113742173895074">"નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરી"</string>
+    <!-- no translation found for reset_network_desc (581668983587311282) -->
+    <skip />
+    <string name="reset_network_button_text" msgid="2035676527471089853">"સેટિંગ્સ ફરીથી સેટ કરો"</string>
+    <!-- no translation found for reset_network_final_desc (4874737348054213767) -->
+    <skip />
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"સેટિંગ્સ ફરીથી સેટ કરો"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ફરીથી સેટ કરીએ?"</string>
+    <!-- no translation found for reset_network_complete_toast (787829973559541880) -->
+    <skip />
+    <!-- no translation found for device_reset_title (2384019005638768076) -->
+    <skip />
+    <!-- no translation found for master_clear_title (5907939616087039756) -->
+    <skip />
+    <!-- no translation found for master_clear_desc (8317211882509025841) -->
+    <skip />
+    <!-- no translation found for master_clear_desc (9165016501623540228) -->
+    <skip />
+    <!-- no translation found for master_clear_accounts (6412857499147999073) -->
+    <skip />
+    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (7744115866662613411) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (4801026652617377093) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (969364037450286809) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (1397239046334307625) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (4728558173931599429) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (1737638779582964966) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (3130786116528304116) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (7550632653343157971) -->
+    <skip />
+    <!-- no translation found for master_clear_final_desc (1062841478823409667) -->
+    <skip />
+    <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
+    <skip />
+    <!-- no translation found for master_clear_failed (7959646179737950703) -->
+    <skip />
+    <!-- no translation found for master_clear_confirm_title (7572642091599403668) -->
+    <skip />
+    <!-- no translation found for master_clear_not_available (1000370707967468909) -->
+    <skip />
+    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
+    <skip />
+    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
+    <skip />
+    <!-- no translation found for media_format_title (3999653431422767156) -->
+    <skip />
+    <!-- no translation found for media_format_title (4427528440306787972) -->
+    <skip />
+    <!-- no translation found for media_format_summary (776603298628082065) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (4557243156946319034) -->
+    <skip />
+    <!-- no translation found for media_format_desc (8764037252319942415) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (6293669371185352810) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (6721544380069373626) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (699929778486375913) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (3344525419872744989) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for call_settings_title (5188713413939232801) -->
+    <skip />
+    <!-- no translation found for call_settings_summary (7291195704801002886) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_usb (6688416425801386511) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_wifi (3277144155960302049) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_bluetooth (355855408317564420) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_usb_bluetooth (5355828977109785001) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_all (8356136101061143841) -->
+    <skip />
+    <!-- no translation found for usb_title (7483344855356312510) -->
+    <skip />
+    <!-- no translation found for usb_tethering_button_text (585829947108007917) -->
+    <skip />
+    <!-- no translation found for usb_tethering_available_subtext (156779271296152605) -->
+    <skip />
+    <!-- no translation found for usb_tethering_active_subtext (8916210851136467042) -->
+    <skip />
+    <!-- no translation found for usb_tethering_storage_active_subtext (5210094834194907094) -->
+    <skip />
+    <!-- no translation found for usb_tethering_unavailable_subtext (1044622421184007254) -->
+    <skip />
+    <!-- no translation found for usb_tethering_turnon_subtext (4748616058219273033) -->
+    <skip />
+    <!-- no translation found for usb_tethering_errored_subtext (1377574819427841992) -->
+    <skip />
+    <!-- no translation found for bluetooth_tether_checkbox_text (2379175828878753652) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_available_subtext (8811610320942954709) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_available_subtext (4229220575771946723) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (1666736165420290466) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext_config (1790242032929221788) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext (2093881379028235555) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext (706860924389041342) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_errored_subtext (4926566308991142264) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_overflow_error (6285122039489881969) -->
+    <skip />
+    <!-- no translation found for bluetooth_untether_blank (2871192409329334813) -->
+    <skip />
+    <!-- no translation found for tethering_help_button_text (656117495547173630) -->
+    <skip />
+    <!-- no translation found for network_settings_title (4871233236744292831) -->
+    <skip />
+    <!-- no translation found for manage_mobile_plan_title (7630170375010107744) -->
+    <skip />
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS એપ્લિકેશન"</string>
+    <!-- no translation found for sms_change_default_dialog_title (1958688831875804286) -->
+    <skip />
+    <!-- no translation found for sms_change_default_dialog_text (1522783933230274787) -->
+    <skip />
+    <!-- no translation found for sms_change_default_no_previous_dialog_text (602683880284921998) -->
+    <skip />
+    <!-- no translation found for network_scorer_change_active_dialog_title (3776301550387574975) -->
+    <skip />
+    <!-- no translation found for network_scorer_change_active_dialog_text (8035173880322990715) -->
+    <skip />
+    <!-- no translation found for network_scorer_change_active_no_previous_dialog_text (7444620909047611601) -->
+    <skip />
+    <!-- no translation found for mobile_unknown_sim_operator (2156912373230276157) -->
+    <skip />
+    <!-- no translation found for mobile_no_provisioning_url (2399426808423775711) -->
+    <skip />
+    <!-- no translation found for mobile_insert_sim_card (9052590985784056395) -->
+    <skip />
+    <!-- no translation found for mobile_connect_to_internet (1733894125065249639) -->
+    <skip />
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
+    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
+    <skip />
+    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
+    <skip />
+    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
+    <skip />
+    <!-- no translation found for location_mode_title (3982009713118421689) -->
+    <skip />
+    <!-- no translation found for location_mode_high_accuracy_title (8241802585110932849) -->
+    <skip />
+    <!-- no translation found for location_mode_battery_saving_title (711273645208158637) -->
+    <skip />
+    <!-- no translation found for location_mode_sensors_only_title (3040366132175435160) -->
+    <skip />
+    <!-- no translation found for location_mode_location_off_title (2829713015012529465) -->
+    <skip />
+    <!-- no translation found for location_category_recent_location_requests (1938721350424447421) -->
+    <skip />
+    <!-- no translation found for location_no_recent_apps (2800907699722178041) -->
+    <skip />
+    <!-- no translation found for location_category_location_services (7437150886946685979) -->
+    <skip />
+    <!-- no translation found for location_high_battery_use (517199943258508020) -->
+    <skip />
+    <!-- no translation found for location_low_battery_use (8602232529541903596) -->
+    <skip />
+    <!-- no translation found for location_mode_screen_title (4528716772270246542) -->
+    <skip />
+    <!-- no translation found for location_mode_high_accuracy_description (5349014493087338351) -->
+    <skip />
+    <!-- no translation found for location_mode_battery_saving_description (7581657383062066461) -->
+    <skip />
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"સ્થાન નક્કી કરવા માટે GPS નો ઉપયોગ કરો"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"સ્કેન કરે છે"</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="2070686681074461301">"Wi‑Fi બંધ હોય ત્યારે પણ, Wi‑Fi નેટવર્ક્સ સ્કેન કરવા માટે એપ્લિકેશન્સ અને સેવાઓને મંજૂરી આપીને સ્થાન સેવાઓને બહેતર બનાવો"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth સ્કેનિંગ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"જ્યારે Bluetooth બંધ હોય ત્યારે પણ, Bluetooth ઉપકરણો સ્કેન કરવા માટે સિસ્ટમ સેવાઓને મંજૂરી આપીને સ્થાન બહેતર બનાવો."</string>
+    <!-- no translation found for location_network_based (6010456018401296590) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level (5626515380188353712) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level_wifi (4234820941954812210) -->
+    <skip />
+    <!-- no translation found for location_gps (8392461023569708478) -->
+    <skip />
+    <!-- no translation found for location_street_level (1669562198260860802) -->
+    <skip />
+    <!-- no translation found for location_street_level (4617445745492014203) -->
+    <skip />
+    <!-- no translation found for assisted_gps (4649317129586736885) -->
+    <skip />
+    <!-- no translation found for assisted_gps_enabled (8751899609589792803) -->
+    <skip />
+    <!-- no translation found for assisted_gps_disabled (6982698333968010748) -->
+    <skip />
+    <!-- no translation found for use_location_title (5206937465504979977) -->
+    <skip />
+    <!-- no translation found for use_location_summary (3978805802386162520) -->
+    <skip />
+    <!-- no translation found for location_access_title (7064108942964081243) -->
+    <skip />
+    <!-- no translation found for location_access_summary (69031404093194341) -->
+    <skip />
+    <!-- no translation found for location_sources_heading (1278732419851088319) -->
+    <skip />
+    <!-- no translation found for about_settings (593457295516533765) -->
+    <skip />
+    <!-- no translation found for about_settings (1743378368185371685) -->
+    <skip />
+    <!-- no translation found for about_settings_summary (3371517697156165959) -->
+    <skip />
+    <!-- no translation found for legal_information (5769301644270604095) -->
+    <skip />
+    <!-- no translation found for contributors_title (5917703088825286504) -->
+    <skip />
+    <!-- no translation found for regulatory_information (5695464367088752150) -->
+    <skip />
+    <!-- no translation found for copyright_title (865906688917260647) -->
+    <skip />
+    <!-- no translation found for license_title (1990487604356037871) -->
+    <skip />
+    <!-- no translation found for terms_title (7697580845616764642) -->
+    <skip />
+    <!-- no translation found for webview_license_title (2813507464175738967) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_title (7553683406244228650) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_unavailable (4210539215951487627) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_loading (3337535809093591740) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_title (1289483965535937431) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_activity_title (6901214628496951727) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_activity_unreachable (232523852222964470) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_activity_loading (8059022597639516348) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_password_header (8624900666929394990) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_pattern_header (6949761069941694050) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_pin_header (7598849519816138302) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_password_header (6308478184889846633) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pattern_header (7543433733032330821) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pin_header (49038294648213197) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_passwords_dont_match (6850677112663979120) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_pins_dont_match (4757532830594400147) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_lock_generic_header (3811438094903786145) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_set_toast (4875050283108629383) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_set_toast (6011826444725291475) -->
+    <skip />
+    <!-- no translation found for lockpassword_pattern_set_toast (6867259621331406236) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pattern_generic (7050256155547273836) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pin_generic (1072670959803859869) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_password_generic (1022239625083264596) -->
+    <skip />
+    <!-- no translation found for lockpassword_invalid_pin (15588049067548470) -->
+    <skip />
+    <!-- no translation found for lockpassword_invalid_password (4038507398784975200) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_unlock_wrong (1745247595356012176) -->
+    <skip />
+    <string name="lock_settings_title" msgid="4213839087748988686">"ઉપકરણ સુરક્ષા"</string>
+    <!-- no translation found for lockpattern_change_lock_pattern_label (5679630792003440352) -->
+    <skip />
+    <!-- no translation found for lockpattern_change_lock_pin_label (266707138486731661) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_intro_header (308287052221942814) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_intro_footer (1118579101409152113) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_inprogress (6667844062721656773) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_incorrect_too_short (1348234155120957561) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_entered_header (4316818983675591604) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_confirm (8054853451639221265) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_confirmed_header (8455614172231880211) -->
+    <skip />
+    <!-- no translation found for lockpattern_confirm_button_text (1128204343957002841) -->
+    <skip />
+    <!-- no translation found for lockpattern_restart_button_text (3337574403350953926) -->
+    <skip />
+    <!-- no translation found for lockpattern_retry_button_text (1949847413862309134) -->
+    <skip />
+    <!-- no translation found for lockpattern_continue_button_text (4723771754714471410) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_title (3207750489460466680) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_title (6920616873671115281) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_summary (1165707416664252167) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_visible_pattern_title (2615606088906120711) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_tactile_feedback_title (8898518337442601027) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_power_button_instantly_locks (5735444062633666327) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_power_button_instantly_locks_summary (8196258755143711694) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_choose_lock_pattern (1652352830005653447) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_change_lock_pattern (1123908306116495545) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_help_how_to_record (2614673439060830433) -->
+    <skip />
+    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts (6909161623701848863) -->
+    <skip />
+    <!-- no translation found for activity_not_found (5551664692991605325) -->
+    <skip />
+    <!-- no translation found for manageapplications_settings_title (7041951105633616745) -->
+    <skip />
+    <!-- no translation found for manageapplications_settings_summary (1794401500935451259) -->
+    <skip />
+    <!-- no translation found for applications_settings (1721442176406964682) -->
+    <skip />
+    <!-- no translation found for applications_settings_summary (6683465446264515367) -->
+    <skip />
+    <!-- no translation found for applications_settings_header (1014813055054356646) -->
+    <skip />
+    <!-- no translation found for install_applications (4872012136210802181) -->
+    <skip />
+    <!-- no translation found for install_applications_title (4987712352256508946) -->
+    <skip />
+    <!-- no translation found for install_unknown_applications_title (663831043139080992) -->
+    <skip />
+    <!-- no translation found for install_unknown_applications (176855644862942064) -->
+    <skip />
+    <!-- no translation found for install_all_warning (3263360446508268880) -->
+    <skip />
+    <!-- no translation found for install_all_warning (8113734576826384682) -->
+    <skip />
+    <!-- no translation found for advanced_settings (1777249286757067969) -->
+    <skip />
+    <!-- no translation found for advanced_settings_summary (4016682978071086747) -->
+    <skip />
+    <!-- no translation found for application_info_label (5736524913065714880) -->
+    <skip />
+    <!-- no translation found for storage_label (8700867073480107253) -->
+    <skip />
+    <!-- no translation found for auto_launch_label (3012617472833815382) -->
+    <skip />
+    <!-- no translation found for auto_launch_label_generic (3230569852551968694) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_label (663250687205465394) -->
+    <skip />
+    <!-- no translation found for permissions_label (2605296874922726203) -->
+    <skip />
+    <!-- no translation found for cache_header_label (1877197634162461830) -->
+    <skip />
+    <!-- no translation found for clear_cache_btn_text (5756314834291116325) -->
+    <skip />
+    <!-- no translation found for cache_size_label (7505481393108282913) -->
+    <skip />
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
+    <!-- no translation found for total_size_label (1048676419552557254) -->
+    <skip />
+    <!-- no translation found for application_size_label (8494609207373874267) -->
+    <skip />
+    <!-- no translation found for external_code_size_label (3459343140355961335) -->
+    <skip />
+    <!-- no translation found for data_size_label (8679376373625710107) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (7533821466482000453) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (626414192825329708) -->
+    <skip />
+    <!-- no translation found for uninstall_text (3644892466144802466) -->
+    <skip />
+    <!-- no translation found for uninstall_all_users_text (851857393177950340) -->
+    <skip />
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
+    <!-- no translation found for disable_text (6544054052049395202) -->
+    <skip />
+    <!-- no translation found for enable_text (9217362512327828987) -->
+    <skip />
+    <!-- no translation found for clear_user_data_text (5597622864770098388) -->
+    <skip />
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
+    <!-- no translation found for auto_launch_enable_text (2652825923953591251) -->
+    <skip />
+    <!-- no translation found for always_allow_bind_appwidgets_text (3368654672141202604) -->
+    <skip />
+    <!-- no translation found for auto_launch_disable_text (7800385822185540166) -->
+    <skip />
+    <!-- no translation found for clear_activities (7408923511535174430) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_text (1616155457673106022) -->
+    <skip />
+    <!-- no translation found for ask_compatibility (7225195569089607846) -->
+    <skip />
+    <!-- no translation found for enable_compatibility (5806819252068617811) -->
+    <skip />
+    <!-- no translation found for unknown (1592123443519355854) -->
+    <skip />
+    <!-- no translation found for sort_order_alpha (1410278099123670628) -->
+    <skip />
+    <!-- no translation found for sort_order_size (7024513286636502362) -->
+    <skip />
+    <!-- no translation found for show_running_services (5736278767975544570) -->
+    <skip />
+    <!-- no translation found for show_background_processes (2009840211972293429) -->
+    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"ઇમર્જન્સી એપ્લિકેશન"</string>
+    <!-- no translation found for reset_app_preferences (1321050641018356925) -->
+    <skip />
+    <!-- no translation found for reset_app_preferences_title (6093179367325336662) -->
+    <skip />
+    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
+    <skip />
+    <!-- no translation found for reset_app_preferences_button (2559089511841281242) -->
+    <skip />
+    <!-- no translation found for manage_space_text (8852711522447794676) -->
+    <skip />
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (8693024463731076091) -->
+    <skip />
+    <!-- no translation found for filter_apps_all (5142129378749391876) -->
+    <skip />
+    <!-- no translation found for filter_apps_disabled (5364447573326472890) -->
+    <skip />
+    <!-- no translation found for filter_apps_third_party (7786348047690140979) -->
+    <skip />
+    <!-- no translation found for filter_apps_running (7767071454371350486) -->
+    <skip />
+    <!-- no translation found for filter_apps_onsdcard (4843063154701023349) -->
+    <skip />
+    <!-- no translation found for filter_apps_onsdcard (1477351142334784771) -->
+    <skip />
+    <!-- no translation found for disabled (9206776641295849915) -->
+    <skip />
+    <!-- no translation found for not_installed (2797554494953450291) -->
+    <skip />
+    <!-- no translation found for no_applications (7336588977497084921) -->
+    <skip />
+    <!-- no translation found for internal_storage (1584700623164275282) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (2673203150465132465) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (7623513618171928235) -->
+    <skip />
+    <!-- no translation found for recompute_size (7722567982831691718) -->
+    <skip />
+    <!-- no translation found for clear_data_dlg_title (5605258400134511197) -->
+    <skip />
+    <!-- no translation found for clear_data_dlg_text (8847257251846779938) -->
+    <skip />
+    <!-- no translation found for dlg_ok (2402639055725653590) -->
+    <skip />
+    <!-- no translation found for dlg_cancel (1674753358972975911) -->
+    <skip />
+    <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
+    <!-- no translation found for app_not_found_dlg_text (8333723538280257243) -->
+    <skip />
+    <!-- no translation found for clear_data_failed (1907582169616856698) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_title (7441012826373143593) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (6371247225487725860) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (1092177570631523106) -->
+    <skip />
+    <!-- no translation found for security_settings_desc (1292421279262430109) -->
+    <skip />
+    <!-- no translation found for security_settings_desc (61749028818785244) -->
+    <skip />
+    <!-- no translation found for security_settings_desc_multi (7300932212437084403) -->
+    <skip />
+    <!-- no translation found for security_settings_desc_multi (6610268420793984752) -->
+    <skip />
+    <!-- no translation found for join_two_items (1336880355987539064) -->
+    <skip />
+    <!-- no translation found for join_many_items_last (5925635036718502724) -->
+    <skip />
+    <!-- no translation found for join_many_items_first (4333907712038448660) -->
+    <skip />
+    <!-- no translation found for join_many_items_middle (7556692394478220814) -->
+    <skip />
+    <!-- no translation found for security_settings_billing_desc (8061019011821282358) -->
+    <skip />
+    <!-- no translation found for security_settings_premium_sms_desc (8734171334263713717) -->
+    <skip />
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
+    <!-- no translation found for invalid_size_value (7563537715280712285) -->
+    <skip />
+    <!-- no translation found for empty_list_msg (5993162337235907160) -->
+    <skip />
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
+    <!-- no translation found for move_app (5042838441401731346) -->
+    <skip />
+    <!-- no translation found for move_app_to_internal (2299714147283854957) -->
+    <skip />
+    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
+    <skip />
+    <!-- no translation found for move_app_to_sdcard (4350451696315265420) -->
+    <skip />
+    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
+    <skip />
+    <!-- no translation found for moving (6431016143218876491) -->
+    <skip />
+    <!-- no translation found for insufficient_storage (481763122991093080) -->
+    <skip />
+    <!-- no translation found for does_not_exist (3476487214886606748) -->
+    <skip />
+    <!-- no translation found for app_forward_locked (6331564656683790866) -->
+    <skip />
+    <!-- no translation found for invalid_location (2786030127356312746) -->
+    <skip />
+    <!-- no translation found for system_package (6222593098063037137) -->
+    <skip />
+    <!-- no translation found for force_stop_dlg_title (977530651470711366) -->
+    <skip />
+    <!-- no translation found for force_stop_dlg_text (7208364204467835578) -->
+    <skip />
+    <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
+    <!-- no translation found for move_app_failed_dlg_text (3465267182923054022) -->
+    <skip />
+    <!-- no translation found for app_install_location_title (2068975150026852168) -->
+    <skip />
+    <!-- no translation found for app_install_location_summary (5155453752692959098) -->
+    <skip />
+    <!-- no translation found for app_disable_dlg_title (3916469657537695436) -->
+    <skip />
+    <!-- no translation found for app_disable_dlg_text (3562567756362627323) -->
+    <skip />
+    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
+    <skip />
+    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
+    <skip />
+    <!-- no translation found for app_disable_notifications_dlg_title (7669264654851761857) -->
+    <skip />
+    <!-- no translation found for app_disable_notifications_dlg_text (5088484670924769845) -->
+    <skip />
+    <!-- no translation found for app_ops_settings (5108481883575527511) -->
+    <skip />
+    <!-- no translation found for app_ops_running (7706949900637284122) -->
+    <skip />
+    <!-- no translation found for app_ops_never_used (9114608022906887802) -->
+    <skip />
+    <string name="no_default_apps" msgid="2915315663141025400">"કોઇ ડિફોલ્ટ એપ્લિકેશન્સ નથી."</string>
+    <!-- no translation found for storageuse_settings_title (5657014373502630403) -->
+    <skip />
+    <!-- no translation found for storageuse_settings_summary (3748286507165697834) -->
+    <skip />
+    <!-- no translation found for runningservices_settings_title (8097287939865165213) -->
+    <skip />
+    <!-- no translation found for runningservices_settings_summary (854608995821032748) -->
+    <skip />
+    <!-- no translation found for service_restarting (2242747937372354306) -->
+    <skip />
+    <!-- no translation found for cached (1059590879740175019) -->
+    <skip />
+    <!-- no translation found for no_running_services (2059536495597645347) -->
+    <skip />
+    <!-- no translation found for service_started_by_app (818675099014723551) -->
+    <skip />
+    <!-- no translation found for service_client_name (4037193625611815517) -->
+    <skip />
+    <!-- no translation found for service_background_processes (6844156253576174488) -->
+    <skip />
+    <!-- no translation found for service_foreground_processes (7583975676795574276) -->
+    <skip />
+    <!-- no translation found for memory (6609961111091483458) -->
+    <skip />
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <!-- no translation found for running_process_item_user_label (3129887865552025943) -->
+    <skip />
+    <!-- no translation found for running_process_item_removed_user_label (8250168004291472959) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_s_s (5790575965282023145) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_s_p (8019860457123222953) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_p_s (744424668287252915) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_p_p (1607384595790852782) -->
+    <skip />
+    <!-- no translation found for running_processes_header_title (6588371727640789560) -->
+    <skip />
+    <!-- no translation found for running_processes_header_footer (723908176275428442) -->
+    <skip />
+    <!-- no translation found for running_processes_header_system_prefix (6104153299581682047) -->
+    <skip />
+    <!-- no translation found for running_processes_header_apps_prefix (5787594452716832727) -->
+    <skip />
+    <!-- no translation found for running_processes_header_free_prefix (4620613031737078415) -->
+    <skip />
+    <!-- no translation found for running_processes_header_used_prefix (5924288703085123978) -->
+    <skip />
+    <!-- no translation found for running_processes_header_cached_prefix (7950853188089434987) -->
+    <skip />
+    <!-- no translation found for running_processes_header_ram (996092388884426817) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_settings_title (3224004818524731568) -->
+    <skip />
+    <!-- no translation found for no_services (7133900764462288263) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_services_title (391168243725357375) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_processes_title (928115582044655268) -->
+    <skip />
+    <!-- no translation found for service_stop (6369807553277527248) -->
+    <skip />
+    <!-- no translation found for service_manage (1876642087421959194) -->
+    <skip />
+    <!-- no translation found for service_stop_description (9146619928198961643) -->
+    <skip />
+    <!-- no translation found for heavy_weight_stop_description (2979218727598321095) -->
+    <skip />
+    <!-- no translation found for background_process_stop_description (5034773197139654588) -->
+    <skip />
+    <!-- no translation found for service_manage_description (7050092269951613102) -->
+    <skip />
+    <!-- no translation found for main_running_process_description (1130702347066340890) -->
+    <skip />
+    <!-- no translation found for process_service_in_use_description (8993335064403217080) -->
+    <skip />
+    <!-- no translation found for process_provider_in_use_description (5586603325677678940) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_title (4253292537154337233) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (3371302398335665793) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (3920243762189484756) -->
+    <skip />
+    <!-- no translation found for language_settings (5292716747264442359) -->
+    <skip />
+    <!-- no translation found for language_keyboard_settings_title (243220021717425813) -->
+    <skip />
+    <!-- no translation found for language_settings_category (2288258489940617043) -->
+    <skip />
+    <!-- no translation found for keyboard_settings_category (8275523930352487827) -->
+    <skip />
+    <!-- no translation found for phone_language (8870144109924299673) -->
+    <skip />
+    <string name="phone_language_summary" msgid="3871309445655554211"></string>
+    <!-- no translation found for auto_replace (6199184757891937822) -->
+    <skip />
+    <!-- no translation found for auto_replace_summary (370288728200084466) -->
+    <skip />
+    <!-- no translation found for auto_caps (6379232078052591265) -->
+    <skip />
+    <!-- no translation found for auto_caps_summary (6358102538315261466) -->
+    <skip />
+    <!-- no translation found for auto_punctuate (4595367243950425833) -->
+    <skip />
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
+    <!-- no translation found for auto_punctuate_summary (4372126865670574837) -->
+    <skip />
+    <!-- no translation found for show_password (3001113966880559611) -->
+    <skip />
+    <!-- no translation found for ime_security_warning (4135828934735934248) -->
+    <skip />
+    <!-- no translation found for spellchecker_security_warning (9060897418527708922) -->
+    <skip />
+    <!-- no translation found for spellchecker_quick_settings (246728645150092058) -->
+    <skip />
+    <!-- no translation found for spellchecker_language (6041050114690541437) -->
+    <skip />
+    <!-- no translation found for failed_to_open_app_settings_toast (1251067459298072462) -->
+    <skip />
+    <!-- no translation found for pointer_settings_category (8183819795164034286) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
+    <!-- no translation found for game_controller_settings_category (8794508575329923718) -->
+    <skip />
+    <!-- no translation found for vibrate_input_devices (2599591466928793082) -->
+    <skip />
+    <!-- no translation found for vibrate_input_devices_summary (4595570516865299153) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_title (8030087214949381372) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_setup_button (8514583747236476384) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_switch_hint (3889961090676293795) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_default_label (2952672513543482165) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_picker_title (556081931972771610) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_title (3427169369758733521) -->
+    <skip />
+    <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
+    <!-- no translation found for user_dict_settings_add_menu_title (4056762757149923551) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_title (4702613990174126482) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_screen_title (742580720124344291) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_more_options (8848798370746019825) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_less_options (2441785268726036101) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_confirm (6225823625332416144) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_word_option_name (7868879174905963135) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_shortcut_option_name (660089258866063925) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_locale_option_name (5696358317061318532) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_word_hint (5725254076556821247) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_shortcut_hint (7333763456561873445) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_edit_dialog_title (8967476444840548674) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_context_menu_edit_title (2210564879320004837) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_context_menu_delete_title (9140703913776549054) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_empty_text (8165273379942105271) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_all_languages (6742000040975959247) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_more_languages (7316375944684977910) -->
+    <skip />
+    <!-- no translation found for testing (6584352735303604146) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (193561832258534798) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (8656693364332840056) -->
+    <skip />
+    <!-- no translation found for testing_battery_info (3497865525976497848) -->
+    <skip />
+    <!-- no translation found for input_methods_settings_title (6800066636850553887) -->
+    <skip />
+    <!-- no translation found for input_method (5434026103176856164) -->
+    <skip />
+    <!-- no translation found for current_input_method (2636466029213488159) -->
+    <skip />
+    <!-- no translation found for input_method_selector (4311213129681430709) -->
+    <skip />
+    <!-- no translation found for input_method_selector_show_automatically_title (1001612945471546158) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_show_title (3891824124222371634) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_hide_title (7699647095118680424) -->
+    <skip />
+    <!-- no translation found for configure_input_method (1317429869771850228) -->
+    <skip />
+    <!-- no translation found for input_method_settings (5801295625486269553) -->
+    <skip />
+    <!-- no translation found for input_method_settings_button (6778344383871619368) -->
+    <skip />
+    <!-- no translation found for active_input_method_subtypes (3596398805424733238) -->
+    <skip />
+    <!-- no translation found for use_system_language_to_select_input_method_subtypes (3346751753141428573) -->
+    <skip />
+    <!-- no translation found for input_methods_settings_label_format (6002887604815693322) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title (4421813273170250462) -->
+    <skip />
+    <!-- no translation found for onscreen_keyboard_settings_summary (5841558383556238653) -->
+    <skip />
+    <!-- no translation found for builtin_keyboard_settings_title (7688732909551116798) -->
+    <skip />
+    <!-- no translation found for builtin_keyboard_settings_summary (2392531685358035899) -->
+    <skip />
+    <!-- no translation found for development_settings_title (215179176067683667) -->
+    <skip />
+    <!-- no translation found for development_settings_summary (1815795401632854041) -->
+    <skip />
+    <!-- no translation found for development_settings_not_available (4308569041701535607) -->
+    <skip />
+    <!-- no translation found for vpn_settings_not_available (956841430176985598) -->
+    <skip />
+    <!-- no translation found for tethering_settings_not_available (6765770438438291012) -->
+    <skip />
+    <!-- no translation found for apn_settings_not_available (7873729032165324000) -->
+    <skip />
+    <!-- no translation found for enable_adb (7982306934419797485) -->
+    <skip />
+    <!-- no translation found for enable_adb_summary (4881186971746056635) -->
+    <skip />
+    <!-- no translation found for clear_adb_keys (4038889221503122743) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (1778455732762984579) -->
+    <skip />
+    <!-- no translation found for keep_screen_on (1146389631208760344) -->
+    <skip />
+    <!-- no translation found for keep_screen_on_summary (2173114350754293009) -->
+    <skip />
+    <!-- no translation found for bt_hci_snoop_log (3340699311158865670) -->
+    <skip />
+    <!-- no translation found for bt_hci_snoop_log_summary (730247028210113851) -->
+    <skip />
+    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
+    <skip />
+    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
+    <skip />
+    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
+    <skip />
+    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
+    <skip />
+    <!-- no translation found for select_logd_size_title (7433137108348553508) -->
+    <skip />
+    <!-- no translation found for select_logd_size_dialog_title (1206769310236476760) -->
+    <skip />
+    <!-- no translation found for allow_mock_location (2787962564578664888) -->
+    <skip />
+    <!-- no translation found for allow_mock_location_summary (317615105156345626) -->
+    <skip />
+    <!-- no translation found for debug_view_attributes (6485448367803310384) -->
+    <skip />
+    <string name="debug_networking_category" msgid="7044075693643009662">"નેટવર્કિંગ"</string>
+    <!-- no translation found for wifi_display_certification (8611569543791307533) -->
+    <skip />
+    <!-- no translation found for wifi_verbose_logging (4203729756047242344) -->
+    <skip />
+    <!-- no translation found for wifi_aggressive_handover (9194078645887480917) -->
+    <skip />
+    <!-- no translation found for wifi_allow_scan_with_traffic (3601853081178265786) -->
+    <skip />
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"લેગેસી DHCP ક્લાઇન્ટનો ઉપયોગ કરો"</string>
+    <!-- no translation found for wifi_display_certification_summary (1155182309166746973) -->
+    <skip />
+    <!-- no translation found for wifi_verbose_logging_summary (6615071616111731958) -->
+    <skip />
+    <!-- no translation found for wifi_aggressive_handover_summary (6328455667642570371) -->
+    <skip />
+    <!-- no translation found for wifi_allow_scan_with_traffic_summary (2575101424972686310) -->
+    <skip />
+    <!-- no translation found for select_logd_size_title (7433137108348553508) -->
+    <skip />
+    <!-- no translation found for select_logd_size_dialog_title (1206769310236476760) -->
+    <skip />
+    <!-- no translation found for select_usb_configuration_title (2649938511506971843) -->
+    <skip />
+    <!-- no translation found for select_usb_configuration_dialog_title (6385564442851599963) -->
+    <skip />
+    <!-- no translation found for allow_mock_location (2787962564578664888) -->
+    <skip />
+    <!-- no translation found for allow_mock_location_summary (317615105156345626) -->
+    <skip />
+    <!-- no translation found for debug_view_attributes (6485448367803310384) -->
+    <skip />
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"નવા Android DHCP ક્લાઇન્ટને બદલે Lollipop તરફથી DHCP ક્લાઇન્ટનો ઉપયોગ કરો."</string>
+    <!-- no translation found for adb_warning_title (6234463310896563253) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (7316799925425402244) -->
+    <skip />
+    <!-- no translation found for adb_keys_warning_message (6932230298032192937) -->
+    <skip />
+    <!-- no translation found for dev_settings_warning_title (7244607768088540165) -->
+    <skip />
+    <!-- no translation found for dev_settings_warning_message (2298337781139097964) -->
+    <skip />
+    <!-- no translation found for verify_apps_over_usb_title (4177086489869041953) -->
+    <skip />
+    <!-- no translation found for verify_apps_over_usb_summary (9164096969924529200) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_title (7733257271454664956) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_summary (1798088409346660567) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_title (2112813067171502209) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_message (605444326545922054) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_title (2226662853797940829) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_summary (2750027486786530064) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_title (273220585729800783) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_message (3858482712337574407) -->
+    <skip />
+    <!-- no translation found for enable_terminal_title (95572094356054120) -->
+    <skip />
+    <!-- no translation found for enable_terminal_summary (67667852659359206) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
+    <!-- no translation found for allow_bind_app_widget_activity_allow_bind_title (2538303018392590627) -->
+    <skip />
+    <!-- no translation found for allow_bind_app_widget_activity_allow_bind (1584388129273282080) -->
+    <skip />
+    <!-- no translation found for allow_bind_app_widget_activity_always_allow_bind (7037503685859688034) -->
+    <skip />
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
+    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
+    <skip />
+    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (5440362857006046193) -->
+    <skip />
+    <!-- no translation found for last_time_used_label (8459441968795479307) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings (3975902491934816215) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_title (2130492524656204459) -->
+    <skip />
+    <!-- no translation found for accessibility_services_title (2592221829284342237) -->
+    <skip />
+    <!-- no translation found for accessibility_system_title (7187919089874130484) -->
+    <skip />
+    <!-- no translation found for accessibility_display_title (7610175687949675162) -->
+    <skip />
+    <!-- no translation found for accessibility_captioning_title (7589266662024836291) -->
+    <skip />
+    <!-- no translation found for accessibility_screen_magnification_title (7001782548715744981) -->
+    <skip />
+    <!-- no translation found for accessibility_screen_magnification_summary (2380627654189671754) -->
+    <skip />
+    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
+    <skip />
+    <!-- no translation found for accessibility_global_gesture_preference_summary_on (6180927399052022181) -->
+    <skip />
+    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
+    <skip />
+    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_large_text_preference_title (6307247527580207161) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_high_text_contrast_preference_title (2567402942683463779) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_preference_title (2472285215737820469) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_auto_update_preference_title (7218498768415430963) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_auto_update_preference_summary (4392059334816220155) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call_prerefence_title (6673851944175874235) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_speak_password_preference_title (5986628515113204844) -->
+    <skip />
+    <!-- no translation found for accessibility_long_press_timeout_preference_title (6708467774619266508) -->
+    <skip />
+    <!-- no translation found for accessibility_display_inversion_preference_title (2119647786141420802) -->
+    <skip />
+    <!-- no translation found for accessibility_display_inversion_preference_subtitle (8658240868230680912) -->
+    <skip />
+    <!-- no translation found for accessibility_display_daltonizer_preference_title (5800761362678707872) -->
+    <skip />
+    <!-- no translation found for accessibility_display_daltonizer_preference_subtitle (3484969015295282911) -->
+    <skip />
+    <!-- no translation found for enable_quick_setting (2366999897816894536) -->
+    <skip />
+    <!-- no translation found for daltonizer_type (1124178250809091080) -->
+    <skip />
+    <!-- no translation found for daltonizer_type_overridden (3116947244410245916) -->
+    <skip />
+    <!-- no translation found for daltonizer_mode_disabled (7482661936053801862) -->
+    <skip />
+    <!-- no translation found for daltonizer_mode_monochromacy (8485709880666106721) -->
+    <skip />
+    <!-- no translation found for daltonizer_mode_deuteranomaly (5475532989673586329) -->
+    <skip />
+    <!-- no translation found for daltonizer_mode_protanomaly (8424148009038666065) -->
+    <skip />
+    <!-- no translation found for daltonizer_mode_tritanomaly (481725854987912389) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_settings (3344942964710773365) -->
+    <skip />
+    <!-- no translation found for accessibility_feature_state_on (2864292320042673806) -->
+    <skip />
+    <!-- no translation found for accessibility_feature_state_off (4172584906487070211) -->
+    <skip />
+    <!-- no translation found for accessibility_feature_or_input_method_not_allowed (5950315477009501647) -->
+    <skip />
+    <!-- no translation found for captioning_preview_title (1234015253497016890) -->
+    <skip />
+    <!-- no translation found for captioning_standard_options_title (3284211791180335844) -->
+    <skip />
+    <!-- no translation found for captioning_locale (4559155661018823503) -->
+    <skip />
+    <!-- no translation found for captioning_text_size (6737002449104466028) -->
+    <skip />
+    <!-- no translation found for captioning_preset (8939737196538429044) -->
+    <skip />
+    <!-- no translation found for captioning_custom_options_title (5067500939930322405) -->
+    <skip />
+    <!-- no translation found for captioning_background_color (9053011212948992570) -->
+    <skip />
+    <!-- no translation found for captioning_background_opacity (6029993616419971202) -->
+    <skip />
+    <!-- no translation found for captioning_window_color (6902052743419717394) -->
+    <skip />
+    <!-- no translation found for captioning_window_opacity (5041556024849862376) -->
+    <skip />
+    <!-- no translation found for captioning_foreground_color (85623486537640059) -->
+    <skip />
+    <!-- no translation found for captioning_foreground_opacity (4370967856995419788) -->
+    <skip />
+    <!-- no translation found for captioning_edge_color (3670094753735263238) -->
+    <skip />
+    <!-- no translation found for captioning_edge_type (5997247394951682154) -->
+    <skip />
+    <!-- no translation found for captioning_typeface (1826169240566563259) -->
+    <skip />
+    <!-- no translation found for captioning_preview_text (4067935959797375065) -->
+    <skip />
+    <!-- no translation found for captioning_preview_characters (7105909138497851769) -->
+    <skip />
+    <!-- no translation found for locale_default (2593883646136326969) -->
+    <skip />
+    <!-- no translation found for color_title (4258931051732243983) -->
+    <skip />
+    <!-- no translation found for color_unspecified (5179683785413568326) -->
+    <skip />
+    <!-- no translation found for color_none (3475640044925814795) -->
+    <skip />
+    <!-- no translation found for color_white (8045195170201590239) -->
+    <skip />
+    <!-- no translation found for color_gray (9192312087142726313) -->
+    <skip />
+    <!-- no translation found for color_black (7517353520909872561) -->
+    <skip />
+    <!-- no translation found for color_red (4949354900304125428) -->
+    <skip />
+    <!-- no translation found for color_green (5537717328428845841) -->
+    <skip />
+    <!-- no translation found for color_blue (7731984529016953223) -->
+    <skip />
+    <!-- no translation found for color_cyan (7033027180641173211) -->
+    <skip />
+    <!-- no translation found for color_yellow (9112680561610873529) -->
+    <skip />
+    <!-- no translation found for color_magenta (5059212823607815549) -->
+    <skip />
+    <!-- no translation found for enable_service_title (3061307612673835592) -->
+    <skip />
+    <!-- no translation found for capabilities_list_title (86713361724771971) -->
+    <skip />
+    <!-- no translation found for touch_filtered_warning (8644034725268915030) -->
+    <skip />
+    <!-- no translation found for enable_service_encryption_warning (3064686622453974606) -->
+    <skip />
+    <!-- no translation found for secure_lock_encryption_warning (464101518421886337) -->
+    <skip />
+    <!-- no translation found for enable_service_pattern_reason (777577618063306751) -->
+    <skip />
+    <!-- no translation found for enable_service_pin_reason (7882035264853248228) -->
+    <skip />
+    <!-- no translation found for enable_service_password_reason (1224075277603097951) -->
+    <skip />
+    <!-- no translation found for capability_title_receiveAccessibilityEvents (1869032063969970755) -->
+    <skip />
+    <!-- no translation found for capability_desc_receiveAccessibilityEvents (2095111008854376237) -->
+    <skip />
+    <!-- no translation found for disable_service_title (3624005212728512896) -->
+    <skip />
+    <!-- no translation found for disable_service_message (2012273739481042318) -->
+    <skip />
+    <!-- no translation found for accessibility_no_services_installed (7200948194639038807) -->
+    <skip />
+    <!-- no translation found for accessibility_service_default_description (1072730037861494125) -->
+    <skip />
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
+    <!-- no translation found for print_settings (4742428530112487843) -->
+    <skip />
+    <!-- no translation found for print_settings_title (3685449667822217816) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_title (2338435517408144841) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
+    <skip />
+    <!-- no translation found for print_no_services_installed (8443039625463872294) -->
+    <skip />
+    <!-- no translation found for print_no_printers_found (989018646884973683) -->
+    <skip />
+    <!-- no translation found for print_menu_item_settings (6591330373682227082) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_printers (2890738028215834012) -->
+    <skip />
+    <!-- no translation found for print_feature_state_on (8098901852502441048) -->
+    <skip />
+    <!-- no translation found for print_feature_state_off (7294876968403966040) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_service (3811645167869797802) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_printer (8251218970577291032) -->
+    <skip />
+    <!-- no translation found for print_menu_item_search (7025589328240514553) -->
+    <skip />
+    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
+    <skip />
+    <!-- no translation found for print_service_disabled (7739452396114245222) -->
+    <skip />
+    <!-- no translation found for print_print_jobs (3582094777756968793) -->
+    <skip />
+    <!-- no translation found for print_print_job (7563741676053287211) -->
+    <skip />
+    <!-- no translation found for print_restart (8373999687329384202) -->
+    <skip />
+    <!-- no translation found for print_cancel (3621199386568672235) -->
+    <skip />
+    <!-- no translation found for print_job_summary (8472427347192930694) -->
+    <skip />
+    <!-- no translation found for print_printing_state_title_template (5736107667714582025) -->
+    <skip />
+    <!-- no translation found for print_cancelling_state_title_template (7102968925358219875) -->
+    <skip />
+    <!-- no translation found for print_failed_state_title_template (1436099128973357969) -->
+    <skip />
+    <!-- no translation found for print_blocked_state_title_template (9065391617425962424) -->
+    <skip />
+    <!-- no translation found for print_search_box_shown_utterance (7730361832020726951) -->
+    <skip />
+    <!-- no translation found for print_search_box_hidden_utterance (7980832833405818400) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (7190304207330319919) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for power_usage_not_available (3214000535532434353) -->
+    <skip />
+    <!-- no translation found for power_usage_level_and_status (7449847570973811784) -->
+    <skip />
+    <!-- no translation found for power_discharge_remaining (4925678997049911808) -->
+    <skip />
+    <!-- no translation found for power_charge_remaining (6132074970943913135) -->
+    <skip />
+    <!-- no translation found for power_discharging_duration (1605929174734600590) -->
+    <skip />
+    <!-- no translation found for power_charging (1779532561355864267) -->
+    <skip />
+    <!-- no translation found for power_charging_duration (2853265177761520490) -->
+    <skip />
+    <!-- no translation found for power_charging_duration_ac (3969186192576594254) -->
+    <skip />
+    <!-- no translation found for power_charging_duration_usb (182405645340976546) -->
+    <skip />
+    <!-- no translation found for power_charging_duration_wireless (1829295708243159464) -->
+    <skip />
+    <!-- no translation found for power_usage_list_summary (2409288197839512482) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_on_battery (4970762168505236033) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for battery_stats_charging_label (4223311142875178785) -->
+    <skip />
+    <!-- no translation found for battery_stats_screen_on_label (7150221809877509708) -->
+    <skip />
+    <!-- no translation found for battery_stats_gps_on_label (1193657533641951256) -->
+    <skip />
+    <!-- no translation found for battery_stats_wifi_running_label (1845839195549226252) -->
+    <skip />
+    <!-- no translation found for battery_stats_wake_lock_label (1908942681902324095) -->
+    <skip />
+    <!-- no translation found for battery_stats_phone_signal_label (3537569115723850618) -->
+    <skip />
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (3208518458663637035) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (3056108148042308690) -->
+    <skip />
+    <!-- no translation found for history_details_title (3608240585315506067) -->
+    <skip />
+    <!-- no translation found for details_title (3792801565213935385) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (3023346080675904613) -->
+    <skip />
+    <!-- no translation found for power_flashlight (7794409781003567614) -->
+    <skip />
+    <!-- no translation found for power_wifi (1135085252964054957) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (4612478572401640759) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for power_unaccounted (709925017022660740) -->
+    <skip />
+    <!-- no translation found for power_overcounted (2762354976171358445) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_wake_lock (5125438890233677880) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_wifi_running (3134357198266380400) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (262638572890253393) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (8971710128438365919) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (5468564329333954445) -->
+    <skip />
+    <!-- no translation found for usage_type_radio_active (1732647857619420121) -->
+    <skip />
+    <!-- no translation found for usage_type_data_wifi_send (1847552143597396162) -->
+    <skip />
+    <!-- no translation found for usage_type_data_wifi_recv (5678475911549183829) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
+    <skip />
+    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
+    <skip />
+    <!-- no translation found for usage_type_total_battery_capacity (3798285287848675346) -->
+    <skip />
+    <!-- no translation found for usage_type_computed_power (5862792259009981479) -->
+    <skip />
+    <!-- no translation found for usage_type_actual_power (7047814738685578335) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (7861051816778419018) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (4570481408106287454) -->
+    <skip />
+    <!-- no translation found for battery_action_display (7338551244519110831) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (8181553479021841207) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (6284747418668280364) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_flashlight (2908579430841025494) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (2375567464707394131) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3355461362094706957) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (8069070756186680367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (1942935021750897422) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (4071352514714259230) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8530418792605735226) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6907588126789841231) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (5959067516281866135) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (3974902365643634514) -->
+    <skip />
+    <!-- no translation found for battery_desc_users (7682989161885027823) -->
+    <skip />
+    <!-- no translation found for battery_desc_unaccounted (7404256448541818019) -->
+    <skip />
+    <!-- no translation found for battery_msg_unaccounted (1963583522633067961) -->
+    <skip />
+    <!-- no translation found for battery_desc_overcounted (5481865509489228603) -->
+    <skip />
+    <!-- no translation found for mah (95245196971239711) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for battery_saver (1426682272004907982) -->
+    <skip />
+    <!-- no translation found for battery_saver_turn_on_automatically_title (9023847300114669426) -->
+    <skip />
+    <!-- no translation found for battery_saver_turn_on_automatically_never (6610846456314373) -->
+    <skip />
+    <!-- no translation found for battery_saver_turn_on_automatically_pct (7536784431655058267) -->
+    <skip />
+    <!-- no translation found for process_stats_summary_title (1144688045609771677) -->
+    <skip />
+    <!-- no translation found for process_stats_summary (109387941605607762) -->
+    <skip />
+    <!-- no translation found for app_memory_use (7849258480392171939) -->
+    <skip />
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="TOTALRAM">%2$s</xliff:g> માંથી <xliff:g id="USEDRAM">%1$s</xliff:g> નો વપરાશ <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
+    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
+    <skip />
+    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
+    <skip />
+    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
+    <skip />
+    <!-- no translation found for process_stats_memory_status (4251599550196193093) -->
+    <skip />
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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-રેમ"</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>
+    <!-- no translation found for process_stats_run_time (6520628955709369115) -->
+    <skip />
+    <string name="processes_subtitle" msgid="6827502409379462438">"પ્રક્રિયાઓ"</string>
+    <!-- no translation found for services_subtitle (4296402367067266425) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_duration (2323483592994720196) -->
+    <skip />
+    <!-- no translation found for mem_details_title (6548392825497290498) -->
+    <skip />
+    <!-- no translation found for mem_state_subtitle (2407238869781011933) -->
+    <skip />
+    <!-- no translation found for mem_use_subtitle (7319468770222422412) -->
+    <skip />
+    <!-- no translation found for mem_use_kernel_type (8698327165935012484) -->
+    <skip />
+    <!-- no translation found for mem_use_native_type (5976704902328347400) -->
+    <skip />
+    <!-- no translation found for mem_use_kernel_cache_type (6411475064463957513) -->
+    <skip />
+    <!-- no translation found for mem_use_zram_type (9087217476795358232) -->
+    <skip />
+    <!-- no translation found for mem_use_free_type (717708548454880840) -->
+    <skip />
+    <!-- no translation found for mem_use_total (6308786055749777934) -->
+    <skip />
+    <!-- no translation found for menu_duration_3h (4714866438374738385) -->
+    <skip />
+    <!-- no translation found for menu_duration_6h (1940846763432184132) -->
+    <skip />
+    <!-- no translation found for menu_duration_12h (7890465404584356294) -->
+    <skip />
+    <!-- no translation found for menu_duration_1d (3393631127622285458) -->
+    <skip />
+    <!-- no translation found for menu_show_system (8864603400415567635) -->
+    <skip />
+    <string name="menu_hide_system" msgid="4106826741703745733">"સિસ્ટમ છુપાવો"</string>
+    <!-- no translation found for menu_use_uss (467765290771543089) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
+    <skip />
+    <!-- no translation found for voice_input_output_settings (1336135218350444783) -->
+    <skip />
+    <!-- no translation found for voice_input_output_settings_title (2442850635048676991) -->
+    <skip />
+    <!-- no translation found for voice_search_settings_title (2775469246913196536) -->
+    <skip />
+    <!-- no translation found for keyboard_settings_title (5080115226780201234) -->
+    <skip />
+    <!-- no translation found for voice_category (1430370497125803904) -->
+    <skip />
+    <!-- no translation found for voice_input_settings (1099937800539324567) -->
+    <skip />
+    <!-- no translation found for voice_input_settings_title (2676028028084981891) -->
+    <skip />
+    <!-- no translation found for voice_service_preference_section_title (3778706644257601021) -->
+    <skip />
+    <!-- no translation found for voice_interactor_preference_summary (1801414022026937190) -->
+    <skip />
+    <!-- no translation found for voice_recognizer_preference_summary (669880813593690527) -->
+    <skip />
+    <!-- no translation found for voice_interaction_security_warning (6378608263983737325) -->
+    <skip />
+    <!-- no translation found for tts_settings (8186971894801348327) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (1237820681016639683) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (5916421806783703823) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_synth_title (4755558388333117572) -->
+    <skip />
+    <!-- no translation found for tts_default_synth_summary (7326298606388069173) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
+    <skip />
+    <!-- no translation found for tts_lang_not_selected (7395787019276734765) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for tts_engine_error (3305141107104670703) -->
+    <skip />
+    <!-- no translation found for tts_engine_error_config (5820525416624637313) -->
+    <skip />
+    <!-- no translation found for tts_engine_error_reselect (2415399149293842112) -->
+    <skip />
+    <!-- no translation found for tts_engine_security_warning (8786238102020223650) -->
+    <skip />
+    <!-- no translation found for tts_engine_network_required (1190837151485314743) -->
+    <skip />
+    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
+    <skip />
+    <!-- no translation found for tts_status_title (7268566550242584413) -->
+    <skip />
+    <!-- no translation found for tts_status_ok (1309762510278029765) -->
+    <skip />
+    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
+    <skip />
+    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
+    <skip />
+    <!-- no translation found for tts_status_checking (4983413982985913047) -->
+    <skip />
+    <!-- no translation found for tts_engines_section (7515470972378742429) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_settings (4974538563074395920) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_is_enabled_summary (4909484006804022115) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_is_disabled_summary (7644198182255168200) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
+    <!-- no translation found for pico_languages_and_voices (4611320375917773238) -->
+    <skip />
+    <!-- no translation found for pico_installed (2452546687858267414) -->
+    <skip />
+    <!-- no translation found for pico_not_installed (6266845418419994311) -->
+    <skip />
+    <!-- no translation found for pico_voice_summary_female (8047327176247727492) -->
+    <skip />
+    <!-- no translation found for pico_voice_summary_male (8331266854058577610) -->
+    <skip />
+    <!-- no translation found for tts_notif_engine_install_title (7000346872482649034) -->
+    <skip />
+    <!-- no translation found for tts_notif_engine_install_message (7250804349781973329) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_button (1030512042040722285) -->
+    <skip />
+    <!-- no translation found for tts_engine_preference_section_title (448294500990971413) -->
+    <skip />
+    <!-- no translation found for tts_general_section_title (4402572014604490502) -->
+    <skip />
+    <!-- no translation found for gadget_title (5519037532720577836) -->
+    <skip />
+    <!-- no translation found for gadget_toggle_wifi (319262861956544493) -->
+    <skip />
+    <!-- no translation found for gadget_toggle_bluetooth (7538903239807020826) -->
+    <skip />
+    <!-- no translation found for gadget_state_template (5156935629902649932) -->
+    <skip />
+    <!-- no translation found for gadget_state_on (6909119593004937688) -->
+    <skip />
+    <!-- no translation found for gadget_state_off (5220212352953066317) -->
+    <skip />
+    <!-- no translation found for gadget_state_turning_on (3395992057029439039) -->
+    <skip />
+    <!-- no translation found for gadget_state_turning_off (2395546048102176157) -->
+    <skip />
+    <!-- no translation found for gadget_wifi (4712584536500629417) -->
+    <skip />
+    <!-- no translation found for gadget_bluetooth (8998572807378694410) -->
+    <skip />
+    <!-- no translation found for gadget_location (2974757497945178165) -->
+    <skip />
+    <!-- no translation found for gadget_sync (858895763714222152) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_template (930541920933123603) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_auto (6667967252426515446) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_full (6814570109772137631) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_half (3696671957608774204) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_off (946382262872753084) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (5662579425832406705) -->
+    <skip />
+    <!-- no translation found for credentials_title (4446234003860769883) -->
+    <skip />
+    <!-- no translation found for credentials_install (466093273825150847) -->
+    <skip />
+    <!-- no translation found for credentials_install (953914549998062317) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (4220422806818210676) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
+    <skip />
+    <!-- no translation found for credentials_reset (3239382277144980418) -->
+    <skip />
+    <!-- no translation found for credentials_reset_summary (3369361230171260282) -->
+    <skip />
+    <!-- no translation found for trusted_credentials (4266945289534242402) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
+    <skip />
+    <!-- no translation found for advanced_security_title (2434776238010578865) -->
+    <skip />
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
+    <!-- no translation found for credentials_settings_not_available (7968275634486624215) -->
+    <skip />
+    <string name="credentials_unlock" msgid="385427939577366499"></string>
+    <!-- no translation found for credentials_unlock_hint (2301301378040499348) -->
+    <skip />
+    <!-- no translation found for credentials_old_password (7553393815538684028) -->
+    <skip />
+    <!-- no translation found for credentials_reset_hint (6297256880896133631) -->
+    <skip />
+    <!-- no translation found for credentials_password_too_short (7502749986405522663) -->
+    <skip />
+    <!-- no translation found for credentials_wrong_password (2541932597104054807) -->
+    <skip />
+    <!-- no translation found for credentials_reset_warning (5320653011511797600) -->
+    <skip />
+    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
+    <skip />
+    <!-- no translation found for credentials_erased (2907836028586342969) -->
+    <skip />
+    <!-- no translation found for credentials_not_erased (93461830775441220) -->
+    <skip />
+    <!-- no translation found for credentials_enabled (7588607413349978930) -->
+    <skip />
+    <!-- no translation found for credentials_configure_lock_screen_hint (6757119179588664966) -->
+    <skip />
+    <!-- no translation found for usage_access_title (332333405495457839) -->
+    <skip />
+    <!-- no translation found for allow_usage_access_title (2134237975190472249) -->
+    <skip />
+    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
+    <!-- no translation found for privacy_settings (5446972770562918934) -->
+    <skip />
+    <!-- no translation found for privacy_settings_title (4856282165773594890) -->
+    <skip />
+    <!-- no translation found for backup_section_title (7952232291452882740) -->
+    <skip />
+    <!-- no translation found for personal_data_section_title (7815209034443782061) -->
+    <skip />
+    <!-- no translation found for backup_data_title (1239105919852668016) -->
+    <skip />
+    <!-- no translation found for backup_data_summary (708773323451655666) -->
+    <skip />
+    <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
+    <skip />
+    <!-- no translation found for include_app_data_title (2829970132260278394) -->
+    <skip />
+    <!-- no translation found for auto_restore_title (5397528966329126506) -->
+    <skip />
+    <!-- no translation found for auto_restore_summary (4235615056371993807) -->
+    <skip />
+    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
+    <skip />
+    <!-- no translation found for local_backup_password_title (3860471654439418822) -->
+    <skip />
+    <!-- no translation found for local_backup_password_summary_none (393503434408227110) -->
+    <skip />
+    <!-- no translation found for local_backup_password_summary_change (2731163425081172638) -->
+    <skip />
+    <!-- no translation found for local_backup_password_toast_success (582016086228434290) -->
+    <skip />
+    <!-- no translation found for local_backup_password_toast_confirmation_mismatch (3495167398824569524) -->
+    <skip />
+    <!-- no translation found for local_backup_password_toast_validation_failure (5646377234895626531) -->
+    <skip />
+    <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
+    <!-- no translation found for backup_erase_dialog_message (5221011285568343155) -->
+    <skip />
+    <!-- no translation found for device_admin_settings_title (1335557832906433309) -->
+    <skip />
+    <!-- no translation found for active_device_admin_msg (6930903262612422111) -->
+    <skip />
+    <!-- no translation found for remove_device_admin (3596845261596451437) -->
+    <skip />
+    <!-- no translation found for select_device_admin_msg (2645509057946368094) -->
+    <skip />
+    <!-- no translation found for no_device_admins (702695100241728775) -->
+    <skip />
+    <!-- no translation found for managed_profile_device_admin_info (5048846624960067582) -->
+    <skip />
+    <!-- no translation found for personal_device_admin_title (2849617316347669861) -->
+    <skip />
+    <!-- no translation found for managed_device_admin_title (7853955652864478435) -->
+    <skip />
+    <!-- no translation found for no_trust_agents (7450273545568977523) -->
+    <skip />
+    <!-- no translation found for add_device_admin_msg (6246742476064507965) -->
+    <skip />
+    <!-- no translation found for add_device_admin (7133327675884827091) -->
+    <skip />
+    <!-- no translation found for device_admin_add_title (7705551449705676363) -->
+    <skip />
+    <!-- no translation found for device_admin_warning (2026747446313628233) -->
+    <skip />
+    <!-- no translation found for device_admin_status (4252975713178851910) -->
+    <skip />
+    <!-- no translation found for profile_owner_add_title (6249331160676175009) -->
+    <skip />
+    <!-- no translation found for adding_profile_owner_warning (6469780138110334180) -->
+    <skip />
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
+    <!-- no translation found for sound_category_sound_title (1488759370067953996) -->
+    <skip />
+    <!-- no translation found for notification_log_title (3766148588239398464) -->
+    <skip />
+    <!-- no translation found for sound_category_call_ringtone_vibrate_title (1543777228646645163) -->
+    <skip />
+    <!-- no translation found for sound_category_system_title (1480844520622721141) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title (2970260757780025029) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_editing_network (6020614644556717979) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connecting_network (5572226790101017822) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connected_network (1608788657122010919) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_add_network (6932651000151032301) -->
+    <skip />
+    <!-- no translation found for wifi_setup_not_connected (6997432604664057052) -->
+    <skip />
+    <!-- no translation found for wifi_setup_add_network (5939624680150051807) -->
+    <skip />
+    <!-- no translation found for wifi_setup_refresh_list (3411615711486911064) -->
+    <skip />
+    <!-- no translation found for wifi_setup_skip (6661541841684895522) -->
+    <skip />
+    <!-- no translation found for wifi_setup_next (3388694784447820477) -->
+    <skip />
+    <!-- no translation found for wifi_setup_back (144777383739164044) -->
+    <skip />
+    <!-- no translation found for wifi_setup_detail (2336990478140503605) -->
+    <skip />
+    <!-- no translation found for wifi_setup_connect (7954456989590237049) -->
+    <skip />
+    <!-- no translation found for wifi_setup_forget (2562847595567347526) -->
+    <skip />
+    <!-- no translation found for wifi_setup_save (3659235094218508211) -->
+    <skip />
+    <!-- no translation found for wifi_setup_cancel (3185216020264410239) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_scanning (5317003416385428036) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_select_network (7519563569903137003) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_existing_network (6394925174802598186) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_unsecured_network (8143046977328718252) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_edit_network (4765340816724760717) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_new_network (7468952850452301083) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_connecting (4971421484401530740) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_proceed_to_next (6708250000342940031) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_eap_not_supported (5335338851032315905) -->
+    <skip />
+    <!-- no translation found for wifi_setup_eap_not_supported (1955087534276570962) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connecting (2793554932006756795) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connected (736032046548460779) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_enabled (558480439730263116) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_disabled (1741194106479011384) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_in_progress (4501160520879902723) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
+    <skip />
+    <!-- no translation found for sync_failed (1696499856374109647) -->
+    <skip />
+    <!-- no translation found for sync_active (8476943765960863040) -->
+    <skip />
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
+    <!-- no translation found for add_account_label (7811707265834013767) -->
+    <skip />
+    <!-- no translation found for managed_profile_not_available_label (3489771164851107822) -->
+    <skip />
+    <!-- no translation found for remove_managed_profile_label (3856519337797285325) -->
+    <skip />
+    <!-- no translation found for background_data (5779592891375473817) -->
+    <skip />
+    <!-- no translation found for background_data_summary (8328521479872763452) -->
+    <skip />
+    <!-- no translation found for background_data_dialog_title (6059217698124786537) -->
+    <skip />
+    <!-- no translation found for background_data_dialog_message (6981661606680941633) -->
+    <skip />
+    <!-- no translation found for sync_automatically (1682730255435062059) -->
+    <skip />
+    <!-- no translation found for sync_enabled (4551148952179416813) -->
+    <skip />
+    <!-- no translation found for sync_disabled (8511659877596511991) -->
+    <skip />
+    <!-- no translation found for sync_error (5060969083117872149) -->
+    <skip />
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
+    <!-- no translation found for settings_backup (2274732978260797031) -->
+    <skip />
+    <!-- no translation found for settings_backup_summary (7916877705938054035) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
+    <!-- no translation found for sync_one_time_sync (6766593624598183090) -->
+    <skip />
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <!-- no translation found for sync_plug (3905078969081888738) -->
+    <skip />
+    <!-- no translation found for header_application_sync_settings (6205903695598000286) -->
+    <skip />
+    <!-- no translation found for header_data_and_synchronization (5165024023936509896) -->
+    <skip />
+    <!-- no translation found for preference_change_password_title (8955581790270130056) -->
+    <skip />
+    <!-- no translation found for header_account_settings (5382475087121880626) -->
+    <skip />
+    <!-- no translation found for remove_account_label (5921986026504804119) -->
+    <skip />
+    <!-- no translation found for header_add_an_account (756108499532023798) -->
+    <skip />
+    <!-- no translation found for finish_button_label (481587707657751116) -->
+    <skip />
+    <!-- no translation found for really_remove_account_title (8800653398717172460) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (1936147502815641161) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (3483528757922948356) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (4010643669489606536) -->
+    <skip />
+    <!-- no translation found for provider_label (7724593781904508866) -->
+    <skip />
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_title (8923508322291625282) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_message (1938380442159016449) -->
+    <skip />
+    <!-- no translation found for wimax_settings (2655139497028469039) -->
+    <skip />
+    <!-- no translation found for status_wimax_mac_address (8390791848661413416) -->
+    <skip />
+    <!-- no translation found for enter_password (8035706727471334122) -->
+    <skip />
+    <!-- no translation found for enter_pin (5305333588093263790) -->
+    <skip />
+    <!-- no translation found for enter_pattern (4187435713036808566) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_wrong_pattern (8423835922362956999) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_wrong_password (5200857195368904047) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_wrong_pin (755720788765259382) -->
+    <skip />
+    <!-- no translation found for checking_decryption (8287458611802609493) -->
+    <skip />
+    <!-- no translation found for starting_android (8581493237458496835) -->
+    <skip />
+    <!-- no translation found for delete (4219243412325163003) -->
+    <skip />
+    <!-- no translation found for misc_files (6720680815969643497) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count (4647048020823912088) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
+    <!-- no translation found for select_all (1562774643280376715) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_title (8605478913544273282) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
+    <skip />
+    <!-- no translation found for debug_debugging_category (6781250159513471316) -->
+    <skip />
+    <!-- no translation found for debug_app (8349591734751384446) -->
+    <skip />
+    <!-- no translation found for debug_app_not_set (718752499586403499) -->
+    <skip />
+    <!-- no translation found for debug_app_set (2063077997870280017) -->
+    <skip />
+    <!-- no translation found for select_application (5156029161289091703) -->
+    <skip />
+    <!-- no translation found for no_application (2813387563129153880) -->
+    <skip />
+    <!-- no translation found for wait_for_debugger (1202370874528893091) -->
+    <skip />
+    <!-- no translation found for wait_for_debugger_summary (1766918303462746804) -->
+    <skip />
+    <!-- no translation found for debug_input_category (1811069939601180246) -->
+    <skip />
+    <!-- no translation found for debug_drawing_category (6755716469267367852) -->
+    <skip />
+    <!-- no translation found for debug_hw_drawing_category (6220174216912308658) -->
+    <skip />
+    <!-- no translation found for media_category (4388305075496848353) -->
+    <skip />
+    <!-- no translation found for debug_monitoring_category (7640508148375798343) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_touches (1356420386500834339) -->
+    <skip />
+    <!-- no translation found for show_touches_summary (6684407913145150041) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (5470814345876056420) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (2569622766672785529) -->
+    <skip />
+    <!-- no translation found for show_hw_screen_updates (5036904558145941590) -->
+    <skip />
+    <!-- no translation found for show_hw_screen_updates_summary (1115593565980196197) -->
+    <skip />
+    <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+    <skip />
+    <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+    <skip />
+    <!-- no translation found for debug_hw_overdraw (2968692419951565417) -->
+    <skip />
+    <!-- no translation found for disable_overlays (2074488440505934665) -->
+    <skip />
+    <!-- no translation found for disable_overlays_summary (3578941133710758592) -->
+    <skip />
+    <!-- no translation found for simulate_color_space (6745847141353345872) -->
+    <skip />
+    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
+    <skip />
+    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
+    <skip />
+    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
+    <skip />
+    <!-- no translation found for usb_audio_disable_routing (8114498436003102671) -->
+    <skip />
+    <!-- no translation found for usb_audio_disable_routing_summary (980282760277312264) -->
+    <skip />
+    <!-- no translation found for debug_layout (5981361776594526155) -->
+    <skip />
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
+    <!-- no translation found for force_rtl_layout_all_locales (2259906643093138978) -->
+    <skip />
+    <!-- no translation found for force_rtl_layout_all_locales_summary (9192797796616132534) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for force_hw_ui (6426383462520888732) -->
+    <skip />
+    <!-- no translation found for force_hw_ui_summary (5535991166074861515) -->
+    <skip />
+    <!-- no translation found for force_msaa (7920323238677284387) -->
+    <skip />
+    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
+    <skip />
+    <!-- no translation found for show_non_rect_clip (505954950474595172) -->
+    <skip />
+    <!-- no translation found for track_frame_time (6146354853663863443) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for animator_duration_scale_title (3406722410819934083) -->
+    <skip />
+    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
+    <skip />
+    <string name="enable_multi_window" msgid="1091779249819137016">"બહુ-વિંડો મોડ"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"સ્ક્રીન પર એકજ સમયે બહુવિધ પ્રવૃત્તિ."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"બહુ-વિંડો મોડ સક્ષમ કરીએ?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ચેતવણી: આ એક ઉચ્ચ પ્રાયોગિક સુવિધા છે જે તાજેતરની એપ્લિકેશન્સ UI મારફતે સમાન સમયે ઑન-સ્ક્રીન બહુવિધ પ્રવૃત્તિઓની મંજૂરી આપે છે. આ સુવિધા સાથે ઉપયોગમાં લેવા પર કેટલીક એપ્લિકેશન્સ ક્રેશ થઈ શકે છે અથવા ઠીકથી કામ કરી શકશે નહીં."</string>
+    <!-- no translation found for debug_applications_category (4206913653849771549) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (8366775083630234121) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4280600650253107163) -->
+    <skip />
+    <!-- no translation found for show_all_anrs (28462979638729082) -->
+    <skip />
+    <!-- no translation found for show_all_anrs_summary (641908614413544127) -->
+    <skip />
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_app_summary_title (4147258989837459172) -->
+    <skip />
+    <!-- no translation found for data_usage_accounting (7170028915873577387) -->
+    <skip />
+    <!-- no translation found for data_usage_app (4970478397515423303) -->
+    <skip />
+    <!-- no translation found for data_usage_app_info_label (3409931235687866706) -->
+    <skip />
+    <!-- no translation found for data_usage_cellular_data (4859424346276043677) -->
+    <skip />
+    <!-- no translation found for data_usage_data_limit (1193930999713192703) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_app_items_header_text (5017850810459372828) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_roaming (8042359966835203296) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_restrict_background (1989394568592253331) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_allow_background (2694761978633359223) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (5322857680792601899) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (2296217964873872571) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_hide_wifi (7290056718050186769) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_ethernet (5181361208532314097) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_hide_ethernet (3326702187179943681) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_metered (6235119991372755026) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_sim_cards (6410498422797244073) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_cellular_networks (5243515735055652279) -->
+    <skip />
+    <!-- no translation found for account_settings_menu_auto_sync (6243013719753700377) -->
+    <skip />
+    <!-- no translation found for account_settings_menu_auto_sync_personal (785541379617346438) -->
+    <skip />
+    <!-- no translation found for account_settings_menu_auto_sync_work (329565580969147026) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_empty (8621855507876539282) -->
+    <skip />
+    <!-- no translation found for data_usage_label_foreground (4938034231928628164) -->
+    <skip />
+    <!-- no translation found for data_usage_label_background (3225844085975764519) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restricted (3568465218866589705) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile (2613595056882494652) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (3934211003105066167) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (6233554774946681175) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (2558557840444266906) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_wifi_limit (1394901415264660888) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (481146038146585749) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_ethernet (7298064366282319911) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (2084466270343460491) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_list_mobile (7219011330831181312) -->
+    <skip />
+    <!-- no translation found for data_usage_list_none (3933892774251050735) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (5900650720568852325) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_forground_label (7654319010655983591) -->
+    <skip />
+    <!-- no translation found for data_usage_background_label (2722008379947694926) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (2279171379771253165) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (7510046552380574925) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (3720075732277934106) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary_disabled (1446565717342917727) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (1613108390242737923) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (5871168521456832764) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_denied_dialog (4674085030810350875) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (8581983093524041669) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (8651376294887142858) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (8821760330497941117) -->
+    <skip />
+    <!-- no translation found for data_usage_warning_editor_title (3704136912240060339) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_editor_title (9153595142385030015) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (5788774061143636263) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (3511301596446820549) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background_title (2201315502223035062) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background (8210134218644196511) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background_multiuser (3262993384666280985) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background_multiuser (4352615206362479722) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_limit (860566507375933039) -->
+    <skip />
+    <!-- no translation found for data_usage_uninstalled_apps (614263770923231598) -->
+    <skip />
+    <!-- no translation found for data_usage_uninstalled_apps_users (7986294489899813194) -->
+    <skip />
+    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
+    <skip />
+    <!-- no translation found for data_usage_total_during_range (4091294280619255237) -->
+    <skip />
+    <!-- no translation found for data_usage_total_during_range_mobile (5961720793603268572) -->
+    <skip />
+    <!-- no translation found for data_usage_total_during_range_mobile (1625833170144610767) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_title (7383175371006596441) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_body (3262343834446126044) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_mobile (2326986339431119372) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_wifi (1761738002328299714) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_wifi_disabled (727808462375941567) -->
+    <skip />
+    <!-- no translation found for data_usage_disclaimer (6887858149980673444) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_return_to_call (5613717339452772491) -->
+    <skip />
+    <!-- no translation found for vpn_name (4689699885361002297) -->
+    <skip />
+    <!-- no translation found for vpn_type (5435733139514388070) -->
+    <skip />
+    <!-- no translation found for vpn_server (2123096727287421913) -->
+    <skip />
+    <!-- no translation found for vpn_mppe (6639001940500288972) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_identifier (4098175859460006296) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_secret (4526453255704888704) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_user_cert (6880651510020187230) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_ca_cert (91338213449148229) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
+    <skip />
+    <!-- no translation found for vpn_show_options (7182688955890457003) -->
+    <skip />
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_dns_servers (5570715561245741829) -->
+    <skip />
+    <!-- no translation found for vpn_routes (3818655448226312232) -->
+    <skip />
+    <!-- no translation found for vpn_username (1863901629860867849) -->
+    <skip />
+    <!-- no translation found for vpn_password (6756043647233596772) -->
+    <skip />
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <!-- no translation found for vpn_no_ca_cert (2095005387500126113) -->
+    <skip />
+    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
+    <skip />
+    <!-- no translation found for vpn_cancel (1979937976123659332) -->
+    <skip />
+    <!-- no translation found for vpn_save (4233484051644764510) -->
+    <skip />
+    <!-- no translation found for vpn_connect (8469608541746132301) -->
+    <skip />
+    <!-- no translation found for vpn_edit (8647191407179996943) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
+    <skip />
+    <!-- no translation found for vpn_title (6317731879966640551) -->
+    <skip />
+    <!-- no translation found for vpn_create (5628219087569761496) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (408275284159243490) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
+    <skip />
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
+    <!-- no translation found for vpn_no_network (3050233675132726155) -->
+    <skip />
+    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_system_tab (3984284264816924534) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_user_tab (2244732111398939475) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_label (3864493185845818506) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_label (2498444573635146913) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_label (3633691709300260836) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_confirmation (83215982842660869) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_confirmation (8199697813361646792) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_confirmation (443561923016852941) -->
+    <skip />
+    <!-- no translation found for spellcheckers_settings_title (399981228588011501) -->
+    <skip />
+    <!-- no translation found for current_backup_pw_prompt (7735254412051914576) -->
+    <skip />
+    <!-- no translation found for new_backup_pw_prompt (8755501377391998428) -->
+    <skip />
+    <!-- no translation found for confirm_new_backup_pw_prompt (3238728882512787864) -->
+    <skip />
+    <!-- no translation found for backup_pw_set_button_text (2387480910044648795) -->
+    <skip />
+    <!-- no translation found for backup_pw_cancel_button_text (8845630125391744615) -->
+    <skip />
+    <!-- no translation found for additional_system_update_settings_list_item_title (214987609894661992) -->
+    <skip />
+    <!-- no translation found for selinux_status_disabled (924551035552323327) -->
+    <skip />
+    <!-- no translation found for selinux_status_permissive (6004965534713398778) -->
+    <skip />
+    <!-- no translation found for selinux_status_enforcing (2252703756208463329) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (4583879256548819713) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8216218659139190498) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
+    <!-- no translation found for user_settings_title (6151874007858148344) -->
+    <skip />
+    <!-- no translation found for user_list_title (7937158411137563543) -->
+    <skip />
+    <!-- no translation found for user_add_user_or_profile_menu (6923838875175259418) -->
+    <skip />
+    <!-- no translation found for user_add_user_menu (1675956975014862382) -->
+    <skip />
+    <!-- no translation found for user_summary_restricted_profile (6354966213806839107) -->
+    <skip />
+    <!-- no translation found for user_need_lock_message (2596365678651842785) -->
+    <skip />
+    <!-- no translation found for user_set_lock_button (8311219392856626841) -->
+    <skip />
+    <!-- no translation found for user_summary_not_set_up (8778205026866794909) -->
+    <skip />
+    <!-- no translation found for user_summary_restricted_not_set_up (1628116001964325544) -->
+    <skip />
+    <!-- no translation found for user_summary_managed_profile_not_set_up (1659125858619760573) -->
+    <skip />
+    <!-- no translation found for user_owner (3879126011135546571) -->
+    <skip />
+    <!-- no translation found for user_you (1639158809315025986) -->
+    <skip />
+    <!-- no translation found for user_nickname (5148818000228994488) -->
+    <skip />
+    <!-- no translation found for user_add_user_type_title (2146438670792322349) -->
+    <skip />
+    <!-- no translation found for user_add_user_item_summary (4702776187132008661) -->
+    <skip />
+    <!-- no translation found for user_add_profile_item_summary (5931663986889138941) -->
+    <skip />
+    <!-- no translation found for user_add_user_item_title (8212199632466198969) -->
+    <skip />
+    <!-- no translation found for user_add_profile_item_title (8353515490730363621) -->
+    <skip />
+    <!-- no translation found for user_add_user_title (2108112641783146007) -->
+    <skip />
+    <!-- no translation found for user_add_user_message_long (8562152293752222985) -->
+    <skip />
+    <!-- no translation found for user_add_user_message_short (1511354412249044381) -->
+    <skip />
+    <!-- no translation found for user_setup_dialog_title (1765794166801864563) -->
+    <skip />
+    <!-- no translation found for user_setup_dialog_message (1004068621380867148) -->
+    <skip />
+    <!-- no translation found for user_setup_profile_dialog_message (3896568553327558731) -->
+    <skip />
+    <!-- no translation found for user_setup_button_setup_now (3391388430158437629) -->
+    <skip />
+    <!-- no translation found for user_setup_button_setup_later (3068729597269172401) -->
+    <skip />
+    <!-- no translation found for user_cannot_manage_message (8440449301994432789) -->
+    <skip />
+    <!-- no translation found for user_cannot_manage_message (1133251987818014757) -->
+    <skip />
+    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
+    <skip />
+    <!-- no translation found for user_remove_user_menu (6897150520686691355) -->
+    <skip />
+    <!-- no translation found for user_add_on_lockscreen_menu (3025132738715222247) -->
+    <skip />
+    <!-- no translation found for user_new_user_name (369856859816028856) -->
+    <skip />
+    <!-- no translation found for user_new_profile_name (2632088404952119900) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_self_title (8432050170899479556) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_title (1163721647646152032) -->
+    <skip />
+    <!-- no translation found for user_profile_confirm_remove_title (5573161550669867342) -->
+    <skip />
+    <!-- no translation found for work_profile_confirm_remove_title (2017323555783522213) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_self_message (8167855311779740207) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_self_message (5391888073786090274) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_message (1020629390993095037) -->
+    <skip />
+    <!-- no translation found for work_profile_confirm_remove_message (7593793549364168783) -->
+    <skip />
+    <!-- no translation found for user_profile_confirm_remove_message (7373754145959298522) -->
+    <skip />
+    <!-- no translation found for user_adding_new_user (1521674650874241407) -->
+    <skip />
+    <!-- no translation found for user_delete_user_description (3158592592118767056) -->
+    <skip />
+    <!-- no translation found for user_delete_button (5131259553799403201) -->
+    <skip />
+    <!-- no translation found for user_guest (8475274842845401871) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_title (5613997155527410675) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (3405527634738147409) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_message (2194459201944413257) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_dialog_remove (6351370829952745350) -->
+    <skip />
+    <!-- no translation found for user_enable_calling (5128605672081602348) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_sms (9172507088023097063) -->
+    <skip />
+    <!-- no translation found for user_remove_user (6490483480937295389) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_confirm_title (4315789475268695378) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_confirm_message (8061594235219352787) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_and_sms_confirm_title (7243308401401932681) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_and_sms_confirm_message (4025082715546544967) -->
+    <skip />
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
+    <!-- no translation found for only_one_home_message (3538846733750242759) -->
+    <skip />
+    <!-- no translation found for global_change_warning (8045013389464294039) -->
+    <skip />
+    <!-- no translation found for global_change_warning (2461264421590324675) -->
+    <skip />
+    <!-- no translation found for global_locale_change_title (5956281361384221451) -->
+    <skip />
+    <!-- no translation found for global_font_change_title (1887126466191012035) -->
+    <skip />
+    <!-- no translation found for nfc_payment_settings_title (1807298287380821613) -->
+    <skip />
+    <!-- no translation found for google_wallet (9122936252378589227) -->
+    <skip />
+    <!-- no translation found for nfc_payment_no_apps (2481080809791416010) -->
+    <skip />
+    <!-- no translation found for nfc_payment_favor_foreground (8881893980929835838) -->
+    <skip />
+    <!-- no translation found for nfc_payment_learn_more (5583407773744324447) -->
+    <skip />
+    <!-- no translation found for nfc_more_title (815910943655133280) -->
+    <skip />
+    <!-- no translation found for nfc_payment_menu_item_add_service (2885947408068969081) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (8961120988148253016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (3803693771001226795) -->
+    <skip />
+    <!-- no translation found for restriction_settings_title (4233515503765879736) -->
+    <skip />
+    <!-- no translation found for restriction_menu_reset (2067644523489568173) -->
+    <skip />
+    <!-- no translation found for restriction_menu_change_pin (740081584044302775) -->
+    <skip />
+    <!-- no translation found for app_notifications_switch_label (9124072219553687583) -->
+    <skip />
+    <!-- no translation found for help_label (6886837949306318591) -->
+    <skip />
+    <!-- no translation found for user_account_title (1127193807312271167) -->
+    <skip />
+    <!-- no translation found for user_picture_title (7297782792000291692) -->
+    <skip />
+    <!-- no translation found for extreme_threats_title (6549541803542968699) -->
+    <skip />
+    <!-- no translation found for extreme_threats_summary (8777860706500920667) -->
+    <skip />
+    <!-- no translation found for severe_threats_title (8362676353803170963) -->
+    <skip />
+    <!-- no translation found for severe_threats_summary (8848126509420177320) -->
+    <skip />
+    <!-- no translation found for amber_alerts_title (2772220337031146529) -->
+    <skip />
+    <!-- no translation found for amber_alerts_summary (4312984614037904489) -->
+    <skip />
+    <!-- no translation found for repeat_title (6473587828597786996) -->
+    <skip />
+    <!-- no translation found for call_manager_enable_title (7718226115535784017) -->
+    <skip />
+    <!-- no translation found for call_manager_enable_summary (8458447798019519240) -->
+    <skip />
+    <!-- no translation found for call_manager_title (4479949569744516457) -->
+    <skip />
+    <!-- no translation found for call_manager_summary (5918261959486952674) -->
+    <skip />
+    <!-- no translation found for cell_broadcast_settings (2451014351355183338) -->
+    <skip />
+    <!-- no translation found for network_operators_settings (2583178259504630435) -->
+    <skip />
+    <!-- no translation found for access_point_names (1381602020438634481) -->
+    <skip />
+    <!-- no translation found for enhanced_4g_lte_mode_title (5808043757309522392) -->
+    <skip />
+    <!-- no translation found for enhanced_4g_lte_mode_summary (1376589643017218924) -->
+    <skip />
+    <!-- no translation found for preferred_network_type_title (3431041717309776341) -->
+    <skip />
+    <!-- no translation found for preferred_network_type_summary (6564884693884755019) -->
+    <skip />
+    <!-- no translation found for work_sim_title (4843322164662606891) -->
+    <skip />
+    <!-- no translation found for user_restrictions_title (5794473784343434273) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <!-- no translation found for app_restrictions_custom_label (6160672982086584261) -->
+    <skip />
+    <!-- no translation found for user_restrictions_controlled_by (3164078767438313899) -->
+    <skip />
+    <!-- no translation found for app_sees_restricted_accounts (7503264525057246240) -->
+    <skip />
+    <!-- no translation found for app_sees_restricted_accounts_and_controlled_by (6968697624437267294) -->
+    <skip />
+    <!-- no translation found for restriction_wifi_config_title (8889556384136994814) -->
+    <skip />
+    <!-- no translation found for restriction_wifi_config_summary (70888791513065244) -->
+    <skip />
+    <!-- no translation found for restriction_bluetooth_config_title (8871681580962503671) -->
+    <skip />
+    <!-- no translation found for restriction_bluetooth_config_summary (8372319681287562506) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_title (5888100955212267941) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_summary_config (3232480757215851738) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_summary (3891097373396149915) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_summary (825331120501418592) -->
+    <skip />
+    <!-- no translation found for restriction_location_enable_title (5020268888245775164) -->
+    <skip />
+    <!-- no translation found for restriction_location_enable_summary (3489765572281788755) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
+    <!-- no translation found for user_image_take_photo (1280274310152803669) -->
+    <!-- no translation found for user_image_take_photo (7496128293167402354) -->
+    <skip />
+    <!-- no translation found for user_image_choose_photo (7940990613897477057) -->
+    <!-- no translation found for user_image_choose_photo (3746334626214970837) -->
+    <skip />
+    <!-- no translation found for user_image_photo_selector (5492565707299454873) -->
+    <skip />
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <!-- no translation found for sim_setup_wizard_title (1732682852692274928) -->
+    <skip />
+    <!-- no translation found for sim_settings_title (6822745211458959756) -->
+    <skip />
+    <!-- no translation found for sim_settings_summary (4050372057097516088) -->
+    <skip />
+    <!-- no translation found for sim_cards_changed_message (7900721153345139783) -->
+    <skip />
+    <!-- no translation found for sim_cards_changed_message_summary (5452545583546944683) -->
+    <skip />
+    <!-- no translation found for sim_cellular_data_unavailable (9018555543451203035) -->
+    <skip />
+    <!-- no translation found for sim_cellular_data_unavailable_summary (3654805961942166428) -->
+    <skip />
+    <!-- no translation found for sim_calls_always_use (7936774751250119715) -->
+    <skip />
+    <!-- no translation found for select_sim_for_data (2366081042162853044) -->
+    <skip />
+    <!-- no translation found for data_switch_started (2040761479817166311) -->
+    <skip />
+    <!-- no translation found for select_sim_for_calls (3503094771801109334) -->
+    <skip />
+    <!-- no translation found for sim_select_card (211285163525563293) -->
+    <skip />
+    <!-- no translation found for sim_card_number_title (7845379943474336488) -->
+    <skip />
+    <!-- no translation found for sim_slot_empty (8964505511911854688) -->
+    <skip />
+    <!-- no translation found for sim_editor_name (1722945976676142029) -->
+    <skip />
+    <!-- no translation found for sim_name_hint (7038643345238968930) -->
+    <skip />
+    <!-- no translation found for sim_editor_title (4034301817366627870) -->
+    <skip />
+    <!-- no translation found for sim_editor_carrier (5684523444677746573) -->
+    <skip />
+    <!-- no translation found for sim_editor_number (6705955651035440667) -->
+    <skip />
+    <!-- no translation found for sim_editor_color (2542605938562414355) -->
+    <skip />
+    <!-- no translation found for sim_card_select_title (6668492557519243456) -->
+    <skip />
+    <!-- no translation found for color_orange (4417567658855022517) -->
+    <skip />
+    <!-- no translation found for color_purple (3888532466427762504) -->
+    <skip />
+    <!-- no translation found for sim_no_inserted_msg (210316755353227087) -->
+    <skip />
+    <!-- no translation found for sim_status_title (6744870675182447160) -->
+    <skip />
+    <!-- no translation found for sim_call_back_title (5181549885999280334) -->
+    <skip />
+    <!-- no translation found for sim_outgoing_call_title (1019763076116874255) -->
+    <skip />
+    <!-- no translation found for sim_other_call_settings (8247802316114482477) -->
+    <skip />
+    <!-- no translation found for preferred_network_offload_title (1605829724169550275) -->
+    <skip />
+    <!-- no translation found for preferred_network_offload_header (2321173571529106767) -->
+    <skip />
+    <!-- no translation found for preferred_network_offload_footer (5857279426054744020) -->
+    <skip />
+    <!-- no translation found for preferred_network_offload_popup (2252915199889604600) -->
+    <skip />
+    <!-- no translation found for sim_signal_strength (9144010043784767984) -->
+    <skip />
+    <!-- no translation found for sim_notification_title (6272913297433198340) -->
+    <skip />
+    <!-- no translation found for sim_notification_summary (5024470200658902406) -->
+    <skip />
+    <!-- no translation found for sim_pref_divider (6778907671867621874) -->
+    <skip />
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
+    <!-- no translation found for sim_selection_required_pref (3446721423206414652) -->
+    <skip />
+    <!-- no translation found for dashboard_title (5453710313046681820) -->
+    <skip />
+    <!-- no translation found for search_results_title (1796252422574886932) -->
+    <skip />
+    <!-- no translation found for search_menu (7053532283559077164) -->
+    <skip />
+    <!-- no translation found for query_hint_text (3350700807437473939) -->
+    <skip />
+    <!-- no translation found for search_recents_queries_label (2128811638532309069) -->
+    <skip />
+    <!-- no translation found for search_results_label (4163304782363526148) -->
+    <skip />
+    <!-- no translation found for keywords_wifi (8947676711698613374) -->
+    <skip />
+    <!-- no translation found for keywords_more_default_sms_app (895656981962034647) -->
+    <skip />
+    <!-- no translation found for keywords_more_mobile_networks (4939725094449606744) -->
+    <skip />
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi કૉલ કૉલિંગ"</string>
+    <!-- no translation found for keywords_home (3626170808219458848) -->
+    <skip />
+    <!-- no translation found for keywords_display (6709007669501628320) -->
+    <skip />
+    <!-- no translation found for keywords_display_brightness_level (8923289340474728990) -->
+    <skip />
+    <!-- no translation found for keywords_display_auto_brightness (8357056338746666901) -->
+    <skip />
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ઘાટી થીમ રાત્રિ મોડ ઝાંખી સ્ક્રીન તેજસ્વીતા ઉલટાવો"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"પૃષ્ઠભૂમિ વ્યક્તિગત કસ્ટમાઇઝ ડિસ્પ્લે"</string>
+    <!-- no translation found for keywords_display_font_size (3404655440064726124) -->
+    <skip />
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"પ્રોજેક્ટ કાસ્ટ કરો"</string>
+    <!-- no translation found for keywords_storage (6572905220031852173) -->
+    <skip />
+    <!-- no translation found for keywords_battery (2096185085932675704) -->
+    <skip />
+    <!-- no translation found for keywords_spell_checker (6106749039734174140) -->
+    <skip />
+    <!-- no translation found for keywords_voice_input (3519547605812413860) -->
+    <skip />
+    <!-- no translation found for keywords_text_to_speech_output (392447904221657930) -->
+    <skip />
+    <!-- no translation found for keywords_date_and_time (2631808108134830066) -->
+    <skip />
+    <!-- no translation found for keywords_factory_data_reset (4355133848707691977) -->
+    <skip />
+    <!-- no translation found for keywords_printing (1701778563617114846) -->
+    <skip />
+    <!-- no translation found for keywords_sounds_and_notifications (5965996187974887000) -->
+    <skip />
+    <!-- no translation found for keywords_sounds_and_notifications_interruptions (2912933812460077912) -->
+    <skip />
+    <!-- no translation found for keywords_app (6334757056536837791) -->
+    <skip />
+    <!-- no translation found for keywords_location (782326973714313480) -->
+    <skip />
+    <!-- no translation found for keywords_location_mode (8584992704568356084) -->
+    <skip />
+    <!-- no translation found for keywords_accounts (1957925565953357627) -->
+    <skip />
+    <!-- no translation found for keywords_users (4673901601478559100) -->
+    <skip />
+    <!-- no translation found for keywords_keyboard_and_ime (5251531893531063855) -->
+    <skip />
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"પસંદગીઓના ડિફોલ્ટને ફરીથી સેટ કરો"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"કટોકટી ice એપ્લિકેશન ડિફોલ્ટ"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"એપ્લિકેશન્સ ડાઉનલોડ એપ્લિકેશન્સ સિસ્ટમ"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"એપ્લિકેશન્સ પરવાનગીઓની સુરક્ષા"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"એપ્લિકેશન્સ ડિફોલ્ટ"</string>
+    <!-- no translation found for keywords_lockscreen (4806191868723291541) -->
+    <skip />
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
+    <!-- no translation found for write_tag (8571858602896222537) -->
+    <skip />
+    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <skip />
+    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <skip />
+    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <skip />
+    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <skip />
+    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <skip />
+    <!-- no translation found for default_sound (8821684447333687810) -->
+    <skip />
+    <!-- no translation found for notification_settings (8791730980212496561) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <!-- no translation found for notification_volume_option_title (6064656124416882130) -->
+    <skip />
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ફક્ત પ્રાધાન્યતાને મંજૂરી"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"સ્વયંચાલિત નિયમો"</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="1168212070233080706">"કોઈ વિક્ષેપ નહીં"</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>
+    <!-- no translation found for ringtone_title (5379026328015343686) -->
+    <skip />
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <!-- no translation found for vibrate_when_ringing_title (3806079144545849032) -->
+    <skip />
+    <!-- no translation found for notification_section_header (95661783916799134) -->
+    <skip />
+    <!-- no translation found for notification_pulse_title (1247988024534030629) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_show (6407527697810672847) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_hide (7891552853357258782) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_interstitial_message (6164532459432182244) -->
+    <skip />
+    <!-- no translation found for app_notifications_title (5810577805218003760) -->
+    <skip />
+    <!-- no translation found for other_sound_settings (3151004537006844718) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (1340569241625989837) -->
+    <skip />
+    <!-- no translation found for docking_sounds_title (155236288949940607) -->
+    <skip />
+    <!-- no translation found for touch_sounds_title (5326587106892390176) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for dock_audio_media_title (1346838179626123900) -->
+    <skip />
+    <!-- no translation found for dock_audio_media_disabled (3430953622491538080) -->
+    <skip />
+    <!-- no translation found for dock_audio_media_enabled (667849382924908673) -->
+    <skip />
+    <!-- no translation found for emergency_tone_silent (1067515631635824291) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8941852695428130667) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (8281126443204950847) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_summary_zero (2409912785614953348) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_summary_nonzero (7930130030691218387) -->
+    <!-- no translation found for no_notification_listeners (2767405417723149879) -->
+    <skip />
+    <!-- no translation found for notification_listener_security_warning_title (6494221261778885893) -->
+    <skip />
+    <!-- no translation found for notification_listener_security_warning_summary (2780319203595885564) -->
+    <skip />
+    <!-- no translation found for loading_notification_apps (5031818677010335895) -->
+    <skip />
+    <string name="app_notification_block_title" msgid="4069351066849087649">"તમામને અવરોધિત કરો"</string>
+    <!-- no translation found for app_notification_block_summary (9049487483231233726) -->
+    <skip />
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"પ્રાધાન્યતા તરીકે ગણો"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"જ્યારે ખલેલ પાડશો નહીં ફક્ત પ્રાધાન્યતા પર સેટ કરેલ હોય ત્યારે આ એપ્લિકેશનની સૂચનાઓ સાંભળવા દો"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"જોવાની મંજૂરી આપો"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"આ એપ્લિકેશનને અમુક સૂચનાઓને વર્તમાન સ્ક્રીન પર દૃશ્યમાં સંક્ષિપ્તમાં સ્લાઇડ કરીને તેમના પર ભાર મૂકવા દો"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"સંવેદનશીલ સામગ્રી છુપાવો"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"જ્યારે ઉપકરણ લૉક કરેલ હોય, ત્યારે આ એપ્લિકેશનની સૂચનાઓમાંની સામગ્રી છુપાવો કે જે ખાનગી માહિતી જણાવી શકે છે."</string>
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7723839972982746568) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_done (3484067728568791014) -->
+    <skip />
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"નિયમનું નામ"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"નિયમ ઉમેરો"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"નિયમ કાઢી નાખો"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" નિયમ કાઢી નાખીએ?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"કાઢી નાખો"</string>
+    <!-- no translation found for zen_mode_rule_type (2289413469580142888) -->
+    <skip />
+    <!-- no translation found for zen_mode_rule_type_unknown (3049377282766700600) -->
+    <skip />
+    <!-- no translation found for zen_mode_configure_rule (8865785428056490305) -->
+    <skip />
+    <!-- no translation found for zen_schedule_rule_type_name (3201273040477861538) -->
+    <skip />
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"નિયમ મળ્યો નથી."</string>
+    <!-- no translation found for zen_mode_rule_summary_combination (2526506268333198254) -->
+    <skip />
+    <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>
+    <!-- no translation found for summary_divider_text (7228986578690919294) -->
+    <skip />
+    <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>
+    <!-- no translation found for zen_mode_calls (7051492091133751208) -->
+    <skip />
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
+    <skip />
+    <!-- no translation found for zen_mode_from (1033337300289871697) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"એલાર્મ્સ"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"સ્મૃતિપત્રો"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ઇવેન્ટ્સ"</string>
+    <string name="zen_mode_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>
+    <!-- no translation found for zen_mode_when (2767193283311106373) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <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_interruptions_voice_title" msgid="855256211259132964">"વિક્ષેપ"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"જ્યારે કૉલ્સ અને સૂચનાઓ આવે ત્યારે"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_prompt (3041817362475695079) -->
+    <skip />
+    <!-- no translation found for zen_mode_duration_voice_prompt (7381920739389625133) -->
+    <skip />
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"હંમેશાં વિક્ષેપિત કરો"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"બંધ,તમામ,બધુંજ"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"ફક્ત પ્રાધાન્યતા વિક્ષેપોને મંજૂરી આપો"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"ફક્ત એલાર્મને મંજૂરી આપો"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"વિક્ષેપિત કરશો નહીં"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <!-- no translation found for zen_mode_duration_indefinte_voice_label (9026001994945950539) -->
+    <skip />
+    <!-- no translation found for zen_mode_duration_minutes_voice_label (4750982084453980) -->
+    <!-- no translation found for zen_mode_duration_hours_voice_label (175180249071227957) -->
+    <!-- no translation found for zen_mode_summary_priority_indefinitely (5417246022606171241) -->
+    <skip />
+    <!-- no translation found for zen_mode_summary_priority_by_minute (1938955186728929112) -->
+    <!-- no translation found for zen_mode_summary_priority_by_hour (6664710096150897823) -->
+    <!-- no translation found for zen_mode_summary_alarams_only_indefinite (7941708969866496605) -->
+    <skip />
+    <!-- no translation found for zen_mode_summary_alarms_only_by_minute (6122003583875424601) -->
+    <!-- no translation found for zen_mode_summary_alarms_only_by_hour (2407703455581767748) -->
+    <!-- no translation found for zen_mode_summary_no_interruptions_indefinite (5705225870569410806) -->
+    <skip />
+    <!-- no translation found for zen_mode_summary_no_interruptions_by_minute (4719882120685708458) -->
+    <!-- no translation found for zen_mode_summary_no_interruptions_by_hour (1508397683895056389) -->
+    <!-- no translation found for zen_mode_summary_always (6172985102689237703) -->
+    <skip />
+    <!-- no translation found for zen_mode_duration_indefinite_voice_synonyms (4213829562303429456) -->
+    <skip />
+    <!-- no translation found for notification_settings_apps_title (1125354590652967250) -->
+    <skip />
+    <!-- no translation found for notification_app_settings_button (6685640230371477485) -->
+    <skip />
+    <!-- no translation found for device_feedback (3238056036766293294) -->
+    <skip />
+    <!-- no translation found for restr_pin_enter_admin_pin (2451187374960131018) -->
+    <skip />
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
+    <!-- no translation found for screen_pinning_title (2292573232264116542) -->
+    <skip />
+    <!-- no translation found for screen_pinning_description (1137904524037468263) -->
+    <skip />
+    <!-- no translation found for screen_pinning_unlock_pattern (8282268570060313339) -->
+    <skip />
+    <!-- no translation found for screen_pinning_unlock_pin (8757588350454795286) -->
+    <skip />
+    <!-- no translation found for screen_pinning_unlock_password (2514079566873826434) -->
+    <skip />
+    <!-- no translation found for screen_pinning_unlock_none (3814188275713871856) -->
+    <skip />
+    <!-- no translation found for managed_user_title (8101244883654409696) -->
+    <skip />
+    <!-- no translation found for experimental_preference (7083015446690681376) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_title (6176450657107806043) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_rotate (4544299861233497728) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_stay_in_portrait (292745182318093651) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_stay_in_landscape (3804752830204062162) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_stay_in_current (317932372686498096) -->
+    <skip />
+    <!-- no translation found for imei_information_title (8499085421609752290) -->
+    <skip />
+    <!-- no translation found for encryption_interstitial_header (5790264941172726485) -->
+    <skip />
+    <!-- no translation found for encryption_continue_button (1121880322636992402) -->
+    <skip />
+    <!-- no translation found for encryption_interstitial_message_pin (3705622704667901162) -->
+    <skip />
+    <!-- no translation found for encryption_interstitial_message_pattern (2944051427890104942) -->
+    <skip />
+    <!-- no translation found for encryption_interstitial_message_password (1439296580879440802) -->
+    <skip />
+    <!-- no translation found for encrypt_require_pin (2063945047845243752) -->
+    <skip />
+    <!-- no translation found for encrypt_require_pattern (6898479411004015810) -->
+    <skip />
+    <!-- no translation found for encrypt_require_password (8770628366276570518) -->
+    <skip />
+    <!-- no translation found for encrypt_dont_require_pin (1082444817726247368) -->
+    <skip />
+    <!-- no translation found for encrypt_dont_require_pattern (6668299362640433843) -->
+    <skip />
+    <!-- no translation found for encrypt_dont_require_password (2580403214917009046) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_require_pin (8299960550048989807) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_require_pattern (1499790256154146639) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_require_password (8841994614218049215) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_message_pin (1890374082842868489) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_message_pattern (4474332516537386384) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_message_password (8166099418487083927) -->
+    <skip />
+    <!-- no translation found for imei_information_title (8499085421609752290) -->
+    <skip />
+    <!-- no translation found for imei_information_summary (2074095606556565233) -->
+    <skip />
+    <!-- no translation found for slot_number (3762676044904653577) -->
+    <skip />
+    <string name="launch_by_default" msgid="2184141780491382435">"ડિફોલ્ટ તરીકે લોંચ કરો"</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="app_launch_domain_links_title" msgid="458956710410857777">"ડોમેન લિંક્સ"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"ડોમેન URL ખોલો"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"એપ્લિકેશનને સીધા જ ડોમેન URL ખોલવાની મંજૂરી આપો"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"સમર્થિત ડોમેન્સ URL"</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="410824961149037234">"આંતરિક મેમરી"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"બાહ્ય મેમરી"</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="notifications_enabled" msgid="6983396130566021385">"ચાલુ"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"અવરોધિત કરો"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"સંવેદનશીલ"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"પ્રાધાન્યતા"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"પ્રાધાન્યતા અને સંવેદનશીલ"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <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="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_3">%d</xliff:g> માંથી <xliff:g id="COUNT_2">%d</xliff:g> પરવાનગીઓ આપી</item>
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> માંથી <xliff:g id="COUNT_2">%d</xliff:g> પરવાનગીઓ આપી</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"કેટલાંક ડિફોલ્ટ્સ સેટ કરેલ છે"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"કોઇ ડિફોલ્ટ્સ સેટ કરેલ નથી"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"બધી એપ્લિકેશન્સ"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"સક્ષમ કરેલ"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"વ્યક્તિગત"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"કાર્યાલય"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"અવરોધિત"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"પ્રાધાન્યતા"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"સંવેદનશીલ"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ડોમેન URL સાથે"</string>
+    <!-- no translation found for trust_agent_disabled_device_admin (5982562414642596563) -->
+    <skip />
+    <string name="advanced_apps" msgid="4812975097124803873">"વિગતવાર"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"અજાણી એપ્લિકેશન"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"પ્રોફાઇલ પસંદ કરો"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"એપ્લિકેશન પરવાનગીઓ"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> માંથી <xliff:g id="COUNT_0">%d</xliff:g> એપ્લિકેશન્સને અતિરિક્ત ઍક્સેસની મંજૂરી છે"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> માંથી <xliff:g id="COUNT_0">%d</xliff:g> એપ્લિકેશન્સને મંજૂરી છે"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"ડોમેન URL"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"કોઇપણ ડોમેન URL ખોલશો નહીં"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' ખોલો"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' અને સંબંધિત URL ખોલો"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> એપ્લિકેશન્સ તેમના ડોમેન URL ખોલી શકે છે</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> એપ્લિકેશન્સ તેમના ડોમેન URL ખોલી શકે છે</item>
+    </plurals>
+    <!-- no translation found for fingerprint_not_recognized (1739529686957438119) -->
+    <skip />
+    <string name="default_apps_title" msgid="1854974637597514435">"ડિફોલ્ટ એપ્લિકેશન્સ"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"બ્રાઉઝર એપ્લિકેશન"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"કોઈ ડિફોલ્ટ બ્રાઉઝર નથી"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ડિફોલ્ટ)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"એપ્લિકેશન્સ સ્ટોરેજ"</string>
+</resources>
diff --git a/res/drawable/setup_illustration_bg.xml b/res/values-h330dp/dimens.xml
similarity index 73%
copy from res/drawable/setup_illustration_bg.xml
copy to res/values-h330dp/dimens.xml
index 0a229c7..eae9660 100644
--- a/res/drawable/setup_illustration_bg.xml
+++ b/res/values-h330dp/dimens.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -15,6 +14,7 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/setup_illustration_tile"
-    android:tileMode="repeat" />
+<resources>
+    <!-- RedactionInterstitial -->
+    <dimen name="redaction_vertical_margins">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 57cb420..676ef50 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"पुश बटन"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
     <item msgid="1148142988678569310">"प्रोजेक्ट मीडिया"</item>
     <item msgid="9130014005474445273">"VPN सक्रिय करें"</item>
+    <item msgid="1165192162975045562">"वॉलपेपर पर लिखें"</item>
+    <item msgid="7129487923652967258">"सहायक संरचना"</item>
+    <item msgid="1069023208100114540">"सहायक स्क्रीनशॉट"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"स्थान"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
     <item msgid="5906017727368097853">"प्रोजेक्ट मीडिया"</item>
     <item msgid="2486614710846178542">"VPN सक्रिय करें"</item>
+    <item msgid="5586547561693629602">"वॉलपेपर पर लिखें"</item>
+    <item msgid="32794179825485062">"सहायक संरचना"</item>
+    <item msgid="7872852746938272552">"सहायक स्क्रीनशॉट"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"कम"</item>
     <item msgid="4212263919458209842">"अत्यधिक"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"बंद"</item>
-    <item msgid="5656544177755411222">"कॉल और मैसेज को कभी कभी रोकें"</item>
-    <item msgid="8735337502532332056">"कॉल और मैसेज को कभी ना रोकें"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"सामान्य"</item>
     <item msgid="866544120205026771">"मध्यम"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"गुलाबी"</item>
     <item msgid="6131821495505931173">"लाल"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (मीडिया ट्रांसफ़र प्रोटोकॉल)"</item>
+    <item msgid="8856820259201251036">"PTP (पिक्चर ट्रांसफ़र प्रोटोकॉल)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB ईथरनेट)"</item>
+    <item msgid="2686051673589572111">"ऑडियो स्रोत"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b280338..aad0f98 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"अनुमति दें"</string>
     <string name="deny" msgid="6947806159746484865">"अस्वीकार करें"</string>
     <string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"अब आप डेवलपर बनने से <xliff:g id="STEP_COUNT">%1$d</xliff:g> चरण दूर हैं"</item>
-    <item quantity="other" msgid="6722953419953594148">"अब आप डेवलपर बनने से <xliff:g id="STEP_COUNT">%1$d</xliff:g> चरण दूर हैं."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">अब आप डेवलपर बननेे से <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण दूर हैं.</item>
+      <item quantity="other">अब आप डेवलपर बननेे से <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण दूर हैं.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"अब आप डेवलपर बन गए हैं!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"आवश्यकता नहीं, आप पहले से ही डेवलपर हैं."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"वायरलेस और नेटवर्क"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS पर SMS बंद करें"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS पंजीकरण आवश्‍यक है को चालू करें"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS पंजीकरण आवश्‍यक है को बंद करें"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE प्रावधान किए गए फ़्लैग को चालू करें"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE प्रावधान किए गए फ़्लैग को बंद करें"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram डंप चालू करें"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram डंप बंद करें"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"सिम पता पुस्‍तिका देखें"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"कनेक्ट किया गया"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"कनेक्‍ट है (फ़ोन नहीं)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"कनेक्‍ट है (मीडि‍या नहीं)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"कनेक्ट किया गया (कोई संदेश एक्सेस नहीं)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"कनेक्‍ट है (फ़ोन या मीडि‍या नहीं)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"डिस्कनेक्‍ट किया गया"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"डिस्‍कनेक्‍ट हो रहा है..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"कनेक्ट हो रहा है..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"युग्‍मित कर रहा है…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"अनामित ब्लूटूथ डिवाइस"</string>
     <string name="progress_scanning" msgid="192587958424295789">"खोजना"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"आस-पास कोई ब्लूटूथ डिवाइस नहीं मिला."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त फ़ाइलें दिखाएं"</string>
     <string name="device_picker" msgid="4978696506172252813">"ब्लूटूथ डिवाइस चुनें"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"ब्लूटूथ अनूमति अनुरोध"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"एक ऐप्स  ब्लूटूथ को चालू करना चाहता है."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"एक ऐप्स इस डिवाइस के लिए ब्लूटूथ चालू करना चाहता है."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"एक ऐप्स  आपके टेबलेट को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य ब्लूटूथ डिवाइस के लिए दृश्यमान बनाना चाहता है."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"एक ऐप्स  आपके फ़ोन को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य ब्लूटूथ डिवाइस के लिए दृश्यमान बनाना चाहता है."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"एक ऐप्स  आपके टेबलेट को अन्य ब्लूटूथ डिवाइस के लिए दृश्यमान बनाना चाहता है. आप इसे बाद में ब्लूटूथ सेटिंग में बदल सकते हैं."</string>
@@ -274,13 +267,11 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"रहने दें"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"जारी रखें"</string>
+    <string name="cancel" msgid="6859253417269739139">"अभी नहीं"</string>
     <string name="okay" msgid="1997666393121016642">"ठीक"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"हां"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"नहीं"</string>
-    <string name="forget" msgid="7267115980248732932">"भूल जाएं"</string>
+    <string name="forget" msgid="1400428660472591263">"भूल जाएं"</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>
@@ -293,7 +284,7 @@
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS संदेश"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"सेल्युलर नेटवर्क पर डेटा उपयोग करने दें"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"रोमिंग में डेटा उपयोग करने दें"</string>
-    <string name="roaming" msgid="3596055926335478572">"डेटा रोमिंग"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"चेहरे का मिलान बेहतर बनाएं"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"जीवंतता जांच"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"अनलॉक करते समय आंख झपकाने की आवश्‍यकता है"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरा स्‍थान, स्‍क्रीन अनलॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"पासवर्ड"</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="3453670509485083962">"जोड़ें"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"स्‍क्रीन लॉक"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"अंगुली की छाप सेटअप"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"अपनी स्‍क्रीन अनलॉक करने या खरीदी की पुष्‍टि करने हेतु आपके फ़िंगरप्रिंट का उपयोग करने के लिए, हमें निम्‍नलिखित कार्य करने होंगे: \n\n✓ आपकी बैकअप स्‍क्रीन लॉक विधि सेट करना \n\n✓ आपका फ़िंगरप्रिंट जोड़ना"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"संवेदक ढूंढें"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"अपने फ़ोन के पीछे फ़िंगरप्रिंट संवेदक का पता लगाएं."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"आइए प्रारंभ करें!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"अपनी अंगुली को अंगुली की छाप के संवेदक पर रखें. जब आपको कंपन का अनुभव हो तो हटा लें."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"बहुत अच्छा! अब दोहराएं."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"उसी अंगुली को अंगुली की छाप के संवेदक पर रखें और जब आपको कंपन का अनुभव हो तो हटा लें."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"अंगुली की छाप जोड़ा है!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जब भी आपको यह आइकन दिखाई दे, आप पहचान के लिए या खरीदारी को अधिकृत करने के लिए अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"जोड़ें"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"आगे"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"अपने डिवाइस को एन्क्रिप्ट करने की पुष्टि करने के लिए आपको अपना अनलॉक प्रतिमान बनाना होगा."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"एन्‍क्रिप्‍ट करें?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"एन्‍क्रिप्शन कार्यवाही पूर्ववत नहीं की जा सकती है और यदि आप इसमें बाधा डालते हैं, तो आप डेटा खो देंगे. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान टेबलेट कई बार पुन: प्रारंभ होगा."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"सुरक्षित करने का कार्यवाही पूर्ववत नहीं की जा सकती है और यदि आप इसमें बाधा डालते हैं, तो आप डेटा खो देंगे. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान फ़ोन कई बार पुन: प्रारंभ होगा."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"फेस अनलॉक"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"निम्न सुरक्षा, प्रयोगात्‍मक"</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>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"पासवर्ड"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षा"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"वर्तमान स्क्रीन लॉक"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"डिवाइस सुरक्षा सुविधाएं अब काम नहीं करेंगी."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"व्यवस्‍थापक, एन्‍क्रिप्शन नीति, या प्रमाणिकता मेमोरी द्वारा अक्षम किया गया"</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_biometric_weak" msgid="3008473624490350142">"फेस अनलॉक"</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="7579210814842056547">"स्‍क्रीन लॉक सेट करने के बाद, आप सेटिंग और सुरक्षा में अपनी अंगुली की छाप भी सेट कर सकते हैं."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"स्‍क्रीन लॉक बंद करें"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"अनलॉक आकार निकालें"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"अनलॉक पिन निकालें"</string>
@@ -427,35 +437,35 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"पासवर्ड में कम से कम एक अक्षर होना चाहिए."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"पासवर्ड में कम से कम एक अंक होना चाहिए."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"पासवर्ड में कम से कम एक प्रतीक होना चाहिए."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"पासवर्ड में कम से कम 1 अक्षर होना चाहिए."</item>
-    <item quantity="other" msgid="8186027808415585970">"पासवर्ड में कम से कम %d अक्षर होने चाहिए."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"पासवर्ड में कम से कम 1 लोअरकेस अक्षर होना चाहिए."</item>
-    <item quantity="other" msgid="2693910942679679225">"पासवर्ड में कम से कम %d लोअरकेस अक्षर होने चाहिए."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"पासवर्ड में कम से कम 1 अपरकेस अक्षर होना चाहिए."</item>
-    <item quantity="other" msgid="3030801209112209245">"पासवर्ड में कम से कम %d अपरकेस अक्षर होने चाहिए."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"पासवर्ड में कम से कम 1 संख्‍यात्‍मक अंक होना चाहिए."</item>
-    <item quantity="other" msgid="4703982391407595924">"पासवर्ड में कम से कम %d संख्‍यात्‍मक अंक होने चाहिए."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"पासवर्ड में कम से कम 1 विशेष प्रतीक होना चाहिए."</item>
-    <item quantity="other" msgid="1221290525051187757">"पासवर्ड में कम से कम %d विशेष प्रतीक होने चाहिए."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"पासवर्ड में कम से कम 1 वर्ण ऐसा होना चाहिए जो अक्षर न हो."</item>
-    <item quantity="other" msgid="3952508584649046404">"पासवर्ड में कम से कम %d वर्ण ऐसे होने चाहिए जो अक्षर न हों."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">पासवर्ड में कम से कम %d अक्षर होने चाहिए.</item>
+      <item quantity="other">पासवर्ड में कम से कम %d अक्षर होने चाहिए.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">पासवर्ड में कम से कम %d लोअरकेस अक्षर होने चाहिए.</item>
+      <item quantity="other">पासवर्ड में कम से कम %d लोअरकेस अक्षर होने चाहिए.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">पासवर्ड में कम से कम %d अपरकेस अक्षर होने चाहिए.</item>
+      <item quantity="other">पासवर्ड में कम से कम %d अपरकेस अक्षर होने चाहिए.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">पासवर्ड में कम से कम %d संख्‍यात्‍मक अंक होने चाहिए.</item>
+      <item quantity="other">पासवर्ड में कम से कम %d संख्‍यात्‍मक अंक होने चाहिए.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">पासवर्ड में कम से कम %d विशेष प्रतीक होने चाहिए.</item>
+      <item quantity="other">पासवर्ड में कम से कम %d विशेष प्रतीक होने चाहिए.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">पासवर्ड में कम से कम %d वर्ण ऐसे होने चाहिए जो अक्षर ना हों.</item>
+      <item quantity="other">पासवर्ड में कम से कम %d वर्ण ऐसे होने चाहिए जो अक्षर ना हों.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"डिवाइस नियंत्रक हाल ही के पासवर्ड का उपयोग करने की अनुमति नहीं देता."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"अंकों का आरोही, अवरोही या पुनरावृत्ति अनुक्रम निषिद्ध है"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ठीक है"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"रहने दें"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"रहने दें"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"अभी नहीं"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"अभी नहीं"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"आगे"</string>
     <string name="lock_setup" msgid="3355847066343753943">"सेटअप पूरा हुआ."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"डिवाइस का व्‍यवस्‍थापन"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"युग्‍म बनाएं"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"युग्‍मित करें"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"रहने दें"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"कनेक्ट रहने पर, पेयरिंग आपको अपने संपर्कों और कॉल इतिहास की एक्सेस प्रदान करता है."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्‍मित नहीं हो सका."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"गलत पिन या पासकी के कारण <xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्‍मित नहीं हो सका."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> से संचार नहीं कर सकता."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारा युग्‍मन अस्‍वीकृत किया गया."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"स्थान सटीकता को बेहतर बनाने के लिए, ऐप्‍स और सेवाएं ब्‍लूटूथ के बंद होने पर भी ब्‍लूटूथ डिवाइसों के लिए स्‍कैन करेंगी. आप इसे <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_specific_profiles_title" msgid="6952214406025825164">"इससे कनेक्‍ट करें…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"मीडिया ऑडियो"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"फ़ोन ऑडियो"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"फ़ाइल स्थानांतरण"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"इनपुट डिवाइस"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"इंटरनेट पहुंच"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"संपर्क साझाकरण"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"संपर्क साझाकरण के लिए उपयोग करें"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"इंटरनेट कनेक्शन साझाकरण"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"संदेश एक्सेस"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"मीडिया ऑडियो से कनेक्‍ट किया गया"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"फ़ोन ऑडियो से कनेक्‍ट किया गया"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"फ़ाइल स्‍थानांतरण सर्वर से कनेक्‍ट किया गया"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"मानचित्र से कनेक्ट किया गया"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"फ़ाइल स्‍थानांतरण सर्वर से कनेक्‍ट नहीं किया गया"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"इनपुट डिवाइस से कनेक्‍ट किया गया"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"मीडिया ऑडियो के लिए उपयोग करें"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"फ़ोन ऑडियो के लिए उपयोग करें"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"फ़ाइल स्‍थानांतरण के लिए उपयोग करें"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"इनपुट के लिए उपयोग करें"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"इंटरनेट पहुंच के लिए उपयोग करें"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"मानचित्र के लिए उपयोग करें"</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_assistant_title" msgid="2553267316621598101">"वाई-फ़ाई सहायक"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"वाई-फ़ाई सहायक के द्वारा कनेक्‍ट है"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"स्क्रीन कास्ट करें"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"वाई-फ़ाई  बंद हो रहा है…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"त्रुटि"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"हवाई जहाज़ मोड में"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"नेटवर्क के लिए स्‍कैन नहीं कर सकता"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"नेटवर्क नोटिफिकेशन"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"सार्वजनिक नेटवर्क उपलब्ध होने पर सूचित करें"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"खराब कनेक्‍शन से बचें"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"जब तक वाई-फ़ाई  नेटवर्क में अच्छा इंटरनेट कनेक्‍शन न हो, तब तक उसका उपयोग न करें"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"उन्हीं नेटवर्क का उपयोग करें जिनमें अच्छा इंटरनेट कनेक्शन है"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"स्कैनिंग हमेशा उपलब्ध है"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"हमेशा स्कैन करने दें"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google की स्थान सेवा और अन्य ऐप्स को नेटवर्क स्कैन करने दें, भले ही वाई-फ़ाई बंद हो"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"खुले वाई-फ़ाई का अपने आप उपयोग करें"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"उच्‍च गुणवत्‍ता वाले के रूप में पहचाने गए खुले नेटवर्क से वाई-फ़ाई सहायक को अपने आप कनेक्‍ट होने दें"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"सहायक चुनें"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्र इंस्टाल करें"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान सटीकता को बेहतर बनाने तथा अन्य प्रयोजनों के लिए, Google और अन्य ऐप्स  आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही वाई-फ़ाई  बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"ऐप्स  आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही वाई-फ़ाई  बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"स्थान सटीकता को बेहतर बनाने के लिए, ऐप्‍स और सेवाएं वाई-फ़ाई के बंद होने पर भी वाई-फ़ाई डिवाइसों के लिए स्‍कैन करेंगी. आप इसे <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="5340097010842405981">"फिर से न दिखाएं"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"प्रयोग में नहीं रहने के दौरान वाई-फ़ाई  चालू रखें"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"निष्क्रिय रहने पर वाई-फ़ाई चालू"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"कोई अन्य नेटवर्क जोड़ें"</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्‍वचालित सेटअप (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"सेटअप पूर्ण करने के लिए, आपके टेबलेट को वाई-फ़ाई की एक्सेस चाहिए. सेटअप के बाद, आप सेल्युलर डेटा और वाई-फ़ाई के बीच स्विच कर सकते हैं."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"अतिरिक्त सेटिंग"</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="5940801028985255304">"अपने राउटर पर वाई-फ़ाई  सुरक्षित सेटअप बटन दबाएं. इसे \"WPS\" कहा जा सकता है या इसमें यह चिन्ह हो सकता है:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"अपने राउटर पर वाई-फ़ाई सुरक्षित सेटअप बटन दबाएं. इसे \"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>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"कॉन्‍फ़िग AP बैंड"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(अपरिवर्तित)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(अनिर्दिष्ट)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"सहेजा गया"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"अक्षम"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP कॉन्‍फ़िगरेशन की विफलता"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"वाईफ़ाई कनेक्‍शन विफलता"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"प्रमाणीकरण समस्या"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"रेंज में नहीं"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"किसी इंटरनेट कनेक्‍शन का पता नहीं चला, अपने आप पुन: कनेक्‍ट नहीं हो सकता."</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_security_none" msgid="7985461072596594400">"कोई नहीं"</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>
@@ -686,14 +659,16 @@
     <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="1509171132175355674">"इस नेटवर्क में इंटरनेट ऐक्सेस नहीं है. क्या फिर भी इस नेटवर्क का उपयोग करें?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"इस नेटवर्क के लिए फिर से ना पूछें"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"जोड़ दें"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"नेटवर्क से कनेक्ट करने में विफल रहा"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"भूलें"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"नेटवर्क भूलने में विफल रहा"</string>
     <string name="wifi_save" msgid="3331121567988522826">"जोड़ें"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"नेटवर्क सहेजने में विफल रहा"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"रहने दें"</string>
-    <string name="wifi_skip_anyway" msgid="6965361454438011190">"रहने दें"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"अभी नहीं"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"अभी नहीं"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"छोड़े नहीं"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"चेतावनी: यदि आप वाई-फ़ाई को छोड़ते हैं, तो आपका टेबलेट आरंभिक डाउनलोड और नई जानकारी के लिए केवल सेल्युलर डेटा का उपयोग करेगा. संभावित डेटा शुल्क से बचने के लिए, वाई-फ़ाई से कनेक्ट करें."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"चेतावनी: यदि आप वाई-फ़ाई को छोड़ते हैं, तो आपका डिवाइस आरंभिक डाउनलोड और अपडेट के लिए केवल सेल्युलर डेटा का उपयोग करेगा. संभावित डेटा शुल्क से बचने के लिए, वाई-फ़ाई से कनेक्ट करें."</string>
@@ -714,7 +689,7 @@
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"सहेजे गए नेटवर्क"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP सेटिंग"</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_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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK पोर्टेबल वाई-फ़ाई हॉटस्पॉट"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<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_mode_title" msgid="2164073796253284289">"कॉल को प्राथमिकता"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"वाई-फ़ाई कॉलिंग मोड"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"वाई-फ़ाई को प्राथमिकता"</item>
+    <item msgid="5267397515594230396">"सेल्‍युलर को प्राथमिकता"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"वाई-फ़ाई कॉलिंग चालू होने पर, आपका फ़ोन आपकी प्राथमिकता और अधिक सशक्त सिग्‍नल के आधार पर वाई-फ़ाई नेटवर्क या आपके वाहक के नेटवर्क के द्वारा कॉल को रूट कर सकता है. इस सुविधा को चालू करने से पहले, शुल्‍क और अन्‍य विवरणों के बारे में अपने वाहक से बात करें."</string>
     <string name="home_settings" msgid="212375129455718176">"होम"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनि"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"थीम"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"हल्का"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"गहरा"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"स्वचालित"</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>
@@ -857,7 +849,7 @@
     <string name="sim_change_succeeded" msgid="8556135413096489627">"सिम पिन सफलतापूर्वक बदला गया"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"सिम कार्ड लॉक स्‍थिति नहीं बदल सकता.\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="7018740080801483990">"सेल्युलर डेटा के लिए अपनी पसंदीदा सिम चुनें."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"डेटा सिम बदलें?"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"पसंदीदा सिम कार्ड अपडेट करें?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<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">
-    <item quantity="one" msgid="4840607930166101114">"गलत सिम पिन कोड, अपने डिवाइस को अनलॉक करने के लिए अपने वाहक से संपर्क करने से पहले आपके पास <xliff:g id="NUMBER">%d</xliff:g> प्रयास शेष है."</item>
-    <item quantity="other" msgid="77103619544346451">"गलत सिम PIN कोड, आपके पास <xliff:g id="NUMBER">%d</xliff:g> प्रयास शेष हैं."</item>
-  </plurals>
+    <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>
+    </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="default" msgid="475872867864762157">"फ़ोन स्‍थिति"</string>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"ऐप्स (ऐप्स और मीडिया डेटा)"</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_dcim_usage" msgid="558887013613822577">"चित्र, वीडियो"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"ऑडियो (संगीत, रिंगटोन, पॉडकास्‍ट, आदि)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"विविध"</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="default" msgid="6915293408836853020">"SD कार्ड अनमाउंट करें"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"माउंट करें"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"निकालें"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"मिटाएं और फ़ॉर्मेट करें"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"आंतरिक मेमोरी के रूप में मिटाएं व फ़ॉर्मेट करें"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB कंप्‍यूटर कनेक्‍शन"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB कंप्‍यूटर कनेक्‍शन"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"इस रूप में कनेक्ट करें"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"आपको Windows पर मीडि‍या फ़ाइल स्‍थानांतरि‍त करने, या Mac पर Android File Transfer का उपयोग करने देता है (www.android.com/filetransfer देखें)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"कैमरा (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"आपको कैमरा सॉफ़्टवेयर का उपयोग करके फ़ोटो स्‍थानांतरित करने देता है, और MTP का समर्थन न करने वाले कंप्‍यूटरों पर कोई भी फ़ाइलें स्‍थानांतरित करने देता है"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"फ़ाइल स्थानांतरण डिवाइस इंस्‍टॉल करें"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI सक्षम ऐप्‍लिकेशन को आपके कंप्‍यूटर पर MIDI सॉफ़्टवेयर के साथ USB पर कार्य करने देती है."</string>
     <string name="storage_other_users" msgid="808708845102611856">"अन्य उपयोगकर्ता"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"डिवाइस मेमोरी"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"निकाले जाने योग्‍य मेमोरी"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> नि:शुल्‍क (कुल <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> माउंट किया गया है"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> को फ़ॉर्मेट नहीं किया जा सका"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"मेमोरी का नाम बदलें"</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="3677827796634199714"><b>"आपके द्वारा इस <xliff:g id="NAME_0">^1</xliff:g> को निकाल दिए जाने पर इसमें संग्रहीत ऐप्स काम करना बंद कर देंगे और इसमें संग्रहीत मीडिया फ़ाइलें तब तक उपलब्ध नहीं होंगी जब तक कि इसे फिर से नहीं डाल दिया जाता."</b>" \n\nइस <xliff:g id="NAME_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_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_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="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट करते समय ना निकालें."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"डेटा को नई मेमोरी में ले जाएं"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"आप अपनी फ़ोटो, फ़ाइलों और ऐप डेटा को इस नए <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="5035719146373359329"><b>"ले जाने में लगभग <xliff:g id="TIME">^1</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="8641916179067596592">"ले जाने के दौरान: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> को ले जाएं"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"ले जाने के दौरान <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="battery_status_title" msgid="9159414319574976203">"बैटरी स्‍थिति"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"बैटरी स्‍तर"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"नेटवर्क सेटिंग रीसेट कर दी गई"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"इससे सभी नेटवर्क सेटिंग रीसेट हो जाएंगी, जिनमें ये सेटिंग शामिल हैं:\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="4874737348054213767">"सभी नेटवर्क सेटिंग रीसेट करें? आप इस कार्रवाई को वापस नहीं ला सकते!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिंग रीसेट करें"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"रीसेट करें?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"नेटवर्क सेटिंग रीसेट कर दी गई हैं"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"डिवाइस रीसेट करें"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"फ़ैक्टरी डेटा रीसेट"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"टेबलेट से सभी डेटा मिटाएं"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"फ़ोन से सभी डेटा मिटाएं"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"इससे आपके टेबलेट के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"इससे आपके फ़ोन के "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD कार्ड पर मौजूद सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"टेबलेट रीसेट करें"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फ़ोन रीसेट करें"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"आपकी सभी निजी जानकारी और डाउनलोड किए गए ऐप्स मिटाएं? आप इस क्रिया को पूर्ववत नहीं कर सकते!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"आपकी सभी व्यक्तिगत जानकारी और डाउनलोड किए गए ऐप्स मिटाएं? आप इस कार्रवाई को वापस नहीं ला सकते!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सब कुछ मिटाएं"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"आपको फ़ैक्टरी डेटा रीसेट की पुष्टि करने के लिए अपना अनलॉक आकार बनाना होगा."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"सिस्‍टम साफ़ करें सेवा उपलब्‍ध न होने के कारण कोई रीसेट निष्‍पादित नहीं किया गया था."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करें?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"इस उपयोगकर्ता के लिए फ़ैक्टरी रीसेट उपलब्ध नहीं है"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"SD कार्ड में संग्रहीत सभी फ़ाइलें हटाते हुए उसे मिटाएं? आप यह क्रिया पूर्ववत नहीं कर सकते!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD कार्ड में संग्रहीत सभी फ़ाइलें हटाते हुए उसे मिटाएं? आप इस क्रिया को पूर्ववत नहीं कर सकते!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"सब कुछ मिटाएं"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"आप USB मेमोरी मिटाना चाहते हैं, इसकी पुष्टि के लिए आपको अपना अनलॉक आकार बनाना होगा."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"आप SD कार्ड को मिटाना चाहते हैं, इसकी पुष्टि करने के लिए आपको अपना अनलॉक आकार बनाना होगा."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"सहायता"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"सेल्युलर नेटवर्क"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाइल प्लान"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"डिफ़ॉल्ट 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> के बजाय 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"स्थान का पता लगाने के लिए, GPS, वाई-फ़ाई और सेल्युलर नेटवर्क का उपयोग करें"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"स्थान का पता लगाने के लिए वाई-फ़ाई और सेल्युलर नेटवर्क का उपयोग करें"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"अपना स्थान निर्धारित करने के लिए GPS का उपयोग करें"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्‍थान निर्धारित करने के लिए GPS का उपयोग करें"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"स्‍कैन करना"</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="2070686681074461301">"वाई-फ़ाई के बंद होने पर भी ऐप्‍स और सेवाओं को वाई-फ़ाई नेटवर्क स्‍कैन करने की अनुमति देकर स्‍थान सटीकता को बेहतर बनाएं"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्‍लूटूथ स्‍कैन करना"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"सिस्‍टम सेवाओं को ब्‍लूटूथ के बंद होने पर भी ब्‍लूटूथ डिवाइस के लिए स्‍कैन करने की अनुमति देकर स्‍थान सटीकता को बेहतर बनाएं"</string>
     <string name="location_network_based" msgid="6010456018401296590">"वाई-फ़ाई और सेल्युलर नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"आपके स्थान का तेज़ अनुमान लगाने के लिए, ऐप्स को Google की स्थानीय सेवा का उपयोग करने दें. अज्ञात स्थानीय डेटा एकत्रित करके Google को भेजा जाएगा."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाई-फ़ाई  द्वारा निर्धारित किया गया स्‍थान"</string>
@@ -1142,7 +1187,7 @@
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"अपना आकार चुनें"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"अपना पिन चुनें"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"अपने पासवर्ड की दुबारा पूछें"</string>
-    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"अपने आकार की दुबारा पूछें"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"अपने आकार को दुबारा बनाएं"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"अपने पिन की दुबारा पूछें"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"पासवर्ड मेल नहीं खाते"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"पिन मेल नहीं खाते"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"स्क्रीन सुरक्षा"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"जारी रखने के लिए अपने डिवाइस पैटर्न का उपयोग करें."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"जारी रखने के लिए अपना डिवाइस पिन डालें."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"जारी रखने के लिए अपना डिवाइस पासवर्ड डालें."</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_need_to_unlock" msgid="757935356911054465">"सहेजे गए आकार की दुबारा पूछें"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"फिर से प्रयास करें:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"बहुत से गलत प्रयास!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> सेकंड में पुन: प्रयास करें."</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="manageapplications_settings_title" msgid="7041951105633616745">"ऐप्स  प्रबंधित करें"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"इंस्‍टॉल किए गए ऐप्स प्रबंधित करें और निकालें"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1251,7 +1300,7 @@
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"ऐप्स डेटा हटाएं?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"इस ऐप्स का सभी डेटा स्‍थायी रूप से हटा दिया जाएगा. इसमें सभी फ़ाइलें, सेटिंग, खाते, डेटाबेस आदि शामिल हैं."</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="8333723538280257243">"इंस्‍टॉल किए गए ऐप्स की सूची में ऐप्स नहीं मिला."</string>
     <string name="clear_data_failed" msgid="1907582169616856698">"ऐप्स डेटा साफ़ नहीं कर सका."</string>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"मेमोरी उपयोग"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"ऐप्स द्वारा उपयोग किया गया मेमोरी देखें"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"चल रही सेवाएं"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"टेबलेट जानकारी"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"फ़ोन जानकारी"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"बैटरी जानकारी"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"त्वरित लॉन्च"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"ऐप्स लॉन्‍च करने के लिए कीबोर्ड शॉर्टकट सेट करें"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"ऐप्स सौंपें"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"कोई शॉर्टकट नहीं"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"खोज + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"साफ़ करें"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) के आपके शॉर्टकट साफ़ कर दिए जाएंगे."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ठीक है"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"रहने दें"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"ऐप्स"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"शॉर्टकट"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"फ़ाइल के सभी ब्लूटूथ HCI पैकेट कैप्‍चर करें"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM अनलॉक करना"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"बूटलोडर को अनलाॅक किए जाने की अनुमति दें"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"अपना पिन डालें"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM अनलॉक सक्षम करने के लिए अपना डिवाइस पिन डालें"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM अनलॉक करने की अनुमति दें?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"चेतावनी: इस सेटिंग के चालू रहने पर डिवाइस सुरक्षा सुविधाएं इस डिवाइस पर काम नहीं करेंगी."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"लॉगर बफ़र आकार"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"प्रति लॉग बफ़र लॉगर आकार चुनें"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"कृत्रिम स्‍थानों को अनुमति दें"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"कृत्रिम स्‍थानों को अनुमति दें"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"दृश्य विशेषता निरीक्षण सक्षम करें"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"नेटवर्किंग"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस दिखाई देने के लिए प्रमाणन"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाई-फ़ाई वर्बोस प्रवेश सक्षम करें"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"वाई-फ़ाई से सेल्यूलर पर बलपूर्वक हस्तांतरण"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"हमेशा वाई-फ़ाई रोम स्कैन करने दें"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"लीगेसी DHCP क्‍लाइंट"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"वायरलेस दिखाई देने के लिए प्रमाणन विकल्प दिखाएं"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"वाई-फ़ाई प्रवेश स्तर बढ़ाएं, वाई-फ़ाई पिकर में प्रति SSID RSSI दिखाएं"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"इसके सक्षम होने पर, जब वाई-फ़ाई संकेत कमज़ोर हों तो वाई-फ़ाई, डेटा कनेक्शन को सेल्यूलर पर अधिक बलपूर्वक भेजेगा"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"इंटरफ़ेस पर वर्तमान में मौजूद डेटा ट्रैफ़िक के आधार पर वाई-फ़ाई रोम स्कैन करने देता/नहीं देता है"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"लॉगर बफ़र आकार"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"प्रति लॉग बफ़र लॉगर आकार चुनें"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB कॉन्फ़िगरेशन चुनें"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB कॉन्फ़िगरेशन चुनें"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"कृत्रिम स्‍थानों को अनुमति दें"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"कृत्रिम स्‍थानों को अनुमति दें"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"दृश्य विशेषता निरीक्षण सक्षम करें"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"नए Android DHCP क्‍लाइंट के बजाय Lollipop के DHCP क्‍लाइंट का उपयोग करें."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB डीबग करने की अनुमति दें?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB डीबग डीबग करने का उद्देश्‍य केवल विकास है. इसका उपयोग आपके कंप्‍यूटर और आपके डिवाइस के बीच डेटा की प्रतिलिपि बनाने, बिना नोटिफिकेशन के आपके डिवाइस पर ऐप्स इंस्‍टॉल करने और लॉग डेटा पढ़ने के लिए करें."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"आपके द्वारा पूर्व में प्राधिकृत सभी कंप्यूटर से USB डीबगिंग की पहुंच निरस्त करें?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"मैजेंटा"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए यह आवश्यक है:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"चूंकि एक ऐप अनुमति के अनुरोध को अस्पष्ट बना रहा है, इसलिए सेटिंग आपके प्रतिसाद को सत्यापित नहीं कर पा रही हैं."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"यदि आप <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करते हैं, तो आपका डिवाइस डेटा एन्क्रिप्शन को एन्हांस करने के लिए आपके स्क्रीन लॉक का उपयोग नहीं करेगा."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"क्योंकि आपने सरल उपयोग सेवा चालू की हुई है इसलिए आपका डिवाइस डेटा एन्क्रिप्शन को एन्हांस करने के लिए आपके स्क्रीन लॉक का उपयोग नहीं करेगा."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पैटर्न की पुष्‍टि करनी होगी."</string>
@@ -1591,7 +1639,7 @@
     <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_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>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TIME">%2$s</xliff:g> में <xliff:g id="TYPE">%1$s</xliff:g> ऐप्लिकेशन"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<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_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_memory_status" msgid="4251599550196193093">"डिवाइस मेमोरी वर्तमान में <xliff:g id="MEMSTATE">%1$s</xliff:g> है"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"औसत RAM उपयोग"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"अधिकतम RAM उपयोग"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"प्रक्रियाएं"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"सेवाएं"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"अवधि"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"मेमोरी का विवरण"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"सिस्टम छिपाएं"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"नीचे दी गईं डिफ़ॉल्ट सेटिंग ऐप्स सेटिंग को ओवरराइड करती हैं"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"डिफ़ॉल्‍ट सेटिंग"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"डिफ़ॉल्‍ट इंजन"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"बोले गए लेख के लिए उपयोग किए जाने के लिए बोली संश्लेषण इंजन सेट करता है"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"वाक् संश्लेषण इंजन को बोले जाने वाले लेख के लिए सेट करें"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"बोली दर"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"जिस गति से लेख बोला जाता है"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"पिच"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"आपको प्रमाणिकता इंस्‍टॉलेशन की पुष्टि करने के लिए अपना अनलॉक आकार बनाना होगा."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"प्रमाणिकता मेमोरी के लिए पासवर्ड लिखें."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"वर्तमान पासवर्ड:"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"मेरे डेटा को सुरक्षित करें"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"ऐप्स  डेटा, वाई-फ़ाई पासवर्ड, और अन्य सेटिंग को Google सर्वर पर सुरक्षित रखें"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"सुरक्षित खाता"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"वर्तमान में कोई भी खाता बैकअप डेटा संग्रहीत नहीं कर रहा है"</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="5355557151569037197">"बैकअप सेवा निष्‍क्रिय है."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"इसे आपकी डिवाइस नीति द्वारा सेट किया गया है."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्‍कटॉप बैकअप पासवर्ड"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्‍कटॉप पूर्ण बैकअप वर्तमान में सुरक्षित नहीं हैं"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटॉप के पूर्ण बैकअप के पासवर्ड को बदलने या निकालने के लिए स्‍पर्श करें."</string>
@@ -1897,7 +1949,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="7519563569903137003">"किसी नेटवर्क से कनेक्‍ट करने के लिए उसे स्‍पर्श करें"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"मौजूदा नेटवर्क से कनेक्‍ट करें"</string>
@@ -1917,7 +1969,7 @@
     <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>
+    <string name="sync_is_failing" msgid="1591561768344128377">"किसी समस्या के कारण अभी समन्वयन नहीं हो पाया.यह शीघ्र ही उपलब्ध होगा."</string>
     <string name="add_account_label" msgid="7811707265834013767">"खाता जोड़ें"</string>
     <string name="managed_profile_not_available_label" msgid="3489771164851107822">"कार्य प्रोफ़ाइल अभी तक उपलब्ध नहीं है"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"कार्य प्रोफ़ाइल निकालें"</string>
@@ -1945,10 +1997,10 @@
     <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_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="4010643669489606536">"यह बदलाव आपके व्यवस्थापक द्वारा अनुमत नहीं है"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"संक्रमण एनिमेशन स्‍केल"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"एनिमेटर अवधि स्केल"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"द्वितीयक डिस्प्ले अनुरूपित करें"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"एकाधिक विंडो मोड"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"एक ही समय में स्‍क्रीन पर एकाधिक गतिविधियां."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"एकाधिक विंडो मोड सक्षम करें?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"चेतावनी: यह एक अत्‍यधिक प्रयोगात्‍मक सुविधा है जो हाल ही के ऐप्‍स UI द्वारा एक ही समय में स्क्रीन पर एकाधिक गतिविधियों की अनुमति देती है. हो सकता है इस सुविधा के साथ उपयोग किए जाने पर कुछ ऐप्‍स क्रैश हो जाएं या ठीक से काम ना करें."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"ऐप्स"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"गतिविधियों को न रखें"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"उपयोगकर्ता के छोड़ते ही प्रत्‍येक गतिविधि समाप्त करें"</string>
@@ -2039,7 +2095,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>
@@ -2137,7 +2193,7 @@
     <string name="vpn_not_used" msgid="9094191054524660891">"(उपयोग नहीं किया)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(सर्वर सत्‍यापित न करें)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(सर्वर से प्राप्त)"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"रहने दें"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"अभी नहीं"</string>
     <string name="vpn_save" msgid="4233484051644764510">"जोड़ें"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"जोड़ दें"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"VPN प्रोफ़ाइल संपादित करें"</string>
@@ -2165,7 +2221,7 @@
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"पूर्ण बैकअप के लिए यहां नया पासवर्ड लिखें"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"यहां अपना नया पूर्ण सुरक्षित पासवर्ड फिर से लिखें"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"सुरक्षित करने का पासवर्ड सेट करें"</string>
-    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"रहने दें"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"अभी नहीं"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"सिस्‍टम के बारे में अतिरिक्त नई जानकारी"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"अक्षम"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"अनुमति देने वाला"</string>
@@ -2195,7 +2251,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="718192651887726259">"आप अतिरिक्त उपयोगकर्ता बनाकर इस डिवाइस को अन्य लोगों से साझा कर सकते हैं. प्रत्येक उपयोगकर्ता के पास अपना स्वयं का स्थान होता है, जिसे वह अपने स्वयं के ऐप्स, वॉलपेपर आदि से कस्टमाइज़ कर सकता है. उपयोगकर्ता वाई-फ़ाई जैसे डिवाइस की सेटिंग भी एडजस्ट कर सकते हैं जिनसे हर कोई प्रभावित होता है.\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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"फ़ोन कॉल की अनुमति दें"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"फ़ोन कॉल और SMS की अनुमति दें"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"फ़ोन कॉल चालू करें"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"फ़ोन कॉल और SMS चालू करें"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"उपयोगकर्ता निकालें"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"फ़ोन कॉल की अनुमति दें?"</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_sms_confirm_title" msgid="188164598768941316">"फ़ोन कॉल और SMS की अनुमति दें?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"कॉल और SMS इतिहास इस उपयोगकर्ता के साथ साझा किया जाएगा."</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="application_restrictions" msgid="8207332020898004394">"ऐप्स  और सामग्री की अनुमति दें"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंधों वाले ऐप्स"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ऐप्स  सेटिंग विस्तृत करें"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"यह ऐप्स  प्रतिबंधित प्रोफ़ाइल में समर्थित नहीं है"</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>
@@ -2312,7 +2368,7 @@
     <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="select_sim_for_calls" msgid="3503094771801109334">"इससे सिम से कॉल करें"</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>
     <string name="sim_slot_empty" msgid="8964505511911854688">"सिम खाली है"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi वाई-फ़ाई नेटवर्क कनेक्शन"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellular cell carrier wireless data 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"वाईफ़ाई वाई-फ़ाई कॉल कॉलिंग"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लॉन्चर"</string>
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रीन टचस्क्रीन"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"हल्की रोशनी वाली टचस्‍क्रीन बैटरी"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"हल्की रोशनी वाली टचस्‍क्रीन बैटरी"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background personalize customize diplay"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"गहरी थीम, रात्रि मोड, मंद स्क्रीन ,स्‍क्रीन की विपरीत रोशनी"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"पृष्ठभूमि वैयक्तिकृत कस्टमाइज़ प्रदर्शन"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"लेख का आकार"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"प्रोजेक्ट"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"प्रोजेस्ट कास्ट"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"पावर उपयोग का शुल्‍क"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling dictionary spellcheck auto-correct"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"खाता"</string>
     <string name="keywords_users" msgid="4673901601478559100">"प्रतिबंध प्रतिबंधित करें प्रतिबंधित"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"रीसेट करें प्राथमिकता डिफ़ॉल्‍ट"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"आपातकालीन ice ऐप डिफ़ॉल्‍ट"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"ऐप्‍स डाउनलोड ऐप्‍लिकेशन सिस्‍टम"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ऐप्स अनुमति सुरक्षा"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ऐप्‍स डिफ़ॉल्‍ट"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"स्लाइड पासवर्ड प्रतिमान पिन"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाई-फ़ाई  NFC टैग सेट करें"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिखें"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"कॉल और मैसेज को रोकें"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"कॉल और नोटिफिकेशन आने पर"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"हमेशा अवरोधित करें"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"केवल प्राथमिकता वाले कॉल और मैसेज को रोकने की अनुमति दें"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"अवरोध उत्पन्न न करें"</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_option_important_interruptions" msgid="3903928008177972500">"केवल प्राथमिकता"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"केवल अलार्म"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"कोई बाधा नहीं"</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="ringtone_title" msgid="5379026328015343686">"फ़ोन रिंगटोन"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"डिफ़ॉल्ट नोटिफिकेशन रिंगटोन"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल के लिए भी कंपन"</string>
@@ -2399,7 +2463,7 @@
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"जब डिवाइस लॉक किया गया हो"</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="3001013816427963576">"नोटिफिकेशन बिल्कुल न दिखाएं"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"नोटिफिकेशन बिल्कुल ना दिखाएं"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"जब आपका डिवाइस लॉक हो, तो आप नोटिफिकेशन को किस प्रकार दिखाया जाना चाहेंगे?"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ऐप्स नोटिफिकेशन"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"अन्य ध्वनियां"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"कंपन"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"एक्सेस नोटिफिकेशन"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ऐप्स  नोटिफिकेशन नहीं पढ़ सकते"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d ऐप्स  नोटिफिकेशन पढ़ सकता है"</item>
-    <item quantity="other" msgid="980049191810249052">"%d ऐप्स  नोटिफिकेशन पढ़ सकते हैं"</item>
-  </plurals>
+    <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="2767405417723149879">"कोई नोटिफिकेशन श्रवणकर्ता इंस्टॉल नहीं है."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> सक्षम करें?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> सिस्टम द्वारा या इंस्टॉल किए गए किसी भी ऐप्स  द्वारा पोस्ट की गई ऐसी नोटिफिकेशन पढ़ सकेगा, जिनमें संपर्क नाम तथा आपको भेजे गए संदेशों की सामग्री जैसी व्यक्तिगत जानकारी शामिल हो सकती है. वह इन नोटिफिकेशन को ख़ारिज भी कर सकेगा या उनमें मौजूद स्पर्श कार्यवाही बटन स्पर्श कर सकेगा."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"स्थिति प्रदाता"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"कोई भी ऐप्स स्थितियां प्रदान नहीं करता"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d ऐप्स स्थितियां प्रदान करता है"</item>
-    <item quantity="other" msgid="358057362115673258">"%d ऐप्स स्थितियां प्रदान करते हैं"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"कोई भी स्थिति प्रदाता इंस्टॉल नहीं किया गया है."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> सक्षम करें?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> परेशान न करें मोड में अतिरिक्त शर्तें जोड़ सकेगा."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"अवरुद्ध करें"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"सभी रोक दें"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"इस ऐप्स से कभी भी नोटिफिकेशन न दिखाएं"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"प्राथमिकता"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"जब डिवाइस को केवल प्राथमिकता वाले कॉल और मैसेज को रोकने के लिए सेट किया गया हो, तो नोटिफिकेशन को सूची में सबसे ऊपर दिखाएं और उन्हें आते रहने दें"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"संवेदनशील"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"जब डिवाइस लॉक हो, तो किसी भी संवेदनशील सामग्री को इस ऐप्स की नोटिफिकेशन से छिपाएं"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"प्राथमिकता के रूप में व्यवहार करें"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"जब परेशान ना करें केवल प्राथमिकता पर सेट हो, तो इस ऐप के नोटिफिकेशन सुनने दें"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"गुप्त रूप से देखने दें"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"कुछ नोटिफिकेशन को थोड़ी देर के लिए वर्तमान स्‍क्रीन पर स्‍लाइड करके इस ऐप को उन्हें महत्वपूर्ण दर्शाने दें"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"संवेदनशील सामग्री छिपाएं"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"जब डिवाइस लॉक हो, तो इस ऐप के नोटिफिकेशन की सामग्री छिपाएं जो निजी जानकारी को प्रकट कर सकती है"</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="zen_mode_default_option" msgid="6940069025071935243">"जब तक आप इसे बंद नहीं कर देते"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"प्राथमिकता वाले कॉल और मैसेज को रोकें"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"बंद रहने का समय"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"दिन"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"कोई नहीं"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"कॉल और मैसेज को रोकेने की अनुमति है"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"केवल प्राथमिकता"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"कोई नहीं"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"स्वचालन"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"स्वचालित रूप से चालू"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"नियम का नाम"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"नियम जोड़ें"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"नियम हटाएं"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<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="3201273040477861538">"शेड्यूल नियम"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"नियम नहीं मिला."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"कभी नहीं"</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_from" msgid="1033337300289871697">"इसकी ओर से कॉल/संदेश"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"कोई भी"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"केवल संपर्क"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"केवल तारांकित संपर्क"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"ईवेंट और रिमाइंडर्स"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"अलार्म हमेशा प्राथमिकता वाले अवरोध होते हैं"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमाइंडर्स"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ईवेंट"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"चयनित कॉलर"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"कॉलर दोहराएं"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"यदि वही व्‍यक्‍ति <xliff:g id="MINUTES">%d</xliff:g> मिनट की अवधि के भीतर दूसरी बार कॉल करता है, तो उसे अनुमति दें"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वचालित रूप से चालू"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"कभी नहीं"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अगले दिन"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> या पहले के किसी भी अलार्म पर"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"कॉल और मैसेज को रोकें"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"कॉल और नोटिफिकेशन आने पर"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"आपको किस समय बाधित किया जाना उचित होगा?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"कितने समय तक?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"हमेशा कॉल और मैसेज को रोकें"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"अॉफ,सभी,सबकुछ"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"केवल प्राथमिकता वाले कॉल और मैसेज को रोकने की अनुमति दें"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"केवल अलार्म की अनुमति दें"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"कॉल और मैसेज को ना रोकें"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"अनिश्चित काल तक"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <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="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"केवल अनिश्‍चित काल के लिए प्राथमिकता नोटिफिकेशन में बदलें"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"अनिश्‍चित काल के लिए केवल अलार्म को बदलें"</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>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <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_no_interruptions_indefinite" msgid="5705225870569410806">"अनिश्‍चित काल के लिए बाधित ना करें में बदलें"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_always" msgid="6172985102689237703">"हमेशा बाधित करें में बदलें"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"हमेशा के लिए"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ऐप्स नोटिफिकेशन"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"नोटिफिकेशन सेटिंग"</string>
     <string name="device_feedback" msgid="3238056036766293294">"इस डिवाइस के बारे में फ़ीडबैक भेजें"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"डिफ़ॉल्‍ट रूप से लॉन्‍च करें"</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="app_launch_domain_links_title" msgid="458956710410857777">"डोमेन लिंक"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"डोमेन URL खोलें"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"ऐप को सीधे डोमेन URL खोलने की अनुमति दें"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"समर्थित डोमेन URL"</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="410824961149037234">"आंतरिक मेमोरी"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"बाहरी मेमोरी"</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="notifications_enabled" msgid="6983396130566021385">"चालू"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"अवरुद्ध करें"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"संवेदनशील"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"प्राथमिकता"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"प्राथमिकता और संवेदनशील"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <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="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_3">%d</xliff:g> में से <xliff:g id="COUNT_2">%d</xliff:g> अनुमतियां दी गईं</item>
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> में से <xliff:g id="COUNT_2">%d</xliff:g> अनुमतियां दी गईं</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"कुछ डिफ़ॉल्‍ट सेट हैं"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"कोई डिफ़ॉल्‍ट सेट नहीं है"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"सभी ऐप्स"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"सक्षम"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"कार्यस्‍थल"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"अवरोधित"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"प्राथमिकता"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"संवेदनशील"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URL के साथ"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"नियंत्रक के द्वारा अक्षम किया गया"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"अतिरिक्‍त सेटिंग"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"अज्ञात ऐप"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"प्रोफ़ाइल चुनें"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"ऐप अनुमतियां"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> में से <xliff:g id="COUNT_0">%d</xliff:g> ऐप्स को अतिरिक्त एक्सेस की अनुमति है"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> में से <xliff:g id="COUNT_0">%d</xliff:g> ऐप्स को अनुमति है"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"डोमेन URL"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"कोई भी डोमेन URL न खोलें"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' खोलें"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' और संबंधित URL खोलें"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्स अपने डोमेन URL खोल सकते हैं</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप्स अपने डोमेन URL खोल सकते हैं</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"पहचाना नहीं गया"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"डिफ़ॉल्‍ट ऐप्‍स"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ब्राउज़र ऐप"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"कोई डिफ़ॉल्ट ब्राउज़र नहीं"</string>
+    <string name="default_app" msgid="6864503001385843060">"(डिफ़ॉल्‍ट)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ऐप मेमोरी"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index fbbf535..a447b99 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Gumb"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"isključivanje/uključivanje mikrofona"</item>
     <item msgid="1148142988678569310">"projiciranje medija"</item>
     <item msgid="9130014005474445273">"aktiviraj VPN"</item>
+    <item msgid="1165192162975045562">"pozadinska slika za pisanje"</item>
+    <item msgid="7129487923652967258">"pomoćna struktura"</item>
+    <item msgid="1069023208100114540">"pomoćna snimka zaslona"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokacija"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Isključivanje/uključivanje mikrofona"</item>
     <item msgid="5906017727368097853">"Projiciranje medija"</item>
     <item msgid="2486614710846178542">"Aktiviraj VPN"</item>
+    <item msgid="5586547561693629602">"Pozadinska slika za pisanje"</item>
+    <item msgid="32794179825485062">"Pomoćna struktura"</item>
+    <item msgid="7872852746938272552">"Pomoćna snimka zaslona"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"nisko"</item>
     <item msgid="4212263919458209842">"kritično"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Isključeno"</item>
-    <item msgid="5656544177755411222">"Ograničeni prekidi"</item>
-    <item msgid="8735337502532332056">"Bez prekida"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Uobičajena"</item>
     <item msgid="866544120205026771">"Umjerena"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Ružičasta"</item>
     <item msgid="6131821495505931173">"Crvena"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (protokol za prijenos medija)"</item>
+    <item msgid="8856820259201251036">"PTP (protokol za prijenos fotografija)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB ethernet)"</item>
+    <item msgid="2686051673589572111">"Audioizvor"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2342080..9f5e3d2 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -22,10 +22,11 @@
     <string name="allow" msgid="3349662621170855910">"Dopusti"</string>
     <string name="deny" msgid="6947806159746484865">"Odbij"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Još <xliff:g id="STEP_COUNT">%1$d</xliff:g> korak i postat ćete razvojni programer."</item>
-    <item quantity="other" msgid="6722953419953594148">"Još <xliff:g id="STEP_COUNT">%1$d</xliff:g> koraka i postat ćete razvojni programer ."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak i postat ćete razvojni programer.</item>
+      <item quantity="few">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka i postat ćete razvojni programer.</item>
+      <item quantity="other">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka i postat ćete razvojni programer.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sad ste razvojni programer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nema potrebe, već ste razvojni programer."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Bežično povezivanje i mreže"</string>
@@ -40,6 +41,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Isključi SMS putem IMS-a"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Treba uključiti IMS prijavu"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Treba isključiti IMS prijavu"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Uključi oznaku pružanja usluga putem VoLTE-a"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Isključi oznaku pružanja usluga putem VoLTE-a"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Uključi LTE RAM kopiranje"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Isključi LTE RAM kopiranje"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Prikaži SIM imenik"</string>
@@ -135,16 +138,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitiranje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Onemogućiti profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"To će onemogućiti:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;na uređaju:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Povezan"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Povezano (bez telefona)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Povezano (bez medija)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Povezano (bez pristupa porukama)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Povezano (bez telefona ili medija)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Niste povezani"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Isključivanje…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Povezivanje…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Uparivanje…"</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">"U blizini nema Bluetooth uređaja."</string>
@@ -154,7 +148,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Prikaži primljene datoteke"</string>
     <string name="device_picker" msgid="4978696506172252813">"Odaberite Bluetooth uređaj"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zatraženo je Bluetooth dopuštenje"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacija želi uključiti Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Aplikacija želi UKLJUČITI Bluetooth na ovom uređaju."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacija želi vaše tabletno računalo učiniti vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacija želi vaš telefon učiniti vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacija želi učiniti vaše tabletno računalo vidljivim drugim Bluetooth uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
@@ -275,12 +269,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD kartica"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy postavke"</string>
     <string name="cancel" msgid="6859253417269739139">"Odustani"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ODUSTANI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"NASTAVI"</string>
     <string name="okay" msgid="1997666393121016642">"U redu"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"DA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NE"</string>
-    <string name="forget" msgid="7267115980248732932">"ZABORAVI"</string>
+    <string name="forget" msgid="1400428660472591263">"Zaboravi"</string>
+    <string name="save" msgid="879993180139353333">"Spremi"</string>
+    <string name="done" msgid="6942539184162713160">"Gotovo"</string>
     <string name="settings_label" msgid="1626402585530130914">"Postavke"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Postavke"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Prečac postavki"</string>
@@ -325,9 +317,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Poredaj po vremenskoj zoni"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Vrijeme"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Poboljšanje podudaranja lica"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Provjera živosti"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Prilikom otključavanja potrebno je trepnuti"</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 mirovanja"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> nakon mirovanja, osim kad ga <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> drži oključanim"</string>
@@ -348,6 +337,31 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Zaporke"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisak prsta"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Otisci prstiju"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Upotreba otiska prsta"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Dodaj"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"zaključavanje zaslona"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one">Registriran je <xliff:g id="COUNT_1">%1$d</xliff:g> otisak prsta</item>
+      <item quantity="few">Registrirana su <xliff:g id="COUNT_1">%1$d</xliff:g> otiska prsta</item>
+      <item quantity="other">Registrirano je <xliff:g id="COUNT_1">%1$d</xliff:g> otisaka prsta</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Postavljanje otiska"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Da biste otključali zaslon ili potvrdili kupnju otiskom prsta, trebamo napraviti sljedeće: \n\n✓ postaviti pričuvni način zaključavanja zaslona \n\n✓ dodati vaš otisak prsta."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Traženje senzora"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Pronađite senzor otiska prsta na stražnjoj strani telefona."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naziv"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"U redu"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Počnimo!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Stavite prst na senzor otiska prsta. Podignite ga nakon što osjetite vibraciju."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Sjajno! Sada ponovite."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Stavite isti prst na senzor otiska prsta i podignite ga nakon što osjetite vibraciju."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Otisak prsta je dodan!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kada se prikaže ta ikona, možete se identificirati ili autorizirati kupnju otiskom prsta."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Dodaj"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Dalje"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripcija"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kriptiraj tablet računalo"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kriptiraj telefon"</string>
@@ -360,7 +374,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Uključite punjač i pokušajte ponovo."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nema PIN-a ili zaporke za zaključani zaslon"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Prije nego što ćete moći započeti enkripciju morat ćete postaviti PIN za zaključavanje zaslona ili zaporku."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Morate nacrtati uzorak za otključavanje da biste potvrdili kriptiranje uređaja."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Kriptirati?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operacija kriptiranja nepovratna je i izgubit ćete podatke ako je prekinete. Kriptiranje traje sat vremena ili dulje, a za to vrijeme tabletno računalo nekoliko će se puta ponovo pokrenuti."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operacija kriptiranja nepovratna je i izgubit ćete podatke ako ju prekinete. Kriptiranje traje sat vremena ili dulje, a za to vrijeme telefon će se nekoliko puta ponovo pokrenuti."</string>
@@ -391,22 +404,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Prelazak prstom"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Nema zaštite"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Otključavanje licem"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Niska sigurnost, eksperimentalno"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Uzorak"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Srednja razina sigurnosti"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Srednja do visoka sigurnost"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Zaporka"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Visoka sigurnost"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Trenutačno zaključavanje zaslona"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Značajke za zaštitu uređaja više neće funkcionirati."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onemogućili administrator, pravila enkripcije ili pohrana vjerodajnica"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prelazak prstom"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Otključavanje licem"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Uzorak"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Zaporka"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Nakon postavljanja zaključavanja zaslona možete postaviti i otisak prsta u Postavkama &gt; Sigurnost."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Isključi zaključavanje zaslona"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ukloni uzorak za otključavanje"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ukloni otključavanje PIN-a"</string>
@@ -427,30 +439,36 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Zaporka treba sadržavati barem jedno slovo."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Zaporka mora sadržavati barem jednu znamenku."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Zaporka treba sadržavati barem jedan simbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Zaporka mora sadržavati barem jedno slovo."</item>
-    <item quantity="other" msgid="8186027808415585970">"Zaporka mora sadržavati barem ovoliko slova: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Zaporka mora sadržavati barem jedno malo slovo."</item>
-    <item quantity="other" msgid="2693910942679679225">"Zaporka mora sadržavati barem ovoliko malih slova: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Zaporka mora sadržavati barem jedno veliko slovo."</item>
-    <item quantity="other" msgid="3030801209112209245">"Zaporka mora sadržavati barem ovoliko velikih slova: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Zaporka mora sadržavati barem jednu brojčanu znamenku."</item>
-    <item quantity="other" msgid="4703982391407595924">"Zaporka mora sadržavati barem ovoliko brojčanih znamenki: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Zaporka mora sadržavati barem jedan posebni simbol."</item>
-    <item quantity="other" msgid="1221290525051187757">"Zaporka mora sadržavati barem ovoliko posebnih znakova: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Zaporka mora sadržavati barem jedan znak koji nije slovo."</item>
-    <item quantity="other" msgid="3952508584649046404">"Zaporka mora sadržavati barem ovoliko znakova koji nisu slova: %d."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Zaporka mora sadržavati barem %d slovo.</item>
+      <item quantity="few">Zaporka mora sadržavati barem %d slova.</item>
+      <item quantity="other">Zaporka mora sadržavati barem %d slova.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Zaporka mora sadržavati barem %d malo slovo.</item>
+      <item quantity="few">Zaporka mora sadržavati barem %d mala slova.</item>
+      <item quantity="other">Zaporka mora sadržavati barem %d malih slova.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Zaporka mora sadržavati barem %d veliko slovo.</item>
+      <item quantity="few">Zaporka mora sadržavati barem %d velika slova.</item>
+      <item quantity="other">Zaporka mora sadržavati barem %d velikih slova.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Zaporka mora sadržavati barem %d znamenku.</item>
+      <item quantity="few">Zaporka mora sadržavati barem %d znamenke.</item>
+      <item quantity="other">Zaporka mora sadržavati barem %d znamenki.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Zaporka mora sadržavati barem %d posebni simbol.</item>
+      <item quantity="few">Zaporka mora sadržavati barem %d posebna simbola.</item>
+      <item quantity="other">Zaporka mora sadržavati barem %d posebnih simbola.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Zaporka mora sadržavati barem %d znak koji nije slovo.</item>
+      <item quantity="few">Zaporka mora sadržavati barem %d znaka koji nisu slova.</item>
+      <item quantity="other">Zaporka mora sadržavati barem %d znakova koji nisu slova.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Administrator uređaja ne dopušta upotrebu nedavne zaporke."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"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>
@@ -480,15 +498,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Za uparivanje s:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Uvjerite se da prikazuje ovaj pristupni kôd:&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">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Upariti se s ovim uređajem?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Za uparivanje s uređajem:<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>upišite:<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> na tom uređaju pa pritisnite tipke Return ili Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Upari"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"UPARI"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Odustani"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Uparivanje omogućuje pristup vašim kontaktima i povijesti poziva dok ste povezani."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije bilo moguće."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije bilo moguće zbog netočnog PIN-a ili zaporke."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Komunikacija s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije moguća."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Uparivanje odbio uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Nije moguće povezati se na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Skeniranjem traži uređaje"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Osvježi"</string>
@@ -515,16 +526,8 @@
     <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 s ostalim Bluetooth uređajima u blizini."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Radi poboljšanja preciznosti lokacije, aplikacije i usluge tražit će Bluetooth uređaje, čak i kada je Bluetooth isključen. To možete promijeniti u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama traženja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Poveži se na..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medijski zvuk"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvuk telefona"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Prijenos datoteke"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Ulazni uređaj"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Pristup internetu"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Dijeljenje kontakata"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Upotrijebi za dijeljenje kontakata"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Dijeljenje internetske veze"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Pristup porukama"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen sa zvuka medija."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Handsfree zvuk za uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen s ulaznog uređaja."</string>
@@ -537,28 +540,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Upotrijebi za"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Preimenuj"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Svi dolazni prijenosi datoteka"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezano s medijskim zvukom"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezano sa telefonskim zvukom"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezano s poslužiteljem za prijenos datoteka"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Povezano s kartom"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Niste povezani s poslužiteljem za prijenos datoteka"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Povezano s ulaznim uređajem"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Povezano s uređajem za pristup internetu"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Dijeljenje lokalne internetske veze s uređajem"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Koristi za medijski zvuk"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Koristi za telefonski zvuk"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Koristi za prijenos datoteke"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Upotrijebi za ulaz"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Upotrijebi za pristup internetu"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Upotreba za kartu"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Postavke priključne stanice"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Koristi priključnu stanicu za zvuk"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kao telefonski zvučnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glazbu i medije"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Povezani putem pomoćnika za Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Emitirani zaslon"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Emitiranje"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogući bežični prikaz"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"U blizini nema uređaja."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Povezivanje"</string>
@@ -570,6 +560,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Zaboravi"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Gotovo"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Naziv"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Dopusti razmjenu podataka kada tabletno računalo dodiruje drugi uređaj"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Dopusti razmjenu podataka kada telefon dodiruje drugi uređaj"</string>
@@ -593,21 +585,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Isključivanje Wi-Fi-ja…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Pogreška"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"U načinu rada u zrakoplovu"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Skeniranje mreža nije moguće"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Mrežna obavijest"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Obavijesti uvijek kada je dostupna javna mreža"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izbjegavati slabe veze"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Ne upotrebljavaj Wi-Fi mrežu ako internetska veza nije zadovoljavajuća"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Koristi samo mreže s dobrom internetskom vezom"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Traženje je uvijek dostupno"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Uvijek omogući pretraživanje"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Neka Googleova usluga lokacije i druge aplikacije traže mreže, čak i kada je Wi-Fi isključen"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automatski upotrebljavaj otvoreni Wi‑Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Dopusti pomoćniku za Wi‑Fi automatsko povezivanje s otvorenim mrežama s utvrđenom visokom kvalitetom"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Odaberite pomoćnik"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliranje certifikata"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Radi poboljšavanja preciznosti i u neke druge svrhe Google i ostale aplikacije mogu tražiti mreže u blizini, čak i kada je Wi-Fi isključen. Ako ne želite da se to događa, idite na opcije Napredno &gt; Traženje je uvijek dostupno."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacije mogu tražiti mreže u blizini, čak i kada je Wi-Fi isključen. Ako ne želite da se to događa, idite na opcije Napredno &gt; Traženje je uvijek dostupno."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Radi poboljšanja preciznosti lokacije, aplikacije i usluge tražit će Wi‑Fi mreže, čak i kada je Wi‑Fi isključen. To možete promijeniti u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama traženja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne prikazuj ponovno"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Zadrži Wi-Fi tijekom mirovanja"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi ostaje aktivan u mirovanju"</string>
@@ -635,11 +622,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Dodaj još jednu mrežu"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Više"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. postavljanje (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Da bi se postavljanje dovršilo, tablet mora pristupiti Wi‑Fi mreži. Nakon postavljanja možete izmjenjivati mobilnu podatkovnu vezu i Wi‑Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Napredne opcije"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Zaštićeno postavljanje Wi-Fi mreže"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Pokretanje WPS-a..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Pritisnite gumb za zaštićeno postavljanje Wi-Fi mreže na svom usmjerivaču. Može se zvati \"WPS\" ili sadržavati ovaj simbol:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Pritisnite gumb za zaštićeno postavljanje Wi‑Fi mreže na svom usmjerivaču. Može se zvati \"WPS\" ili biti označen ovim simbolom:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Unesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> na svoj Wi-Fi usmjerivač. Postavljanje može potrajati do dvije minute."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS uspio. Povezivanje s mrežom…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Povezano s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +651,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anoniman identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Zaporka"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Pokaži zaporku"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfiguriranje frekvencije pristupne točke"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Frekvencija od 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Frekvencija od 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP postavke"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nepromijenjeno)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nije određeno)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Spremljeno"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Onemogućeno"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Konfiguracija IP-a nije uspjela"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Povezivanje s Wi-Fi-jem nije uspjelo"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem u autentifikaciji"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Nije u rasponu"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Pristup internetu nije otkriven. Nema automatskog ponovnog povezivanja."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite mrežnu zaporku"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Nema"</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>
@@ -686,6 +667,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Želite li se prijaviti radi povezivanja?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> zahtijeva prijavu na webu za povezivanje s mrežom."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"POVEŽI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Ta mreža nema pristup internetu. Želite li je svejedno upotrebljavati?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Više ne pitaj za tu mrežu"</string>
     <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>
@@ -751,6 +734,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK pokretna Wi-Fi točka"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> prijenosna Wi-Fi ž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_mode_title" msgid="2164073796253284289">"Postavka poziva"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Način Wi-Fi poziva"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Prednost ima Wi-Fi mreža"</item>
+    <item msgid="5267397515594230396">"Prednost ima mobilna mreža"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Početna"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -814,6 +809,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Podesite svjetlinu zaslona"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva svjetlina"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziranje jačine osvjetljenja u odnosu na osvijetljenost okoline"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Lagano"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Tamno"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatski"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Mirovanje"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -865,10 +865,11 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Ažurirati preferirani SIM?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> predstavlja jedini SIM u vašem uređaju. Želite li upotrebljavati taj SIM za mobilne podatke, pozive i SMS poruke?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Netočan PIN kôd SIM kartice; sada morate kontaktirati svog mobilnog operatera da bi otključao vaš uređaj."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Netočan PIN kôd SIM kartice; imate još <xliff:g id="NUMBER">%d</xliff:g> pokušaj prije nego što budete morali kontaktirati svog mobilnog operatera da bi otključao vaš uređaj."</item>
-    <item quantity="other" msgid="77103619544346451">"Netočan PIN kôd SIM kartice; imate još ovoliko preostalih pokušaja: <xliff:g id="NUMBER">%d</xliff:g>."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Netočan PIN kôd SIM kartice; imate još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaj.</item>
+      <item quantity="few">Netočan PIN kôd SIM kartice; imate još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
+      <item quantity="other">Netočan PIN kôd SIM kartice; imate još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operacija PIN-a SIM kartice nije uspjela!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tabletnog uređaja"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Status telefona"</string>
@@ -917,12 +918,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Dostupno (samo za čitanje)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Ukupno prostora"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Izračun u tijeku..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikacije (podaci aplikacije i medijski sadržaj)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikacije i podaci aplikacija"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Mediji"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Preuzimanja"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Slike, videozapisi"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (glazba, melodije zvona, podkastovi itd.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Razno"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Ostale datoteke"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Podaci iz predmemorije"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Isklj. dijeljenu pohranu"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Isključi SD karticu"</string>
@@ -955,6 +956,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Isključivanje u tijeku"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Ponestaje prostora za pohranu"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Neke funkcije sustava, kao što je sinkroniziranje, može neće ispravno funkcionirati. Pokušajte osloboditi prostor brisanjem stavki ili ih otkvačite, primjerice aplikacije ili medijski sadržaj."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Preimenuj"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Učitaj"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Izbaci"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Izbriši i formatiraj"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Izbriši/formatiraj kao internu"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Povezivanje USB-a i računala"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Povezivanje USB-a i računala"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Poveži kao"</string>
@@ -962,8 +968,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Omogućuje prijenos medijskih datoteka u OS Windows ili Androidovim prijenosom datoteka na Mac (pogledajte www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparat (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Omogućuje vam prijenos fotografija pomoću softvera fotoaparata i prijenos bilo koje datoteke na računala koji ne podržavaju MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instaliraj alate za prijenos datoteka"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Omogućuje aplikacijama omogućenima za MIDI rad putem USB-a uz MIDI softver na računalu."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Drugi korisnici"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Pohrana na uređaju"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Prijenosna pohrana"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> slobodno (ukupno <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Učitano: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Učitavanje nije uspjelo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Sigurno izbacivanje uspjelo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Sigurno izbacivanje nije uspjelo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Formatirano: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Formatiranje nije uspjelo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Promjena naziva pohrane"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Nakon formatiranja možete upotrebljavati uređaj <xliff:g id="NAME_0">^1</xliff:g> na drugim uređajima. \n\nSvi podaci na uređaju <xliff:g id="NAME_1">^1</xliff:g> izbrisat će se. Preporučujemo vam da prvo napravite sigurnosnu kopiju. \n\n"<b>"Izrada sigurnosne kopije fotografija i ostalih medija"</b>" \nPremjestite medijske datoteke u neku drugu pohranu na ovom uređaju ili na računalo pomoću USB kabela. \n\n"<b>"Izrada sigurnosne kopije aplikacija"</b>" \nSve aplikacije pohranjene na uređaju <xliff:g id="NAME_6">^1</xliff:g> deinstalirat će se i njihovi će se podaci izbrisati. Da biste zadržali aplikacije, premjestite ih u neku drugu pohranu na ovom uređaju."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kada izbacite uređaj <xliff:g id="NAME_0">^1</xliff:g>, aplikacije koje su pohranjene na njemu prestat će funkcionirati, 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> formatiran je tako da funkcionira samo na ovom uređaju. Neće funkcionirati na drugim uređajima."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Postavite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Upotrebljavaj kao prijenosnu pohranu"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Za premještanje fotografija i ostalih medijskih datoteka s jednog uređaja na drugi."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Upotrebljavaj kao internu pohranu"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Za spremanje svega, uključujući aplikacije i fotografije, samo na ovom uređaju. Zahtijeva formatiranje koje sprječava rad ovog uređaja na drugim uređajima."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatiraj kao internu pohranu"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Potrebno je formatirati uređaj <xliff:g id="NAME_0">^1</xliff:g> radi zaštite. \n\nNakon formatiranja <xliff:g id="NAME_1">^1</xliff:g> funkcionirat će samo na ovom uređaju. \n\n"<b>"Formatiranjem se brišu svi podaci koji su trenutačno pohranjeni na <xliff:g id="NAME_2">^1</xliff:g>."</b>" Da ne biste izgubili podatke, napravite sigurnosnu kopiju."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Izbriši i formatiraj"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatiranje uređaja <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ne uklanjajte uređaj <xliff:g id="NAME">^1</xliff:g> dok se formatira."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Preselite podatke u novu pohranu"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Možete premjestiti svoje fotografije, datoteke i podatke aplikacija na novi uređaj <xliff:g id="NAME">^1</xliff:g>. \n\nPremještanje traje otprilike <xliff:g id="TIME">^2</xliff:g> i oslobodit će <xliff:g id="SIZE">^3</xliff:g> na internoj pohrani. Neke aplikacije neće funkcionirati tijekom tog postupka."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Premjestite odmah"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Premjestite kasnije"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Premjestite datoteke odmah"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Premještanje traje otprilike <xliff:g id="TIME">^1</xliff:g>. Oslobodit će <xliff:g id="SIZE">^2</xliff:g> interne pohrane."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Premjesti"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Premještanje podataka…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Tijekom premještanja: \n• Ne uklanjajte uređaj <xliff:g id="NAME">^1</xliff:g>. \n• Neke aplikacije neće funkcionirati pravilno. \n• Ne isključujte uređaj s napajanja."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Uređaj <xliff:g id="NAME">^1</xliff:g> je spreman"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Uređaj <xliff:g id="NAME">^1</xliff:g> spreman je za upotrebu s fotografijama i ostalim medijskim uređajima."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Novi uređaj <xliff:g id="NAME">^1</xliff:g> funkcionira. \n\nDa biste premjestili fotografije, datoteke i podatke aplikacija na taj uređaj, otvorite Postavke &gt; Pohrana."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Premjestite aplikaciju <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Premještanje aplikacije <xliff:g id="APP">^1</xliff:g> i njezinih podataka na uređaj <xliff:g id="NAME_0">^2</xliff:g> trajat će samo nekoliko trenutaka. Nećete moći upotrebljavati tu aplikaciju dok premještanje ne završi. \n\nNe uklanjajte uređaj <xliff:g id="NAME_1">^2</xliff:g> tijekom premještanja."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Premještanje aplikacije <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ne uklanjajte uređaj <xliff:g id="NAME">^1</xliff:g> tijekom premještanja. \n\nAplikacija <xliff:g id="APP">^2</xliff:g> na ovom uređaju neće biti dostupna dok premještanje ne završi."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Otkaži premještanje"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Razina baterije"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ovi"</string>
@@ -1007,10 +1053,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Vraćanje zadanih APN postavki"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ponovo postavi na zadano"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Poništavanje zadanih postavki APN-a dovršeno."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Poništavanje postavki mreže"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Sve postavke mreže vratit će se na zadano, uključujući:\n\n"<li>"Wi‑Fi"</li>\n<li>"podatkovnu vezu mobilnog uređaja"</li>\n<li>"Bluetooth."</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Poništi postavke"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Želite li vratiti sve postavke mreže na zadano? Tu radnju nije moguće poništiti!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Poništi postavke"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Poništiti?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Postavke mreže vraćene su na zadano."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Vrati uređaj na zadano"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Vraćanje na tvorničko stanje"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Briše sve podatke na tabletnom uređaju"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Izbriši sve podatke na telefonu"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1075,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izbrisati sve podatke na SD kartici, na primjer, glazbu ili fotografije"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Poništi tabletni uređaj"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Poništi telefon"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Izbrisati sve osobne podatke i preuzete aplikacije? Radnja se ne može poništiti!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Želite li izbrisati sve osobne podatke i preuzete aplikacije? Radnju nije moguće poništiti!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Izbriši sve"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Da biste potvrdili vraćanje na tvorničke postavke, trebate nacrtati svoj uzorak za otključavanje."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nije došlo do poništavanja jer nije dostupna usluga brisanja sustava."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Poništiti?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Vraćanje na tvorničko stanje nije dostupno za ovog korisnika"</string>
@@ -1043,8 +1093,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Izbrisati USB pohranu i sve u njoj pohranjene datoteke? Radnja se ne može poništiti!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Izbrisati SD karticu i sve pohranjene datoteke na njoj? Radnja se ne može poništiti!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Izbriši sve"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Morate iscrtati uzorak za otključavanje kako biste potvrdili da želite izbrisati USB memoriju."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Trebate iscrtati svoj uzorak za otključavanje kako biste potvrdili da želite izbrisati SD karticu."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Postavke poziva"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Postavite govornu poštu, preusmjeravanje poziva, ID pozivatelja"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB dijeljenje veze"</string>
@@ -1076,7 +1124,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilne mreže"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilni paket"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Zadana aplikacija za SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS aplikacija"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Želite li promijeniti aplikaciju za SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Želite li upotrijebiti aplikaciju <xliff:g id="NEW_APP">%1$s</xliff:g> umjesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> kao svoju aplikaciju za SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Želite li upotrijebiti aplikaciju <xliff:g id="NEW_APP">%s</xliff:g> kao svoju aplikaciju za SMS?"</string>
@@ -1104,7 +1152,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Način lokacije"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Upotreba GPS-a, Wi‑Fi i mobilnih mreža za utvrđivanje lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Upotreba Wi‑Fi i mobilnih mreža za utvrđivanje lokacije"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Za određivanje lokacije upotrebljava se GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Upotreba GPS-a za utvrđivanje lokacije"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skeniranje"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skeniranje"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Traženje Wi‑Fi-ja"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Poboljšajte lokaciju tako što ćete dopustiti aplikacijama i uslugama traženje Wi‑Fi mreža, čak i kada je Wi‑Fi isključen"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Traženje Bluetootha"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Poboljšajte lokaciju tako što ćete dopustiti uslugama sustava traženje Bluetooth uređaja, čak i kada je Bluetooth isključen"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokacija Wi‑Fi i mobilne mreže"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Omogućite aplik. da upotrebljavaju Googleovu uslugu lokacije za brže lociranje. Anonimni podaci prikupljat će se i slati Googleu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokacija utvrđena pomoću Wi-Fi-ja"</string>
@@ -1150,11 +1204,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Zaporka je postavljena"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN je postavljen"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Uzorak je postavljen"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Sigurnost zaslona"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Upotrijebite uzorak uređaja da biste nastavili."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Unesite PIN uređaja da biste nastavili."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Unesite zaporku uređaja da biste nastavili."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Sigurnost uređaja"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Izmijeni uzorak za otključavanje"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Promijeni PIN za otključavanje"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrdi spremljeni uzorak"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Pokušajte ponovo:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Iscrtajte uzorak za otključavanje"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pritisnite Izbornik za pomoć."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Maknite prst ako ste gotovi"</string>
@@ -1176,8 +1234,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Postavi uzorak za otključavanje"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Izmijeni uzorak za otključavanje"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kako iscrtati uzorak za otključavanje"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Previše netočnih pokušaja!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Pokušajte ponovo za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Previše netočnih pokušaja. Pokušajte ponovo za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikacija nije instalirana na vašem telefonu."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljanje aplikacijama"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje instaliranim aplikacijama i njihovo uklanjanje"</string>
@@ -1228,6 +1285,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Poredaj po veličini"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Prikaži pokrenute usluge"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Prikaži procese iz predmemorije"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija za hitne slučajeve"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Poništi postavke"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Poništiti postavke?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Sve postavke za sljedeće vratit će se na zadano:\n\n "<li>"onemogućene aplikacije"</li>\n" "<li>"onemogućene obavijesti aplikacija"</li>\n" "<li>"zadane aplikacije za radnje"</li>\n" "<li>"ograničenja pozadinskih podataka za aplikacije"</li>\n" "<li>"sva ograničenja dozvola."</li>\n\n" Nećete izgubiti podatke nijedne aplikacije."</string>
@@ -1259,8 +1317,8 @@
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Sva ažuriranja ove aplikacije sustava Android bit će deinstalirana."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Izbriši podatke"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Brisanje podataka za aplikaciju nije uspjelo."</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ova aplikacija može pristupiti sljedećim stavkama na vašem tabletnom računalu:"</string>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ova aplikacija može pristupiti sljedećim stavkama na vašem telefonu:"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ova aplikacija može pristupiti sljedećem na vašem tabletu:"</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ova aplikacija može pristupiti sljedećem na vašem telefonu:"</string>
     <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ta aplikacija može pristupiti sljedećim stavkama na vašem tabletnom računalu. Radi poboljšanja uspješnosti i smanjenja upotrebe memorije neke od tih dozvola dostupne su aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer izvodi isti proces kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ta aplikacija može pristupiti sljedećim stavkama na vašem telefonu. Radi poboljšanja uspješnosti i smanjenja upotrebe memorije neke od tih dozvola dostupne su aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer izvodi isti proces kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> i <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
@@ -1299,6 +1357,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Radnje aplikacija"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"U tijeku"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikada nije upotrebljavano)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Nema zadanih aplikacija."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Upotreba pohrane"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Prikaz pohrane koju upotrebljavaju aplikacije"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Pokrenute usluge"</string>
@@ -1396,17 +1455,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informacije o tabletnom uređaju"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefonske informacije"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informacije o bateriji"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Brzo pokretanje"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Postavljanje tipkovničkih prečaca za pokretanje aplikacija"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Dodjela aplikacije"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Bez prečaca"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Pretraži + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Očisti"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Vaš prečac za stavku <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) bit će izbrisan."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"U redu"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Odustani"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplikacije"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Prečaci"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Unos teksta"</string>
     <string name="input_method" msgid="5434026103176856164">"Način ulaza"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Trenutačna tipkovnica"</string>
@@ -1441,23 +1489,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Snimi sve Bluetooth HCI pakete u datoteci"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM otključavanje"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Neka kôd za pokretanje sustava bude otključan"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Unesite PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Unesite PIN uređaja da biste omogućili OEM otključavanje"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Želite li dopustiti OEM otključavanje?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORENJE: značajke za zaštitu uređaja neće funkcionirati na ovom uređaju dok je ta postavka uključena."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Veličine međuspremnika zapisnika"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Odaberite veličinu međuspr. zapis."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Dopusti probne lokacije"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Dopusti probne lokacije"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Omogući pregled atributa prikaza"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Umrežavanje"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikacija bežičnog prikaza"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogući opširnu prijavu na Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aktivni prijelaz s Wi‑Fi na mob. mrežu"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Uvijek dopusti slobodno traženje Wi-Fi mreže"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Upotrebljavaj stari DHCP klijent"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Prikaži opcije za certifikaciju bežičnog prikaza"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Povećana razina prijave na Wi‑Fi, prikaz po SSID RSSI-ju u Biraču Wi‑Fi-ja"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Ako je omogućeno, Wi-Fi će aktivno prebacivati podatkovnu vezu mobilnoj mreži kada je Wi-Fi signal slab."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Dopuštanje/blokiranje slobodnog traženja Wi-Fi mreža na temelju količine podatkovnog prometa u sučelju"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Veličine međuspremnika zapisnika"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Odaberite veličinu međuspr. zapis."</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Odabir USB konfiguracije"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Odabir USB konfiguracije"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Dopusti probne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dopusti probne lokacije"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Omogući pregled atributa prikaza"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Upotrebljavaj DHCP klijent s Lollipopa umjesto novog Android DHCP klijenta."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Omogućiti rješavanje programske pogreške na USB-u?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Rješavanje programske pogreške USB-a namijenjeno je samo u razvojne svrhe. Može se upotrijebiti za kopiranje podataka s računala na uređaj i obrnuto, instalaciju aplikacija na uređaju bez obavijesti i za čitanje dnevničkih zapisa."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Želite li opozvati pristup uklanjanju pogrešaka USB-a sa svih računala koja ste prethodno autorizirali?"</string>
@@ -1561,6 +1617,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Grimizna"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Želite li upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba obavljati sljedeće:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Budući da aplikacija prekriva zahtjev za dopuštenje, Postavke ne mogu potvrditi vaš odgovor."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ako uključite <xliff:g id="SERVICE">%1$s</xliff:g>, vaš uređaj neće upotrebljavati PIN ili zaporku za zaključavanje zaslona za bolje šifriranje podataka."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Budući da ste uključili uslugu pristupačnosti, vaš uređaj neće upotrebljavati PIN ili zaporku za zaključavanje zaslona za bolje šifriranje podataka."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Budući da uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utječe na enkripciju podataka, morate potvrditi uzorak."</string>
@@ -1702,14 +1759,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistički podaci o procesima"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Detaljni statistički podaci o trenutačnim procesima"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Upotreba memorije"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> aplikacije tijekom <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Iskorišteno <xliff:g id="USEDRAM">%1$s</xliff:g> od <xliff:g id="TOTALRAM">%2$s</xliff:g> tijekom <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Pozadina"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Prednji plan"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Spremljeno u privremenu memoriju"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memorija uređaja trenutačno je <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Prosječna upotreba RAM-a"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimalna upotreba RAM-a"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"OS Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Nativni procesi"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Jezgra sustava"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Predmemorije"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Iskorištenost RAM-a"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Iskorištenost RAM-a (u pozadini)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Vrijeme izvođenja"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Procesi"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Usluge"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trajanje"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Informacije o memoriji"</string>
@@ -1726,6 +1789,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 sati"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dan"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Prikaži sustav"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Sakrij sustav"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Upotrijebi USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Vrsta statističkih podataka"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Pozadina"</string>
@@ -1743,12 +1807,12 @@
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Jednostavno pretvaranje govora u tekst"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ta usluga glasovnog unosa moći će neprekidno nadzirati glasovne unose i kontrolirati aplikacije s omogućenom glasovnom interakcijom u vaše ime. Pruža je aplikacija <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Želite li omogućiti tu uslugu?"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Postavke za tekst u govor"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Izlaz pretvaranja teksta u govor"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Pretvaranje teksta u govor"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Uvijek koristi moje postavke"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Donje zadane postavke poništavaju postavke aplikacije"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Zadane postavke"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Zadani alat"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Postavlja alat za sintezu govora za upotrebu u izgovorenom tekstu"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Postavi alat za sintezu govora koji će se upotrebljavati za govorni tekst"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Brzina govora"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Brzina kojom se izgovara tekst"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Visina glasa"</string>
@@ -1822,7 +1886,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardverska"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Samo softverska"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Za ovog korisnika nisu dostupne vjerodajnice"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Da biste potvrdili instalaciju vjerodajnica, trebate nacrtati svoj obrazac za otključavanje."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1910,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Stvori sigurnosnu kopiju mojih podataka"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Stvaranje sigurnosne kopije podataka aplikacije, Wi-Fi zaporki i ostalih postavki na Googleovim poslužiteljima"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Sigurnosni račun"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Nijedan račun trenutno ne stvara sigurnosne kopije podataka"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Uključi podatke aplikacija"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatska obnova"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri ponovnoj instalaciji aplikacije vratiti postavke i podatke za koje su stvorene sigurnosne kopije"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Usluga sigurnosnog kopiranja nije aktivna."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"To je postavljeno pravilom uređaja."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Zaporka sigurnosne kopije"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Potpune sigurnosne kopije na stolnom računalu trenutačno nisu zaštićene"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Odaberite za promjenu ili uklanjanje zaporke u potpunim sigurnosnim kopijama na stolnom računalu"</string>
@@ -2024,6 +2085,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Animacija prijelaza razmjera"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Razmjer duljine animatora"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuliraj sekund. zaslone"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Način rada s više prozora"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Više istovremenih aktivnosti na zaslonu."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Želite li omogućiti način rada s više prozora?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"UPOZORENJE: ovo je vrlo eksperimentalna značajka koja omogućuje istovremeno vršenje više radnji na zaslonu putem korisničkog sučelja nedavnih aplikacija. Neke se aplikacije mogu srušiti ili možda neće funkcionirati pravilno kada se upotrebljavaju s tom značajkom."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikacije"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Uklanjanje aktivnosti"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Uništite svaku aktivnost čim je korisnik napusti"</string>
@@ -2195,7 +2260,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Korisnik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ograničeni profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Dodati novog korisnika?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Za dijeljenje ovog uređaja s drugima možete izraditi dodatne korisnike. Svaki korisnik ima vlastiti prostor koji može prilagoditi pomoću vlastitih aplikacija, pozadinske slike i tako dalje. Korisnici mogu prilagoditi i postavke uređaja koje utječu na sve ostale korisnike, na primjer, Wi‑Fi.\n\nKada dodate novog korisnika, ta osoba mora postaviti svoj prostor.\n\nBilo koji korisnik može ažurirati aplikacije za sve ostale korisnike."</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 pomoću vlastitih aplikacija, pozadinske slike i tako dalje. Korisnici mogu prilagoditi i postavke uređaja koje utječu na sve ostale korisnike, na primjer, Wi‑Fi.\n\nKada dodate novog korisnika, ta osoba mora postaviti svoj prostor.\n\nBilo koji 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 mora postaviti vlastiti prostor.\n\nBilo koji korisnik može ažurirati aplikacije za sve ostale korisnike."</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 postaviti svoj prostor"</string>
@@ -2226,13 +2291,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Ukloniti gosta?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Sve aplikacije i podaci u ovoj sesiji bit će izbrisani."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Ukloni"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Dopusti telefonske pozive"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Dopusti telefonske pozive i SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Uključivanje telefonskih poziva"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Uključivanje telefonskih poziva i SMS-a"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Ukloni korisnika"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Želite li dopustiti telefonske pozive?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Želite li uključiti telefonske pozive?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Povijest poziva dijelit će se s tim korisnikom."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Želite li dopustiti telefonske pozive i SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Povijest poziva i SMS-ova dijelit će se s tim korisnikom."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Želite li uključiti telefonske pozive i SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Povijest poziva i SMS-ova dijelit će se s tim korisnikom."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dopuštanje aplikacija i sadržaja"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije s ograničenjima"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi postavke za aplikaciju"</string>
@@ -2283,8 +2348,8 @@
     <string name="user_rename" msgid="8523499513614655279">"PREIMENOVANJE"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Postavljanje ograničenja aplikacije"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrolira aplikacija <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ta aplikacija nije podržana u ograničenim profilima"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ta aplikacija može pristupiti vašim računima"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Aplikacija može pristupili vašim računima. Upravlja aplikacija <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi i mobilne mreže"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Dopusti izmjenu postavki Wi‑Fi i mobilne mreže"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2414,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi mreža veza"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekstne poruke slanje SMS-a poruke slanje poruka"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilno mobitel mobilni operater bežično podaci 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"Wi-Fi Wi-Fi poziv pozivanje"</string>
     <string name="keywords_home" msgid="3626170808219458848">"pokretač"</string>
     <string name="keywords_display" msgid="6709007669501628320">"zaslon dodirni zaslon"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"zatamnjenje zaslon dodirni zaslon baterija"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"zatamnjenje zaslon dodirni zaslon baterija"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"pozadina personalizirati prilagoditi zaslon"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tamna tema noćni način rada zatamnjenje zaslona obrnuta svjetlina"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"pozadina personalizirati prilagoditi zaslon"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"veličina teksta"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekcija"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"emitiranje projekta"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"prostor disk tvrdi disk uređaj upotreba"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"potrošnja energije punjenje"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"pravopis rječnik provjera pravopisa automatsko ispravljanje"</string>
@@ -2372,6 +2439,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"račun"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ograničenje ograničiti ograničeno"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ispravak teksta ispraviti zvuk vibracija automatski jezik pokret predložiti prijedlog tema uvredljivo riječ upisivati emoji međunarodno"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"poništavanje vraćanje na zadano postavke zadano"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"hitno u hitnom slučaju aplikacija zadano"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplikacije preuzimanje sustav"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikacije dopuštenja sigurnost"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplikacije zadano"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"kliziti zaporka uzorak PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Postavite oznaku NFC za Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Piši"</string>
@@ -2386,11 +2458,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Glasnoća alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Glasnoća zvona"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Glasnoća obavijesti"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Prekidi"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Kada stignu pozivi i obavijesti"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Uvijek prekidaj"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Dopusti samo prioritetne prekide"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne prekidaj"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Samo prioritetno dopušta"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</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="1168212070233080706">"Bez prekida"</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="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Zadana melodija zvona za obavijesti"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibracija i za pozive"</string>
@@ -2416,62 +2489,124 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibriranje"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obavijestima"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne mogu čitati obavijesti"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplikacija može čitati obavijesti"</item>
-    <item quantity="other" msgid="980049191810249052">"Ovoliko aplikacija može čitati obavijesti: %d"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d aplikacija može čitati obavijesti</item>
+      <item quantity="few">%d aplikacije mogu čitati obavijesti</item>
+      <item quantity="other">%d aplikacija može čitati obavijesti</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nema instaliranih slušatelja obavijesti."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Omogućiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> moći će čitati sve obavijesti koje objavi sustav ili bilo koja instalirana aplikacija, a obavijesti mogu uključivati osobne podatke, primjerice, imena kontakata i tekstove poruka koje su vam poslane. Također će moći odbaciti te obavijesti ili dodirnuti gumbe za radnju u njima."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Davatelji uvjeta"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nijedna aplikacija ne pruža uvjete"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplikacija pruža uvjete"</item>
-    <item quantity="other" msgid="358057362115673258">"Broj aplikacija koje pružaju uvjete: %d"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nije instaliran nijedan davatelj uvjeta."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Želite li omogućiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Davatelj uvjeta <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> moći će dodati uvjete za izlaz načinu Ne ometaj."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blokiraj"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikad ne prikazuj obavijesti s te aplikacije"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritet"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Prikaži obavijesti pri vrhu popisa i nastavi ih prikazivati kada je uređaj postavljen samo na prioritetne prekide"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Osjetljivo"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Kada je uređaj zaključan, sakrij osjetljivi sadržaj u obavijestima te aplikacije"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tretiraj kao prioritet"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Dopusti zvučne signale obavijesti ove aplikacije kada je \"Ne ometaj\" postavljeno na \"Samo prioritetno\""</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Dopusti zavirivanje"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Dopusti aplikaciji naglašavanje određenih obavijesti tako da ih nakratko prikaže na trenutačnom zaslonu"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Sakrij osjetljiv sadržaj"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Kada je uređaj zaključan, u obavijestima ove aplikacije ne prikazuj sadržaj koji bi mogao otkriti privatne podatke"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokirano"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Osjetljivo"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotovo"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Dok to ne isključite"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritetni prekidi"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Prekid rada"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dani"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nijedan"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Ometanja su dopuštena"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Samo prioritetno"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ništa"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizacija"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatski uključi"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Naziv pravila"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Dodaj pravilo"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Izbriši pravilo"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Želite li izbrisati pravilo \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Izbriši"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Vrsta pravila"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Nepoznato"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfiguriranje pravila"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Pravilo rasporeda"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Pravilo nije pronađeno."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dani"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ništa"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Svaki dan"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikada"</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">"Pozivi"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Pozivi/poruke od kontakta"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Svatko"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Samo kontakti"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Samo kontakti sa zvjezdicom"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Događaji i podsjetnici"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmi su uvijek prioritetni prekidi"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsjetnici"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Odabrani pozivatelji"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Višestruki pozivatelji"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ako ista osoba nazove drugi put u razdoblju od <xliff:g id="MINUTES">%d</xliff:g> min, dopusti"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatski uključi"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikada"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Svake noći"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noći radnih dana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Vrijeme početka"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Vrijeme završetka"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sutra"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ili bilo koji alarm prije toga"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sutra ili bilo koji alarm prije toga"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sutra"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Prekidi"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Kada stignu pozivi i obavijesti"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kada dopuštate prekid?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Koliko dugo?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Uvijek prekidaj"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"isključeno, svi, sve"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Dopusti samo prioritetne prekide"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Dopusti samo alarme"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Ne prekidaj"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Neodređeno"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minuta</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuta</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> sat</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> sata</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> sati</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Promijeni na \"Samo prioritetne obavijesti\" na neodređeno vrijeme"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minuta do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Promijeni na \"Samo prioritetne obavijesti\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sati (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Promijeni na \"Samo alarmi\" na neodređeno vrijeme"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minuta (do <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">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Promijeni na \"Samo alarmi\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sati do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Promijeni na \"Ne prekidaj\" na neodređeno vrijeme"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> minuta (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sata do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Promijeni na \"Ne prekidaj\" u trajanju od <xliff:g id="DURATION">%1$d</xliff:g> sati do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Promijeni na \"Uvijek prekidaj\""</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"zauvijek"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obavijest aplikacije"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke obavijesti"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošalji povr. informacije o uređaju"</string>
@@ -2512,4 +2647,66 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Informacije IMEI-ja"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Relativne informacije IMEI-ja"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Utor <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Pokretanje prema zadanim postavkama"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> iskorišteno: <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Veze domena"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Otvori URL-ove domene"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Dopusti aplikaciji izravno otvaranje URL-ova domene"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL-ovi podržanih domena"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Ostale zadane postavke"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> iskorišteno: <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"unutarnja memorija"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"vanjska memorija"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Interna pohrana"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Vanjska pohrana"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Upotreba podataka za apl."</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> potrošeno od <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Upotrijebljena pohrana"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Uključeno"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blokiranje"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Osjetljivo"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritetno"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritetno i osjetljivo"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dopuštenje odobreno</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dopuštenja odobrena</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dopuštenja odobreno</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> dopuštenja odobreno</item>
+      <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> dopuštenja odobreno</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> dopuštenja odobreno</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Postavljene su neke zadane postavke"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Nema zadanih postavki"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Sve aplikacije"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Omogućeno"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Osobno"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Posao"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirano"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritetno"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Osjetljivo"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S URL-ovima domena"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Onemogućio administrator"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Napredno"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Odabir profila"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Dopuštenja aplikacije"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Broj aplikacija s dodatnim pristupom: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Broj aplikacija s dopuštenjem: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL-ovi domena"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Ne otvaraj URL nijedne domene"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Otvori \"<xliff:g id="DOMAIN">%s</xliff:g>\""</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Otvori \"<xliff:g id="DOMAIN">%s</xliff:g>\" i povezane URL-ove"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija može otvoriti URL-ove svoje domene</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacije mogu otvoriti URL-ove svojih domena</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacija može otvoriti URL-ove svojih domena</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nije prepoznat"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Zadane aplikacije"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplikacija preglednika"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nema zadanog preglednika"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Zadano)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Pohrana aplikacija"</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index a158ca4..1acdcdb 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"Nyilvános webes meghajtó"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Nyomógomb"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"mikrofon némítása és a némítás feloldása"</item>
     <item msgid="1148142988678569310">"médiatartalom kivetítése"</item>
     <item msgid="9130014005474445273">"VPN aktiválása"</item>
+    <item msgid="1165192162975045562">"háttérkép írása"</item>
+    <item msgid="7129487923652967258">"segédlet a szerkezethez"</item>
+    <item msgid="1069023208100114540">"segédlet a képernyőképhez"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Hely"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Mikrofon némítása és a némítás feloldása"</item>
     <item msgid="5906017727368097853">"Médiatartalom kivetítése"</item>
     <item msgid="2486614710846178542">"VPN aktiválása"</item>
+    <item msgid="5586547561693629602">"Háttérkép írása"</item>
+    <item msgid="32794179825485062">"Segédlet a szerkezethez"</item>
+    <item msgid="7872852746938272552">"Segédlet a képernyőképhez"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Rövid"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"alacsony"</item>
     <item msgid="4212263919458209842">"kritikus"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Ki"</item>
-    <item msgid="5656544177755411222">"Korlátozott megszakítások"</item>
-    <item msgid="8735337502532332056">"Nincs megszakítás"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normál"</item>
     <item msgid="866544120205026771">"Mérsékelt"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rózsaszín"</item>
     <item msgid="6131821495505931173">"Piros"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol, médiaátviteli protokoll)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol, képátviteli protokoll)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Hangforrás"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e354ca8..9c96c94 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Engedélyezés"</string>
     <string name="deny" msgid="6947806159746484865">"Elutasítás"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ismeretlen"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen."</item>
-    <item quantity="other" msgid="6722953419953594148">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen.</item>
+      <item quantity="one"><xliff:g id="STEP_COUNT_0">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ön mostantól már fejlesztő!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nincs rá szükség, Ön már fejlesztő."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Vezeték nélküli és egyéb hálózatok"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Kapcsolja ki az SMS-t az IMS-en keresztül"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Ehhez be kell kapcsolni a csevegés regisztrációját"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Ehhez ki kell kapcsolni a csevegés regisztrációját"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Ideiglenes VoLTE-jelző bekapcsolása"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Ideiglenes VoLTE-jelző kikapcsolása"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Ite ramlista bekapcsolása"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Ite ramlista kikapcsolása"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM kártya telefonkönyvének megtekintése"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Sugárzás"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil tiltása?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Ezzel kikapcsolja a következőt:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ettől:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Csatlakozva"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Csatlakoztatva (nincs telefon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Csatlakoztatva (nincs hordozó)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Csatlakoztatva (nincs üzenet-hozzáférés)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Csatlakoztatva (nincs telefon vagy hordozó)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Szétkapcsolva"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Szétkapcsolás..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Csatlakozás…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Párosítás..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Névtelen Bluetooth eszköz"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Keresés"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nem található a közelben Bluetooth-eszköz."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Beérkező fájlok megjelenítése"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth-eszköz kiválasztása"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth engedélykérés"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Egy alkalmazás be akarja kapcsolni a Bluetooth funkciót."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Egy alkalmazás szeretné BEKAPCSOLNI a Bluetooth-t a készüléken."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Egy alkalmazás láthatóvá akarja tenni a táblagépet más Bluetooth-eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Egy alkalmazás láthatóvá akarja tenni a telefont más Bluetooth-eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Az egyik alkalmazás láthatóvá akarja tenni a táblagépet más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kártya"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxybeállítások"</string>
     <string name="cancel" msgid="6859253417269739139">"Mégse"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"MÉGSE"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"FOLYTATÁS"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"IGEN"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEM"</string>
-    <string name="forget" msgid="7267115980248732932">"ELFELEJTÉS"</string>
+    <string name="forget" msgid="1400428660472591263">"Elfelejt"</string>
+    <string name="save" msgid="879993180139353333">"Mentés"</string>
+    <string name="done" msgid="6942539184162713160">"Kész"</string>
     <string name="settings_label" msgid="1626402585530130914">"Beállítások"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Beállítások"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Beállítások parancsikon"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rendezés időzóna szerint"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Dátum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Idő"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Arcfelismerés javítása"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Életjelek ellenőrzése"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Pislogás kérése feloldáskor"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Automatikus zárolás"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> alvó mód után"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> alvó üzemmód után; kivéve akkor, amikor <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> feloldva tartja"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Jelszavak"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Ujjlenyomat"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Ujjlenyomatok kezelése"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Ujjlenyomat ehhez:"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Hozzáadás"</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="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ujjlenyomat regisztrálva</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ujjlenyomat regisztrálva</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Ujjlenyomat beállítása"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Ahhoz, hogy ujjlenyomatával feloldhassa a képernyőt vagy megerősíthesse vásárlásait, a következőkre van szükségünk: \n\n✓ A biztonsági képernyőlezárási mód beállítása \n\n✓ Ujjlenyomat hozzáadása"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Keresse az érzékelőt"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Telefonja hátoldalán keresse meg az ujjlenyomat-érzékelőt."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Név"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Törlés"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Lássunk neki!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Helyezze ujját az ujjlenyomat-olvasóra. Emelje fel, ha rezgést érez."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Sikerült! Most újra."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Helyezze ugyanazt az ujját az ujjlenyomat-olvasóra, majd emelje fel, ha rezgést érez."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Ujjlenyomat hozzáadva!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ha ezt az ikont látja, akkor lehetősége van arra, hogy ujjlenyomatával azonosítsa magát, vagy engedélyezze a vásárlást."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Hozzáadás"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Következő"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Titkosítás"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Táblagép titkosítása"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefon titkosítása"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Csatlakoztassa töltőjét, és próbálja újra."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nincs a zárolási képernyőhöz tartozó PIN kód vagy jelszó"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Be kell állítani egy zárolási képernyőhöz tartozó PIN kódot vagy jelszót a titkosítás megkezdése előtt."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Rajzolja le a feloldási mintát az eszköz titkosításának megerősítéséhez."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Titkosítja?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"A titkosítási művelet visszafordíthatatlan, ha megszakítja, adatai elvesznek. A titkosítás legalább egy órát vesz igénybe, mialatt a táblagép többször újra fog indulni."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"A titkosítási művelet visszafordíthatatlan, ha megszakítja, adatai elvesznek. A titkosítás legalább egy órát vesz igénybe, mialatt a telefon többször újra fog indulni."</string>
@@ -384,36 +395,35 @@
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Biztonsági zárolás"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Képernyő zárolása"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Képernyőzár mód."</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Minta, PIN-kód és jelszavas védelem módosítása és kikapcsolása"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Minta, PIN kód és jelszavas védelem módosítása és kikapcsolása"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Válasszon módszert a képernyő lezárásához"</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"Amikor az arcalapú feloldás nem látja Önt, hogyan szeretné feloldani?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nincs"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Söprés"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Nincs védelem"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Arcalapú feloldás"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Alacsony védelem, kísérleti"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Minta"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Közepes védelem"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-kód"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN kód"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Közepes/magas védelem"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Jelszó"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Magas védelem"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Jelenlegi képernyőzár"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Az eszközvédelmi funkciók nem fognak működni."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Rendszergazda, szabályzat vagy adattár letiltotta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nincs"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Söprés"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Arcalapú feloldás"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Minta"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kód"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Jelszó"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Képernyőzár beállítását követően a Beállítások &gt; Biztonság részben beállíthatja ujjlenyomatát is."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Képernyőzár kikapcsolása"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Feloldási minta törlése"</string>
-    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Feloldó PIN-kód törlése"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Feloldó PIN kód törlése"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Feloldási jelszó eltávolítása"</string>
     <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Képernyőzár eltávolítása"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Feloldási minta módosítása"</string>
-    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN-kód módosítása"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN kód módosítása"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Feloldási jelszó módosítása"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A jelszónak legalább %d karakter hosszúnak kell lennie"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"A PIN kódnak legalább %d számjegyűnek kell lennie."</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"A jelszónak tartalmaznia kell legalább egy betűt."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"A jelszónak tartalmaznia kell legalább egy számot."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"A jelszónak tartalmaznia kell legalább egy szimbólumot."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"A jelszónak tartalmaznia kell legalább 1 betűt."</item>
-    <item quantity="other" msgid="8186027808415585970">"A jelszónak tartalmaznia kell legalább %d betűt."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"A jelszónak tartalmaznia kell legalább 1 kisbetűt."</item>
-    <item quantity="other" msgid="2693910942679679225">"A jelszónak tartalmaznia kell legalább %d kisbetűt."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"A jelszónak tartalmaznia kell legalább 1 nagybetűt."</item>
-    <item quantity="other" msgid="3030801209112209245">"A jelszónak tartalmaznia kell legalább %d nagybetűt."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"A jelszónak tartalmaznia kell legalább 1 számot."</item>
-    <item quantity="other" msgid="4703982391407595924">"A jelszónak tartalmaznia kell legalább %d számot."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"A jelszónak tartalmaznia kell legalább 1 speciális karaktert."</item>
-    <item quantity="other" msgid="1221290525051187757">"A jelszónak tartalmaznia kell legalább %d speciális karaktert."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"A jelszónak tartalmaznia kell legalább 1, betűktől eltérő karaktert."</item>
-    <item quantity="other" msgid="3952508584649046404">"A jelszónak tartalmaznia kell legalább %d, betűktől eltérő karaktert."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">A jelszónak tartalmaznia kell legalább %d betűt.</item>
+      <item quantity="one">A jelszónak tartalmaznia kell legalább 1 betűt.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">A jelszónak tartalmaznia kell legalább %d kisbetűt.</item>
+      <item quantity="one">A jelszónak tartalmaznia kell legalább 1 kisbetűt.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">A jelszónak tartalmaznia kell legalább %d nagybetűt.</item>
+      <item quantity="one">A jelszónak tartalmaznia kell legalább 1 nagybetűt.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">A jelszónak tartalmaznia kell legalább %d számot.</item>
+      <item quantity="one">A jelszónak tartalmaznia kell legalább 1 számot.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">A jelszónak tartalmaznia kell legalább %d speciális karaktert.</item>
+      <item quantity="one">A jelszónak tartalmaznia kell legalább 1 speciális karaktert.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">A jelszónak tartalmaznia kell legalább %d, betűktől eltérő karaktert.</item>
+      <item quantity="one">A jelszónak tartalmaznia kell legalább 1, betűktől eltérő karaktert.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Az eszközrendszergazda nem engedélyezi a legutóbbi jelszavak használatát."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Növekvő, csökkenő vagy ismétlődő számsor megadása tilos"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -473,22 +483,15 @@
     <string name="bluetooth_enter_pin_msg" msgid="4954085254142996877">"Eszköz"</string>
     <string name="bluetooth_pairing_key_msg" msgid="333005542843637754">"Párosítókód"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"Gépelje be a párosítókódot, majd nyomja meg az Enter vagy a Return gombot"</string>
-    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"A PIN-kód betűket vagy szimbólumokat tartalmaz"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"A PIN kód betűket vagy szimbólumokat tartalmaz"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Általában 0000 vagy 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Előfordulhat, hogy a PIN kódot a másik készüléken is meg kell adnia."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Előfordulhat, hogy az azonosító kulcsot a másik eszközön is be kell írnia."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Párosítás ezzel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Győződjön meg arról, hogy a következő azonosítókulcs látható rajta:&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">"Küldő:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Párosítja a készüléket?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"A(z) <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> eszközzel való párosításhoz írja be rajta a következőt: <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>, majd nyomja meg a Return vagy az Enter billentyűt."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párosítás"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PÁROSÍTÁS"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Mégse"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"A párosítás hozzáférést biztosít a névjegyekhez és híváselőzményekhez összekapcsolt állapotban."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nem lehet párosítani a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"A párosítás sikertelen volt a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel hibás PIN kód vagy jelszó miatt."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nem lehet kommunikálni a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"A(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszköz elutasította a párosítást."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Nem sikerült csatlakozni a következőhöz: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Eszközök keresése"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Frissítés"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Speciális"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Speciális Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Ha a Bluetooth aktív, az eszköz képes kommunikálni a közelben lévő Bluetooth-eszközökkel."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"A pontosabb helyadatok érdekében az alkalmazások és szolgáltatások Bluetooth-eszközöket keresnek még kikapcsolt Bluetooth mellett is. Ezt a <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>keresési beállításoknál<xliff:g id="LINK_END_1">LINK_END</xliff:g> módosíthatja."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Csatlakozás a következőhöz..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Média audió"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon hangja"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Fájlátvitel"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Beviteli eszköz"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetelérés"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Névjegyek megosztása"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Használja a névjegyek megosztására"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetkapcsolat megosztása"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Üzenet-hozzáférés"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a hordozóeszköz hangkimenetéről."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a kihangosító hangkimenetéről."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a beviteli eszközről."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Használat módja:"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Átnevezés"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Beérkező fájlátvitelek engedélyezése"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Csatlakoztatva az eszköz hangjához"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Csatlakoztatva a telefon hangjához"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Csatlakozva a fájlküldő szerverhez"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Csatlakoztatva a térképhez"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nincs csatlakozva a fájlküldő szerverhez"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Beviteli eszköz csatlakoztatva"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Eszközhöz csatlakozik az interneteléréshez"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Helyi internetkapcsolat megosztva az eszközzel"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Felhasználás az eszköz hangjához"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Felhasználás a telefon hangjához"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Felhasználás fájlátvitelre"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Használat beviteli eszközként"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Használat internetelérésre"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Használat a térképhez"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dokkolási beállítások"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Dokkoló használata a hanghoz"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefonhangszóróként"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Zenéhez és médiához"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Beállítások megjegyzése"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi-kezelő"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Csatlakozva Wi‑Fi-segéddel"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Képernyő tartalmának átküldése"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Tartalomátküldés"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Vezeték nélküli kijelző engedélyezése"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nem található a közelben más eszköz."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Csatlakozás"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Elfelejt"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Kész"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Név"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tegye lehetővé az adatcserét, ha a táblagép érintkezik egy másik eszközzel."</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lehetővé teszi az adatok cseréjét, ha a telefon érintkezik egy másik készülékkel"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi kikapcsolása..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Hiba"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Repülőgép üzemmódban"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nem lehet beolvasni a hálózatokat"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Hálózati értesítés"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Értesítsen, ha rendelkezésre áll nyilvános hálózat"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Rossz minőségű kapcsolatok kerülése"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Csak akkor használjon Wi-Fi hálózatot, ha jó internetkapcsolatot tud biztosítani."</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Csak jó internetkapcsolattal rendelkező hálózatok használata"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"A keresés mindig elérhető"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Keresés engedélyezése mindig"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"A Google helyszolgáltatása és más alkalmazások akkor is kereshetnek hálózatokat, ha a Wi-Fi ki van kapcsolva"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Nyílt Wi‑Fi automatikus használata"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"A Wi-Fi-segéd automatikusan csatlakozhat a jó minőségűnek ítélt nyílt hálózatokhoz"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Segéd kiválasztása"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Tanúsítványok telepítése"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"A hely pontosságának javítása és egyéb célok érdekében a Google és más alkalmazások kereshetnek közeli Wi-Fi hálózatokat még akkor is, ha a Wi-Fi ki van kapcsolva. Ha nem szeretné ezt, állítsa át a Speciális &gt; A keresés mindig elérhető beállítást."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Az alkalmazások még akkor is megkereshetik a közeli hálózatokat, ha a Wi-Fi ki van kapcsolva. Ha nem szeretné ezt, állítsa át a Speciális &gt; A keresés mindig elérhető beállítást."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"A pontosabb helyadatok érdekében az alkalmazások és szolgáltatások Wi-Fi-hálózatokat keresnek még kikapcsolt Wi-Fi mellett is. Ezt a <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>keresési beállításoknál<xliff:g id="LINK_END_1">LINK_END</xliff:g> módosíthatja."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne jelenjen meg többé"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Tartsa bekapcsolva a Wi-Fit alvó üzemmódban"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi bekapcsolva alvó módban"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Újabb hálózat hozzáadása"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Egyebek"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. beállítás (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"A telepítés befejezéséhez a táblagépnek Wi-Fi hálózatra van szüksége. A beállítás után válthat a mobiladat-forgalom és a Wi-Fi között."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Speciális beállítások"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS indítása..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Nyomja meg a Wi-Fi Protected Setup gombot a routeren. Ennek elnevezése lehet „WPS” is, illetve a következő szimbólum is jelölheti:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Nyomja meg a Wi-Fi Protected Setup gombot a routeren. Ennek elnevezése lehet „WPS” is, illetve a következő szimbólum is jelölheti:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Írja be a Wi-Fi router PIN kódját (<xliff:g id="NUMBER">%1$s</xliff:g>). A telepítés legfeljebb 2 percet vesz igénybe."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"Sikeres WPS. Csatlakozás a hálózathoz..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Csatlakozva a(z) <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Név nélküli identitás"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Jelszó"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Jelszó megjelenítése"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Config AP sáv"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GHz-es sáv"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz-es sáv"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-beállítások"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nem változott)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nincs megadva)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Mentve"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Letiltva"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurációs hiba"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-kapcsolati hiba"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Azonosítási probléma"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Hatókörön kívül"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Nincs érzékelhető internet-hozzáférés, ezért nem kapcsolódik újra automatikusan."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS elérhető"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS elérhető)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Adja meg hálózati jelszavát"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Nincs"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Bejelentkezik a csatlakozáshoz?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g>: online bejelentkezés szükséges a csatlakozás előtt."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KAPCSOLÓDÁS"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"A hálózaton nincs internetkapcsolat. Mindenképpen csatalkozni szeretne hozzá?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ne kérdezzen rá újra ennél a hálózatnál"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK hordozható Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> hordozható Wi-Fi 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_mode_title" msgid="2164073796253284289">"Híváspreferencia"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-hívás üzemmód"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi előnyben részesítve"</item>
+    <item msgid="5267397515594230396">"Mobiladat-kapcsolat előnyben részesítve"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Főoldal"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Megjelenítés"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hang"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"A képernyő fényerejének beállítása"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Alkalmazkodó fényerő"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Fényerőszint optimalizálása a környezeti fény alapján"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Téma"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Világos"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Sötét"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatikus"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Alvó mód"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A kijelző kikapcsol"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
@@ -840,9 +832,9 @@
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kártya zárolása"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM kártya lezárása"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN kód kérése a táblagép használatához"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"PIN-kód kérése a telefon használatához"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"PIN kód kérése a telefon használatához"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN kód kérése a táblagép használatához"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN-kód kérése a telefon használatához"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN kód kérése a telefon használatához"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"SIM kártya PIN kódjának módosítása"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM kártya PIN kódja"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM kártya lezárása"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Frissíti a preferált SIM-et?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"A(z) <xliff:g id="NEW_SIM">%1$s</xliff:g> az egyetlen SIM kártya az eszközben. Ezt a kártyát szeretné használni az adatforgalom, a hívások, és SMS-forgalom lebonyolítására?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Helytelen PIN kód a SIM kártyához; vegye fel a kapcsolatot szolgáltatójával az eszköz feloldásához."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Helytelen PIN kód a SIM kártyához; még <xliff:g id="NUMBER">%d</xliff:g> próbálkozása van, mielőtt fel kellene vennie a kapcsolatot szolgáltatójával az eszköz feloldásához."</item>
-    <item quantity="other" msgid="77103619544346451">"Helytelen PIN kód a SIM kártyához; még <xliff:g id="NUMBER">%d</xliff:g> próbálkozása van."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">A SIM kártya PIN kódja helytelen. <xliff:g id="NUMBER_1">%d</xliff:g> próbálkozás maradt.</item>
+      <item quantity="one">A SIM kártya PIN kódja helytelen. <xliff:g id="NUMBER_0">%d</xliff:g> próbálkozás maradt. Utána a szolgáltatótól kell feloldást kérnie.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"A SIM kártya PIN-művelete sikertelen!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Táblagép állapota"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefon állapota"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Elérhető (csak olvasható)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Összes hely"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Számítás..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Alkalmazások (alkalmazásadatok és médiatartalom)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Alkalmazások és alkalmazásadatok"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Média"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Letöltések"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Képek, videók"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Hang (zene, csengőhangok, podcastok stb.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Egyéb."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Egyéb fájlok"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Gyorsítótárazott adatok"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Megosztott tárh. levál."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-kártya leválasztása"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Leválasztás folyamatban"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Kevés a szabad terület"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Néhány rendszerfunkció, mint például a szinkronizálás, nem fog megfelelően működni. Próbáljon meg helyet felszabadítani elemek, például alkalmazások és médiatartalom törlésével vagy feloldásával."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Átnevezés"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Csatlakoztatás"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Kiadás"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Törlés és formázás"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Törlés és formázás belső tárhelyként"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Számítógépes USB-kapcsolat"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Számítógépes USB-kapcsolat"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Kapcsolódás a következőként:"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Lehetővé teszi a médiafájlok átvitelét Windows alatt, vagy az Android fájlátvitel használatát Macen (tekintse meg a www.android.com/filetransfer webhelyet)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Lehetővé teszi a fotók átvitelét a fényképezőgép szoftverével, valamint bármely fájl átvitelét olyan számítógépeken, amelyek nem támogatják az MTP-t"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Fájlátviteli eszközök telepítése"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Lehetővé teszi, hogy a MIDI-kompatibilis alkalmazások USB-n keresztül működjenek a MIDI-szoftverrel a számítógépen."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Egyéb felhasználók"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Eszköz tárhelye"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Cserélhető tárhely"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> szabad (összesen: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"A(z) <xliff:g id="NAME">%1$s</xliff:g> csatlakoztatva"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"A(z) <xliff:g id="NAME">%1$s</xliff:g> csatlakoztatása sikertelen"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"A(z) <xliff:g id="NAME">%1$s</xliff:g> biztonságosan eltávolítva"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"A(z) <xliff:g id="NAME">%1$s</xliff:g> biztonságos eltávolítása sikertelen"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"A(z) <xliff:g id="NAME">%1$s</xliff:g> formázása megtörtént"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"A(z) <xliff:g id="NAME">%1$s</xliff:g> formázása sikertelen"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Tárhely átnevezése"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"A formázás után ez a(z) <xliff:g id="NAME_0">^1</xliff:g> használható más eszközökben. \n\nA(z) <xliff:g id="NAME_1">^1</xliff:g> összes adata törölve lesz, ezért előbb gondolja át, hogy kell-e készítenie biztonsági mentést. \n\n"<b>"Készítsen biztonsági mentést fotóiról és más médiatartalmairól"</b>" \nMédiafájljait helyezze át az eszközben lévő egyéb tárhelyre, vagy másolja át számítógépére egy USB-kábel segítségével. \n\n"<b>"Készítsen biztonsági mentést alkalmazásairól"</b>" \nA(z) <xliff:g id="NAME_6">^1</xliff:g> tárterületén lévő összes alkalmazással együtt azok adatai is törlődnek. Ha meg szeretné tartani ezeket az alkalmazásokat, helyezze át őket az eszközben lévő egyéb tárhelyre."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Ezen <xliff:g id="NAME_0">^1</xliff:g> kiadásakor a rátelepített alkalmazások működésképtelenné válnak, a rajta tárolt médiafájlok pedig nem lesznek elérhetők egészen addig, amíg Ön vissza nem helyezi a tárolót az eszközbe."</b>" \n\nA(z) <xliff:g id="NAME_1">^1</xliff:g> úgy van formázva, hogy csak ezen az eszközön működjön, más eszközökön ne."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"A(z) <xliff:g id="NAME">^1</xliff:g> beállítása"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Használat hordozható tárolóként"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Fotók és más médiatartalmak eszközök közötti áthelyezéséhez."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Használat belső tárhelyként"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Annak érdekében, hogy – az alkalmazásokat és fotókat is beleértve – mindent ezen az eszközön tároljon. Ehhez formázást kell végrehajtania, amely megakadályozza, hogy a tároló más eszközökben is használható legyen."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formázás belső tárhelyként"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Ez megköveteli a(z) <xliff:g id="NAME_0">^1</xliff:g> biztonságos formázását. \n\nA formázás után ez a(z) <xliff:g id="NAME_1">^1</xliff:g> csak ezzel az eszközzel fog működni. \n\n"<b>"A formázással törlődik a(z) <xliff:g id="NAME_2">^1</xliff:g> tárterületén jelenleg megtalálható összes adat."</b>" Az adatvesztés elkerülése érdekében fontolja meg biztonsági mentés végrehajtását."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Törlés és formázás"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"A(z) <xliff:g id="NAME">^1</xliff:g> formázása folyamatban van…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"A(z) <xliff:g id="NAME">^1</xliff:g> formázásakor ne vegye ki azt az eszközből."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Áthelyezés az új tárhelyre"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Fotóit, fájljait és alkalmazásadatait áthelyezheti új tárolóeszközére (<xliff:g id="NAME">^1</xliff:g>). \n\nA művelet időtartama körülbelül <xliff:g id="TIME">^2</xliff:g>, és <xliff:g id="SIZE">^3</xliff:g> tárterületet szabadít fel a belső tárhelyen. Az áthelyezés végrehajtása során egyes alkalmazások nem fognak működni."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Áthelyezés most"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Áthelyezés később"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Adatok áthelyezése most"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"A művelet időtartama körülbelül <xliff:g id="TIME">^1</xliff:g>, és <xliff:g id="SIZE">^2</xliff:g> tárterületet szabadít fel a belső tárhelyen."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Áthelyezés"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Az áthelyezés folyamatban van…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"A művelet végrehajtása során: \n• A(z) <xliff:g id="NAME">^1</xliff:g> nem távolítható el az eszközből. \n• Egyes alkalmazások nem fognak megfelelően működni. \n• Az eszköz legyen töltőn."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"A(z) <xliff:g id="NAME">^1</xliff:g> készen áll"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"A(z) <xliff:g id="NAME">^1</xliff:g> be van állítva, így használhatja fotókhoz és más médiatartalmakhoz."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Az új <xliff:g id="NAME">^1</xliff:g> működik. \n\nHa fotókat, fájlokat és alkalmazásadatokat szeretne áthelyezni erre az eszközre, nyissa meg a Beállítások &gt; Tárhely menüpontot."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> áthelyezése"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"A(z) <xliff:g id="APP">^1</xliff:g> és adatainak a(z) <xliff:g id="NAME_0">^2</xliff:g> tárhelyre való áthelyezése mindössze néhány pillanatig fog tartani. Az áthelyezési művelet befejeződéséig nem fogja tudni használni az alkalmazást. \n\nA(z) <xliff:g id="NAME_1">^2</xliff:g> nem távolítható el a művelet végrehajtása során."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"A(z) <xliff:g id="APP">^1</xliff:g> áthelyezése folyamatban van…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Az áthelyezés végrehajtása során a(z) <xliff:g id="NAME">^1</xliff:g> nem távolítható el az eszközből. \n\nAz eszközön lévő <xliff:g id="APP">^2</xliff:g> alkalmazás a művelet befejeződéséig nem lesz elérhető."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Áthelyezés megszakítása"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akkumulátor állapota"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akkumulátorszint"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ek"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Alapértelmezett APN-beállítások visszaállítása."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Visszaállítás alaphelyzetbe"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Az alapértelmezett APN-beállítások visszaállítása befejeződött."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Hálózati beállítások visszaállítása"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Ezzel minden hálózati beállítás alaphelyzetbe áll, beleértve a következőket:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiladatok"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Beállítások visszaállítása"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Visszaállítja az összes hálózati beállítást? Ezt a műveletet nem lehet visszavonni."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Beállítások visszaállítása"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Visszaállítja?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"A hálózati beállítások vissza lettek állítva."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Eszköz újraindítása"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Gyári adatok visszaállítása"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Törli az összes adatot a táblagépről"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Minden adat törlése a telefonról"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Minden adat, például zenék és képek törlése az SD-kártyáról"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Táblagép visszaállítása"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon visszaállítása"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Törli az összes személyes információt és letöltött alkalmazást? A műveletet nem lehet visszavonni!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Törli az összes személyes információt és letöltött alkalmazást? A műveletet nem lehet visszavonni."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Minden törlése"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Le kell rajzolnia a feloldási mintát a gyári adatok visszaállításának megerősítéséhez."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nem történt visszaállítás, mert a Rendszertisztítás szolgáltatás nem érhető el."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Visszaállítás?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"A gyári beállítások visszaállítása nem hajtható végre ennél a felhasználónál"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Törli az USB-tárolót, ezzel eltávolítva az összes ott tárolt fájlt? A műveletet nem lehet visszavonni!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Törli az SD-kártyát, ezzel eltávolítva az összes ott tárolt fájlt? A műveletet nem lehet visszavonni!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Minden törlése"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Le kell rajzolnia a feloldó mintát annak megerősítéséhez, hogy törölni kívánja az USB-tárat."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Le kell rajzolnia a feloldó mintát annak megerősítéséhez, hogy törölni kívánja az SD-kártyát."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Hívásbeállítások"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Hangposta, hívásátirányítás, hívásvárakoztatás és hívóazonosító beállítása"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-megosztás"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Súgó"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilhálózatok"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobil-előfizetés"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Alapértelmezett SMS-alkalmazás"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-küldő"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Módosítja az SMS-alkalmazást?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"A(z) <xliff:g id="NEW_APP">%1$s</xliff:g> alkalmazást szeretné használni a(z) <xliff:g id="CURRENT_APP">%2$s</xliff:g> helyett az SMS-ekhez?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"A(z) <xliff:g id="NEW_APP">%s</xliff:g> alkalmazást szeretné használni az SMS-ekhez?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Helymeghatározási mód"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, Wi‑Fi- és mobilhálózatok használata a tartózkodási hely megállapításához"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wi‑Fi- és mobilhálózatok használata a tartózkodási hely megállapításához"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS használata a tartózkodási hely meghatározásához"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS használata a tartózkodási hely meghatározásához"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Beolvasás"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Beolvasás"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-alapú keresés"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"A pontosabb helyadatok érdekében engedélyezze az alkalmazások és szolgáltatások számára Wi-Fi-hálózatok keresését akkor is, amikor a Wi‑Fi ki van kapcsolva."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-alapú keresés"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"A pontosabb helyadatokért a rendszerszolgáltatások Bluetooth-eszközöket keresnek még kikapcsolt Bluetooth mellett is."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Hely Wi‑Fi és mobil alapján"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Engedélyezze az alkalmazásoknak, hogy a Google helymeghatározó szolgáltatásával gyorsabban megbecsüljék tartózkodási helyét. A névtelen helyadatok összegyűjtés után a Google-hoz kerülnek."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Helymeghatározás Wi-Fi-vel"</string>
@@ -1140,21 +1185,25 @@
     <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_pattern_header" msgid="6949761069941694050">"Válassza ki a mintát"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Adja meg PIN-kódját"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Adja meg PIN kódját"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Jelszó megerősítése"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Erősítse meg a mintát"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN-kód megerősítése"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN kód megerősítése"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"A jelszavak nem egyeznek"</string>
-    <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"A PIN-kódok nem egyeznek"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"A PIN kódok nem egyeznek"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Kijelöltek feloldása"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A jelszó beállítva"</string>
-    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"A PIN-kód beállítva"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"A PIN kód beállítva"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"A minta beállítva"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Képernyővédelem"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"A folytatáshoz használja eszköze mintáját."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"A folytatáshoz adja meg eszköze PIN kódját."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"A folytatáshoz adja meg eszköze jelszavát."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Eszközbiztonság"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Feloldási minta módosítása"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"A feloldó PIN-kód módosítása"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Erősítse meg az elmentett mintát"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Próbálja újra:"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"A feloldó PIN kód módosítása"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Rajzoljon egy feloldási mintát"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nyomja meg a Menü gombot, ha segítségre van szüksége."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Emelje fel az ujját, ha kész"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Feloldási minta beállítása"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Feloldási minta módosítása"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hogyan kell feloldási mintát rajzolni"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Túl sok helytelen próbálkozás!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Próbálja újra <xliff:g id="NUMBER">%d</xliff:g> másodperc múlva."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Túl sok helytelen próbálkozás. Próbálja újra <xliff:g id="NUMBER">%d</xliff:g> másodperc múlva."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Az alkalmazás már nincs telepítve a telefonján."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Alkalmazások kezelése"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Telepített alkalmazások kezelése és eltávolítása"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Rendezés méret szerint"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Futó szolgáltatások"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Tárolt folyamatok"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Segélyhívó"</string>
     <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>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Alkalmazásműveletek"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Fut"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(nem használt)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Nincs alapértelmezett."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Tárhely-használat"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Alkalmazások által használt tárhely megtekintése"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Futó szolgáltatások"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Táblagép adatai"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefon adatai"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Akkumulátoradatok"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Gyorsindítás"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Állítson be billentyűparancsokat az alkalmazások indítására"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Alkalmazás hozzárendelése"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Nincs parancsikon"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Keresés + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Törlés"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"A(z) <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> parancsikon (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) törlésre kerül."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Mégse"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Alkalmazások"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Parancsikonok"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Szöveges bevitel"</string>
     <string name="input_method" msgid="5434026103176856164">"Beviteli mód"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Jelenlegi billentyűzet"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Az összes Bluetooth HCI-csomag rögzítése egy fájlban"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-feloldás"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"A rendszerbetöltő feloldásának engedélyezése"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Írja be a PIN kódot"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Adja meg az eszköz PIN kódját a kártyafüggetlenítéshez"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Engedélyezi az OEM-feloldást?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"FIGYELEM! Az eszközvédelmi funkciók addig nem fognak működni ezen az eszközön, amíg ez a beállítás be van kapcsolva."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger pufferméret"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Logger naplópufferméret választása"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Helyutánzatok engedélyezése"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Helyutánzatok engedélyezése"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Nézetattribútum vizsgálatának engedélyezése"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Hálózatok"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Vezeték nélküli kijelző tanúsítványa"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Részletes Wi-Fi-naplózás engedélyezése"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresszív Wi‑Fi–mobilhálózat átadás"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi-roaming ellenőrzésének engedélyezése mindig"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Korábbi DHCP-kliens használata"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Beállítások megjelenítése a vezeték nélküli kijelző tanúsítványával kapcsolatban"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi-naplózási szint növelése, RSSI/SSID megjelenítése a Wi‑Fi-választóban"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Ha engedélyezi, a Wi-Fi agresszívebben fogja átadni az adatkapcsolatot a mobilhálózatnak gyenge Wi-Fi-jel esetén"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"A Wi-Fi-roaming ellenőrzésének engedélyezése vagy letiltása az interfészen jelen lévő adatforgalom mennyiségétől függően"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Logger pufferméret"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Logger naplópufferméret választása"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB-beállítás kiválasztása"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB-beállítás kiválasztása"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Helyutánzatok engedélyezése"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Helyutánzatok engedélyezése"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Nézetattribútum vizsgálatának engedélyezése"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"A Lollipop DHCP-kliensének használata az új androidos DHCP-kliens helyett."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Engedélyezi az USB hibakeresést?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Az USB hibakeresés fejlesztési célokat szolgál. Használhatja adatok másolására a számítógép és a készülék között, alkalmazások a készülékre való értesítés nélküli telepítésére és naplózási adatok olvasására."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Visszavonja a hozzáférést az USB-s hibakereséshez az összes számítógépről, ahol korábban engedélyezte azt?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Használja a következő szolgáltatást: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"A(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatásnak a következőkre van szüksége:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Mivel az egyik alkalmazás zavar egy engedélykérelmet, a Beállítások funkció nem tudja ellenőrizni az Ön válaszát."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ha engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást, az eszköz nem fogja használni a képernyőzárat az adattitkosítás növelése érdekében."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Mivel engedélyezett egy kisegítő szolgáltatást, az eszköz nem fogja használni a képernyőzárat az adattitkosítás növelése érdekében."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Mivel a(z) <xliff:g id="SERVICE">%1$s</xliff:g> bekapcsolása hatással van az adatok titkosítására, meg kell erősítenie mintáját."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Folyamatstatisztikák"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"A futó folyamatok statisztikái"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memóriahasználat"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> alkalmazások a következő időszakra: <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="TOTALRAM">%2$s</xliff:g>/<xliff:g id="USEDRAM">%1$s</xliff:g> RAM használva ennyi idő alatt: <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Háttérben futó folyamatok"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Előtérben futó folyamatok"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Gyorsítótárazott folyamatok"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Az eszköz memóriája jelenleg <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Átlagos RAM-használat"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximális RAM-használat"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android operációs rendszer"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Natív"</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">"Gyorsítótárak"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM-használat"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM-használat (háttérben)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Futási idő"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Folyamatok"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Szolgáltatások"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Időtartam"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"A memóriával kapcsolatos részletek"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 óra"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 nap"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Rendszerfolyamatok megjelenítése"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Rendszer elrejtése"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Egyedi készletméret használata"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statisztika típusa"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Háttérben futó folyamatok"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Az alábbi alapértelmezett beállítások felülírják az alkalmazásbeállításokat"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Alapértelmezett beállítások"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Alapértelmezett motor"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"A beszédszintetizáló motor használata beszélt szöveg esetén"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Adja meg a beszédelemző motort a hangalapú szöveg használatához"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Beszéd sebessége"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"A szöveg kimondásának sebessége"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Hangmagasság"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"hardveresen támogatott"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"kizárólag szoftveres"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"A hitelesítési adatok nem érhetők el ennél a felhasználónál"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"A hitelesítési adatok telepítésének megerősítéséhez rajzolja le feloldási mintáját."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Adatok biztonsági mentése"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Alkalmazásadatok, Wi-Fi jelszavak és egyéb beállítások mentése a Google szervereire"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Biztonsági mentés helye"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Jelenleg egyik fiók sem tárol biztonsági mentéseket"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Alkalmazásadatok is"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatikus helyreállítás"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Amikor újratelepít egy alkalmazást, a biztonsági mentésből állítsa helyre a beállításait és az adatokat"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"A biztonsági másolat szolgáltatás inaktív."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ezt az eszközszabályzat határozza meg."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Asztali mentés jelszava"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Az asztali teljes biztonsági mentések jelenleg nem védettek."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Érintse meg, ha módosítaná vagy eltávolítaná a jelszót az asztali teljes mentésekhez"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Áttűnési animáció mérete"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animáció léptéke"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Másodlagos kijelzők szimulálása"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Többablakos mód"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Egyszerre több tevékenység végzése a képernyőn."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Engedélyezi a többablakos módot?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"FONTOS: Ez a funkció teljes mértékben kísérleti jellegű. Lehetővé teszi egyszerre több tevékenység végzését a képernyő Legutóbbi alkalmazások paneljén. A funkció használata során előfordulhat, hogy egyes alkalmazások összeomlanak vagy nem működnek megfelelően."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Alkalmazások"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Törölje a tevékenységeket"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Tevékenységek törlése, amint elhagyják azokat"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Felhasználó"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Korlátozott profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Hozzáad új felhasználót?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"További felhasználók létrehozásával megoszthatja ezt az eszközt másokkal. Minden felhasználó saját tárterülettel rendelkezik, amelyet személyre szabhat saját alkalmazásaival, háttérképével stb. A felhasználók módosíthatják az eszköz beállításait is, például a Wi‑Fi használatát, amely mindenkit érint.\n\nHa új felhasználót ad hozzá, az illetőnek be kell állítania saját tárterületét.\n\nBármely felhasználó frissítheti az alkalmazásokat valamennyi felhasználó számára."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"További felhasználók létrehozásával megoszthatja ezt az eszközt másokkal. Minden felhasználó saját tárterülettel rendelkezik, amelyet személyre szabhat saját alkalmazásaival, háttérképével stb. A felhasználók módosíthatják az eszköz beállításait is, például a Wi‑Fi használatát, amely mindenkit érint.\n\nHa új felhasználót ad hozzá, az illetőnek be kell állítania saját tárterületét.\n\nBármely felhasználó frissítheti az alkalmazásokat valamennyi felhasználó számára."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Ha új felhasználót ad hozzá, az illetőnek be kell állítania saját tárterületét.\n\nBármely felhasználó frissítheti az alkalmazásokat valamennyi felhasználó számára."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Beállít most egy felhasználót?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Győződjön meg arról, hogy a személy hozzá tud férni az eszközhöz, hogy beállíthassa a területét"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Eltávolítja a vendég munkamenetet?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"A munkamenetben található összes alkalmazás és adat törlődni fog."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Eltávolítás"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Telefonhívások engedélyezése"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Telefonhívások és SMS engedélyezése"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Hívások engedélyezése"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Hívások és SMS-ek engedélyezése"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Felhasználó törlése"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Engedélyezi a telefonhívásokat?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Engedélyezi a hívásokat?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"A rendszer megosztja a híváslistát ezzel a felhasználóval."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Engedélyezi a telefonhívásokat és SMS-eket?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"A rendszer megosztja az SMS- és híváslistát ezzel a felhasználóval."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Engedélyezi a hívásokat és SMS-eket?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"A rendszer megosztja az SMS- és híváslistát ezzel a felhasználóval."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Alkalmazások és tartalmak engedélyezése"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Alkalmazások korlátozásokkal"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Alkalmazásbeállítás megnyitása"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"ÁTNEVEZÉS"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Alkalmazáskorlátozások beállítása"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"A(z) <xliff:g id="APP">%1$s</xliff:g> irányítja"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Az alkalmazás nem támogatott korlátozott profilok esetében"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ez az alkalmazás hozzáfér az Ön fiókjaihoz"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Ez az alkalmazás hozzáfér az Ön fiókjaihoz; a kezelője pedig a következő: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi és mobil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Lehetővé teszi a Wi‑Fi és mobilbeállítások módosítását."</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2318,7 +2374,7 @@
     <string name="sim_slot_empty" msgid="8964505511911854688">"A SIM kártya üres"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM kártya neve"</string>
     <string name="sim_name_hint" msgid="7038643345238968930">"Adja meg a SIM kártya nevét"</string>
-    <string name="sim_editor_title" msgid="4034301817366627870">"%1$d. számú SIM-nyílás"</string>
+    <string name="sim_editor_title" msgid="4034301817366627870">"%1$d. SIM-nyílás"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Szolgáltató"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Szám"</string>
     <string name="sim_editor_color" msgid="2542605938562414355">"SIM kártya színe"</string>
@@ -2339,7 +2395,7 @@
     <string name="sim_notification_summary" msgid="5024470200658902406">"Érintse meg a beállításhoz"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Előnyben részesített SIM kártya a következőhöz:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Mindig kérdezzen rá"</string>
-    <string name="sim_selection_required_pref" msgid="3446721423206414652">"Kiválasztás szükséges"</string>
+    <string name="sim_selection_required_pref" msgid="3446721423206414652">"Ki kell választani"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Beállítások"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Beállítások"</string>
     <string name="search_menu" msgid="7053532283559077164">"Keresés"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi hálózati kapcsolat"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"szöveges üzenet szöveges üzenet küldése üzenetek üzenetváltás"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobil cella szolgáltató vezeték nélküli adat 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi hív hívás"</string>
     <string name="keywords_home" msgid="3626170808219458848">"indító"</string>
     <string name="keywords_display" msgid="6709007669501628320">"képernyő érintőképernyő"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"képernyő sötétítése érintőképernyő akkumulátor"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"képernyő sötétítése érintőképernyő akkumulátor"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"háttér személyre szabás testreszabás kijelző"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"sötét téma éjszakai mód képernyő halványítása fényerő megfordítása"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"háttér személyre szabás testreszabás kijelző"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"betűméret"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"kivetítés"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projekt átküldése"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"tárhely lemez merevlemez eszköz használat"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"fogyasztás töltés"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"helyesírás szótár helyesírás-ellenőrzés automatikus javítás"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"fiók"</string>
     <string name="keywords_users" msgid="4673901601478559100">"korlátozás korlátoz korlátozott"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"szövegjavítás javítás hang rezgés automatikus nyelv kézmozdulat javasol javaslat téma trágár szó gépel hangulatjel nemzetközi"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"visszaállítás beállítások alapértelmezett érték"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"alapértelmezett segélykérő (ICE) alkalmazás"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"alkalmazás letöltés alkalmazások rendszer"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"alkalmazások engedélyek biztonság"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"Alkalmazások alapbeállításai"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"csúsztatás jelszó minta pin kód"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC-címke beállítása"</string>
     <string name="write_tag" msgid="8571858602896222537">"Írás"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ébresztés hangereje"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Csengés hangereje"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Értesítés hangereje"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Zavaró üzenetek"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Hívások és értesítések érkezésekor"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Bármikor zavarhat"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Csak a prioritást élvező üzenetek engedélyezettek"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne zavarjon"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Csak a prioritást élvezők"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatikus szabályok"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Csak prioritásos"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Csak riasztások"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Ne zavarjon"</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="ringtone_title" msgid="5379026328015343686">"Telefon csengőhangja"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Értesítések alapértelmezett csengőhangja"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Rezgés a hívásoknál is"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Rezgés"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Hozzáférés értesítésekhez"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Az alkalmazások nem tudják olvasni az értesítéseket"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d alkalmazás tudja olvasni az értesítéseket"</item>
-    <item quantity="other" msgid="980049191810249052">"%d alkalmazás tudja olvasni az értesítéseket"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d alkalmazás tudja olvasni az értesítéseket</item>
+      <item quantity="one">%d alkalmazás tudja olvasni az értesítéseket</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nincs telepítve értesítésfigyelő."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> a rendszer és minden telepített alkalmazás által küldött összes értesítést el tudja majd olvasni. Ezekben lehetnek személyes adatok, például ismerősök nevei és az Ön részére küldött SMS-ek szövegei. Ezeket az értesítéseket el is vetheti, illetve a bennük lévő műveletgombokat megérintheti."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Feltételbiztosítók"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Egy alkalmazás sem biztosít feltételeket"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d alkalmazás biztosít feltételeket"</item>
-    <item quantity="other" msgid="358057362115673258">"%d alkalmazás biztosít feltételeket"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nincsenek telepített feltételbiztosítók."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"A(z) <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> szolgáltató hozzáadhat majd kilépési feltételeket a „Ne zavarjanak” módhoz."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Alkalmazások betöltése…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Tiltás"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Az összes letiltása"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Soha ne jelenjenek meg az alkalmazás értesítései"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritást élvező"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Értesítések megjelenítése a lista tetején, és folyamatos érkezésük engedélyezése, ha beállítása szerint az eszközön csak a prioritást élvező üzenetek jelenhetnek meg"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Bizalmas"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"A bizalmas tartalom elrejtése az alkalmazás értesítéseiből, ha az eszköz zárolva van"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Kezelje prioritást élvezőként"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Az alkalmazásból származó értesítések legyenek hallhatók, amikor a „Ne zavarjanak” mód „Csak prioritást élvezők” értékre van állítva"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Betekintés engedélyezése"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Az alkalmazás kiemelhet bizonyos értesítéseket úgy, hogy rövid időre becsúsztatja azokat az éppen aktuális képernyő szélén"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Bizalmas tartalom elrejtése"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"A bizalmas tartalom elrejtése az alkalmazás értesítéseiből, ha az eszköz zárolva van"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Letiltva"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritást élvező"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Bizalmas"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Kész"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Amíg ki nem kapcsolja ezt"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritást élvező üzenetek"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Inaktivitás"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Napok"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nincs"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Engedélyezett megszakítások"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Csak prioritásos"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nincs"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizálás"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatikus bekapcsolás"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Szabály neve"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Szabály hozzáadása"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Szabály törlése"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Törli a(z) „<xliff:g id="RULE">%1$s</xliff:g>” szabályt?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Törlés"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Szabály típusa"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Ismeretlen"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Szabály konfigurálása"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Ütemezési szabály"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Szabály nem található"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Napok"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nincs"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Minden nap"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Soha"</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">"Hívások"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Üzenetek"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Hívások/üzenetek a következőtől:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Bárki"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Csak ismerősök"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Csak a csillagozott ismerősök"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Események és emlékeztetők"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Az ébresztők minden esetben prioritást élveznek"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Riasztások"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Emlékeztetők"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Események"</string>
+    <string name="zen_mode_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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Hétköznap este"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Kezdés ideje"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Befejezés ideje"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>, illetve minden korábbi ébresztéskor"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon, illetve minden korábbi ébresztéskor"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Zavaró üzenetek"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Hívások és értesítések érkezésekor"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Mikor zavarhatják meg?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Mennyi időre?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Bármikor zavarhat"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ki,mind,minden"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Csak a prioritást élvező üzenetek engedélyezettek"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Csak riasztások engedélyezése"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Ne zavarjon"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Határozatlan időre"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> perc</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> perc</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> óra</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> óra</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"„Csak elsőbbségi értesítések” beállítása határozatlan időre"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Csak elsőbbségi értesítések <xliff:g id="DURATION">%1$d</xliff:g> percen át, eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Csak elsőbbségi értesítések egy percen át, eddig: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Csak elsőbbségi értesítések <xliff:g id="DURATION">%1$d</xliff:g> órán át, eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Csak elsőbbségi értesítések egy órán át, eddig: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"„Csak riasztások” beállítása határozatlan időre"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Csak riasztások <xliff:g id="DURATION">%1$d</xliff:g> percen át (eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Csak riasztások egy percen át, eddig: <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">Csak riasztások <xliff:g id="DURATION">%1$d</xliff:g> órán át, eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Csak riasztások egy órán át, eddig: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"„Ne zavarjon” beállítása határozatlan időre"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Módosítás a(z) „<xliff:g id="DURATION">%1$d</xliff:g> percen át ne zavarjanak” beállításra eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Módosítás az „egy percen át ne zavarjanak” beállításra eddig: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Módosítás az „<xliff:g id="DURATION">%1$d</xliff:g> órán át ne zavarjanak” beállításra eddig: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Módosítás az „egy órán át ne zavarjanak” beállításra eddig: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Módosítás a bármikor történő megszakításra"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"végtelenségig"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Alkalmazásértesítések"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Értesítési beállítások"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Visszajelzés küldése az eszközről"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-információ"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Relatív IMEI-információ"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Hely: <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Elindítás alapértelmezettként"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> felhasználva itt: <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Domainlinkek"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Domain URL-ek megnyitása"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Engedély az alkalmazásnak a domain URL-ek közvetlen megnyitására"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Támogatott domainek URL-jei"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Egyéb alapértelmezett értékek"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> felhasználva itt: <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"belső memória"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"külső memória"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Belső tárhely"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Külső tárhely"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Alkalmazás adathasználata"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> <xliff:g id="DATE">%2$s</xliff:g> óta"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Felhasznált tárhely"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Be"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Letiltás"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Bizalmas"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritást élvező"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritást élvező és bizalmas"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> engedély megadva</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> engedély megadva</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g>/<xliff:g id="COUNT_2">%d</xliff:g> engedély megadva</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>/<xliff:g id="COUNT_0">%d</xliff:g> engedély megadva</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Van néhány alapértelmezett beállítás"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Nincs alapértelmezett beállítás"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Az összes alkalmazás"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Engedélyezve"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Személyes"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Munkahelyi"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Letiltva"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritást élvező"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Bizalmas"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domain URL-ekkel"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Letiltva a rendszergazda által"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Speciális"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Ismeretlen alkalmazás"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profil kiválasztása"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Alkalmazásengedélyek"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>/<xliff:g id="COUNT_0">%d</xliff:g> alkalmazásnál van további hozzáférés"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>/<xliff:g id="COUNT_0">%d</xliff:g> alkalmazás engedélyezve"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domain URL-ek"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Nenyisson meg egyetlen domain URL-t sem"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"<xliff:g id="DOMAIN">%s</xliff:g>” megnyitása"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"<xliff:g id="DOMAIN">%s</xliff:g>” és a kapcsolódó URL-ek megnyitása"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> alkalmazás meg tudja nyitni a domainjei URL-jeit</item>
+      <item quantity="one">Egy alkalmazás meg tudja nyitni a domainje URL-jeit</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nem sikerült felismerni"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Alapértelmezett alkalmazások"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Böngésző"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nincs alapértelmezett böngésző"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Alapértelmezett)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Alkalmazások tárhelye"</string>
 </resources>
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml
index 221314a..f178f08 100644
--- a/res/values-hy-rAM/arrays.xml
+++ b/res/values-hy-rAM/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Սեղմման կոճակ"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"խոսափողն անջատել/միացնել"</item>
     <item msgid="1148142988678569310">"տեսարձակել մեդիան"</item>
     <item msgid="9130014005474445273">"ակտիվացնել VPN-ը"</item>
+    <item msgid="1165192162975045562">"պաստառների պահում"</item>
+    <item msgid="7129487923652967258">"օժանդակ կառույց"</item>
+    <item msgid="1069023208100114540">"օժանդակ էկրանի պատկեր"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Տեղակայում"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Խոսափողն անջատել/միացնել"</item>
     <item msgid="5906017727368097853">"Տեսարձակել մեդիան"</item>
     <item msgid="2486614710846178542">"Ակտիվացնել VPN-ը"</item>
+    <item msgid="5586547561693629602">"Պաստառների պահում"</item>
+    <item msgid="32794179825485062">"Օժանդակ կառույց"</item>
+    <item msgid="7872852746938272552">"Օժանդակ էկրանի պատկեր"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Կարճաժամկետ"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"ցածր"</item>
     <item msgid="4212263919458209842">"կրիտիկական"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Անջատված"</item>
-    <item msgid="5656544177755411222">"Սահմանափակ ընդհատումներ"</item>
-    <item msgid="8735337502532332056">"Զրոյական ընդհատումներ"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Սովորական"</item>
     <item msgid="866544120205026771">"Չափավոր"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Վարդագույն"</item>
     <item msgid="6131821495505931173">"Կարմիր"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Մեդիայի փոխանցման պրոտոկոլ)"</item>
+    <item msgid="8856820259201251036">"PTP (Նկարի փոխանցման պրոտոկոլ)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Աուդիոյի աղբյուրը"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index c1865ca..20c0051 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Թույլատրել"</string>
     <string name="deny" msgid="6947806159746484865">"Մերժել"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Անհայտ"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Դուք այժմ ծրագրավորող դառնալուց հեռու եք <xliff:g id="STEP_COUNT">%1$d</xliff:g> քայլ:"</item>
-    <item quantity="other" msgid="6722953419953594148">"Դուք այժմ <xliff:g id="STEP_COUNT">%1$d</xliff:g> քայլ եք հեռու ծրագրավորող կոչվելուց:"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Ծրագրավորող դառնալու համար ձեզ մնացել է կատարել <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> քայլ:</item>
+      <item quantity="other">Ծրագրավորող դառնալու համար ձեզ մնացել է կատարել <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> քայլ:</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Դուք արդեն ծրագրավորո՛ղ եք:"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Կարիք չկա, դուք արդեն իսկ ծրագրավորող եք:"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Անլար կապ և ցանցեր"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS-ը փոխարինել SMS-ով"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Միացնել IMS պարտադիր գրանցումը"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Պահանջվում է անջատել IMS գրանցումը"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Միացնել VoLTE-ի տրամադրած դրոշը"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Անջատել VoLTE-ի տրամադրած դրոշը"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Անջատել բջջային ռամի պարպումը"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Անջատել lte ռամի պարպումը"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Դիտել SIM-ի հասցեների գրքույկը"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"Միացված է"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Միացված (առանց հեռախոսի)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Միացված է (առանց մեդիա)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Միացված է (հաղորդագրությանը մուտք չկա)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Միացված է (առանց հեռախոսի և մեդիայի)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Անջատված է"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Անջատվում է..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Միանում է..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Զուգավորում..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Անանուն Bluetooth սարք"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Որոնում"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Bluetooth սարքեր մոտակայքում չեն գտնվել:"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ցուցադրել ստացված ֆայլերը"</string>
     <string name="device_picker" msgid="4978696506172252813">"Ընտրեք Bluetooth սարք"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-ի թույլտվության հայց"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Հավելվածը ցանկանում է միացնել Bluetooth-ը:"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Ինչ-որ ծրագրի ցանկանում է միացնել Bluetooth-ն այս սարքում"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Հավելվածը ցանկանում է ձեր գրասալիկը տեսանելի դարձնել այլ Bluetooth սարքերի համար <xliff:g id="TIMEOUT">%1$d</xliff:g> վայրկյանում:"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Ձեր հեռախոսի ծրագրերից մեկը թույլտվություն է հայցում` ձեր հեռախոսը հայտնաբերելի դարձնելու այլ Bluetooth սարքերի կողմից <xliff:g id="TIMEOUT">%1$d</xliff:g> վայրկյանից:"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Ծրագիրը ցանկանում է միացնել Bluetooth-ը և ձեր գրասալիկը տեսանելի դարձնել մյուս սարքերի համար: Դուք կարող եք այն փոխել հետագայում Bluetooth-ի կարգավորումներում:"</string>
@@ -205,7 +198,7 @@
     <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="2671425042711054494">"Ձեր մուտքագրած միացքը վավեր չէ:"</string>
-    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP պրոքսին օգտագործվում է զննարկչի կողմից, բայց չի կարող օգտագործվել այլ ծրագրերի կողմից:"</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="16475158265551708">"Տեղակայում."</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Կից CID՝"</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ՉԵՂԱՐԿԵԼ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ՇԱՐՈՒՆԱԿԵԼ"</string>
     <string name="okay" msgid="1997666393121016642">"Լավ"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ԱՅՈ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ՈՉ"</string>
-    <string name="forget" msgid="7267115980248732932">"ՄՈՌԱՆԱԼ"</string>
+    <string name="forget" msgid="1400428660472591263">"Մոռանալ"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Կատարելագործել դիմային համապատասխանեցումը"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Կենդանի ստուգում"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Ապակողպելիս աչքի թարթոց է անհրաժեշտ"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Կարգավորել Իմ տեղադրությունը, էկրանի ապակողպումը, SIM քարտի կողպումը, վկայագրերի պահոցի կողպումը"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Կարգավորել իմ տեղադրությունը, էկրանի ապակողպումը, հավատարմագրային պահոցի կողպումը"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Գաղտնաբառեր"</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="3453670509485083962">"Ավելացնել"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"էկրանի կողպում"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"Մատնահետքի գրանցում"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Էկրանն ապակողպելու կամ գնումները հաստատելու նպատակով ձեր մատնահետքն օգտագործելու համար անհրաժեշտ է՝ \n\n✓ Սահմանել ձեր էկրանի կողպման պահուստային եղանակը \n\n✓ Ավելացնել ձեր մատնահետքը"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Գտեք սենսորը"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Գտեք հեռախոսի հետևում գտնվող մատնահետքի սենսորը:"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Սկսե՛նք:"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Մատը դրեք մատնահետքի սենսորի վրա: Հեռացրեք թրթռոց զգալուց հետո:"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Հիանալի է: Կրկնեք:"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Դրեք նույն մատը մատնահետքի սենսորի վրա և հեռացրեք թրթռոց զգալուց հետո:"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Մատնահետքն ավելացվեց:"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Եթե տեսնում եք այս պատկերակը, դա նշանակում է, որ կարող եք օգտագործել ձեր մատնահետքը՝ նույնականացում կատարելու կամ գնումը թույլատրելու համար:"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Ավելացնել"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Հաջորդը"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Միացրեք ձեր լիցքավորիչը և կրկին փորձեք:"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Կողպէկրանի PIN կամ գաղտնաբառ չկա"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Դուք պետք է կարգավորեք էկրանի կողպման PIN-ը կամ գաղտնաբառը կոդավորումը սկսելուց առաջ:"</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Պետք է ներկայացնեք ձեր ապակողպման կաղապարը` սարքի կոդավորումը հաստատելու համար:"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Կոդավորե՞լ:"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Կոդավորման գործողությունը անդարձ է, և այն ընդհատելու դեպքում, տվյալներ կկորցնեք: Կոդավորումը մեկ ժամ է տևում, անգամ ավելին, որի ընթացքում սարքը մի քանի անգամ կվերագործարկվի:"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Կոդավորման գործընթացը անհետադարձելի է, և եթե դուք այն ընդհատեք, կկորցնեք բոլոր տվյալները: Կոդավորումը տևում է մեկ ժամ կամ ավելի, որի ընթացքում հեռախոսը մի քանի անգամ կվերագործարկվի:"</string>
@@ -376,7 +387,7 @@
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Կոդավորումը անհաջող էր"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Կոդավորումը դադարեցվեց, և այն հնարավոր չէ ավարտել: Արդյունքում ձեր գրասալիկի տվյալները այլևս մատչելի չեն: \n\n Շարունակելու համար օգտագործել ձեր գրասալիկը` դուք պետք է կատարեք գործարանային վերականգնում: Ձեր գրասալիկի վերականգնումից և կարգավորումից հետո դուք հնարավորություն կունենանք վերականգնել ցանկացած տվյալ, որը պահուստավորվել էր ձեր Google Հաշվում:"</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Կոդավորումն ընդհատվել է և հնարավոր չէ ավարտել: Արդյունքում հեռախոսի տվյալներն այլևս հասանելի չեն:\n\nՀեռախոսը նորից օգտագործելու համար պետք է գործարանային վերականգնում իրականացնեք: Երբ վերականգնումից հետո կարգավորեք հեռախոսը, հնարավորություն կունենաք վերականգնելու ցանկացած տվյալ, որ պահուստավորվել է ձեր Google Հաշվում:"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Ապակոդավորումը չհաջողվեց"</string>
+    <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Չհաջողվեց վերծանել"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="3775740783651700375">"Ձեր մուտքագրած գաղտնաբառը ճիշտ է, բայց ձեր տվյալները վնասված են: \n\nՈրպեսզի կարողանաք օգտագործել ձեռ գրասալիկը, պետք է կատարեք գործարանային տվյալների վերակայում: Վերակայումից հետո գրասալիկը կարգավորելիս հնարավորություն կունենաք վերականգնել ձեր տվյալները, եթե դրանք պահուստավորված են ձեր Google հաշվում:"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="6898436151871328007">"Ձեր մուտքագրած գաղտնաբառը ճիշտ է, բայց ձեր տվյալները վնասված են: \n\nՈրպեսզի կարողանաք օգտագործել ձեռ հեռախոսը, պետք է կատարեք գործարանային տվյալների վերակայում: Վերակայումից հետո հեռախոսը կարգավորելիս հնարավորություն կունենաք վերականգնել ձեր տվյալները, եթե դրանք պահուստավորված են ձեր Google հաշվում:"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Փոխարկել մուտքագրման եղանակը"</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Դեմքով ապակողպում"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Ցածր անվտանգություն, փորձնական"</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_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="current_screen_lock" msgid="4104091715420072219">"Կողպման ընթացիկ եղանակը"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Սարքի պաշտպանության գործառույթներն այլևս չեն գործի:"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Կասեցված է ադմինիստրատորի, կոդավորման ծրագրի կամ վկայագրերի պահոցի կողմից"</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_biometric_weak" msgid="3008473624490350142">"Դեմքով ապակողպում"</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_password" msgid="1203938057264146610">"Գաղտնաբառ"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Էկրանի կողպումը կարգավորելուց հետո կարող եք ավելացնել ձեր մատնահետքը Կարգավորումներ &gt; Անվտանգություն ընտրացանկում:"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Անջատել էկրանի կողպումը"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Հեռացնել ապակողպման նախշը"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Հեռացնել PIN-ի ապակողպումը"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Գաղտնաբառը պետք է առնվազն մեկ տառ պարունակի:"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Գաղտնաբառը պետք է պարունակի առնվազն մեկ թվանշան:"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Գաղտնաբառը պետք է պարունակի առնվազն մեկ նիշ:"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Գաղտնաբառը պետք է պարունակի առնվազն 1 տառ:"</item>
-    <item quantity="other" msgid="8186027808415585970">"Գաղտնաբառը պետք է պարունակի առնվազն %d տառ:"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Գաղտնաբառը պետք է  առնվազն 1 փոքրատառ տառ պարունակի:"</item>
-    <item quantity="other" msgid="2693910942679679225">"Գաղտնաբառը պետք է առնվազն %d փոքրատառ տառ պարունակի:"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Գաղտնաբառը պետք է պարունակի առնվազն 1 մեծատառ տառ:"</item>
-    <item quantity="other" msgid="3030801209112209245">"Գաղտնաբառը պետք է պարունակի առնվազն %d մեծատառ տառ:"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Գաղտնաբառը պետք է պարունակի  առնվազն 1 թվային նիշ:"</item>
-    <item quantity="other" msgid="4703982391407595924">"Գաղտնաբառը պետք է պարունակի առնվազն %d թվային նշան:"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Գաղտնաբառը պետք է պարունակի առնվազն 1 հատուկ նշան:"</item>
-    <item quantity="other" msgid="1221290525051187757">"Գաղտնաբառը պետք է առնվազն %d հատուկ նշան պարունակի:"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Գաղտնաբառը պետք է պարունակի առնվազն 1 ոչ տառային նիշ:"</item>
-    <item quantity="other" msgid="3952508584649046404">"Գաղտնաբառը պետք է առնվազն %d ոչ-տառային նիշ պարունակի:"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Գաղտնաբառը պետք է պարունակի առնվազն %d տառ:</item>
+      <item quantity="other">Գաղտնաբառը պետք է պարունակի առնվազն %d տառ:</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Գաղտնաբառը պետք է պարունակի առնվազն %d փոքրատառ նիշ:</item>
+      <item quantity="other">Գաղտնաբառը պետք է պարունակի առնվազն %d փոքրատառ նիշ:</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Գաղտնաբառը պետք է պարունակի առնվազն %d մեծատառ նիշ:</item>
+      <item quantity="other">Գաղտնաբառը պետք է պարունակի առնվազն %d մեծատառ նիշ:</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Գաղտնաբառը պետք է պարունակի առնվազն %d թվային նիշ:</item>
+      <item quantity="other">Գաղտնաբառը պետք է պարունակի առնվազն %d թվային նիշ:</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Գաղտնաբառը պետք է պարունակի առնվազն %d հատուկ նիշ:</item>
+      <item quantity="other">Գաղտնաբառը պետք է պարունակի առնվազն %d հատուկ նիշ:</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Գաղտնաբառը պետք է պարունակի առնվազն %d ոչ-տառային նիշ:</item>
+      <item quantity="other">Գաղտնաբառը պետք է պարունակի առնվազն %d ոչ-տառային նիշ:</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Սարքի վարիչը թույլ չի տալիս օգտագործել վերջին գաղտնաբառը:"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Թվերի աճող, նվազող կամ կրկնվող հաջորդականությունն արգելված է:"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Լավ"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"Զուգավորել"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"Զուգավորել"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Չեղարկել"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Զուգավորում է մուտքի թույլտվությունը դեպի ձեր կոնտակտները և զանգերի պատմությունը, երբ միացված է:"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Չհաջողվեց զուգավորել <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի հետ:"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Հնարավոր չեղավ զուգավորվել <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի հետ սխալ PIN-ի կամ անցաբառի պատճառով:."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Հնարավոր չէ կապ հաստատել  <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի հետ:"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Զուգավորումը մերժվեց <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի կողմից:"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Հնարավոր չեղավ միանալ <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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"Տեղադրության որոշման ճշգրտությունը բարելավելու նպատակով հավելվածներն ու ծառայությունները կորոնեն Bluetooth սարքեր՝ նույնիսկ, երբ Bluetooth-ն անջատված է: Այս ընտրանքը կարող եք փոխել <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>որոնման կարգավորումներում<xliff:g id="LINK_END_1">LINK_END</xliff:g>:"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Միացում…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Մեդիա աուդիո"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Հեռախոսի աուդիո"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Ֆայլերի փոխանցում"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Ներմուծման սարք"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ինտերնետի մուտք"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Կոնտակտի համօգտագործում"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Օգտագործել կոնտակտի համօգտագործման համար"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ինտերնետ կապի տարածում"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Մուտք հաղորդագրություն"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"Միացված է մեդիա աուդիոյին"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Միացված է հեռախոսի ձայնային տվյալներին"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Միացված է ֆայլերի փոխանցման սերվերին"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Միացված է քարտեզին"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ֆայլերը փոխանցող սերվերի հետ կապ չկա"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Միացված է մուտքային սարքին"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Օգտագործել մեդիա աուդիոյի համար"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Օգտագործել հեռախոսի աուդիոյի համար"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Օգտագործել ֆայլի փոխանցման համար"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Օգտագործել ներմուծման համար"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Օգտագործել ինտերնետ մուտք գործելու համար"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Օգտագործել քարտեզի համար"</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_assistant_title" msgid="2553267316621598101">"Wi-Fi Օգնական"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Կապակցված է Wi‑Fi Օգնականի միջոցով"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Հեռակա էկրան"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -578,7 +562,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Անջատած է"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Անհասանելի է, քանի որ NFC-ն անջատված է"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android ճառագայթում"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Երբ այս հատկությունը միացված է, դուք կարող եք բովանդակություն ճառագայթել մեկ այլ NFC հնարավորությամբ սարքի` սարքերը միմյանց մոտ պահելով: Օրինակ` դուք կարող եք ճառագայթել զննարկչի էջէր, YouTube-ի տեսանյութեր, մարդկանց կոնտակտներ և ավելին:\n\nՊարզապես մոտեցրեք սարքերը միմյանց (հիմնականում մեջք մեջքի) և հպեք ձեր էկրանին: Ծրագիրը կորոշի` ինչն է ճառագայթվում:"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Երբ այս հատկությունը միացված է, դուք կարող եք բովանդակություն ճառագայթել մեկ այլ NFC հնարավորությամբ սարքի` սարքերը միմյանց մոտ պահելով: Օրինակ` դուք կարող եք ճառագայթել դիտարկիչի էջէր, YouTube-ի տեսանյութեր, մարդկանց կոնտակտներ և ավելին:\n\nՊարզապես մոտեցրեք սարքերը միմյանց (հիմնականում մեջք մեջքի) և հպեք ձեր էկրանին: Ծրագիրը կորոշի` ինչն է ճառագայթվում:"</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Ցանցային ծառայության հայտնաբերելիություն"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Թույլատրել այլ սարքերի հավելվածներին տեսնել այս սարքի հավելվածները"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi-ն անջատվում է..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Սխալ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Թռիչքային ռեժիմում"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Հնարավոր չէ սկանավորել ցանցերը"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Ցանցի ծանուցումներ"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Տեղեկացնել, երբ որևէ հասարակական ցանց հասանելի լինի"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Չօգտագործել թույլ կապ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Չօգտագործել Wi‑Fi ցանցը, մինչև այն չունենա լավ ինտերնետային կապ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Օգտագործել միայն լավ ինտերնետ կապ ունեցող ցանցերը"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Սկանավորումը միշտ հասանելի է"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Միշտ թույլատրել սկանավորումը"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Թույլատրել Google-ի տեղադրության ծառայությանը և այլ ծրագրերին սկանավորել ցանցեր` նույնիսկ երբ WiFi-ը անջատված է"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Ինքնաշխատ օգտագործել բաց Wi‑Fi ցանցերը"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Թույլ տալ Wi‑Fi օգնականին ինքնաշխատորեն միանալ բաց ցանցերին, որոնց որակը գնահատվում է որպես բարձր"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Օգնականի ընտրություն"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Տեղադրել վկայականները"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Տեղանքի ճշգրտությունը կատարելագործելու կամ այլ նպատակների համար` Google-ը և այլ ծրագրերը հնարավոր է սկանավորեն մոտակա ցանցերը, նույնիսկ եթե Wi-Fi-ը անջատված է: Եթե դուք չեք ցանկանում դա, անցեք դեպի Ընդլայնված &gt; Սկանավորումը միշտ հասանելի:"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Հավելվածը հնարավոր է սկանավորի մոտակա ցանցերը, անգամ եթե  Wi-Fi-ն անջատված է: Եթե չեք ցանկանում, որ սա պատահի, անցեք Ընդլայնված կարգավորումներ &gt; Սկանավորումը միշտ հասանելի է:"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Տեղադրության որոշման ճշգրտությունը բարելավելու նպատակով հավելվածներն ու ծառայությունները կորոնեն Wi‑Fi ցանցեր՝ նույնիսկ, երբ 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="5340097010842405981">"Նորից ցույց չտալ"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Ավելացնել մեկ այլ ցանց"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Ավելին"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Ինքնուրույն կարգավորում (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Կարգավորումներն ավարտելու համար` գրասալիկը պետք է մուտք գործի Wi-Fi ցանց: Կարգավորելուց հետո կարող եք ընտրություն կատարել բջջային կապի տվյալների և Wi-Fi-ի միջև:"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Ընդլայնված ընտրանքներ"</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="5940801028985255304">"Ձեր գրասալիկի վրա սեղմեք Wi‑Fi Պաշտպանված կարգավորում կոճակը: Այն հնարավոր է կոչվի «WPS» կամ պարունակի հետևյալ նշանը`"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Սեղմեք երթուղիչի «անվտանգ 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_complete" msgid="2388138550456729134">"WPS-ը հաջողվեց: Միանում է ցանցին..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Միացված է <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi‑Fi ցանցին"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"Կազմաձևել մուտքի կետի շերտը"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 ԳՀց շերտ"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 ԳՀց շերտ"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP կարգավորումներ"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(անփոփոխ)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(չտարբերակված)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Պահված է"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Անջատված"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP կարգավորման ձախողում"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi կապի ձախողում"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Նույնականացման խնդիր"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ընդգրկույթից դուրս է"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Ինտերնետի հասանելիություն չկա. ավտոմատ կերպով կրկին չի միանա:"</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_security_none" msgid="7985461072596594400">"Ոչ մեկը"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"Այս ցանցը համացանցի կապակցում չունի: Այնուամենայնիվ, օգտագործե՞լ այս ցանցը:"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Չհարցնել այլևս այս ցանցի համար"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Միանալ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ցանցին միանալ չհաջողվեց"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Մոռանալ"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK շարժական Wi-Fi թեժ կետ"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> դյուրակիր Wi‑Fi թեժ կետ"</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_mode_title" msgid="2164073796253284289">"Զանգերի նախասիրություններ"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-ի միջոցով զանգերի ռեժիմ"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi, նախընտրելի"</item>
+    <item msgid="5267397515594230396">"Բջջային, նախընտրելի"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Երբ Wi-Fi-ի միջոցով զանգերը միացված են, հեռախոսը կարող է ուղարկել զանգերը Wi-Fi ցանցերի կամ ձեր օպերատորի ցանցի միջոցով՝ կախված ձեր նախընտրություններից և ազդանշանի ուժգնությունից: Մինչ այս գործառույթը միացնելը՝ տեղեկացեք վճարների և այլ մանրամասների մասին ձեր օպերատորից:"</string>
     <string name="home_settings" msgid="212375129455718176">"Հիմնական"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ցուցադրիչ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ձայն"</string>
@@ -767,7 +754,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="1171590821131077296">"Հպել ձայնային ազդակները"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"Թեմա"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Բաց"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Մուգ"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Ավտոմատ"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Փոխե՞լ նախընտրելի SIM քարտը:"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"Այս սարքի վրա միակ SIM քարտը <xliff:g id="NEW_SIM">%1$s</xliff:g> է: Ցանկանո՞ւմ եք օգտագործել այս SIM-ը բջջային տվյալների փոխանցման, զանգերի և SMS հաղորդագրությունների համար:"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN կոդը սխալ է: Պետք է դիմեք ձեր օպերատորին՝ սարքն արգելաբացելու համար:"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM PIN կոդը սխալ է: Մնաց <xliff:g id="NUMBER">%d</xliff:g> փորձ, որից հետո պետք է դիմեք ձեր օպերատորին՝ սարքն արգելաբացելու համար:"</item>
-    <item quantity="other" msgid="77103619544346451">"SIM PIN կոդը սխալ է: Մնաց <xliff:g id="NUMBER">%d</xliff:g> փորձ:"</item>
-  </plurals>
+    <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>
+    </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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"Հավելվածներ (հավելվածների տվյալներ &amp; մեդիա բովանդակություն)"</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_dcim_usage" msgid="558887013613822577">"Նկարներ, տեսանյութեր"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Աուդիո (երաժշտություն, զանգերանգներ, ձայնագրություններ և այլն)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Խառնաբնույթ"</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="default" msgid="6915293408836853020">"Անջատել SD քարտը"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"Միացնել"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Անջատել"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Ջնջել և ձևաչափել"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Ջնջել և ձևաչափել որպես ներքին հիշողություն"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB համակարգչին միացում"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB համակարգչային կապ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Կապակցել որպես"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Հնարավորություն է տալիս տեղափոխել ֆայլեր Windows կամ օգտագործել Android File Transfer Mac-ում (տեսեք www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Տեսախցիկ (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Թույլատրում է փոխանցել լուսանկարներ` տեսախցիկի ծրագրաշարն օգտագործելով և ցանկացած ֆայլ փոխանցել համակարգիչներ, որոնք չեն աջակցում MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Տեղադրել ֆայլերի փոխանցման գործիքներ"</string>
+    <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_external_title" msgid="2723851748972673696">"Շարժական կրիչ"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ազատ տարածք (ընդհանուր՝ <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> պահեստը միացվեց"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Չհաջողվեց միացնել <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="4161722509712992231">"Չհաջողվեց անվնաս անջատել <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="8343688274191391889">"Չհաջողվեց ձևաչափել <xliff:g id="NAME">%1$s</xliff:g> կրիչը"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Պահեստի վերանվանում"</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="3677827796634199714"><b>"Եթե հանեք այս <xliff:g id="NAME_0">^1</xliff:g>-ը, նրա վրա պահեստավորված հավելվածներն այլևս չեն աշխատի, իսկ մեդիա ֆայլերը հասանելի չեն լինի մինչև նորից չզետեղեք այն:"</b>" \n\nԱյս <xliff:g id="NAME_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_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_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="1259216693690378749">"Չհեռացնեք <xliff:g id="NAME">^1</xliff:g>-ը ձևաչափման ընթացքում:"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Տեղափոխել տվյալները նոր պահեստ"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Ձեր լուսանկարները, ֆայլերը և հավելվածների տվյալները կարող եք տեղափոխել նոր <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="5035719146373359329"><b>"Տեղափոխումը տևում է մոտ <xliff:g id="TIME">^1</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="8641916179067596592">"Տեղափոխման ընթացքում. \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_move_confirm_title" msgid="292782012677890250">"Տեղափոխել <xliff:g id="APP">^1</xliff:g> հավելվածը"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"Տեղափոխման ընթացքում չհեռացնեք <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="battery_status_title" msgid="9159414319574976203">"Մարտկոցի կարգավիճակը"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Մարտկոցի մակարդակը"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ներ"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"Ցանցային կարգավորումների վերակայում"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Այս գործողության արդյունքում կվերակայվեն ցանցի բոլոր կարգավորումները, այդ թվում նաև՝\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="4874737348054213767">"Վերակայե՞լ ցանցի բոլոր կարգավորումները: Այլևս չեք կարող հետարկել այս գործողությունը:"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Վերակայել կարգավորումները"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Վերակայե՞լ:"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Ցանցի կարգավորումները վերակայվել են"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Վերակայել սարքը"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Գործարանային տվյալների վերականգնում"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Ջնջել գրասալիկից բոլոր տվյալները"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Ջնջում է հեռախոսի բոլոր տվյալները"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Սա կջնջի բոլոր տվյալները ձեր գրասալիկի "<b>" ներքին պահոցից"</b>", այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Սա կջնջի բոլոր տվյալները ձեր սարքի "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ջնջել SD քարտի բոլոր տվյալները, ինչպիսիք են երաժշտությունը կամ լուսանկարները"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Վերակայել գրասալիկը"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Վերակայել հեռախոսը"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Ջնջե՞լ ձեր բոլոր անձնական և ներբեռնված հավելվածները: Այս գործողությունն անշրջելի է:"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Ջնջե՞լ բոլոր անձնական տեղեկությունները և ներբեռնված հավելվածները: Այլևս չեք կարող հետարկել այս գործողությունը:"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ջնջել ամենը"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Դուք պետք է պատկերեք ձեր ապակողպման կաղապարը` գործարանային տվյալների վերականգնումը հաստատելու համար:"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Վերականգնում տեղի չի ունեցել, քանի որ համակարգի մաքրիչ ծառայությունը հասանելի չէ:"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Վերակայե՞լ:"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Այս օգտվողը չի կարող վերակայել սարքը և վերականգնել գործարանային կարգավորումները"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ջնջել USB կրիչը՝ ջնջելով այնտեղ պահվող բոլոր ֆայլերը: Այս գործողությունն անշրջելի է:"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ջնջե՞լ USB կրիչը` այնտեղ պահվող բոլոր ֆայլերով: Այս գործողությունը հետադարձելի չէ:"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ջնջել ամեն ինչ"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Դուք պետք է պատկերեք ձեր ապակողպման նախշը` հաստատելու համար USB կրիչի ջնջումը:"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Պետք է պատկերեք էկրանի ապակողպման ձեր կաղապարը՝ հաստատելու համար, որ ցանկանում եք մաքրել SD քարտը:"</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Օգնություն"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Բջջային ցանցեր"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Բջջային փաթեթ"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Լռելյայն 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Տեղադրության ռեժիմ"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Օգտագործել GPS, Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Օգտագործել Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Օգտագործել GPS՝ դիրքը տեղորոշելու համար"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Տեղադրությունը որոշելու համար օգտագործել GPS-ը"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Վերլուծում"</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="2070686681074461301">"Բարելավեք տեղադրության որոնումը՝ թույլատրելով հավելվածներին ու ծառայություններին որոնել Wi‑Fi ցանցեր՝ նույնիսկ, երբ Wi‑Fi-ն անջատված է"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth սարքերի որոնում"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Բարելավեք տեղադրության որոնումը՝ թույլատրելով համակարգի ծառայություններին որոնել Bluetooth սարքեր՝ նույնիսկ, երբ Bluetooth-ն անջատված է"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi և բջջային ցանցի տեղադրություն"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Թույլատրել ծրագրերին օգտագործել Google-ի տեղակայման ծառայությունները` ձեր տեղադրությունը ավելի արագ որոշելու համար: Անանուն տեղակայման տվյալները կհավաքագրվեն և կուղարկվեն Google-ին:"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Տեղադրությունը որոշված է Wi‑Fi-ի կողմից"</string>
@@ -1131,7 +1176,7 @@
     <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_license_activity_title" msgid="7553683406244228650">"Բաց աղբյուրով լիցենզիաներ"</string>
+    <string name="settings_license_activity_title" msgid="7553683406244228650">"Բաց կոդով ծրագրաշարի արտոնագրեր"</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>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"Էկրանի անվտանգություն"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Շարունակելու համար գծեք նախշը:"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Շարունակելու համար մուտքագրեք սարքի PIN կոդը:"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Շարունակելու համար մուտքագրեք սարքի գաղտնաբառը:"</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_need_to_unlock" msgid="757935356911054465">"Հաստատեք պահված նախշը"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Կրկին փորձեք`"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"Չափից շատ սխալ փորձեր"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Կրկին փորձեք <xliff:g id="NUMBER">%d</xliff:g> վայրկյանից:"</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="manageapplications_settings_title" msgid="7041951105633616745">"Կարգավորել հավելվածները"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Կառավարել և հեռացնել տեղադրված ծրագրերը"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Պահոցի օգտագործում"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Տեսնել հավելվածի կողմից օգտագործվող պահոցը"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Աշխատեցվող ծառայություններ"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Գրասալիկի տեղեկատվություն"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Հեռախոսի տեղեկություններ"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Մարտկոցի տեղեկատվություն"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Արագ գործարկում"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Սահմանել ստեղնաշարի դյուրանցումը՝ հավելվածները գործարկելու համար"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Կապակցել հավելվածին"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Դյուրանցում չկա"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Որոնում + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Մաքրել"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Ձեր կարճուղին <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)-ի համար կմաքրվի:"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Լավ"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Չեղարկել"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Հավելվածներ"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Դյուրանցումներ"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Կորզել բոլոր bluetooth HCI փաթեթները մի ֆայլում"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM ապակողպում"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Թույլ տալ սկզբնաբեռնման բեռնիչի ապակողպումը"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Մուտքագրեք PIN-ը"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Մուտքագրեք ձեր սարքի PIN-ը՝ OEM ապակողպումն ակտիվացնելու համար:"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Թույլատրե՞լ OEM ապակողպումը:"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ԶԳՈՒՇԱՑՈՒՄ. Այս կարգավորումը միացրած ժամանակ սարքի պաշտպանության գործառույթները չեն աջակցվի այս սարքի վրա:"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Տեղեկամատյանի պահնակի չափերը"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Ընտրեք տեղեկամատյանի չափը մեկ պահնակի համար"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Թույատրել կեղծ տեղադրությունները"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Թույլ տալ կեղծ տեղադրություններ"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Միացնել ցուցադրման հատկանիշների ստուգումը"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Ցանց"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Անլար էկրանի վկայագրում"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Միացնել Wi‑Fi մանրամասն գրանցամատյանները"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi-ից կտրուկ անցում բջջային ինտերնետի"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Միշտ թույլատրել Wi‑Fi ռոումինգի որոնումը"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Օգտագործել DHCP ծրագրի ավելի հին տարբերակները"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Ցույց տալ անլար էկրանի վկայագրման ընտրանքները"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Բարձրացնել մակարդակը, Wi‑Fi ընտրիչում ամեն մի SSID-ի համար ցույց տալ RSSI"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Եթե այս գործառույթը միացված է, Wi‑Fi-ի թույլ ազդանշանի դեպքում Wi‑Fi ինտերնետից անցումը բջջային ինտերնետին ավելի կտրուկ կլինի"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Թույլատրել/արգելել Wi‑Fi ռոումինգի որոնումը՝ կախված միջերեսում տվյալների երթևեկի ծավալից"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Տեղեկամատյանի պահնակի չափերը"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Ընտրեք տեղեկամատյանի չափը մեկ պահնակի համար"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Ընտրեք USB կարգավորումը"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Ընտրեք USB կարգավորումը"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Թույատրել կեղծ տեղադրությունները"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Թույլ տալ կեղծ տեղադրություններ"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Միացնել ցուցադրման հատկանիշների ստուգումը"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Օգտագործել Lollipop-ի DHCP ծրագիրը՝ նոր Android DHCP ծրագրի փոխարեն:"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Թույլատրե՞լ USB-ի վրիպազերծումը:"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB վրիպազերծումը միայն ծրագրավորման նպատակների համար է: Օգտագործեք այն ձեր համակարգչից տվյալները ձեր սարք պատճենելու համար, առանց ծանուցման ձեր սարքի վրա ծրագրեր տեղադրելու և տվյալների մատյանը ընթերցելու համար:"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Փակե՞լ USB-ի վրիպազերծման մուտքը` անջատելով այն բոլոր համակարգիչներից, որտեղ նախկինում թույլատրել էիք:"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Մանուշակագույն"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Օգտագործե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը:"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>-ը պահանջում է`"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Քանի որ ներածումն արգելափակված է ինչ-որ հավելվածի կողմից, Կարգավորումները չեն կարող հաստատել ձեր պատասխանը:"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Եթե ​​միացնեք <xliff:g id="SERVICE">%1$s</xliff:g>-ը, ձեր սարքը չի օգտագործի էկրանի կողպումը՝ տվյալների կոդավորումը լավացնելու համար:"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Քանի որ միացրել եք մատչելիության ծառայությունը, ձեր սարքը չի օգտագործի էկրանի կողպումը՝ տվյալների կոդավորումը լավացնելու համար:"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների կոդավորմանը, դուք պետք է հաստատեք ձեր գաղտնանախշը:"</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> ծրագիր <xliff:g id="TIME">%2$s</xliff:g> ժամանակում"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g>-ը <xliff:g id="TOTALRAM">%2$s</xliff:g>-ից օգտագործված <xliff:g id="TIMEDURATION">%3$s</xliff:g> ժամանակահատվածում"</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_memory_status" msgid="4251599550196193093">"Սարքի հիշողությունն այժմ <xliff:g id="MEMSTATE">%1$s</xliff:g> է"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM-ի միջին օգտագործում"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM-ի առավելագույն օգտագործում"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"Գործընթացներ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Ծառայություններ"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Տևողությունը"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Հիշողության վերաբերյալ մանրամասներ"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"Թաքցնել համակարգայինները"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Լռելյայն կարգավորումները գերազանցում են հավելվածի կարգավորումները"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Լռելյայն կարգավորումներ"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Լռելյայն շարժիչ"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Կարգավորում է խոսքի սինթեզային շարժիչը խոսքային տեքստի համար"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Օգտագործել խոսքի սինթեզի այս գործիքը արտասանվող տեքստի համար"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Խոսքի գնահատական"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Տեքստի արտասանման արագությունը"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Բարձրություն"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"Պետք է ներկայացնեք ձեր ապակողպման կաղապարը` վկայագրերի տեղադրումը հաստատելու համար:"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Մուտքագրեք հավատարմագրային պահոցի գաղտնաբառը:"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Ընթացիկ գաղտնաբառն է`"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"Պահուստավորված տվյալներով հաշիվ չկա ներկայումս"</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="5355557151569037197">"Կրկնօրինակման ծառայությունը ակտիվ չէ:"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Սարքի քաղաքականության համաձայն:"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Աշխատասեղանի պահուստավորման գաղտնաբառ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Աշխատասեղանի ամբողջական պահուստավորումները այժմ պաշտպանված չեն"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Աշխատասեղանի ամբողջական պահուստավորման համար ընտրել փոխել կամ հեռացնել գաղտնաբառը"</string>
@@ -1940,7 +1992,7 @@
     <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>" \nGoogle համաժամեցումը թույլ է տալիս  միանալ ձեր կոնտակներին, պայմանավորվածություններին և այլն, որտեղ էլ որ լինեք:"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Բարի գալուստ Google Sync:"</font>" \nGoogle-ի համաժամացման տեխնոլոգիան թույլ է տալիս օգտագործել ձեր կոնտակտներից, հանդիպումները և այլ տվյալներ՝ ցանկացած սարքից:"</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Հավելվածի համաժամեցման կարգավորումներ"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Ամսաթիվ &amp; համաժամեցում"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Փոխել գաղտնաբառը"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Անցումային շարժական սանդղակ"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Շարժանկարի տևողության սանդղակ"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Կրկնաստեղծել երկրորդական էկրան"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Բազմապատուհան ռեժիմ"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Մի քանի գործողություն էկրանի վրա միաժամանակ:"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Միացնե՞լ բազմապատուհան ռեժիմը:"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ԶԳՈՒՇԱՑՈՒՄ. Սա զուտ փորձնական գործառույթ է, որը թույլ է տալիս էկրանի վրա միաժամանակ իրականացնել մի քանի գործողություն «Վերջին հավելվածներ» UI-ի միջոցով: Այս գործառույթը կարող է առաջացնել որոշ հավելվածների աշխատանքի խափանում կամ սխալ աշխատանք:"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Հավելվածներ"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Պետք չէ պահել գործողությունները"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Ոչնչացնել ցանացած գործունեություն օգտվողի հեռացումից հետո"</string>
@@ -2195,7 +2251,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="718192651887726259">"Կարող եք սարքը համօգտագործել այլ մարդկանց հետ՝ ստեղծելով լրացուցիչ օգտվողներ: Յուրաքանչյուր օգտվող ունի սեփական տարածք, որտեղ կարող է հարմարեցնել իր ծրագրերը, պաստառները և այլն: Օգտվողները կարող են նաև հարմարեցնել սարքի կարգավորումները, ինչպես օրինակ՝ 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"Թույլատրել հեռախոսազանգերը"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Թույլատրել հեռախոսազանգերը և SMS-ը"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Միացնել հեռախոսազանգերը"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Միացնել հեռախոսազանգերն ու SMS-ները"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Հեռացնել օգտվողին"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Թույլատրե՞լ հեռախոսազանգերը:"</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_sms_confirm_title" msgid="188164598768941316">"Թույլատրե՞լ հեռախոսազանգերը և SMS-ը:"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Զանգերի և SMS պատմությունը կհամօգտագործվի այս օգտվողի հետ:"</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="application_restrictions" msgid="8207332020898004394">"Թույլատրել ծրագրերը և բովանդակությունը"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Սահմանափակումներով ծրագրեր"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ընդլայնել ծրագրի կարգավորումները"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"Այս ծրագիրը չի աջակցվում սահմանափակված պրոֆիլներում"</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>
@@ -2349,18 +2405,20 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ցանցային կապ"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"տեքստային հաղորդագրություն տեքստային հաղորդագրություն գրել հաղորդակցում"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"բջջային օպերատոր անլար 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi զանգ զանգեր"</string>
     <string name="keywords_home" msgid="3626170808219458848">"թողարկիչ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"հպէկրան"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"էկրանի խամրում հպէկրան մարտկոց"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"էկրանի խամրում հպէկրան մարտկոց"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"հետնաշերտ անհատականացնել հարմարեցնել էկրան"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"մուգ թեմա գիշերային ռեժիմ խամրեցված էկրան պայծառության հակադարձում"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"ետին պլան անհատականացնել հարմարեցնել էկրան"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"տեքստի չափը"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"նախագիծ"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"նախագծի հեռարձակում"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"տարածք սկավառակ կոշտ սկավառակ սարք օգտագործում"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"սնուցում օգտագործում լիցքավորում"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ուղղագրություն բառարան ուղղագրության ստուգում ինքնուղղում"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"ճանաչող մուտքի խոսք խոսքի լեզու անձեռն անձեռն ճանաչում վիրավորական բառ աուդիո պատմություն Bluetooth ականջակալ"</string>
-    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"արագություն լեզու կանխադրված խոսել տեքստից խոսք հնչյունավորում մատչելիություն ընթերցող կույր"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"արագություն լեզու կանխադրված խոսել տեքստից խոսք հնչեցում մատչելիություն ընթերցող կույր"</string>
     <string name="keywords_date_and_time" msgid="2631808108134830066">"ժամացույց ռազմական"</string>
     <string name="keywords_factory_data_reset" msgid="4355133848707691977">"սրբել ջնջել վերականգնել մաքրել հեռացնել"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"տպիչ"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"հաշիվ"</string>
     <string name="keywords_users" msgid="4673901601478559100">"սահմանափակում սահմանափակել սահմանափակված"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"տեքստի ուղղում ուղղել ձայն թրթռալ ավտոմատ լեզու ժեստ առաջարկել առաջարկ թեմա վիրավորական բառ մուտքագրել զմայլիկ միջազգային"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"վերակայել կանխադրված նախընտրանքները"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"կանխադրված հավելված արտակարգ իրավիճակներում"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"հավելվածներ ներբեռնել հավելվածներ համակարգ"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"հավելվածների թույլտվություններին վերաբերող անվտանգություն"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"կանխադրված հավելվածները"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"սահեցնել գաղտնաբառ նախշ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Կարգավորել Wi-Fi NFC պիտակը"</string>
     <string name="write_tag" msgid="8571858602896222537">"Գրել"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Ընդհատումներ"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Զանգեր և ծանուցումներ ստանալիս"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Միշտ ընդհատել"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Թույլատրել միայն կարևոր ծանուցումները"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Չընդհատել"</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_option_important_interruptions" msgid="3903928008177972500">"Միայն կարևորները"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Միայն զարթուցիչը"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Առանց ընդհատումների"</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="ringtone_title" msgid="5379026328015343686">"Հեռախոսի զանգերանգ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ծանուցումների կանխադրված զանգերանգը"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Նաև թրթռալ զանգերի ժամանակ"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Թրթռալ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Մուտք ծանուցումներին"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ծրագրիը չի կարող կարդալ ծանուցումները"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d ծրագիրը կարող է կարդալ ծանուցումները"</item>
-    <item quantity="other" msgid="980049191810249052">"%d հավելված կարող է կարդալ ծանուցումները"</item>
-  </plurals>
+    <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="2767405417723149879">"Ծանուցման ունկնդիրներ տեղադրված չեն:"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Միացնե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը:"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>-ը կկարողանա կարդալ համակարգի կամ ցանկացած տեղադրված ծրագրի կողմից փակցված բոլոր ծանուցումները, որոնք կարող են պարունակել այնպիսի անձնական տեղեկություններ, ինչպիսիք են կոնտակտների անունները և ձեզ ուղարկված հաղորդագրությունների պարունակությունը: Այն նաև կկարողանա մերժել այս ծանուցումները կամ հպված գործողության կոճակները իրենց մեջ:"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Պայմանների աղբյուրներ"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ոչ մի ծրագիր պայմաններ չի տալիս"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d ծրագիր տալիս է պայմաններ"</item>
-    <item quantity="other" msgid="358057362115673258">"%d ծրագիր տալիս են պայմաններ"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Պայմանների աղբյուրներ տեղադրված չեն:"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Միացնե՞լ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը:"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>-ը կկարողանա ավելացնել պայմաններ «Չխանգարել» ռեժիմից դուրս գալու համար:"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ծրագրերը բեռնվում են..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Արգելափակել"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Արգելափակել բոլորը"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Երբեք ցույց չտալ ծանուցումներ այս ծրագրից"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Կարևորություն"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Ցույց տալ ծանուցումները ցուցակի վերևում այնքան ժամանակ, քանի դեռ սարքում սահմանված է միայն կարևոր ծանուցումների ռեժիմը"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Զգայուն"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Երբ սարքը կողպված է, թաքցնել ցանկացած զգայուն բովանդակություն այս ծրագրի ծանուցումներից"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Դիտարկել որպես առաջնահերթ"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Թույլատրել այս հավելվածի ձայնային ծանուցումները, երբ «Չանհանգստացնել» գործառույթի համար սահմանված է «Միայն կարևոր ծանուցումների դեպքում» արժեքը"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Թույլատրել կարճ ծանուցումներ"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Թույլ տալ այս հավելվածին ընդգծել որոշ ծանուցումները՝ դրանք ընթացիկ էկրանին մեկ ակնթարթ ցույց տալու միջոցով"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Թաքցնել գաղտնի տվյալները"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Երբ սարքը կողպված է, այս հավելվածում թաքցնել գաղտնի տվյալներ պարունակող ծանուցումները"</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="zen_mode_default_option" msgid="6940069025071935243">"Քանի դեռ չեք անջատել"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Կարևոր ծանուցումներ"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Անգործունության ժամանակը"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Օրեր"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"-"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Ընդհատումները թույլատրված են"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Միայն կարևորները"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ոչ մեկը"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Ավտոմատացում"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ավտոմատ միացնել"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Կանոնի անունը"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Ավելացնել կանոն"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ջնջել կանոնը"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Ջնջե՞լ «<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="3201273040477861538">"Ժամանակացույցի կանոն"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Կանոնը չի գտնվել:"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Երբեք"</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_from" msgid="1033337300289871697">"Զանգեր և հաղորդագրություններ հետևյալ օգտվողից՝"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Բոլորը"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Միայն կոնտակտները"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Միայն աստղանշված կոնտակտները"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Միջոցառումներ և հիշեցումներ"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Զարթուցիչները միշտ կարևոր ընդհատումներ են"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Զարթուցիչ"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Հիշեցումներ"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Միջոցառումներ"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Ընտրված զանգողներ"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Բազմակի զանգեր կատարած"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Թույլատրել նույն անձին <xliff:g id="MINUTES">%d</xliff:g> րոպեի ընթացքում կատարել երկրորդ զանգը"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ավտոմատ միացնել"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Երբեք"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ին հաջորդ օրը"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ին կամ որևէ զարթուցիչից առաջ"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"Ընդհատումներ"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Զանգեր և ծանուցումներ ստանալիս"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Ե՞րբ եք ցանկանում, որ ձեզ ընդհատենք:"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Որքա՞ն ժամանակով:"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Միշտ ընդհատել"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"անջատել,բոլորը,ամեն ինչ"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Թույլատրել միայն կարևոր ծանուցումները"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Թույլատրել միայն զարթուցիչը"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Չընդհատել"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Անորոշ ժամանակով"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> րոպե</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> hours</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ժամ</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Անորոշ ժամանակով ակտիվացնել «Միայն կարևոր ծանուցումները» ռեժիմը"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Change to priority notifications 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">Ակտիվացնել «Միայն կարևոր ծանուցումները» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> րոպեով մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Change to priority notifications 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">Ակտիվացնել «Միայն կարևոր ծանուցումները» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> ժամով (մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Անորոշ ժամանակով ակտիվացնել «Միայն զարթուցիչը» ռեժիմը"</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">Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> րոպեով (մինչև <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">Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> ժամով մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Անորոշ ժամանակով ակտիվացնել «Չընդհատել» ռեժիմը"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Change to don\'t interrupt for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Change to don\'t interrupt for <xliff:g id="DURATION">%1$d</xliff:g> hours until <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>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ակտիվացնել «Միշտ ընդհատել» ռեժիմը"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ընդմիշտ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ծրագրերի ծանուցումներ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Ուղարկել կարծիք այս սարքի մասին"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"Գործարկել լռելյայն"</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="app_launch_domain_links_title" msgid="458956710410857777">"Տիրույթի հղումներ"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Բացել տիրույթի URL-ները"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Թույլատրել հավելվածին անմիջապես բացել տիրույթի URL-ները"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Աջակցվող տիրույթների URL-ներ"</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="410824961149037234">"ներքին հիշողություն"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"արտաքին հիշողություն"</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="notifications_enabled" msgid="6983396130566021385">"Միացված է"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Արգելափակված է"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Զգայուն"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Առաջնահերթություն"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Առաջնահերթություն և զգայունություն"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <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="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="other">Տրվել է <xliff:g id="COUNT_3">%d</xliff:g>-ից <xliff:g id="COUNT_2">%d</xliff:g> թույլտվություն</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Որոշ կանխադրված կարգավորումներ կան"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Կանխադրված կարգավորումներ չկան"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Բոլոր հավելվածները"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Միացված"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Անձնական"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Աշխատանքային"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Արգելափակված"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Առաջնահերթ"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Զգայուն"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Տիրույթի URL-ներով"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Կասեցված է ադմինիստրատորի կողմից"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Լրացուցիչ"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Անհայտ հավելված"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Ընտրել պրոֆիլ"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Հավելվածների թույլտվությունները"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Ընդլայնված հասանելիություն ունեցող հավելվածներ՝ <xliff:g id="COUNT_1">%d</xliff:g>-ը <xliff:g id="COUNT_0">%d</xliff:g>-ից"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Թույլատրված է <xliff:g id="COUNT_0">%d</xliff:g> հավելվածի՝ <xliff:g id="COUNT_1">%d</xliff:g>-ից"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Տիրույթի URL-ներ"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Չբացել տիրույթի URL-ները"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Բացել «<xliff:g id="DOMAIN">%s</xliff:g>»-ը"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Բացել «<xliff:g id="DOMAIN">%s</xliff:g>» տիրույթի և հարակից URL-ները"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> հավելված կարող է բացել իր տիրույթի URL-ները</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> հավելված կարող է բացել իր տիրույթի URL-ները</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Չճանաչվեց"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Կանխադրված հավելվածները"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Դիտարկիչի հավելված"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Կանխադրված դիտարկիչ չկա"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Կանխադրված)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Հավելվածների պահեստ"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index ed06375..e66463c 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Tekan tombol"</item>
@@ -231,7 +234,7 @@
   <string-array name="app_ops_categories">
     <item msgid="6358963769537892925">"Lokasi"</item>
     <item msgid="255608127647030286">"Pribadi"</item>
-    <item msgid="4588829735729884491">"Perpesanan"</item>
+    <item msgid="4588829735729884491">"Pesan"</item>
     <item msgid="886742181977884584">"Media"</item>
     <item msgid="7924928667052300589">"Perangkat"</item>
   </string-array>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"bisukan/suarakan mikrofon"</item>
     <item msgid="1148142988678569310">"media proyek"</item>
     <item msgid="9130014005474445273">"aktifkan VPN"</item>
+    <item msgid="1165192162975045562">"tulis wallpaper"</item>
+    <item msgid="7129487923652967258">"bantu struktur"</item>
+    <item msgid="1069023208100114540">"bantu tangkapan layar"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasi"</item>
@@ -296,7 +302,7 @@
     <item msgid="6093344633066170692">"Membaca kalender"</item>
     <item msgid="1334886368750347692">"Ubah kalender"</item>
     <item msgid="1638204101698708656">"Lokasi"</item>
-    <item msgid="2154671955760380322">"Pemberitahuan pos"</item>
+    <item msgid="2154671955760380322">"Notifikasi pos"</item>
     <item msgid="4282477730595931828">"Lokasi"</item>
     <item msgid="4891423912898525905">"Telepon"</item>
     <item msgid="2623604824935968113">"Baca SMS/MMS"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Bisukan/suarakan mikrofon"</item>
     <item msgid="5906017727368097853">"Media proyek"</item>
     <item msgid="2486614710846178542">"Aktifkan VPN"</item>
+    <item msgid="5586547561693629602">"Tulis wallpaper"</item>
+    <item msgid="32794179825485062">"Bantu struktur"</item>
+    <item msgid="7872852746938272552">"Bantu tangkapan layar"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Singkat"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"rendah"</item>
     <item msgid="4212263919458209842">"kritis"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Nonaktif"</item>
-    <item msgid="5656544177755411222">"Gangguan terbatas"</item>
-    <item msgid="8735337502532332056">"Tanpa gangguan"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Sedang"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Merah Muda"</item>
     <item msgid="6131821495505931173">"Merah"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet USB)"</item>
+    <item msgid="2686051673589572111">"Sumber Audio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 93d54f8..f5febeb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Izinkan"</string>
     <string name="deny" msgid="6947806159746484865">"Tolak"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Tinggal <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah untuk menjadi pengembang."</item>
-    <item quantity="other" msgid="6722953419953594148">"Tinggal <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah untuk menjadi pengembang."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Tinggal <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> langkah untuk menjadi pengembang.</item>
+      <item quantity="one">Tinggal <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> langkah untuk menjadi pengembang.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sekarang Anda adalah seorang pengembang!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, Anda sudah menjadi pengembang."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Jaringan &amp; nirkabel"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Matikan SMS melalui IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Perlu menyalakan registrasi IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Perlu mematikan registrasi IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Aktifkan tanda yang disediakan untuk VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Nonaktifkan tanda yang disediakan untuk VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Hidupkan buangan ram lte"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Matikan buangan ram lte"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Lihat buku alamat SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Nonaktifkan profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Ini akan menonaktifkan:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Terhubung"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Terhubung (bukan telepon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Terhubung (kecuali media)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Tersambung (tidak ada akses pesan)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Terhubung (bukan telepon atau media)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Sambungan terputus"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Memutus sambungan..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Menyambung…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Menyandingkan..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Perangkat Bluetooth tak bernama"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Menelusuri"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Tak ditemukan prngkt Bluetooth terdekat."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tampilkan file yang diterima"</string>
     <string name="device_picker" msgid="4978696506172252813">"Pilih perangkat Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan izin bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Sebuah aplikasi ingin mengaktifkan Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Suatu aplikasi ingin MENGAKTIFKAN Bluetooth untuk perangkat ini."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Sebuah aplikasi ingin menampilkan tablet Anda pada perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Sebuah aplikasi ingin menampilkan ponsel Anda pada perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Sebuah aplikasi ingin menampilkan ponsel Anda di perangkat Bluetooth lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kartu SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Setelan proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Batal"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"BATAL"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"LANJUTKAN"</string>
     <string name="okay" msgid="1997666393121016642">"Oke"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"YA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"TIDAK"</string>
-    <string name="forget" msgid="7267115980248732932">"LUPAKAN"</string>
+    <string name="forget" msgid="1400428660472591263">"Lupakan"</string>
+    <string name="save" msgid="879993180139353333">"Simpan"</string>
+    <string name="done" msgid="6942539184162713160">"Selesai"</string>
     <string name="settings_label" msgid="1626402585530130914">"Setelan"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Setelan"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Pintasan setelan"</string>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Menyempurnakan pencocokan wajah"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Pemeriksaan keaktifan"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Memerlukan kedipan mata saat membuka kunci"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Menggembok 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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setel Lokasiku, pembuka kunci layar, kunci penyimpanan kredensial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Sandi"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sidik jari"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Mengelola sidik jari"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sidik jari untuk"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Tambahkan"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"kunci layar"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> sidik jari didaftarkan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> sidik jari didaftarkan</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Penyiapan sidik jari"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Untuk menggunakan sidik jari guna membuka kunci layar atau mengonfirmasi pembelian, kami harus: \n\n✓ Menyiapkan metode kunci layar cadangan \n\n✓ Menambahkan sidik jari Anda"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Temukan sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Cari sensor sidik jari di bagian belakang ponsel."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nama"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Oke"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Hapus"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Ayo mulai!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Letakkan jari pada sensor sidik jari. Angkat setelah Anda merasakan getaran."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Bagus! Sekarang ulangi."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Letakkan jari yang sama pada sensor sidik jari dan angkat setelah Anda merasakan getaran."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Sidik jari ditambahkan!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Setiap kali melihat ikon ini, Anda dapat menggunakan sidik jari untuk identifikasi atau mengotorisasi pembelian."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Tambahkan"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Berikutnya"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsi"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkripsi tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkripsi ponsel"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pasang pengisi daya Anda dan coba lagi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Tidak ada PIN atau sandi pengunci layar"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Anda perlu menyetel PIN atau sandi pengunci layar sebelum dapat memulai enkripsi."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Anda perlu menggambar pola pembuka kunci untuk mengonfirmasi pengenkripsian perangkat."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Enkripsikan?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operasi enkripsi tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, dan selama itu tablet akan dimulai ulang beberapa kali."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operasi enkripsi tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, dan selama itu ponsel akan dimulai ulang beberapa kali."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Gesek"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Tanpa pengamanan"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Keamanan rendah, eksperimental"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Pola"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Keamanan sedang"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keamanan sedang hingga tinggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Sandi"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Keamanan tinggi"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Kunci layar saat ini"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Fitur perlindungan perangkat tidak akan berfungsi lagi."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dinonaktifkan oleh administrator, kebijakan enkripsi, atau penyimpanan kredensial"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tidak ada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Gesek"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Pola"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Sandi"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Setelah menyiapkan kunci layar, Anda juga dapat menyiapkan sidik jari di Setelan &gt; Keamanan."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Matikan kunci layar"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Hapus pola pembuka kunci"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Hapus PIN pembuka kunci"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Sandi paling tidak harus terdiri dari satu huruf."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Sandi paling tidak harus terdiri dari satu digit."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Sandi paling tidak harus terdiri dari satu simbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Sandi paling tidak harus terdiri dari 1 huruf."</item>
-    <item quantity="other" msgid="8186027808415585970">"Sandi paling tidak harus terdiri dari %d huruf."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Sandi paling tidak harus terdiri dari 1 huruf kecil."</item>
-    <item quantity="other" msgid="2693910942679679225">"Sandi paling tidak harus terdiri dari %d huruf kecil."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Sandi paling tidak harus terdiri dari 1 huruf besar."</item>
-    <item quantity="other" msgid="3030801209112209245">"Sandi paling tidak harus terdiri dari %d huruf besar."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Sandi paling tidak harus terdiri dari 1 digit angka."</item>
-    <item quantity="other" msgid="4703982391407595924">"Sandi paling tidak harus terdiri dari %d digit angka."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Sandi paling tidak harus terdiri dari 1 simbol khusus."</item>
-    <item quantity="other" msgid="1221290525051187757">"Sandi paling tidak harus terdiri dari %d simbol khusus."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Sandi paling tidak harus terdiri dari 1 karakter bukan huruf."</item>
-    <item quantity="other" msgid="3952508584649046404">"Sandi paling tidak harus terdiri dari %d karakter bukan huruf."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Sandi harus terdiri dari minimal %d huruf.</item>
+      <item quantity="one">Sandi harus terdiri dari minimal 1 huruf.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Sandi harus terdiri dari minimal %d huruf kecil.</item>
+      <item quantity="one">Sandi harus terdiri dari minimal 1 huruf kecil.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Sandi harus terdiri dari minimal %d huruf besar.</item>
+      <item quantity="one">Sandi harus terdiri dari minimal 1 huruf besar.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Sandi harus terdari dari minimal %d digit numerik.</item>
+      <item quantity="one">Sandi harus terdiri dari minimal 1 digit numerik.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Sandi harus terdiri dari minimal %d simbol khusus.</item>
+      <item quantity="one">Sandi harus terdiri dari minimal 1 simbol khusus.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Sandi harus terdiri dari minimal %d karakter bukan huruf.</item>
+      <item quantity="one">Sandi harus terdiri dari minimal 1 karakter bukan huruf.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Administrator perangkat tidak mengizinkan penggunaan sandi terbaru."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Urutan digit naik, turun, atau berulang dilarang"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Oke"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Untuk menyandingkan dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pastikan bahwa perangkat tersebut menampilkan kode sandi:&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">"Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sandingkan dengan perangkat ini?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Untuk menyandingkan dengan:<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>Ketikkan:<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>, kemudian tekan Kembali atau Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pasangan"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SANDINGKAN"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Batal"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Penyandingan memberi akses ke kontak dan riwayat panggilan saat tersambung"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Tidak dapat menyandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Tidak dapat menyandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> karena PIN atau kode sandi salah."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Tidak dapat berkomunikasi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Penyandingan ditolak oleh <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Tidak dapat tersambung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Memindai perangkat"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Segarkan"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Lanjutan"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Lanjutan"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Saat Bluetooth aktif, perangkat dapat berkomunikasi dengan perangkat Bluetooth terdekat lainnya."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Untuk meningkatkan akurasi lokasi, aplikasi dan layanan akan memindai perangkat Bluetooth, meski Bluetooth tidak aktif. Anda dapat mengubahnya di <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setelan pemindaian<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Sambungkan ke…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio media"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio telepon"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfer file"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Perangkat masukan"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Berbagi kontak"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Gunakan untuk berbagi kontak"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Berbagi sambungan internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Akses Pesan"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari perangkat masukan."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Gunakan untuk"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Ganti nama"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Izinkan transfer file masuk"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Tersambung ke media audio"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Tersambung ke audio ponsel"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Sambungkan ke server transfer file"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Tersambung ke peta"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak tersambung kepada server transfer file"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Terhubung ke perangkat masukan"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tersambung ke perangkat untuk akses Internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Berbagi sambungan Internet lokal dengan perangkat"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gunakan untuk audio media"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gunakan untuk audio ponsel"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk transfer file"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gunakan untuk masukan"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Digunakan untuk akses internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gunakan untuk peta"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Setelan Dok"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gunakan dok untuk audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai pengeras suara telepon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk musik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat setelan"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Terhubung melalui Asisten Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Layar Transmisi"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmisi"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktifkan layar nirkabel"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tidak ditemukan perangkat terdekat."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Menyambung"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Lupakan"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Selesai"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nama"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Memungkinkan pertukaran data saat tablet bersentuhan dengan perangkat lain"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Memungkinkan pertukaran data saat ponsel bersentuhan dengan perangkat lain"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Mematikan Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Kesalahan"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Dalam mode Pesawat"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Tidak dapat memindai jaringan"</string>
-    <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Pemberitahuan jaringan"</string>
+    <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notifikasi jaringan"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Beri tahu saat jaringan publik tersedia"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Hindari sambungan buruk"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Jangan gunakan jaringan Wi-Fi kecuali koneksi internetnya bagus"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Hanya gunakan jaringan yang memiliki koneksi internet kuat"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Pemindaian selalu tersedia"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Selalu izinkan pemindaian"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Izinkan layanan lokasi Google dan aplikasi lainnya memindai jaringan saat Wi-Fi tidak aktif sekalipun"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Gunakan Wi-Fi terbuka secara otomatis"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Izinkan Asisten Wi-Fi tersambung otomatis ke jaringan terbuka yang ditentukan berkualitas tinggi"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Pilih asisten"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Pasang sertifikat"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Untuk meningkatkan akurasi lokasi dan untuk tujuan lainnya, Google dan aplikasi lainnya dapat memindai jaringan terdekat, bahkan saat Wi-Fi mati. Jika Anda tidak ingin ini terjadi, buka Lanjutan &gt; Pemindaian selalu tersedia."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikasi dapat memindai jaringan terdekat, bahkan saat Wi-Fi mati. Jika Anda tidak ingin ini terjadi, buka Lanjutan &gt; Pemindaian selalu tersedia."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Untuk meningkatkan akurasi lokasi, aplikasi dan layanan akan memindai jaringan Wi-Fi, meski Wi-Fi tidak aktif. Anda dapat mengubahnya di <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setelan pemindaian<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Jangan tampilkan lagi"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Biarkan Wi-Fi nyala saat mode tidur"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi aktif saat mode tidur"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Tambahkan jaringan lain"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lainnya"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Penyiapan otomatis (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Untuk menyelesaikan penyiapan, tablet Anda memerlukan akses ke Wi-Fi. Setelah penyiapan, Anda dapat beralih antara data seluler dan Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Opsi lanjutan"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Penyiapan Wi-Fi yang Dilindungi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulai WPS..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Tekan tombol Penyiapan Wi-Fi yang Dilindungi di router Anda. Ini dapat disebut \"WPS\" atau berisi simbol ini:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Tekan tombol Penyiapan Wi-Fi yang Dilindungi di router. Ini dapat disebut \"WPS\" atau ditandai dengan simbol ini:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Masukkan PIN <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi. Penyiapan perlu waktu hingga dua menit untuk selesai."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS berhasil. Menyambung ke jaringan..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Tersambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitas anonim"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Sandi"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Tampilkan sandi"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfigurasi Pita TA"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Pita 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Pita 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Setelan IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(tidak diubah)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(tidak ditentukan)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Nonaktif"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Kegagalan Konfigurasi IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Kegagalan Sambungan Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Masalah autentikasi"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam jangkauan"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Akses Internet Tidak Terdeteksi, tidak akan menyambung ulang secara otomatis."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Masukkan sandi jaringan Anda"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Tidak Ada"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Masuk untuk menyambung?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> mewajibkan Anda masuk secara online sebelum menyambung ke jaringan."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"SAMBUNGKAN"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Jaringan ini tidak memiliki akses internet. Tetap gunakan jaringan ini?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Jangan tanya lagi untuk jaringan ini"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Hotspot Wi-Fi portabel AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> hotspot Wi-Fi portabel"</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_mode_title" msgid="2164073796253284289">"Preferensi panggilan telepon"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Mode panggilan Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi dipilih"</item>
+    <item msgid="5267397515594230396">"Seluler dipilih"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Beranda"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
@@ -761,7 +748,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar saat senyap"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Suara pemberitahuan default"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
-    <string name="notification_volume_title" msgid="2012640760341080408">"Pemberitahuan"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"Notifikasi"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gunakan volume panggilan masuk untuk pemberitahuan"</string>
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"Tidak mendukung profil kerja"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Suara pemberitahuan default"</string>
@@ -776,7 +763,7 @@
     <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; pemberitahuan"</string>
-    <string name="volume_notification_description" msgid="5810902320215328321">"Pemberitahuan"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Notifikasi"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Alarm"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"Bisukan nada dering &amp; pemberitahuan"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"Bisukan musik &amp; media lain"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Sesuaikan kecerahan layar"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kecerahan adaptif"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimalkan tingkat kecerahan untuk cahaya yang tersedia"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Ringan"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Gelap"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Otomatis"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Layar mati"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Perbarui kartu SIM piihan?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> adalah satu-satunya SIM di perangkat. Ingin menggunakan SIM ini untuk data seluler, panggilan telepon, dan pesan SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Kode PIN SIM salah, sekarang Anda harus menghubungi operator untuk membuka kunci perangkat."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Kode PIN SIM salah, sisa <xliff:g id="NUMBER">%d</xliff:g> percobaan sebelum Anda harus menghubungi operator untuk membuka kunci perangkat."</item>
-    <item quantity="other" msgid="77103619544346451">"Kode PIN SIM salah, sisa <xliff:g id="NUMBER">%d</xliff:g> percobaan."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Kode PIN SIM salah, sisa <xliff:g id="NUMBER_1">%d</xliff:g> percobaan.</item>
+      <item quantity="one">Kode PIN SIM salah, sisa <xliff:g id="NUMBER_0">%d</xliff:g> percobaan sebelum Anda harus menghubungi operator untuk membuka kunci perangkat.</item>
+    </plurals>
     <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>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Tersedia (hanya baca)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total ruang"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Menghitung..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikasi (data &amp; konten media)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikasi &amp; data aplikasi"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Unduhan"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Gambar, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musik, nada dering, podcast, dll.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Serbaneka"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"File lainnya"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data dalam cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Lepas penyimpanan bersama"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Lepaskan kartu SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Pelepasan sedang berlangsung"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Ruang penyimpanan hampir habis"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Beberapa fungsi sistem, seperti sinkronisasi, mungkin tidak bekerja dengan benar. Coba kosongkan ruang dengan menghapus atau mencopot sematan item, seperti konten media atau aplikasi."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Ganti nama"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Pasang"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Keluarkan"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Hapus &amp; format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Hapus &amp; format sbg penyimpanan internal"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Koneksi komputer USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Koneksi komputer USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Sambungkan sebagai"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Memungkinkan Anda mentransfer file media di Windows, atau menggunakan Transfer File Android di Mac (lihat www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Memungkinkan Anda mentransfer foto menggunakan perangkat lunak kamera, dan mentransfer file apa pun di komputer yang tidak mendukung MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Pasang alat transfer file"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Mengizinkan aplikasi dengan MIDI aktif bekerja melalui USB dengan perangkat lunak MIDI di komputer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Pengguna lainnya"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Penyimpanan perangkat"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Penyimpanan yang dapat dicopot"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> kosong (Total <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> telah dipasang"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Tidak dapat memasang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> dikeluarkan dengan aman"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Tidak dapat mengeluarkan <xliff:g id="NAME">%1$s</xliff:g> dengan aman"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> telah diformat"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Tidak dapat memformat <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Ganti nama penyimpanan"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Setelah memformat, Anda dapat menggunakan <xliff:g id="NAME_0">^1</xliff:g> ini di perangkat lain. \n\nSemua data di <xliff:g id="NAME_1">^1</xliff:g> ini akan dihapus. Pertimbangkan untuk mencadangkan terlebih dahulu. \n\n"<b>"Cadangkan foto &amp; media lain"</b>" \nPindahkan file media ke penyimpanan alternatif di perangkat ini, atau transfer ke komputer menggunakan kabel USB. \n\n"<b>"Cadangkan aplikasi"</b>" \nSemua aplikasi yang disimpan di <xliff:g id="NAME_6">^1</xliff:g> ini akan dicopot pemasangannya dan datanya akan dihapus. Untuk menyimpan aplikasi tersebut, pindahkan ke penyimpanan alternatif di perangkat ini."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Saat Anda mengeluarkan <xliff:g id="NAME_0">^1</xliff:g> ini, aplikasi yang tersimpan di situ tidak akan berfungsi lagi, dan file media yang tersimpan di situ baru dapat tersedia jika dicolokkan kembali."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> ini diformat untuk berfungsi hanya di perangkat ini dan tidak akan berfungsi di perangkat lain."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Siapkan <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gunakan sebagai penyimpanan portabel"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Untuk memindahkan foto dan media lain antar-perangkat."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Gunakan sebagai penyimpanan internal"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Untuk menyimpan item apa pun hanya di perangkat ini, termasuk aplikasi dan foto. Perlu diformat agar tidak berfungsi di perangkat lain."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format sebagai penyimpanan internal"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Agar aman, <xliff:g id="NAME_0">^1</xliff:g> perlu diformat. \n\nSetelah diformat, <xliff:g id="NAME_1">^1</xliff:g> ini hanya akan berfungsi di perangkat ini. \n\n"<b>"Memformat akan menghapus semua data yang saat ini disimpan di <xliff:g id="NAME_2">^1</xliff:g>."</b>" Agar tidak kehilangan data, pertimbangkan untuk mencadangkannya."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Hapus &amp; format"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Memformat <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Jangan cabut <xliff:g id="NAME">^1</xliff:g> saat sedang diformat."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Pindahkan data ke penyimpanan baru"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Anda dapat memindahkan foto, file, dan data aplikasi ke <xliff:g id="NAME">^1</xliff:g> baru ini. \n\nPemindahan berlangsung sekitar <xliff:g id="TIME">^2</xliff:g> dan akan mengosongkan <xliff:g id="SIZE">^3</xliff:g> di perangkat internal. Beberapa aplikasi tidak akan berfungsi saat pemindahan berlangsung."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Pindahkan sekarang"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Pindahkan nanti"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Pindahkan data sekarang"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Pemindahan ini berlangsung sekitar <xliff:g id="TIME">^1</xliff:g>. <xliff:g id="SIZE">^2</xliff:g> dari penyimpanan internal akan dikosongkan."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Pindahkan"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Memindahkan data..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Selama pemindahan: \n• Jangan cabut <xliff:g id="NAME">^1</xliff:g>. \n• Beberapa aplikasi tidak akan berfungsi dengan benar. \n• Selalu isi daya perangkat."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> sudah siap"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> sudah siap untuk digunakan dengan foto dan media lain."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> baru sedang bekerja. \n\nUntuk memindahkan foto, file, dan data aplikasi ke perangkat ini, buka Setelan &gt; Pemindahan."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Pindahkan <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Pemindahan <xliff:g id="APP">^1</xliff:g> dan datanya ke <xliff:g id="NAME_0">^2</xliff:g> hanya akan berlangsung sebentar. Anda tidak akan dapat menggunakan aplikasi hingga pemindahan selesai. \n\nJangan cabut <xliff:g id="NAME_1">^2</xliff:g> selama pemindahan."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Memindahkan <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Jangan cabut <xliff:g id="NAME">^1</xliff:g> selama pemindahan. \n\nAplikasi <xliff:g id="APP">^2</xliff:g> di perangkat ini baru dapat tersedia jika pemindahan selesai."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Batalkan pemindahan"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status baterai"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Tingkat baterai"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Memulihkan setelan APN default."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Setel ulang ke default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penyetelan ulang setelan APN default selesai."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Setelan jaringan diatur ulang"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"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">"Atur ulang setelan"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Setel ulang semua setelan jaringan? Tindakan ini tidak dapat diurungkan!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Atur ulang setelan"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Setel ulang?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Setelan jaringan telah disetel ulang"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Setel ulang perangkat"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Kembalikan ke setelan pabrik"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Hapus semua data di tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Hapus semua data pada ponsel"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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 unduhan"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"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 unduhan"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah masuk ke akun berikut ini:\n"</string>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Hapus semua data di kartu SD, seperti musik atau foto"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Setel ulang tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Setel ulang telepon"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Hapus semua informasi pribadi dan apl unduhan Anda? Anda tidak dapat mengurungkan tindakan ini!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Hapus semua informasi pribadi dan aplikasi yang diunduh? Tindakan ini tidak dapat diurungkan!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Hapus semua"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi kembalikan ke setelan pabrik."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Penyetelan ulang tidak dilakukan karena layanan System Clear tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Setel ulang?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Fitur kembalikan ke setelan pabrik tidak tersedia untuk pengguna ini"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Hapus penyimpanan USB beserta semua file yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Hapus kartu SD beserta semua file yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Hapus semua"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus penyimpanan USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus kartu SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Setelan panggilan"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Siapkan kotak pesan, penerusan panggilan, nada tunggu, nomor penelepon"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Penambatan USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Jaringan seluler"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Paket seluler"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplikasi SMS default"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikasi SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ubah aplikasi SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gunakan <xliff:g id="NEW_APP">%1$s</xliff:g> dan bukan <xliff:g id="CURRENT_APP">%2$s</xliff:g> sebagai aplikasi SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> sebagai aplikasi SMS?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode lokasi"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gunakan GPS, Wi‑Fi, dan jaringan seluler untuk menentukan lokasi"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gunakan Wi‑Fi dan jaringan seluler untuk menentukan lokasi"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gunakan GPS untuk menentukan lokasi Anda"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Menggunakan GPS untuk menentukan lokasi"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Memindai"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Memindai"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Pemindaian Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Tingkatkan akurasi lokasi dengan mengizinkan aplikasi dan layanan memindai jaringan Wi-Fi meski Wi-Fi tidak aktif"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Pemindaian Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Tingkatkan akurasi lokasi dengan mengizinkan layanan sistem memindai perangkat Bluetooth, meski Bluetooth tidak aktif"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasi jaringan Wi‑Fi &amp; seluler"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Izinkan aplikasi menggunakan layanan lokasi Google untuk memperkirakan lokasi Anda dengan lebih cepat. Data lokasi anonim akan dikumpulkan dan dikirim ke Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokasi yang ditentukan oleh Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Sandi telah ditetapkan"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN telah ditetapkan"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pola telah ditetapkan"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Keamanan layar"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Gunakan pola perangkat untuk melanjutkan."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Masukkan PIN perangkat untuk melanjutkan."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Masukkan sandi perangkat untuk melanjutkan."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Keamanan perangkat"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Ubah pola pembuka kunci"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Ubah PIN pembuka kunci"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Konfirmasi pola tersimpan"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Coba lagi:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Buat pola pembuka kunci"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tekan Menu untuk bantuan."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Angkat jari ketika selesai"</string>
@@ -1176,8 +1225,7 @@
     <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>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cara membuat pola pembuka kunci"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Terlalu banyak upaya yang salah!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Coba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> detik."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Terlalu banyak kesalahan pola. Coba kembali dalam <xliff:g id="NUMBER">%d</xliff:g> detik."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikasi tidak dipasang pada ponsel Anda."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Kelola aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Mengelola dan menghapus apl terpasang"</string>
@@ -1228,9 +1276,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Urutkan menurut ukuran"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Lihat layanan berjalan"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Lihat proses di cache"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikasi darurat"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Setel ulang pref aplikasi"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setel ulang pref aplikasi?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hal ini akan menyetel ulang semua preferensi untuk:\n\n "<li>"Aplikasi yang dinonaktifkan"</li>\n" "<li>"Pemberitahuan aplikasi yang dinonaktifkan"</li>\n" "<li>"Aplikasi default untuk tindakan"</li>\n" "<li>"Batasan data latar belakang untuk aplikasi"</li>\n" "<li>"Batasan izin apa pun"</li>\n\n" Data aplikasi Anda tidak akan hilang."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hal ini akan menyetel ulang semua preferensi untuk:\n\n "<li>"Aplikasi yang dinonaktifkan"</li>\n" "<li>"Notifikasi aplikasi yang dinonaktifkan"</li>\n" "<li>"Aplikasi default untuk tindakan"</li>\n" "<li>"Batasan data latar belakang untuk aplikasi"</li>\n" "<li>"Batasan izin apa pun"</li>\n\n" Data aplikasi Anda tidak akan hilang."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Setel ulang aplikasi"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Kelola ruang"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Pengoperasian aplikasi"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Berjalan"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Tidak pernah digunakan)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Tak ada Aplikasi default."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan penyimpanan"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Lihat penyimpanan yang digunakan apl"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Layanan yang sedang berjalan"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informasi tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informasi telepon"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informasi baterai"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Peluncuran cepat"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Menyetel pintasan keyboard untuk meluncurkan aplikasi"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Menetapkan apl"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Tanpa pintasan"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Telusuri + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Bersihkan"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Pintasan Anda untuk <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) akan dihapus."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Oke"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Batal"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplikasi"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Pintasan"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Masukan teks"</string>
     <string name="input_method" msgid="5434026103176856164">"Metode masukan"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Keyboard Saat Ini"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth di dalam file"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Buka kunci OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Izinkan bootloader dibuka kuncinya"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Masukkan PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Masukkan PIN perangkat untuk mengaktifkan buka kunci OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Izinkan buka kunci OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"PERINGATAN: Fitur perlindungan perangkat tidak akan berfungsi di perangkat ini saat setelan diaktifkan."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Ukuran penyangga pencatat log"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Ukuran Pencatat Log/penyangga log"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Mengizinkan lokasi palsu"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Aktifkan inspeksi atribut tampilan"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Jaringan"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Sertifikasi layar nirkabel"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktifkan Pencatatan Log Panjang Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Pengalihan Wi-Fi Agresif ke Seluler"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Selalu izinkan Pemindaian Roaming Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Gunakan klien DHCP lawas"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Tampilkan opsi untuk sertifikasi layar nirkabel"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Tingkatkan level pencatatan log Wi-Fi, tampilkan per SSID RSSI di Pemilih Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Jika diaktifkan, Wi-Fi akan menjadi lebih agresif dalam mengalihkan sambungan data ke Seluler saat sinyal Wi-Fi lemah"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Izinkan/Larang Pemindaian Roaming Wi-Fi berdasarkan jumlah lalu lintas data yang ada di antarmuka"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Ukuran penyangga pencatat log"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Ukuran Pencatat Log/penyangga log"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Pilih Konfigurasi USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Pilih Konfigurasi USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Mengizinkan lokasi palsu"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Aktifkan inspeksi atribut tampilan"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gunakan klien DHCP dari Lollipop alih-alih klien DHCP Android baru."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Izinkan melakukan debug USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Debugging USB dimaksudkan untuk tujuan pengembangan saja. Gunakan untuk menyalin data antara komputer dan perangkat Anda, memasang apl pada perangkat tanpa pemberitahuan, dan membaca data log."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Cabut akses ke debug USB dari semua komputer yang telah Anda otorisasi sebelumnya?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Karena sebuah aplikasi menghalangi permintaan izin, Setelan tidak dapat memverifikasi tanggapan Anda."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jika Anda mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g>, perangkat tidak akan menggunakan kunci layar untuk meningkatkan enkripsi data."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Karena Anda telah mengaktifkan layanan aksesibilitas, perangkat tidak akan menggunakan kunci layar untuk meningkatkan enkripsi data."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Karena mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g> memengaruhi enkripsi data, Anda perlu mengonfirmasi pola."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistik Proses"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistik teknis tentang proses yang berjalan"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Penggunaan memori"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplikasi <xliff:g id="TYPE">%1$s</xliff:g> sampai <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> dari <xliff:g id="TOTALRAM">%2$s</xliff:g> digunakan selama <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Latar Belakang"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Latar Depan"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Dalam Cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memori perangkat saat ini <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Rata-rata penggunaan RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Penggunaan RAM maksimum"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"OS Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Asli"</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">"Cache"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Penggunaan RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Penggunaan RAM (latar belakang)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Waktu berjalan"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Proses"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Layanan"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durasi"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Detail memori"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 jam"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 hari"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Tampilkan sistem"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Sembunyikan sistem"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gunakan Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Jenis statistik"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Latar Belakang"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setelan default di bawah menggantikan setelan apl"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Setelan default"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Mesin default"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Atur mesin sintesis suara untuk digunakan pada teks lisan"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Menyetel mesin sintesis ucapan yang akan digunakan untuk teks lisan"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Laju bicara"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kecepatan teks diucapkan"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tinggi nada"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Menggunakan perangkat keras"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Khusus perangkat lunak"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kredensial tidak tersedia untuk pengguna ini"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu menggambar pola pembuka kunci untuk mengonfirmasi instalasi kredensial."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ketik sandi untuk penyimpanan kredensial."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Sandi saat ini:"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Cadangkan data saya"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Mencadangkan data aplikasi, sandi Wi-Fi, dan setelan lainnya ke server Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Akun cadangan"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Saat ini, tidak ada akun yang menyimpan data cadangan"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Sertakan data aplikasi"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan otomatis"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Memulihkan cadangan setelan dan data ketika memasang ulang apl"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Layanan cadangan tidak aktif."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ini ditetapkan oleh kebijakan perangkat Anda."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Sandi cadangan desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Saat ini cadangan desktop penuh tidak dilindungi"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh guna mengubah atau menghapus sandi untuk cadangan lengkap desktop"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animasi transisi"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala durasi animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Menyimulasikan tampilan sekunder"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Mode multijendela"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Beberapa aktivitas di layar secara bersamaan."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Aktifkan mode multijendela?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"PERINGATAN: Fitur ini bersifat eksperimental yang memungkinkan beberapa aktivitas di layar secara bersamaan melalui antarmuka Aplikasi terbaru. Beberapa aplikasi mungkin mogok atau tidak berfungsi dengan baik jika digunakan dengan fitur ini."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikasi"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Jangan simpan kegiatan"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Hancurkan tiap kgiatan setelah ditinggal pengguna"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Pengguna"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil dibatasi"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Tambahkan pengguna baru?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Anda dapat membagikan perangkat ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna memiliki ruang sendiri, yang dapat disesuaikan dengan aplikasi, wallpaper milik mereka, dan lain sebagainya. Pengguna juga dapat menyesuaikan setelan perangkat seperti Wi‑Fi yang memengaruhi semua orang.\n\nSaat Anda menambahkan pengguna baru, orang tersebut perlu menyiapkan ruang mereka.\n\nPengguna mana pun dapat memperbarui aplikasi untuk semua pengguna lainnya."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Anda dapat berbagi perangkat ini ke orang lain dengan membuat pengguna tambahan. Setiap pengguna memiliki ruang sendiri, yang dapat disesuaikan dengan aplikasi, wallpaper, dan lain sebagainya.\n\nSaat Anda menambahkan pengguna baru, maka pengguna tersebut perlu menyiapkan ruangnya.\n\nPengguna mana pun dapat memperbarui aplikasi untuk semua pengguna lainnya."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Saat Anda menambahkan pengguna baru, orang tersebut perlu menyiapkan ruang mereka sendiri.\n\nPengguna mana pun dapat memperbarui aplikasi untuk semua pengguna lain."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Siapkan pengguna sekarang?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Pastikan orang tersebut ada untuk mengambil perangkat dan menyiapkan ruangnya"</string>
@@ -2206,7 +2262,7 @@
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Hanya pemilik ponsel yang dapat mengelola pengguna."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profil yang dibatasi tidak dapat menambahkan akun"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Hapus <xliff:g id="USER_NAME">%1$s</xliff:g> di perangkat"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"Tambah pengguna saat perangkat terkunci"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"+ pengguna dari layar terkunci"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Pengguna baru"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Profil baru"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Hapus diri Anda sendiri?"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Hapus tamu?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Semua aplikasi dan data di sesi ini akan dihapus."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Hapus"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Izinkan panggilan telepon"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Izinkan panggilan telepon dan SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Aktifkan panggilan telepon"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Aktifkan panggilan telepon &amp; SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Buang pengguna"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Izinkan panggilan telepon?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Aktifkan panggilan telepon?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Riwayat panggilan akan dibagikan dengan pengguna ini."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Izinkan panggilan telepon dan SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Riwayat panggilan dan SMS akan dibagikan dengan pengguna ini."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Aktifkan panggilan telepon &amp; SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Riwayat panggilan dan SMS akan dibagikan dengan pengguna ini."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Izinkan aplikasi dan konten"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan batasan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Luaskan setelan untuk aplikasi"</string>
@@ -2268,7 +2324,7 @@
     <string name="repeat_title" msgid="6473587828597786996">"Ulangi"</string>
     <string name="call_manager_enable_title" msgid="7718226115535784017">"Aktifkan Pengelola Panggilan"</string>
     <string name="call_manager_enable_summary" msgid="8458447798019519240">"Memungkinkan layanan ini mengelola cara panggilan Anda dilakukan."</string>
-    <string name="call_manager_title" msgid="4479949569744516457">"Pengelola Teleponan"</string>
+    <string name="call_manager_title" msgid="4479949569744516457">"Pengelola Telepon"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
     <string name="cell_broadcast_settings" msgid="2451014351355183338">"Siaran darurat"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"GANTI NAMA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Setel batasan aplikasi"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Dikontrol oleh <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Aplikasi ini tidak didukung dalam profil yang dibatasi"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Aplikasi ini dapat mengakses akun Anda"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Aplikasi ini dapat mengakses akun. Dikontrol oleh <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi dan Seluler"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Memungkinkan modifikasi setelan Wi‑Fi dan Seluler"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2309,7 +2365,7 @@
     <string name="sim_cards_changed_message_summary" msgid="5452545583546944683">"Sentuh untuk menyetel aktivitas"</string>
     <string name="sim_cellular_data_unavailable" msgid="9018555543451203035">"Data seluler tidak tersedia"</string>
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Sentuh untuk memilih SIM data"</string>
-    <string name="sim_calls_always_use" msgid="7936774751250119715">"Selalu gunakan ini untuk panggilan"</string>
+    <string name="sim_calls_always_use" msgid="7936774751250119715">"Selalu gunakan ini untuk telepon"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Pilih SIM untuk data"</string>
     <string name="data_switch_started" msgid="2040761479817166311">"Mengalihkan SIM data, mungkin perlu waktu beberapa saat..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Telepon dengan"</string>
@@ -2327,7 +2383,7 @@
     <string name="color_purple" msgid="3888532466427762504">"Ungu"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Tidak ada kartu SIM yang dimasukkan"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status SIM"</string>
-    <string name="sim_call_back_title" msgid="5181549885999280334">"Teleponan balik dari SIM default"</string>
+    <string name="sim_call_back_title" msgid="5181549885999280334">"Telepon balik dari SIM default"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM untuk panggilan keluar"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Setelan panggilan lainnya"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"Offload jaringan pilihan"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection sambungan jaringan"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"teks pesan mengirim SMS pesan perpesanan"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"seluler sel operator nirkabel data 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi telepon menelepon"</string>
     <string name="keywords_home" msgid="3626170808219458848">"peluncur"</string>
     <string name="keywords_display" msgid="6709007669501628320">"layar sentuh"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"layar redup layar sentuh baterai"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"layar redup layar sentuh baterai"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"latar belakang personalisasi sesuaikan tampilan"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tema gelap mode malam layar redup inversi kecerahan"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"latar belakang personalisasi sesuaikan tampilan"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ukuran teks"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyeksi"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"proyeksikan transmisi"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ruang disk hard drive perangkat penggunaan"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"penggunaan daya isi daya"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ejaan kamus periksaejaan koreksi-otomatis"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"akun"</string>
     <string name="keywords_users" msgid="4673901601478559100">"pembatasan membatasi dibatasi"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teks koreksi benar suara getar otomatis bahasa isyarat sarankan saran tema menyinggung kata jenis emoji internasional"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"setel ulang preferensi default"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"aplikasi ice darurat default"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"apl unduh aplikasi sistem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"keamanan izin aplikasi"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplikasi default"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"geser pin pola sandi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Siapkan Tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
@@ -2386,22 +2449,23 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume alarm"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume dering"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume pemberitahuan"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interupsi"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Saat ada panggilan telepon dan pemberitahuan"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Selalu ganggu"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Hanya mengizinkan interupsi prioritas"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Jangan ganggu"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Hanya izinkan prioritas"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Aturan otomatis"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Hanya untuk prioritas"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Hanya alarm"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Tanpa gangguan"</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="ringtone_title" msgid="5379026328015343686">"Nada dering ponsel"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Nada dering pemberitahuan default"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Juga getar saat ada panggilan"</string>
-    <string name="notification_section_header" msgid="95661783916799134">"Pemberitahuan"</string>
+    <string name="notification_section_header" msgid="95661783916799134">"Notifikasi"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Kedipkan lampu pemberitahuan"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Saat perangkat terkunci"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tampilkan semua konten pemberitahuan"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sembunyikan konten pemberitahuan yang sensitif"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Jangan tampilkan pemberitahuan sama sekali"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Saat perangkat dikunci, Anda ingin pemberitahuan ditampilkan seperti apa?"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"Pemberitahuan aplikasi"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notifikasi aplikasi"</string>
     <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>
@@ -2416,63 +2480,116 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Getar"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Akses pemberitahuan"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikasi tidak dapat membaca pemberitahuan"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplikasi dapat membaca pemberitahuan"</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplikasi dapat membaca pemberitahuan"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d aplikasi dapat membaca pemberitahuan</item>
+      <item quantity="one">%d aplikasi dapat membaca pemberitahuan</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Tidak ada pendengar pemberitahuan yang terpasang."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Aktifkan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> akan dapat membaca semua pemberitahuan yang diposkan oleh sistem atau aplikasi apa pun yang terpasang, yang dapat meliputi informasi pribadi seperti nama kontak dan pesan teks yang dikirimkan kepada Anda. Pendengar pemberitahuan tersebut juga akan dapat menyingkirkan pemberitahuan ini atau menyentuh tombol tindakan di dalamnya."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Penyedia ketentuan"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Tidak ada aplikasi yang memberikan ketentuan"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplikasi memberikan ketentuan"</item>
-    <item quantity="other" msgid="358057362115673258">"%d aplikasi memberikan ketentuan"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Tidak ada penyedia ketentuan yang dipasang."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Aktifkan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> akan dapat menambah ketentuan keluar ke mode Jangan ganggu."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blokir"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokir semua"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Jangan pernah tampilkan pemberitahuan dari aplikasi ini"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritas"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Tampilkan pemberitahuan di bagian atas daftar dan terus tampilkan saat perangkat disetel ke gangguan prioritas saja"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensitif"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Sembunyikan konten sensitif apa pun dari pemberitahuan aplikasi ini saat perangkat dikunci"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Perlakukan sebagai prioritas"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Izinkan notifikasi aplikasi ini didengarkan saat Jangan ganggu disetel menjadi Hanya untuk prioritas"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Izinkan mengintip"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Izinkan aplikasi ini menekankan notifikasi tertentu dengan menggeser sebentar untuk ditampilkan di layar saat ini"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Sembunyikan konten sensitif"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Jika perangkat terkunci, sembunyikan konten notifikasi aplikasi ini yang dapat mengungkapkan informasi pribadi"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Diblokir"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritas"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitif"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Selesai"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Hingga Anda menonaktifkan ini"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Interupsi prioritas"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Waktu non-operasional"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Hari"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Tidak ada"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Gangguan diizinkan"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Hanya untuk prioritas"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Tidak ada"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automasi"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Otomatis aktif"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nama aturan"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Tambahkan aturan"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Hapus aturan"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Hapus aturan \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Hapus"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Jenis aturan"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Tidak diketahui"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigurasi aturan"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Aturan jadwal"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Aturan tidak ditemukan."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Hari"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Tidak ada"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Setiap hari"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Tidak pernah"</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> sampai <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Panggilan telepon"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Pesan"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Panggilan telepon/pesan dari"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Semua orang"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Kontak saja"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kontak berbintang saja"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Acara dan pengingat"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarm selalu merupakan interupsi prioritas"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarm"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Pengingat"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</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">"Jika orang yang sama menelepon untuk kedua kalinya dalam waktu <xliff:g id="MINUTES">%d</xliff:g> menit, izinkan"</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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Malam hari kerja"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Waktu mulai"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Waktu berakhir"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari berikutnya"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> atau alarm sebelumnya"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari berikutnya atau alarm sebelumnya"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari berikutnya"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Gangguan"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Saat ada panggilan telepon dan notifikasi"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kapan Anda bisa diganggu?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Untuk berapa lama?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Selalu ganggu"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"nonaktif,semua,segalanya"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Hanya mengizinkan interupsi prioritas"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Hanya izinkan alarm"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Jangan ganggu"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Untuk waktu yang tidak ditentukan"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> menit</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> menit</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> jam</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> jam</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Ubah ke mode notifikasi prioritas untuk waktu yang tidak ditentukan"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Ubah ke mode hanya notifikasi prioritas selama <xliff:g id="DURATION">%1$d</xliff:g> menit hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ubah ke mode hanya notifikasi prioritas selama satu menit hingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Ubah ke mode hanya notifikasi prioritas selama <xliff:g id="DURATION">%1$d</xliff:g> jam (hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ubah ke mode hanya notifikasi prioritas selama satu jam hingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Ubah ke mode hanya alarm untuk waktu yang tidak ditentukan"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Ubah ke mode hanya alarm selama <xliff:g id="DURATION">%1$d</xliff:g> menit (hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ubah ke mode hanya alarm selama satu menit hingga <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">Ubah ke mode hanya alarm selama <xliff:g id="DURATION">%1$d</xliff:g> jam hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ubah ke mode hanya alarm selama satu jam hingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Ubah ke mode jangan ganggu untuk waktu yang tidak ditentukan"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Ubah ke mode jangan ganggu selama <xliff:g id="DURATION">%1$d</xliff:g> menit (hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ubah ke mode jangan ganggu selama satu menit hingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Ubah ke mode jangan ganggu selama <xliff:g id="DURATION">%1$d</xliff:g> jam hingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ubah ke mode jangan ganggu selama satu jam hingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ubah ke mode selalu ganggu"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"selamanya"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifikasi apl"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setelan pemberitahuan"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Kirim masukan tentang perangkat ini"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Masukkan PIN administrator"</string>
@@ -2500,9 +2617,9 @@
     <string name="encrypt_require_pin" msgid="2063945047845243752">"Perlu PIN untuk memulai perangkat"</string>
     <string name="encrypt_require_pattern" msgid="6898479411004015810">"Perlu pola untuk memulai perangkat"</string>
     <string name="encrypt_require_password" msgid="8770628366276570518">"Perlu sandi untuk memulai perangkat"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Tidak, terima kasih"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Tidak, terima kasih"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Tidak, terima kasih"</string>
+    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Lain kali"</string>
+    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Lain kali"</string>
+    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Lain kali"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Perlu PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Perlu pola?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Perlu sandi?"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Informasi IMEI"</string>
     <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="2184141780491382435">"Luncurkan secara default"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> digunakan di <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Tautan domain"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Buka URL Domain"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Izinkan aplikasi langsung membuka URL Domain"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL domain yang didukung"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Default lainnya"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> digunakan di <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"memori internal"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"memori eksternal"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Penyimpanan internal"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Penyimpanan eksternal"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Penggunaan data aplikasi"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> digunakan sejak <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Penyimpanan yang terpakai"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Aktif"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blokir"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensitif"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritas"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritas &amp; Sensitif"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izin diberikan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> izin diberikan</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> dari <xliff:g id="COUNT_3">%d</xliff:g> izin diberikan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dari <xliff:g id="COUNT_1">%d</xliff:g> izin diberikan</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Beberapa setelan default"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Tidak ada setelan default"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Semua aplikasi"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Diaktifkan"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Pribadi"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Kantor"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Diblokir"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritas"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitif"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Dengan URL domain"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Dinonaktifkan oleh administrator"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Lanjutan"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Aplikasi tak dikenal"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Izin aplikasi"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> dari <xliff:g id="COUNT_1">%d</xliff:g> aplikasi diizinkan akses tambahan"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> dari <xliff:g id="COUNT_1">%d</xliff:g> aplikasi diizinkan"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL domain"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Jangan buka URL domain apa pun"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Buka \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Buka \'<xliff:g id="DOMAIN">%s</xliff:g>\' dan URL terkait"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikasi dapat membuka URL domainnya</item>
+      <item quantity="one">Satu aplikasi dapat membuka URL domainnya</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Tidak dikenali"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplikasi Default"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplikasi browser"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Tidak ada Browser default"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Default)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Penyimpanan aplikasi"</string>
 </resources>
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is-rIS/arrays.xml
index dd0af19..1981a7c 100644
--- a/res/values-is-rIS/arrays.xml
+++ b/res/values-is-rIS/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Hnappur"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"kveikja/slökkva á hljóðnema"</item>
     <item msgid="1148142988678569310">"margmiðlunarefni verkefnis"</item>
     <item msgid="9130014005474445273">"virkja VPN"</item>
+    <item msgid="1165192162975045562">"skrifa veggfóður"</item>
+    <item msgid="7129487923652967258">"aðstoða við uppbyggingu"</item>
+    <item msgid="1069023208100114540">"aðstoða við skjámynd"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Staðsetning"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Kveikja/slökkva á hljóðnema"</item>
     <item msgid="5906017727368097853">"Margmiðlunarefni verkefnis"</item>
     <item msgid="2486614710846178542">"Virkja VPN"</item>
+    <item msgid="5586547561693629602">"Skrifa veggfóður"</item>
+    <item msgid="32794179825485062">"Aðstoða við uppbyggingu"</item>
+    <item msgid="7872852746938272552">"Aðstoða við skjámynd"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Stutt"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"lítið"</item>
     <item msgid="4212263919458209842">"á þrotum"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Slökkt"</item>
-    <item msgid="5656544177755411222">"Truflanir í lágmarki"</item>
-    <item msgid="8735337502532332056">"Engar truflanir"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Venjulegt"</item>
     <item msgid="866544120205026771">"Í meðallagi"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Bleikur"</item>
     <item msgid="6131821495505931173">"Rauður"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Hljóðveita"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 6cfc87b..f639cdd 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Leyfa"</string>
     <string name="deny" msgid="6947806159746484865">"Hafna"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Óþekkt"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Nú ertu <xliff:g id="STEP_COUNT">%1$d</xliff:g> skrefi frá því að vera þróunaraðili."</item>
-    <item quantity="other" msgid="6722953419953594148">"Nú ertu <xliff:g id="STEP_COUNT">%1$d</xliff:g> skrefum frá því að vera þróunaraðili."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Nú ertu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skrefi frá því að gerast þróunaraðili.</item>
+      <item quantity="other">Nú ertu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skrefum frá því að gerast þróunaraðili.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Nú ertu orðin(n) þróunaraðili!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Þetta er óþarfi; þú ert nú þegar þróunaraðili."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Þráðlaus net og símkerfi"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Ekki nota spjallþjónustu fyrir SMS-skilaboð"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Gera IMS-skráningu nauðsynlega"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Gera IMS-skráningu ónauðsynlega"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Kveikja á flaggi VoLTE-úthlutunar"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Slökkva á flaggi VoLTE-úthlutunar"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Kveikja á afritun LTE-gagna úr vinnsluminni"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Slökkva á afritun LTE-gagna úr vinnsluminni"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Skoða símaskrá SIM-korts"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Útsending"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Gera snið óvirkt?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Þetta slekkur á:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Frá:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Tengt"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Tengt (ekki sími)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Tengt (ekki efnisspilun)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Tengt (enginn skilaboðaaðgangur)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Tengt (ekki sími eða efnisspilun)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Aftengt"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Aftengist…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Tengist…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Parar…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Ónefnt Bluetooth-tæki"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Leitar"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Engin nálæg Bluetooth-tæki fundust."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Sýna mótteknar skrár"</string>
     <string name="device_picker" msgid="4978696506172252813">"Veldu Bluetooth-tæki"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-heimildarbeiðni"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Forrit óskar eftir að kveikja á Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Forrit vill kveikja á Bluetooth í þessu tæki."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Forrit óskar eftir að gera spjaldtölvuna þína sýnilega öðrum Bluetooth-tækjum í <xliff:g id="TIMEOUT">%1$d</xliff:g> sekúndur."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Forrit óskar eftir að gera símann þinn sýnilegan öðrum Bluetooth-tækjum í <xliff:g id="TIMEOUT">%1$d</xliff:g> sekúndur."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Forrit óskar eftir að gera spjaldtölvuna þína sýnilega öðrum Bluetooth-tækjum. Þú getur breytt þessu síðar í stillingum Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Stillingar proxy-þjóns"</string>
     <string name="cancel" msgid="6859253417269739139">"Hætta við"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"HÆTTA VIÐ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"HALDA ÁFRAM"</string>
     <string name="okay" msgid="1997666393121016642">"Í lagi"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JÁ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEI"</string>
-    <string name="forget" msgid="7267115980248732932">"GLEYMA"</string>
+    <string name="forget" msgid="1400428660472591263">"Gleyma"</string>
+    <string name="save" msgid="879993180139353333">"Vista"</string>
+    <string name="done" msgid="6942539184162713160">"Lokið"</string>
     <string name="settings_label" msgid="1626402585530130914">"Stillingar"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Stillingar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Flýtileið stillinga"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Raða eftir tímabelti"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Dagsetning"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Tími"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Bæta andlitssamsvörun"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Biðja um hreyfingu"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Biðja notanda um að depla augum til að taka úr lás"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Læsa sjálfkrafa"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> eftir hvíldarstöðu"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> eftir svefn nema þegar <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> heldur tækinu ólæstu"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Stilla staðsetninguna mína, opnun skjás, SIM-kortalás, lás skilríkjageymslu"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stilla staðsetninguna mína, opnun skjás, lás skilríkjageymslu"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Aðgangsorð"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingrafar"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Stjórna fingraförum"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Nota fingrafar fyrir"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Bæta við"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"skjálás"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fingrafar skráð</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingraför skráð</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Uppsetning fingrafara"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Til að þú getir notað fingrafarið þitt til að opna skjáinn eða staðfesta kaup þurfum við að: \n\n✓ Setja upp varaleið fyrir skjálásinn þinn \n\n✓ Bæta fingrafarinu þínu við"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Finndu skynjarann"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Finndu fingrafaraskynjarann aftan á símanum."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Heiti"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Í lagi"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eyða"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Við skulum byrja!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Settu fingurinn á fingrafaraskynjarann. Lyftu honum eftir að þú finnur fyrir titringi."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Gott! Endurtaktu svo."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Settu sama fingur á fingrafaraskynjarann og lyftu honum eftir að þú finnur fyrir titringi."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingrafari bætt við!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alltaf þegar þú sérð þetta tákn geturðu notað fingrafarið þitt til að auðkenna þig eða til að heimila kaup."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Bæta við"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Áfram"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Dulkóðun"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Dulkóða spjaldtölvu"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Dulkóða síma"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Settu hleðslutækið í samband og reyndu aftur."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekkert PIN-númer eða aðgangsorð fyrir lásskjá"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Þú þarft að velja PIN-númer eða aðgangsorð fyrir lásskjáinn til að geta hafið dulkóðun."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Þú þarft að teikna opnunarmynstrið til að staðfesta dulkóðun tækisins."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Dulkóða?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Dulkóðunaraðgerðin er óafturkræf og ef hún er trufluð glatar þú gögnum. Dulkóðun tekur allt frá einni klukkustund og á þeim tíma endurræsir spjaldtölvan sig nokkrum sinnum."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Dulkóðunaraðgerðin er óafturkræf og ef hún er trufluð glatar þú gögnum. Dulkóðun tekur allt frá einni klukkustund og á þeim tíma endurræsir síminn sig nokkrum sinnum."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Strjúka"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Ekkert öryggi"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Opnun með andliti"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Lítið öryggi, tilraunastig"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Mynstur"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Miðlungsöryggi"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-númer"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Miðlungs til mikið öryggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Aðgangsorð"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mikið öryggi"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Gildandi skjálás"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Eiginleikar til að vernda tæki munu ekki virka lengur."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Stjórnandi, dulkóðunarstefna eða skilríkjageymsla hefur gert óvirkt"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ekkert"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Strjúka"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Opnun með andliti"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Mynstur"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-númer"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Aðgangsorð"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Þegar þú hefur stillt skjálás geturðu einnig sett inn fingrafarið þitt undir Stillingar &gt; Öryggi."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Slökkva á skjálás"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjarlægja opnunarmynstur"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjarlægja PIN-númer"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Aðgangsorðið verður að innihalda minnst einn bókstaf."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Aðgangsorðið verður að innihalda minnst einn tölustaf."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Aðgangsorðið verður að innihalda minnst eitt tákn."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Aðgangsorð verða að innihalda að lágmarki einn bókstaf."</item>
-    <item quantity="other" msgid="8186027808415585970">"Aðgangsorð verða að innihalda að lágmarki %d bókstafi."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Aðgangsorðið verður að innihalda minnst einn lágstaf."</item>
-    <item quantity="other" msgid="2693910942679679225">"Aðgangsorðið verður að innihalda minnst %d lágstafi."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Aðgangsorðið verður að innihalda minnst einn hástaf."</item>
-    <item quantity="other" msgid="3030801209112209245">"Aðgangsorðið verður að innihalda minnst %d hástafi."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Aðgangsorð verða að innihalda að lágmarki einn tölustaf."</item>
-    <item quantity="other" msgid="4703982391407595924">"Aðgangsorðið verður að innihalda minnst %d tölustafi."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Aðgangsorðið verður að innihalda minnst einn sérstaf."</item>
-    <item quantity="other" msgid="1221290525051187757">"Aðgangsorðið verður að innihalda minnst %d sérstafi."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Aðgangsorðið verður að innihalda minnst eitt staftákn sem ekki er bókstafur."</item>
-    <item quantity="other" msgid="3952508584649046404">"Aðgangsorðið verður að innihalda minnst %d staftákn sem ekki eru bókstafir."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Aðgangsorðið verður að innihalda minnst %d bókstaf.</item>
+      <item quantity="other">Aðgangsorðið verður að innihalda minnst %d bókstafi.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Aðgangsorðið verður að innihalda minnst %d lágstaf.</item>
+      <item quantity="other">Aðgangsorðið verður að innihalda minnst %d lágstafi.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Aðgangsorðið verður að innihalda minnst %d hástaf.</item>
+      <item quantity="other">Aðgangsorðið verður að innihalda minnst %d hástafi.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Aðgangsorðið verður að innihalda minnst %d tölustaf.</item>
+      <item quantity="other">Aðgangsorðið verður að innihalda minnst %d tölustafi.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Aðgangsorðið verður að innihalda minnst %d sérstaf.</item>
+      <item quantity="other">Aðgangsorðið verður að innihalda minnst %d sérstafi.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Aðgangsorðið verður að innihalda minnst %d tákn sem ekki er bókstafur.</item>
+      <item quantity="other">Aðgangsorðið verður að innihalda minnst %d tákn sem ekki eru bókstafir.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Stjórnandi tækis leyfir ekki notkun nýlegs aðgangsorðs."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Hækkandi, lækkandi eða endurtekin röð tölustafa er óheimil"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Í lagi"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Til að para við:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Gakktu úr skugga um að þessi aðgangslykill birtist:&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">"Frá:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Para við þetta tæki?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Til að para við:<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>Sláðu inn:<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> og ýttu síðan á vendihnappinn eða Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Para"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PARA"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Hætta við"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Pörun veitir aðgang að tengiliðunum þínum og símtalaferli þegar tengingu hefur verið komið á."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Ekki var hægt að para við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Ekki tókst að para við <xliff:g id="DEVICE_NAME">%1$s</xliff:g> þar sem PIN-númer eða aðgangslykill er rangur."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Ekki er hægt að eiga samskipti við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> hafnaði pörun."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Ekki tókst að tengjast <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Leita að tækjum"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Endurnýja"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Ítarlegt"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ítarlegar Bluetooth-stillingar"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Þegar kveikt er á Bluetooth getur tækið átt í samskiptum við önnur nálæg Bluetooth tæki."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Til þess að auka staðsetningarnákvæmni leita forrit og þjónustur að Bluetooth-tækjum, jafnvel þegar slökkt er á Bluetooth. Þú getur breytt þessu í <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>leitarstillingunum<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Tengjast…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Hljóð efnis"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Hljóð síma"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Skráaflutningur"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Inntakstæki"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetaðgangur"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Deiling tengiliða"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Nota til að deila tengiliðum"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deiling nettengingar"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Skilaboðaaðgangur"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður aftengt frá hljóði efnisspilunar."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður aftengt frá hljóði handfrjáls búnaðar."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður aftengt frá inntakstækinu."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Nota fyrir"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Endurnefna"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Leyfa móttöku skráa"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Tengt við hljóðspilun efnis"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Tengt við hljóð símans"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Tengt við skráaflutningsþjón"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Tengt við kort"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ekki tengt við skráaflutningsþjón."</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Tengt við inntakstæki"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tengt við tæki til að fá netaðgang"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Internettengingu deilt með tæki"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Nota fyrir hljóð efnisspilunar"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Nota fyrir hljóð símans"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Nota við skráaflutning"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Nota fyrir inntak"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Nota fyrir netaðgang"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Nota fyrir kort"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Stillingar dokku"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Nota dokkuna fyrir hljóð"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sem hátalari"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Fyrir tónlist og margmiðlunarefni"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muna stillingar"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi aðstoð"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Tengt í gegnum Wi-Fi aðstoð"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Senda út skjá"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Útsending"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Leyfa þráðlausan skjá"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Engin nálæg tæki fundust."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Tengist"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Gleyma"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Lokið"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Heiti"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Leyfa gagnaflutning þegar spjaldtölvan snertir annað tæki"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Leyfa gagnasamskipti þegar síminn snertir annað tæki"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Slekkur á Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Villa"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Í flugstillingu"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ekki er hægt að leita að netum"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Nettilkynning"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Tilkynna þegar opið net er í boði"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Forðast lélegar tengingar"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Ekki nota Wi-Fi net nema nettengingin sé góð"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Nota aðeins net með góða tengingu"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Leit alltaf í boði"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Leyfa alltaf leit"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Leyfa staðsetningarþjónustu Google og öðrum forritum að leita að Wi-Fi neti, jafnvel þegar slökkt er á Wi-Fi"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Nota opin Wi-Fi net sjálfkrafa"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Leyfa Wi-Fi aðstoð að tengjast neti sjálfkrafa ef gæði þess eru mikil"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Veldu aðstoðarforrit"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Setja upp vottorð"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Til að bæta nákvæmni staðsetningar o.fl. kunna forrit að leita að nálægum netum, jafnvel þegar slökkt er á Wi-Fi. Ef þú vilt koma í veg fyrir þetta skaltu fara í Ítarlegar stillingar &gt; Leit alltaf í boði."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Forrit geta leitað að nálægum netum, jafnvel þegar slökkt er á Wi-Fi. Ef þú vilt koma í veg fyrir þetta skaltu fara í Ítarlegar stillingar &gt; Leit alltaf í boði"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Til þess að auka staðsetningarnákvæmni leita forrit og þjónustur að Wi-Fi netum, jafnvel þegar slökkt er á Wi-Fi. Þú getur breytt þessu í <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>leitarstillingunum<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ekki sýna þetta aftur"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hafa kveikt á Wi-Fi í biðstöðu"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Kveikt á Wi-Fi í svefnstöðu"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Bæta við öðru neti"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Meira"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Sjálfvirk uppsetning (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Til að ljúka uppsetningu þarf að tengja spjaldtölvuna við Wi-Fi net. Að uppsetningu lokinni er hægt að skipta á milli farsímagagna og Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Ítarlegri valkostir"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Varin Wi‑Fi uppsetning"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Ræsir WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Ýttu á hnappinn fyrir varða Wi-Fi uppsetningu á beininum. Hann kann að vera merktur með „WPS“ eða þessu tákni:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Ýttu á hnappinn fyrir varða Wi-Fi uppsetningu á beininum. Hann kann að vera merktur með „WPS“ eða þessu tákni:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Sláðu inn PIN-númerið <xliff:g id="NUMBER">%1$s</xliff:g> á Wi‑Fi beininum. Þessi uppsetning getur tekið allt að tvær mínútur."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS lokið. Tengist neti…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Tengt við Wi-Fi netið <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Nafnlaust auðkenni"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Aðgangsorð"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Sýna aðgangsorð"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Velja tíðnisvið aðgangsstaðar"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GHz tíðnisvið"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz tíðnisvið"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-stillingar"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(óbreytt)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ótilgreint)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Vistað"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Óvirkt"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-stillingarvilla"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi-tengingarvilla"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Vandamál við auðkenningu"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ekkert samband"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Enginn netaðgangur fannst; endurtengist ekki sjálfkrafa."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tiltækt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tiltækt)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Sláðu inn aðgangsorð netsins"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Ekkert"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Viltu skrá þig inn til að tengjast?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> krefst þess að þú skráir þig inn á netinu áður en þú tengist þessu netkerfi."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"TENGJA"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Engin internetaðgangur er á þessu neti. Viltu samt nota það?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ekki spyrja aftur fyrir þetta net"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK þráðlaus heitur Wi‑Fi reitur"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> heitur Wi‑Fi 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_mode_title" msgid="2164073796253284289">"Forgangur símtala"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi símtöl"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi í forgangi"</item>
+    <item msgid="5267397515594230396">"Farsímakerfi í forgangi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Þ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="home_settings" msgid="212375129455718176">"Heim"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjár"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hljóð"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Stilla birtustig skjásins"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Aðlögun birtustigs"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Stilla birtustig eftir umhverfisbirtu"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Þema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Ljóst"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Dökkt"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Sjálfvirkt"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Hvíld"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Slökkt er á skjánum"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Eftir <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> af aðgerðaleysi"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Uppfæra valið SIM-kort?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> er eina SIM-kortið í tækinu. Viltu nota þetta SIM-kort fyrir farsímagögn, símtöl og SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Rangt PIN-númer SIM-korts. Nú þarftu að hafa samband við símafyrirtækið til að opna fyrir tækið."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Rangt PIN-númer SIM-korts. Þú átt <xliff:g id="NUMBER">%d</xliff:g> tilraun eftir áður en þú þarft að hafa samband við símafyrirtækið þitt til að taka tækið úr lás."</item>
-    <item quantity="other" msgid="77103619544346451">"Rangt PIN-númer SIM-korts. Þú átt <xliff:g id="NUMBER">%d</xliff:g> tilraunir eftir."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Rangt PIN-númer SIM-korts. Þú átt <xliff:g id="NUMBER_1">%d</xliff:g> tilraun eftir.</item>
+      <item quantity="other">Rangt PIN-númer SIM-korts. Þú átt <xliff:g id="NUMBER_1">%d</xliff:g> tilraunir eftir.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"PIN-aðgerð SIM-korts mistókst!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Staða spjaldtölvu"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Staða síma"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Laust (skrifvarið)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Heildarrými"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Reiknar út…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Forrit (gögn forrita og margmiðlunarefni)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Forrit og forritsgögn"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Margmiðlun"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Niðurhal"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Myndir, myndskeið"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Hljóð (tónlist, hringitónar, hlaðvarpsskrár o.s.frv.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Ýmislegt"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Aðrar skrár"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Gögn í skyndiminni"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Aftengja samnýtta geymslu"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Aftengja SD-kort"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Aftenging fer fram"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Geymslurýmið er senn á þrotum"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Sumar kerfisaðgerðir, svo sem samstilling, virka hugsanlega ekki rétt. Prófaðu að losa um pláss með því að eyða eða losa atriði á borð við forrit eða margmiðlunarefni."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Endurnefna"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Tengja"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Aftengja"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Eyða og forsníða"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Eyða og forsníða sem innbyggða geymslu"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-tenging tölvu"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tenging tölvu"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Tengja sem"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Gerir þér kleift að flytja efnisskrár í Windows eða með Android File Transfer í Mac (sjá www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Myndavél (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Gerir þér kleift að flytja myndir með myndavélarhugbúnaði og flytja hvaða skrár sem er í tölvum sem styðja ekki MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Setja upp skráaflutningsverkfæri"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Gerir MIDI-forritum kleift að virka yfir USB með MIDI-hugbúnaði í tölvunni."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Aðrir notendur"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Geymsla tækis"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Tengd geymsla"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> laus (<xliff:g id="TOTAL">%2$s</xliff:g> samtals)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> var tengt"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Ekki var hægt að tengja <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> var aftengt á öruggan hátt"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Ekki var hægt að aftengja <xliff:g id="NAME">%1$s</xliff:g> á öruggan hátt"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> var forsniðið"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Ekki var hægt að forsníða <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Endurnefna geymslu"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Þegar búið er að forsníða þetta <xliff:g id="NAME_0">^1</xliff:g> geturðu notað það í öðrum tækjum. \n\nÖllum gögnum á þessu <xliff:g id="NAME_1">^1</xliff:g> verður eytt. Þú ættir að afrita gögnin af því fyrst. \n\n"<b>"Taktu afrit af myndum og öðru efni"</b>" \nFærðu skrárnar þínar yfir í aðra geymslu í þessu tæki eða flyttu þær yfir í tölvu með því að nota USB-snúru. \n\n"<b>"Taktu afrit af forritum"</b>" \nÖll forrit sem vistuð eru á þessu <xliff:g id="NAME_6">^1</xliff:g> verða fjarlægð og gögnum þeirra eytt. Til að halda þessum forritum skaltu færa þau yfir í aðra geymslu í þessu tæki."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Þegar þú tekur þetta <xliff:g id="NAME_0">^1</xliff:g> úr hætta forrit sem eru vistuð á því að virka og skrár á því verða ekki aðgengilegar fyrr en það er sett aftur í."</b>" \n\nÞetta <xliff:g id="NAME_1">^1</xliff:g> er forsniðið þannig að það virkar aðeins í þessu tæki. Það virkar ekki í neinu öðru tæki."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Setja upp <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Nota sem færanlega geymslu"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Til að færa myndir og aðrar skrár milli tækja."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Nota sem innbyggða geymslu"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Aðeins til geymslu í þessu tæki, s.s. á forritum og myndum. Þarf að forsníða til að ekki sé hægt að nota það í öðrum tækjum."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Forsníða sem innri geymslu"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Þetta krefst þess að <xliff:g id="NAME_0">^1</xliff:g> sé forsniðið til að gera það öruggt. \n\nÞegar búið er að forsníða <xliff:g id="NAME_1">^1</xliff:g> virkar það bara í þessu tæki. \n\n"<b>"Þetta eyðir öllum gögnum sem vistuð eru á <xliff:g id="NAME_2">^1</xliff:g>."</b>" Til að forðast að þessi gögn glatist þarftu að taka öryggisafrit af þeim."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Hreinsa og forsníða"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Forsníður <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ekki fjarlægja <xliff:g id="NAME">^1</xliff:g> á meðan verið er að forsníða það."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Færðu gögn í nýja geymslu"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Þú getur flutt myndir, skrár og forritsgögn yfir á þetta nýja <xliff:g id="NAME">^1</xliff:g>. \n\nFlutningurinn tekur um það bil <xliff:g id="TIME">^2</xliff:g> og mun losa um <xliff:g id="SIZE">^3</xliff:g> af innra geymsluplássi. Sum forrit virka ekki meðan á flutningi stendur."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Færa núna"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Færa síðar"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Færa gögn núna"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Flutningurinn tekur um það bil <xliff:g id="TIME">^1</xliff:g>. Hann mun losa um <xliff:g id="SIZE">^2</xliff:g> af innra geymsluplássi."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Færa"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Færir gögn…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Meðan á flutningi stendur: \n• Ekki fjarlægja <xliff:g id="NAME">^1</xliff:g>. \n• Sum forrit munu ekki starfa rétt. \n• Hafðu tækið í hleðslu."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> er tilbúið"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> er nú tilbúið til notkunar með myndunum þínum og öðrum skrám."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> er tilbúið. \n\nTil að færa myndir, skrár og forritsgögn yfir í þetta tæki skaltu fara í Stillingar &gt; Geymsla."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Færa <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Það tekur bara smástund að færa <xliff:g id="APP">^1</xliff:g> og meðfylgjandi gögn yfir á <xliff:g id="NAME_0">^2</xliff:g>. Þú getur ekki notað forritið fyrr en að flutningi loknum. \n\nEkki fjarlægja <xliff:g id="NAME_1">^2</xliff:g> meðan á flutningi stendur."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Færir <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ekki fjarlægja <xliff:g id="NAME">^1</xliff:g> á meðan flutningur stendur yfir. \n\n<xliff:g id="APP">^2</xliff:g> forritið í þessu tæki verður ekki aðgengilegt fyrr en að flutningi loknum."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Hætta við flutning"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Staða rafhlöðu"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Staða rafhlöðu"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Aðgangsstaðir"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Endurheimtir sjálfgefnar stillingar aðgangsstaðar."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Núllstilla"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Sjálfgefnar stillingar aðgangsstaðar endurheimtar."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Netstillingar endurstilltar"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Þetta endurstillir allar netstillingar, þ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 stillingar"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Endurstilla allar netstillingar? Ekki er hægt að afturkalla þessa aðgerð."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Endurstilla stillingar"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Endurstilla?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Netstillingar voru endurstilltar"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Endurstilla tæki"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Núllstilling"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Eyðir öllum gögnum úr spjaldtölvunni"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Eyðir öllum gögnum úr símanum"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Þ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="9165016501623540228">"Þ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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Eyða öllum gögnum á SD-korti, svo sem tónlist eða ljósmyndum"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Endurstilla spjaldtölvuna"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Endurstilla símann"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Eyða öllum persónuupplýsingum og sóttum forritum? Ekki er hægt að afturkalla þessa aðgerð."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Eyða öllum persónuupplýsingum og sóttum forritum? Ekki er hægt að afturkalla þessa aðgerð."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Eyða öllu"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Þú þarft að teikna opnunarmynstrið til að staðfesta núllstillingu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Endurstilling var ekki framkvæmd vegna þess að kerfishreinsunarþjónustan er ekki tiltæk."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Endurstilla?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Núllstilling er ekki í boði fyrir þennan notanda"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Hreinsa út af USB-geymslunni og eyða öllum skrám sem þar eru geymdar? Sú aðgerð er óafturkræf!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Hreinsa út af SD-kortinu og eyða öllum skrám sem þar eru geymdar? Sú aðgerð er óafturkræf!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Eyða öllu"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Þú þarft að teikna opnunarmynstrið til að staðfesta að þú viljir eyða öllum gögnum af USB-geymslunni."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Þú þarft að teikna opnunarmynstrið til að staðfesta að þú viljir hreinsa SD-kortið."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Símtalsstillingar"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Setja upp talhólf, framsendingu símtala, símtöl í bið, númerabirtingu"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tjóðrun"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjálp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Farsímakerfi"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Farsímaáskrift"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Sjálfgefið SMS-forrit"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-forrit"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Skipta um SMS-forrit?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Nota <xliff:g id="NEW_APP">%1$s</xliff:g> í stað <xliff:g id="CURRENT_APP">%2$s</xliff:g> sem SMS-forrit?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Nota <xliff:g id="NEW_APP">%s</xliff:g> sem SMS-forrit?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Staðsetningarstilling"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Nota GPS, Wi-Fi og farsímakerfi til að ákvarða staðsetningu"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Nota Wi-Fi og farsímkerfi til að ákvarða staðsetningu"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Nota GPS til að ákvarða staðsetningu þína"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Nota GPS til að ákvarða staðsetningu"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skönnun"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skönnun"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi leit"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Auktu staðsetningarnákvæmni með því að leyfa forritum og þjónustum að leita að Wi-Fi netum, jafnvel þegar slökkt er á Wi-Fi"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-leit"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Bættu staðsetningarnákvæmni með því að leyfa kerfisþjónustum að leita að Bluetooth-tækjum, jafnvel þegar slökkt er á Bluetooth"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Staðsetning með Wi-Fi og farsímakerfi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Leyfir forritum að nota þjónustu Google fyrir hraðvirkari staðsetningarákvörðun. Nafnlausar upplýsingar verða sendar til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi ákvarðar staðsetningu"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Aðgangsorð hefur verið valið"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-númer var valið"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mynstur hefur verið valið"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Öryggi skjás"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Teiknaðu mynstrið þitt fyrir tækið til að halda áfram."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Sláðu inn PIN-númerið þitt fyrir tækið til að halda áfram."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Sláðu inn aðgangsorðið þitt fyrir tækið til að halda áfram."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Öryggi tækis"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Breyta opnunarmynstri"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Breyta PIN-númeri til að opna"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Staðfestu vistað mynstur"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Reyndu aftur:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Teiknaðu opnunarmynstur"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Ýttu á valmyndartakkann til að fá hjálp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Slepptu fingrinum þegar þú ert búin(n)"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Velja opnunarmynstur"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Breyta opnunarmynstri"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hvernig opnunarmynstur er teiknað"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Of margar misheppnaðar tilraunir!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Reyndu aftur eftir <xliff:g id="NUMBER">%d</xliff:g> sekúndur."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Of margar misheppnaðar tilraunir. Reyndu aftur eftir <xliff:g id="NUMBER">%d</xliff:g> sekúndur."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Forritið er ekki uppsett í símanum."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Stjórna forritum"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Stjórna og fjarlægja upsett forrit"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Raða eftir stærð"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Sýna þjónustur í gangi"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Sýna vinnslur í skyndiminni"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Neyðarforrit"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Endurstilla stillingar forrits"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Endurstilla stillingar forrita?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Þetta endurstillir allar stillingar fyrir:\n\n "<li>"Óvirk forrit"</li>\n" "<li>"Óvirkar tilkynningar forrita"</li>\n" "<li>"Sjálfgefin forrit aðgerða"</li>\n" "<li>"Gagnatakmarkanir forrita í bakgrunni"</li>\n" "<li>"Takmarkanir á heimildum"</li>\n\n" Þú glatar engum fyrirliggjandi forritagögnum."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Forritsaðgerðir"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Í birtingu"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Aldrei notað)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Engin sjálfgefin forrit"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Geymslunotkun"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Skoða geymslurými sem forrit nota"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Þjónustur í gangi"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Upplýsingar um spjaldtölvuna"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Upplýsingar um símann"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Upplýsingar um rafhlöðu"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Flýtiræsing"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Stilla flýtilykla að opna forrit"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Velja forrit"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Engin flýtileið"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Leita + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Hreinsa"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Flýtileiðin þín fyrir <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) verður hreinsuð."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Í lagi"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Hætta við"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Forrit"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Flýtileiðir"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Textainnsláttur"</string>
     <string name="input_method" msgid="5434026103176856164">"Innsláttaraðferð"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Valið lyklaborð"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Fanga alla HCI-pakka Bluetooth í skrá"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Opnun framleiðanda"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Leyfa opnun ræsiforritsins"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Sláðu inn PIN-númerið þitt"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Sláðu inn PIN-númer tækisins til að gera opnun framleiðanda virka"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Leyfa opnun framleiðanda?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"VIÐVÖRUN: Öryggiseiginleikar til að vernda tækið virka ekki í þessu tæki þegar þessi stilling er virk."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Annálsritastærðir biðminna"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Veldu annálsritastærðir á biðminni"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Leyfa gervistaðsetningar"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Leyfa gervistaðsetningar"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Virkja yfirlit skoðunar eiginda"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Netkerfi"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Vottun þráðlausra skjáa"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Kveikja á ítarlegri skráningu Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Ágeng yfirfærsla frá Wi-Fi til símkerfis"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Leyfa alltaf reikileit með Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Nota gamlan DHCP-biðlara"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Sýna valkosti fyrir vottun þráðlausra skjáa"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Auka skráningarstig Wi-Fi, sýna RSSI fyrir hvert SSID í Wi-Fi vali"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Þegar þetta er virkt mun Wi-Fi ganga harðar fram í að færa gagnatenginguna yfir til símkerfisins þegar Wi-Fi merkið er lélegt"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Leyfa/banna reikileit með Wi-Fi á grunni þess hversu mikil gagnaumferð er fyrir hendi í viðmótinu"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Annálsritastærðir biðminna"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Veldu annálsritastærðir á biðminni"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Velja USB-stillingar"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Velja USB-stillingar"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Leyfa gervistaðsetningar"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Leyfa gervistaðsetningar"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Virkja yfirlit skoðunar eiginda"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Nota gamla DHCP-biðlarann úr Lollipop í staðinn fyrir nýja Android DHCP-biðlarann."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Leyfa USB-villuleit?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-villuleit er aðeins ætluð til nota í þróunarskyni. Hana má nota til að afrita gögn á milli tölvu og tækis, setja forrit upp í tækinu án tilkynninga og lesa annálagögn."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Afturkalla aðgang að USB-villuleit í öllum tölvum sem þú hefur áður veitt heimild?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Blárauður"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Nota <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> þarf að:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Stillingar geta ekki staðfest svarið þitt vegna þess að forrit er að fela heimildarbeiðni."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ef þú kveikir á <xliff:g id="SERVICE">%1$s</xliff:g> mun tækið ekki nota skjálásinn til að efla dulkóðun gagna."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Þar sem þú hefur kveikt á aðgengisþjónustu mun tækið ekki nota skjálásinn til að efla dulkóðun gagna."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Ef <xliff:g id="SERVICE">%1$s</xliff:g> er gert virkt hefur það áhrif á dulkóðun gagna og því þarftu að staðfesta mynstrið þitt."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Tölfræði vinnsluferla"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nördaleg tölfræði um opin vinnsluferli"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Minnisnotkun"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> forrit yfir <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> af <xliff:g id="TOTALRAM">%2$s</xliff:g> notuð á <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Í bakgrunni"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Í forgrunni"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Í skyndiminni"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Staðan á minni tækisins er <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Meðalnotkun vinnsluminnis"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Hámarksnotkun vinnsluminnis"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android stýrikerfið"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Sérforritað"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kjarni"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-vinnsluminni"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Skyndiminni"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Notkun vinnsluminnis"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Notkun vinnsluminnis (bakgrunnur)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Keyrslutími"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Ferli"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Þjónusta"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tímalengd"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Upplýsingar um minni"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 klukkustundir"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dagur"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Sýna kerfi"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Fela kerfi"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Nota USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tegund tölfræði"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Bakgrunnur"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Sjálfgefnar stillingar hér að neðan hnekkja stillingum forrits"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Sjálfgefnar stillingar"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Sjálfgefin vél"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Velur talgervilsvél sem nota á fyrir lesinn texta"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Velja talgervil fyrir talað mál"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Talhraði"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Hraði talaðs texta"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tónhæð"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Byggist á vélbúnaði"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Hugbúnaður eingöngu"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Skilríki eru ekki í boði fyrir þennan notanda"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Þú þarft að teikna opnunarmynstrið til að staðfesta uppsetningu skilríkja."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Taka öryggisafrit af gögnunum mínum"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Vista öryggisafrit af gögnum forrita, Wi-Fi aðgangsorðum og öðrum stillingum á þjóna Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Afritunarreikningur"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Sem stendur geymir enginn reikningur öryggisafrit af gögnum"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Fela forritsgögn"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Sjálfvirk endurheimt"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Endurheimta vistaðar stillingar og gögn þegar forrit er enduruppsett"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Afritunarþjónustan er óvirk."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tækjastefnan stillti þetta."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Aðgangsorð tölvuafritunar"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Heildarafritun á tölvu er ekki varin sem stendur."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Snertu til að breyta eða fjarlægja aðgangsorðið fyrir heildarafritun á tölvu"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Lengd hreyfiumbreytinga"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Tímalengd hreyfiáhrifa"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Herma eftir aukaskjáum"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Margir gluggar"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Margar aðgerðir á skjánum samtímis."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Kveikja á mörgum gluggum?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"VIÐVÖRUN: Þetta er eiginleiki á algjöru tilraunastigi sem leyfir margar aðgerðir á skjánum samtímis í gegnum viðmót nýlegra forrita. Einhver forrit kunna að hrynja eða virka rangt þegar þau eru notuð með þessum eiginleika."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Forrit"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ekki vista virkni"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Eyðileggja öll verk um leið og notandi yfirgefur þau"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Notandi"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Takmarkað snið"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Bæta nýjum notanda við?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Þú getur búið til fleiri notendur til að deila þessu tæki með öðrum. Hver notandi hefur sitt eigið svæði sem viðkomandi getur sérsniðið með eigin forritum, veggfóðri o.s.frv. Notendur geta einnig breytt þeim stillingum tækisins sem hafa áhrif á alla notendur, t.d. Wi-Fi.\n\nÞegar þú bætir nýjum notanda við þarf sá notandi að setja upp svæðið sitt.\n\nHvaða notandi sem er getur uppfært forrit fyrir alla aðra notendur."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Þú getur búið til fleiri notendur til að deila þessu tæki með öðrum. Hver notandi hefur sitt eigið svæði sem viðkomandi getur sérsniðið með forritum, veggfóðri o.s.frv. Notendur geta einnig breytt þeim stillingum tækisins sem hafa áhrif á alla notendur, t.d. Wi-Fi.\n\nÞegar þú bætir nýjum notanda við þarf sá notandi að setja upp svæðið sitt.\n\nHvaða notandi sem er getur uppfært forrit fyrir alla aðra notendur."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Þegar þú bætir nýjum notanda við þarf sá notandi að setja upp svæðið sitt.\n\nHvaða notandi sem er getur uppfært forrit fyrir alla aðra notendur."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Setja notanda upp núna?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Gakktu úr skugga um að notandinn geti tekið tækið og sett upp sitt svæði"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Fjarlægja gest?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Öllum forritum og gögnum í þessari lotu verður eytt."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Fjarlægja"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Leyfa símtöl"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Leyfa símtöl og SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Kveikja á símtölum"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Kveikja á símtölum og SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Fjarlægja notanda"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Leyfa símtöl?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Kveikja á símtölum?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Símtalaferli verður deilt með þessum notanda."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Leyfa símtöl og SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Símtala- og SMS-ferli verður deilt með þessum notanda."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Kveikja á símtölum og SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Símtala- og SMS-ferli verður deilt með þessum notanda."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Leyfa forrit og innihald þeirra"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Forrit með takmörkunum"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Stækka stillingar forrits"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"ENDURNEFNA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Stilla takmarkanir forrits"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Stjórnað af <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ekki er stuðningur við þetta forrit í takmörkuðum prófílum"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Þetta forrit hefur aðgang að reikningunum þínum"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Þetta forrit hefur aðgang að reikningunum þínum. Stjórnað af <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi og farsímakerfi"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Leyfa breytingar á stillingum Wi-Fi og farsímakerfa"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi nettenging"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"skilaboð sms textaskilaboð sms-skilaboð"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"farsími farsímakerfi símafyrirtæki þráðlaust gögn 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi hringja símtal"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ræsiforrit"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skjár snertiskjár"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"myrkva skjár snertiskjár rafhlaða"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"myrkva skjár snertiskjár rafhlaða"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"bakgrunnur sérsníða sérstilla skjár"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"dökkt þema næturstilling dekkja skjá umsnúa birtu"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"bakgrunnur sérsníða sérstilla skjá"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textastærð"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"verkefni"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"útsending verkefnis"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"pláss harður diskur drif tæki notkun"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"orka notkun hleðsla"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"stafsetning orðabók ritvilluleit sjálfvirk leiðrétting"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"reikningur"</string>
     <string name="keywords_users" msgid="4673901601478559100">"takmörkun takmarka takmarkað"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"texti leiðrétting leiðrétta hljóð titringur sjálfvirkt tungumál bending stinga upp á tillaga þema móðgandi orð skrifa emoji alþjóðlegt"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"endurstilla stillingar sjálfgildi"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"sjálfgefið ICE-neyðarforrit"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"forrit sækja niðurhal kerfi"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"öryggi forritsheimilda"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"sjálfgefin forrit"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"renna aðgangsorð mynstur pin-númer"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setja upp Wi-Fi NFC-merki"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skrifa"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hljóðstyrkur vekjara"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Hljóðstyrkur hringingar"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hljóðstyrkur tilkynninga"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Truflun"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Þegar símtöl og tilkynningar berast"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Trufla alltaf"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Leyfa aðeins forgangstruflanir"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ekki trufla"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Aðeins forgangsheimildir"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sjálfvirkar reglur"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Aðeins forgangur"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Aðeins vekjarar"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Engar truflanir"</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="ringtone_title" msgid="5379026328015343686">"Hringitónn síma"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Sjálfgefinn hringitónn tilkynninga"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Titra líka fyrir símtöl"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Titringur"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Tilkynningaaðgangur"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Forrit geta ekki lesið tilkynningar"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d forrit getur lesið tilkynningar"</item>
-    <item quantity="other" msgid="980049191810249052">"%d forrit geta lesið tilkynningar"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d forrit getur lesið tilkynningar</item>
+      <item quantity="other">%d forrit geta lesið tilkynningar</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Engin tilkynningahlustun er uppsett."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Virkja <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> mun geta lesið allar tilkynningar frá kerfinu eða uppsettum forritum, sem kunna að innihalda persónuupplýsingar á borð við nöfn tengiliða og texta skilaboða sem þú færð. Það mun einnig geta hunsað þessar tilkynningar eða valið aðgerðahnappa innan þeirra."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Skilyrðaveitur"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Engin forrit setja skilyrði"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d forrit setur skilyrði"</item>
-    <item quantity="other" msgid="358057362115673258">"%d forrit setja skilyrði"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Engar skilyrðaveitur eru uppsettar."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Gera <xliff:g id="SERVICE">%1$s</xliff:g> virkt?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> getur bætt lokaskilyrðum við stillinguna „Ónáðið ekki“."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Hleður forrit..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Setja á bannlista"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Útiloka allt"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Birta aldrei tilkynningar úr þessu forriti"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Forgangur"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Birta tilkynningar efst á listanum og halda áfram að láta þær berast þegar tækið er stillt á forgangstilkynningar eingöngu"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Viðkvæmt"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Fela allt viðkvæmt efni úr tilkynningum þessa forrits þegar tækið er læst"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Setja í forgang"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Leyfa tilkynningum þessa forrits að heyrast þegar „Ónáðið ekki“ er stillt á „Aðeins forgangur“"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Leyfa gægjur"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Leyfa þessu forriti að leggja áherslu á tilteknar tilkynningar með því að birta þær stuttlega á skjánum sem er opinn"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Fela viðkvæmt efni"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Fela allt efni úr tilkynningum þessa forrits sem kann að afhjúpa persónulegar upplýsingar þegar tækið er læst"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Á bannlista"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Forgangur"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Viðkvæmt"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Lokið"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Þar til þú slekkur á þessu"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Forgangstruflanir"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Niðritími"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dagar"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Engir"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Truflun leyfð"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Aðeins forgangur"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Enginn"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Sjálfvirkni"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Kveikja sjálfkrafa"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Heiti reglu"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Bæta við reglu"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Eyða reglu"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Eyða reglunni „<xliff:g id="RULE">%1$s</xliff:g>“?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Eyða"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tegund reglu"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Óþekkt"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Stilla reglu"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Dagskrárregla"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regla fannst ekki."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dagar"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ekkert"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Á hverjum degi"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldrei"</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> til <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Símtöl"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Skilaboð"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Símtöl/skilaboð frá"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Öllum"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Tengiliðum"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Tengiliðum með stjörnu"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Viðburðir og áminningar"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Vekjarar eru alltaf forgangstruflanir"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Vekjarar"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Áminningar"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Viðburðir"</string>
+    <string name="zen_mode_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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Á virkum kvöldum"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Upphafstími"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Lokatími"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næsta dag"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> eða við vekjara áður"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næsta dag eða við vekjara áður"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> daginn eftir"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Truflanir"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Þegar símtöl og tilkynningar berast"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Hvenær viltu fá truflun?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Hversu lengi?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Trufla alltaf"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"slökkt,allt,allar"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Leyfa aðeins forgangstruflanir"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Leyfa aðeins vekjara"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Ekki trufla"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Án tímatakmarkana"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> mínúta</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> mínútur</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> klukkustund</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> klukkustundir</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Breyta í forgangstruflanir eingöngu til frambúðar"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Breyta í forgangstruflanir eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> mínútu til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Breyta í forgangstruflanir eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> mínútur til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Breyta í forgangstruflanir eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> klukkustund (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Breyta í forgangstruflanir eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> klukkustundir (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Breyta í vekjara eingöngu til frambúðar"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Breyta í vekjara eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> mínútu (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Breyta í vekjara eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> mínútur (til <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">Breyta í vekjara eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> klukkustund til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Breyta í vekjara eingöngu í <xliff:g id="DURATION">%1$d</xliff:g> klukkustundir til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Breytar í engar truflanir til frambúðar"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Breyta í engar truflanir í <xliff:g id="DURATION">%1$d</xliff:g> mínútu (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Breyta í engar truflanir í <xliff:g id="DURATION">%1$d</xliff:g> mínútur (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Breyta í engar truflanir í <xliff:g id="DURATION">%1$d</xliff:g> klukkustund til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Breyta í engar truflanir í <xliff:g id="DURATION">%1$d</xliff:g> klukkustundir til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Breyta í truflanir alltaf"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"til frambúðar"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Forritatilkynningar"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tilkynningastillingar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Senda ábendingar um þetta tæki"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-upplýsingar"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-tengdar upplýsingar"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Rauf<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Keyra sjálfgefið"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> í notkun í <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Lénstenglar"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Opna vefslóðir léns"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Leyfa forriti að opna vefslóðir léns beint"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Studdar vefslóðir léns"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Aðrar sjálfgefnar stillingar"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> í notkun í <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"innbyggðu minni"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"ytra minni"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Innbyggð geymsla"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Ytri geymsla"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Gagnanotkun forrits"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> notuð frá <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Notað pláss"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Kveikt"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Loka fyrir"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Viðkvæmt"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Forgangur"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Forgangur og viðkvæmt"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> heimild veitt</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> heimildir veittar</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> heimild af <xliff:g id="COUNT_3">%d</xliff:g> veitt</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> heimildir af <xliff:g id="COUNT_3">%d</xliff:g> veittar</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Einhver sjálfgildi valin"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Engin sjálfgildi valin"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Öll forrit"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Virkt"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Persónulegt"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Vinna"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Á bannlista"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Forgangur"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Viðkvæmt"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Með vefslóðum léns"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Stjórnandi gerði óvirkt"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Ítarlegt"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Óþekkt forrit"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Veldu snið"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Heimildir forrits"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> af <xliff:g id="COUNT_1">%d</xliff:g> forritum veittur frekari aðgangur"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> af <xliff:g id="COUNT_1">%d</xliff:g> forritum leyfð"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Vefslóðir léns"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Ekki opna hvaða vefslóð léns sem er"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Opna „<xliff:g id="DOMAIN">%s</xliff:g>“"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Opna „<xliff:g id="DOMAIN">%s</xliff:g>“ og tengdar vefslóðir"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> forrit getur opnað vefslóðir lénsins síns</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> forrit geta opnað vefslóðir lénsins síns</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Þekktist ekki"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Sjálfgefin forrit"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Vafraforrit"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Enginn sjálfgefinn vafri"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Sjálfgefið)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Forritageymsla"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index bf4ae9d..5e7a880 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Pulsante di comando"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"attiva/disattiva microfono"</item>
     <item msgid="1148142988678569310">"elementi multimediali dei progetti"</item>
     <item msgid="9130014005474445273">"attiva VPN"</item>
+    <item msgid="1165192162975045562">"scrivi sfondo"</item>
+    <item msgid="7129487923652967258">"struttura evento indiretto"</item>
+    <item msgid="1069023208100114540">"screenshot evento indiretto"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Posizione"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Attiva/disattiva microfono"</item>
     <item msgid="5906017727368097853">"Elementi multimediali dei progetti"</item>
     <item msgid="2486614710846178542">"Attiva VPN"</item>
+    <item msgid="5586547561693629602">"Scrivi sfondo"</item>
+    <item msgid="32794179825485062">"Struttura evento indiretto"</item>
+    <item msgid="7872852746938272552">"Screenshot evento indiretto"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Breve"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"basso"</item>
     <item msgid="4212263919458209842">"critico"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Disattivata"</item>
-    <item msgid="5656544177755411222">"Interruzioni limitate"</item>
-    <item msgid="8735337502532332056">"Zero interruzioni"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normale"</item>
     <item msgid="866544120205026771">"Moderata"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Rosso"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Sorgente audio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5f5f9e8..a2f7aab 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Consenti"</string>
     <string name="deny" msgid="6947806159746484865">"Rifiuta"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Sconosciuto"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Ora ti manca <xliff:g id="STEP_COUNT">%1$d</xliff:g> passaggio per diventare uno sviluppatore."</item>
-    <item quantity="other" msgid="6722953419953594148">"Ora ti mancano <xliff:g id="STEP_COUNT">%1$d</xliff:g> passaggi per diventare uno sviluppatore."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Ora ti mancano <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passaggi per diventare uno sviluppatore.</item>
+      <item quantity="one">Ora ti manca <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passaggio per diventare uno sviluppatore.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ora sei uno sviluppatore."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Non è necessario, sei già uno sviluppatore."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless e reti"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Disattiva SMS su IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Attivazione registrazione IMS obbligatoria"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Disattivazione registrazione IMS obbligatoria"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Attiva flag provisioning VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Disattiva flag provisioning VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Accendi dump ram lte"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Spegni dump ram lte"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visualizza rubrica SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Trasmissione"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disattivare il profilo?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Verrà disattivato:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Connesso"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Collegato (telefono escluso)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Collegato (contenuti multimed. esclusi)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connesso (nessun accesso ai messaggi)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Collegato (telef. o conten. mult. esclusi)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnesso"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnessione..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Connessione..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Accoppiamento..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth senza nome"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Ricerca"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nessun dispositivo Bluetooth in vicinanze."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra file ricevuti"</string>
     <string name="device_picker" msgid="4978696506172252813">"Scegli il dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Richiesta autorizzazione Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Un\'app chiede di attivare il Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Un\'app desidera attivare Bluetooth su questo dispositivo."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Un\'app chiede di rendere il tablet visualizzabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Un\'app chiede di rendere il telefono visualizzabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Un\'app chiede di rendere il tablet visualizzabile da altri dispositivi Bluetooth. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Scheda SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Impostazioni proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Annulla"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANNULLA"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUA"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SÌ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NO"</string>
-    <string name="forget" msgid="7267115980248732932">"ELIMINA"</string>
+    <string name="forget" msgid="1400428660472591263">"Elimina"</string>
+    <string name="save" msgid="879993180139353333">"Salva"</string>
+    <string name="done" msgid="6942539184162713160">"Fine"</string>
     <string name="settings_label" msgid="1626402585530130914">"Impostazioni"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Impostazioni"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Scorciatoia Impostazioni"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordina per fuso orario"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Migliora riconoscimento viso"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Controllo vitalità"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Richiedi battito di ciglia durante sblocco"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Blocca automaticamente"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> dopo sospensione"</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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Password"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impronta digitale"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gestisci impronte digitali"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Utilizza l\'impronta digitale per"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Aggiungi"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"blocco schermo"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impronte digitali registrate</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impronta digitale registrata</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Config. impr. digitale"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Per sbloccare lo schermo o confermare acquisti con l\'impronta digitale, devi: \n\n✓ Configurare il metodo di blocco della schermata di backup \n\n✓ Aggiungere l\'impronta digitale"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Trova il sensore"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Individua il sensore di impronte digitali sul retro del telefono."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Elimina"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Inizia."</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Appoggia il dito sul sensore di impronte digitali. Alzalo quando senti una vibrazione."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Bene. Ora ripeti."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Appoggia lo stesso dito sul sensore di impronte digitali e alzalo quando senti una vibrazione."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Impronta aggiunta."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando viene visualizzata questa icona, puoi utilizzare la tua impronta digitale per l\'identificazione o per autorizzare un acquisto."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Aggiungi"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Avanti"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Crittografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Esegui crittografia tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Esegui crittografia telefono"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Collega il caricabatterie e riprova."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nessun PIN/password di blocco dello schermo"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Devi impostare un PIN o una password di blocco dello schermo per poter iniziare la crittografia."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Devi tracciare la sequenza di sblocco per confermare la crittografia del dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Crittografare?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"L\'operazione di crittografia non è reversibile e la sua interruzione causerà la perdita di dati. La crittografia richiede almeno un\'ora, durante la quale il tablet verrà riavviato diverse volte."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"L\'operazione di crittografia non è reversibile e la sua interruzione causerà la perdita di dati. La crittografia richiede almeno un\'ora, durante la quale il telefono verrà riavviato diverse volte."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Scorrimento"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Nessuna protezione"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Sblocco col sorriso"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Protezione bassa, sperimentale"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Sequenza"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Sicurezza media"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Protezione medio-alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Protezione alta"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Blocco schermo corrente"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Le funzionalità di protezione del dispositivo non saranno più disponibili."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disattivata da amministratore, norma crittografia o archivio credenziali"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nessuno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Fai scorrere"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Sblocco col sorriso"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Sequenza"</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="7579210814842056547">"Dopo aver impostato il blocco schermo, puoi anche impostare la tua impronta digitale in Impostazioni e sicurezza."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Disattiva blocco schermo"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Rimuovi sequenza di sblocco"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Rimuovi PIN di sblocco"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"La password deve contenere almeno una lettera."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"La password deve contenere almeno una cifra."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"La password deve contenere almeno un simbolo."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"La password deve contenere almeno una lettera."</item>
-    <item quantity="other" msgid="8186027808415585970">"La password deve contenere almeno %d lettere."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"La password deve contenere almeno una lettera minuscola."</item>
-    <item quantity="other" msgid="2693910942679679225">"La password deve contenere almeno %d lettere minuscole."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"La password deve contenere almeno una lettera maiuscola."</item>
-    <item quantity="other" msgid="3030801209112209245">"La password deve contenere almeno %d lettere maiuscole."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"La password deve contenere almeno una cifra numerica."</item>
-    <item quantity="other" msgid="4703982391407595924">"La password deve contenere almeno %d cifre numeriche."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"La password deve contenere almeno un simbolo speciale."</item>
-    <item quantity="other" msgid="1221290525051187757">"La password deve contenere almeno %d simboli speciali."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"La password deve contenere almeno un carattere non costituito da una lettera."</item>
-    <item quantity="other" msgid="3952508584649046404">"La password deve contenere almeno %d caratteri non costituiti da lettere."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">La password deve contenere almeno %d lettere.</item>
+      <item quantity="one">La password deve contenere almeno una lettera.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">La password deve contenere almeno %d lettere minuscole.</item>
+      <item quantity="one">La password deve contenere almeno una lettera minuscola.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">La password deve contenere almeno %d lettere maiuscole.</item>
+      <item quantity="one">La password deve contenere almeno una lettera maiuscola.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">La password deve contenere almeno %d cifre numeriche.</item>
+      <item quantity="one">La password deve contenere almeno una cifra numerica.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">La password deve contenere almeno %d simboli speciali.</item>
+      <item quantity="one">La password deve contenere almeno un simbolo speciale.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">La password deve contenere almeno %d caratteri non costituiti da una lettera.</item>
+      <item quantity="one">La password deve contenere almeno un carattere non costituito da una lettera.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"L\'amministratore del dispositivo non consente l\'utilizzo di una password recente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Non sono consentite sequenze di cifre in ordine ascendente o discendente oppure ripetute"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Per l\'accoppiamento con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assicurati che sia visualizzata questa 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">"Da:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Accoppiare con questo dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Per eseguire l\'accoppiamento con <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>, digita sul dispositivo <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>, quindi premi A capo o Invio."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Accoppia"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ACCOPPIA"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annulla"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"L\'accoppiamento consente l\'accesso ai tuoi contatti e alla cronologia chiamate quando i dispositivi sono connessi."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Impossibile eseguire l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Impossibile eseguire l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. La passkey o il PIN è errato."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Impossibile comunicare con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Accoppiamento rifiutato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Impossibile collegarsi a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Cerca dispositivi"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Aggiorna"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avanzate"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzato"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Quando il Bluetooth è attivato, il dispositivo può comunicare con altri dispositivi che si trovano nelle vicinanze."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Per una maggiore precisione della localizzazione, le app e i servizi cercheranno dispositivi Bluetooth nelle vicinanze, anche quando il Bluetooth non è attivo. Puoi modificare questa impostazione nelle <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>impostazioni di ricerca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connessione a…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimediale"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio telefono"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Trasferimento file"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo di input"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accesso Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Condivisione contatti"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Usa per condivisione contatti"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Condivisione connessione Internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accesso ai messaggi"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio multimediale."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio vivavoce."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dal dispositivo di input."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Utilizza per"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Rinomina"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Consenti trasfer. file arrivo"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Collegato ad audio media"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Collegato ad audio telefono"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Collegato al server di trasferimento file"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connesso alla mappa"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Non collegato al server di trasferimento file"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connesso a dispositivo di input"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connesso a dispositivo per accesso Internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Connessione Internet locale condivisa con dispositivo"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Usa per audio media"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Usa per audio telefono"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usa per trasferimento file"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizza per l\'input"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usa per accesso Internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utilizza per la mappa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Impostazioni dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Usa dock per audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Come vivavoce"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e audio media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ricorda impostazioni"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistente Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Connesso tramite assistente Wi‑Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Trasmetti schermo"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Trasmetti"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Attiva display wireless"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nessun dispositivo Bluetooth vicino."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Collegamento in corso"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Elimina"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Fine"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Consenti lo scambio di dati quando il tablet tocca un altro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Consenti lo scambio di dati quando il telefono tocca un altro dispositivo"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Disattivazione Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Errore"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In modalità aereo"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Impossibile cercare reti"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notifica rete"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Avvisa quando è disponibile una rete pubblica"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evita connessioni deboli"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Non utilizzare una rete Wi‑Fi a meno che non abbia una buona connessione a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilizza solo reti con una buona connessione a Internet"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scansione sempre disponibile"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Consenti sempre la scansione"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Consenti al servizio di geolocalizzazione di Google e ad altre app di eseguire la scansione delle reti, anche quando il Wi-Fi non è attivo"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utilizza automaticamente Wi‑Fi aperto"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Consenti a un assistente Wi‑Fi di connettersi automaticamente alle reti aperte di alta qualità"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Seleziona assistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installa certificati"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Per una maggiore precisione nella localizzazione e altri motivi, Google e altre app sono in grado di cercare reti nelle vicinanze, anche quando la connessione Wi-Fi è disattivata. Se non desideri consentire tale ricerca, accedi ad Avanzate &gt; Scansione sempre disponibile."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Le app possono cercare reti nelle vicinanze, anche quando la connessione Wi-Fi è disattivata. Se non desideri consentire tale ricerca, accedi ad Advanzate &gt; Scansione sempre disponibile."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Per una maggiore precisione della localizzazione, le app e i servizi cercheranno reti Wi-Fi nelle vicinanze, anche quando la connessione Wi-Fi non è attiva. Puoi modificare questa impostazione nelle <xliff:g id="LINK_END_1">LINK_END</xliff:g>impostazioni di ricerca<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Non mostrare più"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Tieni attivo Wi‑Fi durante sospensione"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi attivo in sospensione"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Aggiungi un\'altra rete"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Altro"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configurazione auto (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Per poter completare la configurazione, il tablet deve poter accedere a una rete Wi‑Fi. Dopo la configurazione potrai passare dalla rete dati alla rete Wi‑Fi e viceversa."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Opzioni avanzate"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Avvvio WPS..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Premi il pulsante Wi‑Fi Protected Setup del router. Il pulsante potrebbe essere denominato \"WPS\" o contenere questo simbolo:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Premi il pulsante Impostazione protetta Wi-Fi del router. Il pulsante potrebbe essere denominato \"WPS\" o essere contrassegnato da questo simbolo:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Inserisci il PIN <xliff:g id="NUMBER">%1$s</xliff:g> sul router Wi‑Fi. Il completamento della configurazione può richiedere fino a due minuti."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"Configurazione WPS riuscita. Connessione alla rete..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Connesso alla rete Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identità anonima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Password"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Mostra password"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Config banda AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda a 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda a 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Impostazioni IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(invariati)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non specificati)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Salvata"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disattivata"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Errore configurazione IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Errore connessione Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema di autenticazione"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuori portata"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Nessun accesso a Internet rilevato, non verrà eseguita la riconnessione automatica."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibile"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibile)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Inserisci la password di rete"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Nessuna"</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 di overflow."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Consenti"</string>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Accedere per connettersi?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> richiede di accedere online per potersi collegare alla rete."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNETTI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Questa rete non ha accesso a Internet. Utilizzare questa rete comunque?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Non chiedermelo più per questa rete"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Hotspot Wi-Fi portatile WPA2 PSK AndroidAP"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Hotspot Wi‑Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portatile"</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_mode_title" msgid="2164073796253284289">"Preferenza di chiamata"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modalità di chiamata Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Reta preferita: Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Rete preferita: cellulare"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Home page"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Regola la luminosità dello schermo"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosità adattiva"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Ottimizza il livello di luminosità per la luce disponibile"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Chiaro"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Scuro"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatico"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sospensione"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Lo schermo si spegne"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Aggiornare la SIM preferita?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> è l\'unica SIM del tuo dispositivo. Vuoi utilizzarla per dati mobili, chiamate e SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Codice PIN della SIM errato. Devi contattare l\'operatore per sbloccare il dispositivo."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Codice PIN della SIM errato. Hai ancora <xliff:g id="NUMBER">%d</xliff:g> tentativo a disposizione, dopodiché dovrai contattare l\'operatore per sbloccare il dispositivo."</item>
-    <item quantity="other" msgid="77103619544346451">"Codice PIN della SIM errato. Hai ancora <xliff:g id="NUMBER">%d</xliff:g> tentativi a disposizione."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Codice PIN della SIM errato. Hai ancora <xliff:g id="NUMBER_1">%d</xliff:g> tentativi a disposizione.</item>
+      <item quantity="one">Codice PIN della SIM errato. Hai ancora <xliff:g id="NUMBER_0">%d</xliff:g> tentativo a disposizione, dopodiché dovrai contattare l\'operatore per sbloccare il dispositivo.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operazione con PIN della SIM non riuscita."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stato tablet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Stato telefono"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponibile (in sola lettura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Spazio totale"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcolo..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"App (dati di app e contenuti multimediali)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"App e dati delle app"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Supporti"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Download"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Foto, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musica, suonerie, podcast e così via)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Vari"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Altri file"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dati memorizzati nella cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Smonta archivio condiviso"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Smonta scheda SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Smontaggio in corso"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Spazio archiviazione in esaurim."</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Alcune funzioni di sistema, come la sincronizzazione, potrebbero non funzionare correttamente. Prova a liberare spazio eliminando o sbloccando elementi, come applicazioni o contenuti multimediali."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Rinomina"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Monta"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Espelli"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Resetta e formatta"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Resetta e formatta memoria interna"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Connessione computer USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Connessione computer USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connetti come"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Consente di trasferire file multimediali su Windows oppure utilizzando Android File Transfer su Mac (visita www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotocamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Consente di trasferire foto utilizzando il software della fotocamera e di trasferire i file su computer che non supportano MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installa strumenti trasferimento file"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Consente alle applicazioni MIDI di funzionare tramite USB con software MIDI sul computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Altri utenti"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Memoria dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Archivio rimovibile"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> liberi (<xliff:g id="TOTAL">%2$s</xliff:g> totali)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> montata"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Impossibile montare la <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Espulsione della <xliff:g id="NAME">%1$s</xliff:g> eseguita in modo sicuro"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Impossibile espellere in modo sicuro la <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Formattazione della <xliff:g id="NAME">%1$s</xliff:g> eseguita"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Impossibile formattare la <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Rinomina memoria"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Dopo la formattazione potrai utilizzare questa <xliff:g id="NAME_0">^1</xliff:g> in altri dispositivi. \n\nTutti i dati della <xliff:g id="NAME_1">^1</xliff:g> verranno cancellati. Potresti effettuare il backup prima. \n\n"<b>"Effettua il backup di foto e altri contenuti multimediali"</b>" \nSposta i file multimediali sulla memoria alternativa di questo dispositivo, oppure trasferiscili su un computer utilizzando un cavo USB. \n\n"<b>"Effettua il backup delle app"</b>" \nTutte le app memorizzate su questa <xliff:g id="NAME_6">^1</xliff:g> verranno disinstallate e i relativi dati verranno cancellati. Per tenere queste app, spostale sulla memoria alternativa del dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Se espelli questa <xliff:g id="NAME_0">^1</xliff:g>, le app memorizzate non funzioneranno più e i file multimediali memorizzati non saranno disponibili fino all\'inserimento della scheda."</b>" \n\nQuesta <xliff:g id="NAME_1">^1</xliff:g> è supportata soltanto su questo dispositivo pertanto non funzionerà su altri dispositivi."</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>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Per spostare foto e altri contenuti multimediali da un dispositivo all\'altro"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utilizza come memoria interna"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Per memorizzare tutti i contenuti soltanto su questo dispositivo, incluse app e foto. È necessario formattare la memoria per evitare che funzioni con altri dispositivi."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatta memoria interna"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"È necessario formattare la <xliff:g id="NAME_0">^1</xliff:g> per proteggerla. \n\nDopo la formattazione, questa <xliff:g id="NAME_1">^1</xliff:g> funzionerà soltanto in questo dispositivo. \n\n"<b>"La formattazione cancella tutti i dati attualmente memorizzati sulla <xliff:g id="NAME_2">^1</xliff:g>."</b>" Per evitare di perdere i dati, effettua il backup."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Resetta e formatta"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formattazione della <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Non rimuovere la <xliff:g id="NAME">^1</xliff:g> durante la formattazione."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Sposta dati nella nuova memoria"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Puoi spostare foto, file e dati delle app su questa nuova <xliff:g id="NAME">^1</xliff:g>. \n\nLo spostamento richiede circa <xliff:g id="TIME">^2</xliff:g> e verranno liberati <xliff:g id="SIZE">^3</xliff:g> di memoria interna. Alcune app non funzioneranno durante la procedura."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Sposta ora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Sposta più tardi"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Sposta ora i dati"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Lo spostamento richiede circa <xliff:g id="TIME">^1</xliff:g>. Verranno liberati <xliff:g id="SIZE">^2</xliff:g> di memoria interna."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Sposta"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Spostamento dei dati…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Durante lo spostamento: \n• Non rimuovere la <xliff:g id="NAME">^1</xliff:g>. \n• Alcune app non funzioneranno correttamente. \n• Il dispositivo deve essere sempre carico."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"La <xliff:g id="NAME">^1</xliff:g> è pronta"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"La tua <xliff:g id="NAME">^1</xliff:g> è pronta per memorizzare foto e altri contenuti multimediali."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"La tua nuova <xliff:g id="NAME">^1</xliff:g> è attiva. \n\nPer spostare foto, file e dati delle app su questo dispositivo, seleziona Impostazioni &gt; Memoria."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Sposta <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Lo spostamento dell\'app <xliff:g id="APP">^1</xliff:g> e dei relativi dati sulla <xliff:g id="NAME_0">^2</xliff:g> sarà veloce. Potrai utilizzare l\'app soltanto al termine dello spostamento. \n\nNon rimuovere la <xliff:g id="NAME_1">^2</xliff:g> durante lo spostamento."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Spostamento dell\'app <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Non rimuovere la <xliff:g id="NAME">^1</xliff:g> durante lo spostamento. \n\nL\'app <xliff:g id="APP">^2</xliff:g> su questo dispositivo sarà disponibile soltanto al termine dello spostamento."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annulla spostamento"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stato batteria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Livello batteria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"Reimpostazione della rete"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"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 impostazioni"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Reimpostare tutte le impostazioni di rete? Questa azione è irreversibile."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Reimposta impostazioni"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reimpostare?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Le impostazioni di rete sono state reimpostate"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Ripristina dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ripristino dati di fabbrica"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Cancella tutti i dati sul tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Cancella tutti i dati sul telefono"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del tablet, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del telefono, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:\n"</string>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Cancella tutti i dati sulla scheda SD, come musica o foto"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reimposta tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ripristina telefono"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Cancellare tutti i dati personali e le applicazioni scaricate? Questa azione è irreversibile."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Cancellare tutte le informazioni personali e le app scaricate? Questa azione è irreversibile."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Cancella tutto"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Per confermare un ripristino dati di fabbrica occorre inserire la sequenza di sblocco."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nessun ripristino eseguito perché il servizio System Clear non è disponibile."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Reimpostare?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Il ripristino dati di fabbrica non è consentito per questo utente"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Cancellare l\'archivio USB, eliminando tutti i file memorizzati al suo interno? Questa azione è irreversibile."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Cancellare la scheda SD, eliminando tutti i file memorizzati al suo interno? Questa azione è irreversibile."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Cancella tutto"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare l\'archivio USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare la scheda SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Impostazioni chiamate"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Imposta segreteria, deviazione chiamate, avviso di chiamata, ID chiamante"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Guida"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Reti cellulari"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Piano dati mobile"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"App SMS predefinita"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"App SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Cambiare app per gli SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizzare <xliff:g id="NEW_APP">%1$s</xliff:g> anziché <xliff:g id="CURRENT_APP">%2$s</xliff:g> come app per gli SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizzare <xliff:g id="NEW_APP">%s</xliff:g> come app per gli SMS?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modalità di geolocalizzazione"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Usa reti GPS, Wi-Fi e cellulari per stabilire la posizione"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Usa reti Wi-Fi e cellulari per stabilire la posizione"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Usa GPS per stabilire la posizione"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilizza il GPS per stabilire la posizione"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Ricerca"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Ricerca"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Ricerca di reti Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Migliora la localizzazione consentendo ad app e servizi di cercare reti Wi-Fi anche quando il Wi-Fi non è attivo"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Ricerca di dispositivi Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Migliora la localizzazione consentendo ai servizi di sistema di cercare dispositivi Bluetooth nelle vicinanze, anche quando il Bluetooth non è attivo"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Posiz. Wi‑Fi e rete cellulare"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Consenti alle app di usare localizzazione Google per stabilire la tua posizione. Saranno raccolti e inviati a Google dati anonimi."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Posizione determinata da Wi‑Fi"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Password impostata"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN impostato"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Sequenza impostata"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Sicurezza schermo"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Per continuare devi utilizzare la sequenza del dispositivo."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Per continuare devi inserire il PIN del dispositivo."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Per continuare devi inserire la password del dispositivo."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Sicurezza dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambia sequenza sblocco"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambia PIN di sblocco"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Conferma sequenza salvata"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Riprova:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Inserisci una sequenza di sblocco"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Premi Menu per visualizzare la guida."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Solleva il dito al termine"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Imposta sequenza"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambia sequenza di sblocco"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Procedura per l\'impostazione di una sequenza di sblocco"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Troppi tentativi errati."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Riprova fra <xliff:g id="NUMBER">%d</xliff:g> secondi."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Troppi tentativi errati. Riprova fra <xliff:g id="NUMBER">%d</xliff:g> secondi."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Applicazione non installata sul telefono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestisci e rimuovi applicazioni installate"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordina per dimensioni"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostra servizi in esecuzione"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processi nella cache"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"App di emergenza"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Reimposta preferenze app"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reimpostare preferenze app?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Verranno reimpostate tutte le preferenze relative a:\n\n "<li>"App disattivate"</li>\n" "<li>"notifiche di app disattivate"</li>\n" "<li>"Applicazioni predefinite per azioni"</li>\n" "<li>"Limitazioni di dati in background per app"</li>\n" "<li>"Eventuali limitazioni di autorizzazione"</li>\n\n" Non perderai i dati delle app."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Op. app"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"In corso"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Mai utilizzata)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Nessun\'app predefinita."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilizzo memoria"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Visualizza la memoria utilizzata dalle applicazioni"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servizi in esecuzione"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informazioni sul tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informazioni telefono"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informazioni batteria"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Avvio rapido"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Imposta scorciatoie da tastiera per avviare le applicazioni"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Assegna applicazione"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Nessuna scorciatoia"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Ricerca + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Cancella"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"La scorciatoia per <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) verrà cancellata."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Annulla"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"App"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Scorciatoie"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Inserimento testo"</string>
     <string name="input_method" msgid="5434026103176856164">"Metodo inserimento"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Tastiera corrente"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Acquisisci tutti i pacchetti HCI Bluetooth in un file"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Sblocco OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Consenti lo sblocco del bootloader"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Inserisci il PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Inserisci il PIN del dispositivo per attivare lo sblocco OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Consentire lo sblocco OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVVISO. Le funzioni di protezione del dispositivo non funzionano su questo dispositivo se questa impostazione è attiva."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Dimensioni buffer Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Seleziona dim. Logger buffer log"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Attiva controllo attributi visualizzazione"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Reti"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificazione display wireless"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Attiva registrazione dettagliata Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi aggressivo per passaggio a cellulare"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Consenti sempre scansioni roaming Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Utilizza il client della versione precedente di DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostra opzioni per la certificazione display wireless"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumenta il livello di registrazione Wi-Fi, mostrando il SSID RSSI nel selettore Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Quando questa impostazione è attivata, il Wi-Fi sarà più aggressivo nel passare la connessione dati al cellulare, quando il segnale Wi-Fi è basso"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Consenti/vieta scansioni roaming Wi-Fi basate sulla quantità di traffico dati presente a livello di interfaccia"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Dimensioni buffer Logger"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Seleziona dim. Logger buffer log"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Seleziona configurazione USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Seleziona configurazione USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Attiva controllo attributi visualizzazione"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utilizza il client DHCP di Lollipop anziché il nuovo client DHCP Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Consentire debug USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Il debug USB è solo a scopo di sviluppo. Utilizzalo per copiare dati tra il computer e il dispositivo, per installare applicazioni sul tuo dispositivo senza notifica e per leggere i dati dei log."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revocare l\'accesso al debug USB da tutti i computer precedentemente autorizzati?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> deve:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Un\'app sta oscurando una richiesta di autorizzazione, pertanto Impostazioni non può verificare la tua risposta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se attivi <xliff:g id="SERVICE">%1$s</xliff:g>, il dispositivo non utilizzerà il blocco schermo per migliorare la crittografia dei dati."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Il dispositivo non utilizzerà il blocco schermo per migliorare la crittografia dei dati perché hai attivato un servizio di accessibilità."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"L\'attivazione di <xliff:g id="SERVICE">%1$s</xliff:g> incide sulla crittografia dei dati, pertanto devi confermare la sequenza."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiche sui processi"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiche tecniche sui processi in esecuzione"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memoria usata"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"App <xliff:g id="TYPE">%1$s</xliff:g> per <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> di <xliff:g id="TOTALRAM">%2$s</xliff:g> utilizzati in <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"In background"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"In primo piano"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Memorizzati nella cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Attuale memoria del dispositivo: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Utilizzo medio della RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Utilizzo massimo della RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Sistema operativo Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Nativo"</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">"Cache"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Utilizzo di RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Utilizzo di RAM (in background)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Run-time"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Processi"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servizi"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durata"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Dettagli memoria"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ore"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 giorno"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostra sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Nascondi sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utilizza Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo di statistiche"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"In background"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Le impostazioni predefinite sotto hanno la priorità su quelle delle applicazioni"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Impostazioni predefinite"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Motore predefinito"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Imposta il motore di sintesi vocale per l\'uso con testo parlato"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Imposta il motore di sintesi vocale da utilizzare per il testo pronunciato"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Velocità voce"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocità di pronuncia del testo"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tono"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Basato sull\'hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Le credenziali non sono disponibili per questo utente"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Per confermare l\'installazione delle credenziali devi inserire la sequenza di sblocco."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Backup dei miei dati"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Effettua il backup di dati delle app, password Wi-Fi e altre impostazioni sui server di Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Account di backup"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Al momento nessun account memorizza i dati di backup"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Includi dati app"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ripristino automatico"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In caso di reinstallazione di un\'applicazione, ripristina impostazioni e dati di backup"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Il servizio di backup non è attivo."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Viene impostato in base alla norma del dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Password di backup desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"I backup desktop completi non sono attualmente protetti."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocca per modificare o rimuovere la password per i backup desktop completi"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Scala animazione transizione"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scala durata animatore"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simula display secondari"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Modalità multi-finestra"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Diverse attività contemporaneamente sullo schermo."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Attivare la modalità multi-finestra?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"AVVISO. Si tratta di una funzione altamente sperimentale che consente di svolgere diverse attività contemporaneamente sullo schermo tramite l\'interfaccia utente Applicazioni recenti. Alcune app potrebbero arrestarsi in modo anomalo o non funzionare correttamente se utilizzate con questa funzione."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"App"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Non conservare attività"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Elimina ogni attività appena l\'utente la interrompe"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utente"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profilo con limitazioni"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Aggiungere un nuovo utente?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Puoi condividere il dispositivo con altre persone creando altri utenti. Ogni utente ha un proprio spazio personalizzabile con le app, gli sfondi e le altre opzioni che preferisce. Gli utenti possono anche regolare le impostazioni che riguardano tutti, come il Wi‑Fi.\n\nIl nuovo utente, una volta aggiunto, dovrà seguire una procedura di configurazione.\n\nQualsiasi utente può aggiornare le app per tutti gli altri utenti."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Puoi condividere il dispositivo con altre persone creando altri utenti. Ogni utente ha un proprio spazio personalizzabile con app, sfondi e così via. Gli utenti possono anche regolare le impostazioni del dispositivo che riguardano tutti, come il Wi‑Fi.\n\nIl nuovo utente, una volta aggiunto, dovrà configurare il suo spazio.\n\nQualsiasi utente può aggiornare le app per tutti gli altri utenti."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Il nuovo utente, una volta aggiunto, deve impostare il proprio spazio.\n\nQualsiasi utente può aggiornare le app per tutti gli altri."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurare l\'utente ora?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assicurati che la persona sia disponibile a prendere il dispositivo e configurare il suo spazio"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Rimuovere l\'ospite?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Tutte le app e i dati di questa sessione verranno eliminati."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Rimuovi"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Consenti telefonate"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Consenti telefonate e SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Attivazione delle chiamate"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Attivazione di chiamate e SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Rimuovi utente"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Consentire telefonate?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Desideri attivare le chiamate?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"La cronologia chiamate verrà condivisa con questo utente."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Consentire telefonate e SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"La cronologia chiamate e SMS verrà condivisa con questo utente."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Desideri attivare chiamate e SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"La cronologia chiamate e SMS verrà condivisa con questo utente."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Consenti app e contenuti"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applicazioni con limitazioni"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Espandi impostazioni per app"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"RINOMINA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Imposta restrizioni applicazioni"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controllate da <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Questa app non è supportata nei profili con limitazioni"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Questa app può accedere ai tuoi account"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Questa app è controllata da <xliff:g id="APP">%1$s</xliff:g> e può accedere ai tuoi account."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi e mobile"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Consenti la modifica di impostazioni Wi‑Fi e rete mobile"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi connessione rete Wi-Fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS invio di messaggi messaggi"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellulare cell operatore wireless dati 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi chiamata chiamare"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Avvio applicazioni"</string>
     <string name="keywords_display" msgid="6709007669501628320">"display touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"attenuazione schermo touchscreen batteria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"attenuazione schermo touchscreen batteria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"sfondo personalizzare personalizzazione display"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tema scuro modalità notturna oscurare schermo invertire luminosità"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"sfondo personalizzare personalizzazione display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"dimensioni testo"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"progetto"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"trasmissione progetto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"spazio disco disco rigido dispositivo utilizzo"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"alimentazione utilizzo ricarica"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografia dizionario correttore ortografico correzione automatica"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"limitazione limitare limitato"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correzione del testo correggere suono vibrazione lingua automatica gesto suggerire suggerimento tema digitazione parole offensive emoji internazionale"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"ripristino preferenze predefinite"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"app ice di emergenza predefinita"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"download app applicazioni sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"sicurezza delle autorizzazioni app"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"impostazioni predefinite per le app"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"scorrimento password sequenza pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifica"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume sveglia"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume suoneria"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume notifiche"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interruzioni"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Quando ricevo chiamate e notifiche"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Interrompi sempre"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Consenti solo interruzioni con priorità"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Non interrompere"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"La priorità consente solo"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regole automatiche"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Solo con priorità"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo sveglie"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Nessuna interruzione"</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="ringtone_title" msgid="5379026328015343686">"Suoneria telefono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Suoneria predefinita notifiche"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrazione anche per chiamate"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrazione"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Accesso alle notifiche"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Le app non possono leggere le notifiche"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"L\'app %d può leggere le notifiche"</item>
-    <item quantity="other" msgid="980049191810249052">"Le app %d possono leggere le notifiche"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">Le app %d possono leggere le notifiche</item>
+      <item quantity="one">L\'app %d può leggere le notifiche</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nessun listener di notifica installato."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Abilitare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> sarà in grado di leggere tutte le notifiche pubblicate dal sistema o da qualsiasi app installata, che potrebbero includere informazioni personali come i nomi dei contatti e il testo dei messaggi ricevuti. Sarà inoltre in grado di ignorare tali notifiche o di attivare pulsanti di azione al loro interno."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fornitori di condizioni"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nessuna app fornisce condizioni"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app fornisce condizioni"</item>
-    <item quantity="other" msgid="358057362115673258">"%d app forniscono condizioni"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nessun fornitore di condizioni installato."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Attivare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> potrà aggiungere condizioni di uscita alla modalità Non disturbare."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blocca"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blocca tutto"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Non mostrare mai notifiche di questa app"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Priorità"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Mostra le notifiche in cima all\'elenco e continua a riceverle quando il dispositivo è impostato su interruzioni con priorità"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Riservati"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Quando il dispositivo è bloccato, nascondi i contenuti riservati dalle notifiche dell\'app"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Considera prioritarie"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Attiva l\'audio delle notifiche dell\'app quando l\'opzione \"Non disturbare\" è impostata su \"Solo con priorità\""</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Consenti breve visualizzazione"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Consenti a questa app di mettere in evidenza determinate notifiche mostrandole brevemente nella schermata corrente tramite scorrimento"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Nascondi contenuti riservati"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Quando il dispositivo è bloccato, nascondi i contenuti delle notifiche dell\'app che potrebbero rivelare informazioni private"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloccate"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorità"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Riservate"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fine"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Fino alla disattivazione"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Interruzioni con priorità"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Tempo di inattività"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Giorni"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nessuno"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interruzioni consentite"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Solo con priorità"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nessuno"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automazione"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Attiva automaticamente"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nome regola"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Aggiungi regola"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Elimina regola"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Eliminare la regola \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Elimina"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo di regola"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Sconosciuto"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configura regola"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Regola di pianificazione"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regola non trovata."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Giorni"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nessuno"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Ogni giorno"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mai"</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">"Dal <xliff:g id="START">%1$s</xliff:g> al <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Chiamate"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messaggi"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Chiamate/messaggi da"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Chiunque"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Solo contatti"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Solo contatti Speciali"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Eventi e promemoria"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Le sveglie sono sempre interruzioni con priorità"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Sveglie"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Promemoria"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Eventi"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Chiamanti selezionati"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ripeti chiamanti"</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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Sere giorni feriali"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ora di inizio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ora di fine"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> giorno successivo"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> o qualsiasi sveglia precedente"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> giorno successivo o qualsiasi sveglia precedente"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> giorno successivo"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Interruzioni"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Quando ricevo chiamate e notifiche"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quando vuoi essere interrotto?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Per quanto tempo?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Interrompi sempre"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"disattivate,tutte,tutto"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Consenti solo interruzioni con priorità"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Consenti solo sveglie"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Non interrompere"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Sempre"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuti</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ore</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Cambia su Solo notifiche prioritarie sempre"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Cambia su Solo notifiche prioritarie per <xliff:g id="DURATION">%1$d</xliff:g> minuti (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Solo notifiche prioritarie per un minuto (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Cambia su Solo notifiche prioritarie per <xliff:g id="DURATION">%1$d</xliff:g> ore (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Solo notifiche prioritarie per un\'ora (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Cambia su Solo sveglie sempre"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Cambia su Solo sveglie per <xliff:g id="DURATION">%1$d</xliff:g> minuti (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Solo sveglie per un minuto (fino alle <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">Cambia su Solo sveglie per <xliff:g id="DURATION">%1$d</xliff:g> ore (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Solo sveglie per un\'ora (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Cambia su Non interrompere sempre"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Cambia su Non interrompere per <xliff:g id="DURATION">%1$d</xliff:g> minuti (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Non interrompere per un minuto (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Cambia su Non interrompere per <xliff:g id="DURATION">%1$d</xliff:g> ore (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Non interrompere per un\'ora (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambia su Interrompi sempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"per sempre"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifiche app"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Invia feedback sul dispositivo"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Dati IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Dati relativi all\'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="2184141780491382435">"Avvia per impostazione predefinita"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> in uso nella <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Link di dominio"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Apri gli URL di dominio"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Consenti all\'app di aprire direttamente gli URL di dominio"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL di dominio supportati"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Altri valori predefiniti"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> in uso nella <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"memoria interna"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"memoria esterna"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Memoria interna"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Memoria esterna"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Dati sull\'utilizzo dell\'app"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> utilizzati dal giorno <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Spazio di archiviazione utilizzato"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Attive"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloccate"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Riservate"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritarie"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritarie e riservate"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizzazioni concesse</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorizzazione concessa</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorizzazioni su <xliff:g id="COUNT_3">%d</xliff:g> concesse</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorizzazione su <xliff:g id="COUNT_1">%d</xliff:g> concessa</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Alcune applicazioni predefinite impostate"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Nessuna applicazione predefinita impostata"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Tutte le applicazioni"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Attive"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personali"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Lavoro"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloccate"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritarie"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Riservate"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL di dominio"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disattivato dall\'amministratore"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Avanzate"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Applicazione sconosciuta"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Scegli profilo"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Autorizzazioni app"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"A <xliff:g id="COUNT_0">%d</xliff:g> app su <xliff:g id="COUNT_1">%d</xliff:g> è stato autorizzato un ulteriore accesso"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Sono consentite <xliff:g id="COUNT_0">%d</xliff:g> app su <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL di dominio"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Non aprire gli URL di dominio"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Apri \"<xliff:g id="DOMAIN">%s</xliff:g>\""</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Apri \"<xliff:g id="DOMAIN">%s</xliff:g>\" e URL correlati"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> app possono aprire i relativi URL di dominio</item>
+      <item quantity="one">Un\'app può aprire i relativi URL di dominio</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Non riconosciuto"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"App predefinite"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"App Browser"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nessun browser predefinito"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predefinita)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Quota di archiviaz. per app"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index de3f45d..c1e67bc 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"לחצן דחיפה"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"השתק/בטל השתקה של המיקרופון"</item>
     <item msgid="1148142988678569310">"הקרן מדיה"</item>
     <item msgid="9130014005474445273">"‏הפעל VPN"</item>
+    <item msgid="1165192162975045562">"כתיבת טפט"</item>
+    <item msgid="7129487923652967258">"מבנה של מסייע"</item>
+    <item msgid="1069023208100114540">"צילום מסך של מסייע"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"מיקום"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"השתק/בטל השתקה של המיקרופון"</item>
     <item msgid="5906017727368097853">"הקרן מדיה"</item>
     <item msgid="2486614710846178542">"‏הפעל VPN"</item>
+    <item msgid="5586547561693629602">"כתיבת טפט"</item>
+    <item msgid="32794179825485062">"מבנה של מסייע"</item>
+    <item msgid="7872852746938272552">"צילום מסך של מסייע"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"קצר"</item>
@@ -345,7 +354,7 @@
     <item msgid="7247838127505318669">"‏Sans-serif עם רווח יחיד"</item>
     <item msgid="4478414822462359763">"Serif"</item>
     <item msgid="7502451783483660829">"‏Serif עם רווח יחיד"</item>
-    <item msgid="639503332147461010">"רגיל"</item>
+    <item msgid="639503332147461010">"Casual"</item>
     <item msgid="7967169925231332424">"כתב-יד"</item>
     <item msgid="561832997193039673">"רישיות קטנות"</item>
   </string-array>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"נמוך"</item>
     <item msgid="4212263919458209842">"קריטי"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"כבוי"</item>
-    <item msgid="5656544177755411222">"הפרעות מוגבלות"</item>
-    <item msgid="8735337502532332056">"אפס הפרעות"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"רגיל"</item>
     <item msgid="866544120205026771">"בינוני"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"ורוד"</item>
     <item msgid="6131821495505931173">"אדום"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"‏MTP (פרוטוקול העברת מדיה)"</item>
+    <item msgid="8856820259201251036">"‏PTP (פרוטוקול העברת תמונות)"</item>
+    <item msgid="216135047298423770">"‏RNDIS (אתרנט ב-USB)"</item>
+    <item msgid="2686051673589572111">"מקור אודיו"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1aa867a..2d67fad 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -22,10 +22,12 @@
     <string name="allow" msgid="3349662621170855910">"אפשר"</string>
     <string name="deny" msgid="6947806159746484865">"דחה"</string>
     <string name="device_info_default" msgid="7847265875578739287">"לא ידוע"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"אתה כעת במרחק של צעד <xliff:g id="STEP_COUNT">%1$d</xliff:g> מלהיות מפתח."</item>
-    <item quantity="other" msgid="6722953419953594148">"אתה כעת במרחק של <xliff:g id="STEP_COUNT">%1$d</xliff:g> צעדים מלהיות מפתח."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="two">אתה כעת במרחק של <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> צעדים מלהיות מפתח.</item>
+      <item quantity="many">אתה כעת במרחק של <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> צעדים מלהיות מפתח.</item>
+      <item quantity="other">אתה כעת במרחק של <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> צעדים מלהיות מפתח.</item>
+      <item quantity="one">אתה כעת במרחק של צעד <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> מלהיות מפתח.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"אתה כעת מפתח!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"אין צורך, אתה כבר מפתח."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"רשתות ותקשורת אלחוטית"</string>
@@ -40,6 +42,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"‏כבה SMS באמצעות IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"‏הפעל את הדרישה להרשמת IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"‏כבה את הדרישה להרשמת IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"‏הפעל את הסימון של ניהול תצורת VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"‏כבה את הסימון של ניהול תצורת VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"‏הפעל פעולת Dump של lte RAM"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"‏כבה פעולת Dump של lte RAM"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"‏הצג פנקס כתובות של SIM"</string>
@@ -135,16 +139,7 @@
     <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_connected" msgid="6038755206916626419">"מחובר"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"מחובר (ללא טלפון)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"מחובר (ללא מדיה)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"מחובר (אין גישה להודעות)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"מחובר (ללא טלפון או מדיה)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"מנותק"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"מתנתק..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"מתחבר ..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"מבצע התאמה..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"‏מכשיר Bluetooth ללא שם"</string>
     <string name="progress_scanning" msgid="192587958424295789">"מחפש"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"‏לא נמצאו מכשירי Bluetooth בקרבת מקום."</string>
@@ -154,7 +149,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"הצג קבצים שהתקבלו"</string>
     <string name="device_picker" msgid="4978696506172252813">"‏בחר מכשיר Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"‏בקשה להרשאת Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"‏אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"‏יש אפליקציה הרוצה להפעיל את ה-Bluetooth עבור המכשיר הזה."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"‏אפליקציה מסוימת רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"‏אפליקציה מסוימת רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"‏אפליקציה מסוימת רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth"</string>
@@ -275,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"‏כרטיס SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"‏הגדרות שרת Proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"ביטול"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"בטל"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"המשך"</string>
     <string name="okay" msgid="1997666393121016642">"אישור"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"כן"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"לא"</string>
-    <string name="forget" msgid="7267115980248732932">"שכח"</string>
+    <string name="forget" msgid="1400428660472591263">"שכח"</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>
@@ -325,9 +318,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"שיפור התאמת פנים"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"פנים אמיתיות"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"דרוש מצמוץ עיניים בעת ביטול נעילה"</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_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>
@@ -348,6 +338,32 @@
     <string name="security_settings_summary" msgid="967393342537986570">"‏הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"סיסמאות"</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="3453670509485083962">"הוסף"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"נעילת מסך"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"הגדרה של טביעת אצבע"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"כדי להשתמש בטביעת האצבע לביטול נעילת המסך או לאישור רכישות, יהיה עלינו: \n\n✓ להגדיר את השיטה של נעילת המסך המשמשת כגיבוי \n\n✓ להוסיף את טביעת האצבע שלך"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"אתר את החיישן"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"אתר את חיישן טביעת האצבע בגב הטלפון."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"אפשר להתחיל!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"הנח את אותה האצבע על חיישן טביעות האצבעות. הרם אותה לאחר שתחוש רטט."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"נהדר! כעת חזור על הפעולה."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"הנח את אותה האצבע על חיישן טביעות האצבעות והרם אותה לאחר שתחוש רטט."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"טביעת האצבע נוספה!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"כשתראה את הסמל הזה, תוכל להשתמש בטביעת האצבע שלך לצורך זיהוי או אישור רכישה."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"הוסף"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"הבא"</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>
@@ -360,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"חבר את המטען ונסה שוב."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"‏אין PIN או סיסמה לנעילת מסך"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"‏עליך להגדיר PIN או סיסמה לנעילת מסך כדי שתוכל להתחיל בהצפנה."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"עליך לצייר את קו ביטול הנעילה על מנת לאשר את הצפנת המכשיר."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"האם להצפין?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"פעולת ההצפנה אינה ניתנת לביטול, ואם תפסיק אותה תאבד נתונים. ההצפנה אורכת שעה לפחות, ובמהלך זמן זה הטאבלט יופעל מחדש כמה פעמים."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"פעולת ההצפנה אינה ניתנת לביטול, ואם תפסיק אותה תאבד נתונים. ההצפנה אורכת שעה לפחות, ובמהלך זמן זה הטלפון יופעל מחדש כמה פעמים."</string>
@@ -391,22 +406,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"זיהוי פנים"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"אבטחה נמוכה, ניסיוני"</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_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="current_screen_lock" msgid="4104091715420072219">"נעילת המסך הנוכחית"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"תכונות להגנת המכשיר יפסיקו לפעול."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"הושבת על ידי מדיניות ההצפנה של מנהל המערכת, או אחסון האישורים"</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_biometric_weak" msgid="3008473624490350142">"זיהוי פנים"</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_password" msgid="1203938057264146610">"סיסמה"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"לאחר הגדרה של נעילת מסך, תוכל גם להגדיר את טביעת האצבע ב\'הגדרות\' &gt; \'אבטחה\'."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"כיבוי נעילת מסך"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"הסר קו ביטול נעילה"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"‏הסר PIN של ביטול נעילה"</string>
@@ -427,30 +441,42 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"הסיסמה צריכה להכיל אות אחת לפחות."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"הסיסמה צריכה להכיל ספרה אחת לפחות."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"הסיסמה צריכה להכיל סמל אחד לפחות."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"הסיסמה צריכה להכיל אות אחת לפחות."</item>
-    <item quantity="other" msgid="8186027808415585970">"‏הסיסמה צריכה להכיל %d אותיות לפחות."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"הסיסמה צריכה להכיל אות קטנה אחת לפחות."</item>
-    <item quantity="other" msgid="2693910942679679225">"‏הסיסמה צריכה להכיל %d אותיות קטנות לפחות."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"הסיסמה צריכה להכיל אות גדולה אחת לפחות."</item>
-    <item quantity="other" msgid="3030801209112209245">"‏הסיסמה צריכה להכיל %d אותיות גדולות לפחות."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"הסיסמה צריכה להכיל ספרה אחת לפחות."</item>
-    <item quantity="other" msgid="4703982391407595924">"‏הסיסמה צריכה להכיל %d ספרות לפחות."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"הסיסמה צריכה להכיל סמל מיוחד אחד לפחות."</item>
-    <item quantity="other" msgid="1221290525051187757">"‏הסיסמה צריכה להכיל %d סמלים מיוחדים לפחות."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"הסיסמה צריכה להכיל תו אחד לפחות שאינו אות."</item>
-    <item quantity="other" msgid="3952508584649046404">"‏הסיסמה צריכה להכיל %d תווים לפחות שאינם אותיות."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="two">‏הסיסמה צריכה להכיל %d אותיות לפחות.</item>
+      <item quantity="many">‏הסיסמה צריכה להכיל %d אותיות לפחות.</item>
+      <item quantity="other">‏הסיסמה צריכה להכיל %d אותיות לפחות.</item>
+      <item quantity="one">הסיסמה צריכה להכיל אות אחת לפחות.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="two">‏הסיסמה צריכה להכיל %d אותיות קטנות לפחות.</item>
+      <item quantity="many">‏הסיסמה צריכה להכיל %d אותיות קטנות לפחות.</item>
+      <item quantity="other">‏הסיסמה צריכה להכיל %d אותיות קטנות לפחות.</item>
+      <item quantity="one">הסיסמה צריכה להכיל אות קטנה אחת לפחות.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="two">‏הסיסמה צריכה להכיל %d אותיות גדולות לפחות.</item>
+      <item quantity="many">‏הסיסמה צריכה להכיל %d אותיות גדולות לפחות.</item>
+      <item quantity="other">‏הסיסמה צריכה להכיל %d אותיות גדולות לפחות.</item>
+      <item quantity="one">הסיסמה צריכה להכיל אות גדולה אחת לפחות.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="two">‏הסיסמה צריכה להכיל %d ספרות לפחות.</item>
+      <item quantity="many">‏הסיסמה צריכה להכיל %d ספרות לפחות.</item>
+      <item quantity="other">‏הסיסמה צריכה להכיל %d ספרות לפחות.</item>
+      <item quantity="one">הסיסמה צריכה להכיל ספרה אחת לפחות.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="two">‏הסיסמה צריכה להכיל %d סמלים מיוחדים לפחות.</item>
+      <item quantity="many">‏הסיסמה צריכה להכיל %d סמלים מיוחדים לפחות.</item>
+      <item quantity="other">‏הסיסמה צריכה להכיל %d סמלים מיוחדים לפחות.</item>
+      <item quantity="one">הסיסמה צריכה להכיל סמל מיוחד אחד לפחות.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="two">‏הסיסמה צריכה להכיל %d תווים לפחות שאינם אותיות.</item>
+      <item quantity="many">‏הסיסמה צריכה להכיל %d תווים לפחות שאינם אותיות.</item>
+      <item quantity="other">‏הסיסמה צריכה להכיל %d תווים לפחות שאינם אותיות.</item>
+      <item quantity="one">הסיסמה צריכה להכיל תו אחד לפחות שאינו אות.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"מנהל המכשירים אינו מאפשר שימוש בסיסמה שנעשה בה שימוש לאחרונה."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"אין להגדיר רצף ספרות עולה, יורד או חוזר"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"אישור"</string>
@@ -480,15 +506,8 @@
     <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_accept" msgid="6163520056536604875">"התאם"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"התאם"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ביטול"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"לאחר החיבור, התאמה מספקת גישה לאנשי הקשר ולהיסטוריית השיחות שלך."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"לא ניתן לבצע התאמה עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"‏לא ניתן להתאים את <xliff:g id="DEVICE_NAME">%1$s</xliff:g> בשל קוד PIN או סיסמה שגויים."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"לא ניתן לתקשר עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ההתאמה נדחתה על ידי <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"לא הייתה אפשרות להתחבר אל <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>
@@ -515,16 +534,8 @@
     <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="3719383048635344071">"‏כדי לשפר את דיוק המיקום, אפליקציות ושירותים יחפשו מכשירי Bluetooth גם כאשר ה-Bluetooth כבוי. תוכל לשנות את ההגדרה הזו ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"התחבר אל…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"אודיו של מדיה"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"אודיו של טלפון"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"העברת קבצים"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"מכשיר קלט"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"גישה לאינטרנט"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"שיתוף אנשי קשר"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"השתמש עבור שיתוף אנשי קשר"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"שיתוף חיבור לאינטרנט"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"גישה להודעות"</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>
@@ -537,28 +548,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"מחובר לאודיו של מדיה"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"מחובר לאודיו של הטלפון"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"מחובר לשרת העברת קבצים"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"מחובר למפה"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"לא מחובר לשרת העברת קבצים"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"מחובר למכשיר קלט"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"השתמש עבור אודיו של מדיה"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"השתמש עבור האודיו של הטלפון"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"השתמש להעברת קבצים"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"השתמש לקלט"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"השתמש עבור גישה לאינטרנט"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"שימוש עבור מפה"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"‏מחובר באמצעות אסיסטנט ה-Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"‏מסך Cast"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"‏הפעל תצוגת WiFi"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"לא נמצאו מכשירים בקרבת מקום."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"מתחבר"</string>
@@ -570,6 +568,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +593,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"‏מכבה את ה-Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"שגיאה"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"במצב טיסה"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"לא ניתן לסרוק לאיתור רשתות"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"התראת רשת"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"הצג הודעה כאשר יש רשת ציבורית זמינה"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"הימנע מחיבורים באיכות ירודה"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"‏אל תשתמש ברשת Wi-Fi, אלא אם יש לה חיבור אינטרנט באיכות טובה"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"השתמש רק ברשתות בעלות חיבור אינטרנט איכותי"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"סריקה זמינה תמיד"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"התר סריקה תמיד"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"‏אפשר לשירות המיקום של Google ולאפליקציות אחרות לסרוק בחיפוש אחר רשתות, גם כש-Wi-Fi כבוי."</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"‏השתמש אוטומטית ב-Wi‑Fi פתוח"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"‏אפשר לאסיסטנט ה-Wi-Fi להתחבר אוטומטית לרשתות פתוחות שנקבע כי הן באיכות גבוהה"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"בחירת אסיסטנט"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"התקן אישורים"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"‏כדי לשפר את מידת הדיוק מבחינת מיקום ולהשגת יתרונות נוספים, אפליקציות של Google ואפליקציות נוספות עשויות לבצע סריקה לאיתור רשתות קרובות, גם כאשר ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"‏אפליקציות עשויים לבצע סריקה לאיתור רשתות קרובות, גם אם ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"‏כדי לשפר את דיוק המיקום, אפליקציות ושירותים יחפשו רשתות Wi‑Fi גם כאשר ה-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="5340097010842405981">"אל תציג שוב"</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>
@@ -635,11 +630,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"הוסף רשת אחרת"</string>
     <string name="wifi_more" msgid="3195296805089107950">"עוד"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"‏התקנה אוטומטית (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"‏כדי להשלים את ההגדרה, הטאבלט צריך גישה ל-Wi-Fi. לאחר ההגדרה, תוכל לעבור בין רשת סלולרית ובין Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"אפשרויות מתקדמות"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"‏מפעיל WPS..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"‏לחץ על הכפתור \'Wi‑Fi Protected Setup\' בנתב שלך. ייתכן שבמקום שם זה יופיע הכיתוב \"WPS\" או הסמל הזה:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"‏לחץ על הלחצן \'Wi‑Fi Protected Setup\' בנתב שלך. ייתכן שבמקום שם זה יופיע הכיתוב \"WPS\" או הסמל הזה:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"‏הזן את מספר ה-PIN ‏<xliff:g id="NUMBER">%1$s</xliff:g> בנתב ה-Wi-Fi שלך. השלמת ההגדרה עשויה להימשך עד שתי דקות."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"‏WPS הצליח. מתחבר לרשת..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"‏מחובר לרשת Wi-Fi ‏<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +659,15 @@
     <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="219415018348922629">"‏הגדרת פס AP"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ללא שינוי)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(לא צוין)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"נשמר"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"מושבת"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏כשל בתצורת IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏כשל בחיבור Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"בעיית אימות"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"מחוץ לטווח"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"אין גישה לאינטרנט. לא יתבצע חיבור מחדש באופן אוטומטי."</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_security_none" msgid="7985461072596594400">"ללא"</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>
@@ -686,6 +675,8 @@
     <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="1509171132175355674">"אין לרשת הזו חיבור לאינטרנט. האם להשתמש בה בכל זאת?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"אל תשאל שוב בשביל הרשת הזו"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"התחבר"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"נכשל הניסיון להתחבר לרשת"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"שכח"</string>
@@ -751,6 +742,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"‏נק\' שיתוף Wi-Fi ניידת AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"‏נקודה ניידת לשיתוף אינטרנט ב-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_mode_title" msgid="2164073796253284289">"העדפת התקשרות"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"‏מצב שיחות ב-Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"‏Wi-Fi מועדף"</item>
+    <item msgid="5267397515594230396">"סלולרי מועדף"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"‏כשהתקשרות Wi-Fi פועלת, הטלפון יכול לנתב שיחות ברשתות Wi-Fi או ברשת של הספק, בהתאם להעדפה שלך ולאות שחזק יותר. לפני הפעלת תכונה זו, בדוק עם הספק פרטים הקשורים לעמלות ופרטים אחרים."</string>
     <string name="home_settings" msgid="212375129455718176">"דף הבית"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
     <string name="sound_settings" msgid="5534671337768745343">"צלילים"</string>
@@ -814,6 +817,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"עיצוב"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"בהיר"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"כהה"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"באופן אוטומטי"</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>
@@ -865,10 +873,12 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"‏האם לעדכן כרטיס SIM מועדף?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"‏<xliff:g id="NEW_SIM">%1$s</xliff:g> הוא ה-SIM היחיד במכשיר שלך. האם ברצונך להשתמש בו עבור נתונים סלולריים, שיחות והודעות SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"‏מספר PIN שגוי של כרטיס ה-SIM. עליך ליצור כעת קשר עם הספק על מנת לבטל את נעילת המכשיר."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"‏מספר PIN שגוי של כרטיס ה-SIM. נותר לך ניסיון <xliff:g id="NUMBER">%d</xliff:g> נוסף לפני שיהיה עליך ליצור קשר עם הספק על מנת לבטל את נעילת המכשיר."</item>
-    <item quantity="other" msgid="77103619544346451">"‏מספר PIN שגוי של כרטיס ה-SIM. נותרו לך <xliff:g id="NUMBER">%d</xliff:g> ניסיונות נוספים."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="two">‏קוד PIN שגוי של כרטיס SIM. נותרו לך <xliff:g id="NUMBER_1">%d</xliff:g> ניסיונות.</item>
+      <item quantity="many">‏קוד PIN שגוי של כרטיס SIM. נותרו לך <xliff:g id="NUMBER_1">%d</xliff:g> ניסיונות.</item>
+      <item quantity="other">‏קוד PIN שגוי של כרטיס 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">"‏פעולת מספר ה-PIN של כרטיס ה-SIM נכשלה!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"סטטוס טאבלט"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"מצב טלפון"</string>
@@ -917,12 +927,12 @@
     <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="2348501997988663688">"אפליקציות (נתונים ותוכן מדיה)"</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_dcim_usage" msgid="558887013613822577">"תמונות, סרטוני וידאו"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"אודיו (מוזיקה, רינגטונים, פודקאסטים ועוד)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"שונות"</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="default" msgid="6915293408836853020">"‏בטל טעינה של כרטיס SD"</string>
@@ -955,6 +965,11 @@
     <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_mount" msgid="1014683672493425425">"טען"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"הוצא"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"מחק ופרמט"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"מחק ופרמט כאחסון פנימי"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"‏חיבור USB למחשב"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"‏חיבור USB למחשב"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"חבר בתור"</string>
@@ -962,8 +977,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"‏מאפשר העברת קובצי מדיה ב-Windows, או באמצעות העברת הקבצים של Android ב-Mac (ראה www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"‏מצלמה (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"‏מאפשר להעביר תמונות באמצעות תוכנת המצלמה, ולהעביר קבצים במחשבים שאינם תומכים ב-MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"התקן כלים להעברת קבצים"</string>
+    <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_external_title" msgid="2723851748972673696">"אחסון נשלף"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> פנוי (סה\"כ <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> נטען"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"לא ניתן לטעון את <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="4161722509712992231">"לא ניתן להוציא את <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="8343688274191391889">"לא ניתן לפרמט את <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"שינוי שם של אמצעי אחסון"</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="3677827796634199714"><b>"כשתוציא את <xliff:g id="NAME_0">^1</xliff:g>, האפליקציות המאוחסנות בו יפסיקו לפעול, וקובצי מדיה שמאוחסנים בו לא יהיו זמינים עד שתכניס אותו שוב."</b>" \n\nהפורמט של <xliff:g id="NAME_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_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_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="1259216693690378749">"אל תסיר את <xliff:g id="NAME">^1</xliff:g> בעת קביעת הפורמט."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"העברת נתונים לאחסון חדש"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"תוכל להעביר את התמונות, הקבצים ואת נתוני האפליקציות אל ה-<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="5035719146373359329"><b>"ההעברה אורכת כ-<xliff:g id="TIME">^1</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="8641916179067596592">"במהלך ההעברה: \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_move_confirm_title" msgid="292782012677890250">"העברת <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"העברת <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="4288580957960820740">"אל תסיר את ה-<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="battery_status_title" msgid="9159414319574976203">"מצב סוללה"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"טעינת סוללה:"</string>
     <string name="apn_settings" msgid="3743170484827528406">"‏פריטי APN"</string>
@@ -1007,10 +1062,15 @@
     <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_network_title" msgid="4557113742173895074">"איפוס של הגדרות הרשת"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"‏הפעולה הזו תאפס את כל הגדרות הרשת, כולל:\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="4874737348054213767">"לאפס את כל הגדרות הרשת? לא ניתן לבטל את הפעולה!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"אפס הגדרות"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"האם לאפס?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"הגדרות הרשת אופסו"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"אפס את המכשיר"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"איפוס נתוני יצרן"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"מוחק את כל הנתונים בטאבלט"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"מחק את כל הנתונים בטלפון"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"‏פעולה זו תמחק את כל הנתונים מ"<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>
@@ -1024,9 +1084,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏מחק את כל הנתונים שבכרטיס ה-SD, כגון מוזיקה או תמונות"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"איפוס טאבלט"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"איפוס טלפון"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"למחוק את כל המידע האישי שלך והאפליקציות שהורדת? לא ניתן לבטל את הפעולה!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"למחוק את כל המידע האישי שלך והאפליקציות שהורדת? לא ניתן לבטל את הפעולה!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"מחק הכל"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"עליך לשרטט את קו ביטול הנעילה כדי לאפשר איפוס נתוני יצרן."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"לא בוצע איפוס מכיוון שהשירות \'ניקוי מערכת\' אינו זמין."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"לאפס?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"איפוס להגדרות היצרן אינו זמין עבור המשתמש הזה"</string>
@@ -1043,8 +1102,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"‏למחוק את אחסון ה-USB, כולל כל הקבצים שמאוחסנים בו? לא ניתן לבטל פעולה זו!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"‏למחוק את כרטיס ה-SD ואת כל הקבצים המאוחסנים בו? לא ניתן לבטל פעולה זו!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"מחק הכל"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"‏עליך לשרטט את קו ביטול הנעילה כדי לאשר שברצונך למחוק את אחסון ה-USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"‏עליך לשרטט את קו ביטול הנעילה כדי לאשר שברצונך למחוק את כרטיס ה-SD."</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>
@@ -1076,7 +1133,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"עזרה"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"רשתות סלולריות"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"תכנית לנייד"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"‏אפליקציית 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>
@@ -1104,7 +1161,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"מצב מיקום"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏השתמש ב-GPS‏, Wi‑Fi ורשתות סלולריות לקביעת המיקום"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏השתמש ב-Wi-Fi ורשתות סלולריות לקביעת המיקום"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"‏השתמש ב-GPS לקביעת המיקום"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏השתמש ב-GPS לקביעת המיקום"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"סריקה"</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="2070686681074461301">"‏תוכל לשפר את דיוק המיקום על ידי כך שתאפשר לאפליקציות ולשירותים לחפש רשתות Wi‑Fi, אפילו כאשר ה-Wi‑Fi כבוי."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"‏סריקת Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"‏תוכל לשפר את דיוק המיקום על ידי כך שתאפשר לשירותי מערכת לחפש מכשירי Bluetooth גם כאשר ה-Bluetooth כבוי."</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏מיקום עם Wi‑Fi ורשת סלולרית"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏אפשר לאפליקציות להשתמש בשירות המיקום של Google כדי להעריך את מיקומך מהר יותר. נתוני מיקום אנונימיים ייאספו ויישלחו אל Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏המיקום נקבע באמצעות Wi-Fi"</string>
@@ -1150,11 +1213,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"אבטחת מסך"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"השתמש בקו ביטול הנעילה של המכשיר כדי להמשיך."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"‏הזן את מספר ה-PIN כדי להמשיך."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"הזן את סיסמת המכשיר כדי להמשיך."</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_need_to_unlock" msgid="757935356911054465">"אשר קו שנשמר"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"נסה שוב:"</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>
@@ -1176,8 +1243,7 @@
     <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_header" msgid="819903817323783498">"ניסיונות כושלים רבים מדי!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"נסה שוב בעוד <xliff:g id="NUMBER">%d</xliff:g> שניות."</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="manageapplications_settings_title" msgid="7041951105633616745">"נהל אפליקציות"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"נהל והסר אפליקציות מותקנות"</string>
@@ -1228,6 +1294,7 @@
     <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>
@@ -1299,6 +1366,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"שימוש בשטח אחסון"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"הצג את שטח האחסון שנמצא בשימוש על ידי אפליקציות"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"שירותים פועלים"</string>
@@ -1396,17 +1464,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"פרטי טאבלט"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"מידע על הטלפון"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"מידע על סוללה"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"הפעלה מהירה"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"הגדרת מקשי קיצור להפעלת אפליקציות"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"הקצאה לאפליקציה"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"אין קיצור דרך"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"חיפוש + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"נקה"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"קיצור הדרך של <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> ‏(<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) יוסר."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"אישור"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ביטול"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apps"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"קיצורי דרך"</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>
@@ -1441,23 +1498,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"‏אחד את כל חבילות Bluetooth HCI בקובץ"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"‏ביטול נעילה של OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"אפשר ביטול של נעילת מנהל האתחול"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"‏הזן את מספר ה-PIN שלך"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"‏הזן את מספר ה-PIN של המכשיר כדי להפעיל ביטול נעילה של OEM (יצרן ציוד מקורי)"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"‏האם לאפשר ביטול נעילה של OEM (יצרן ציוד מקורי)?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"אזהרה: תכונות הגנת מכשיר לא יפעלו במכשיר הזה כשההגדרה הזו פועלת."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"גדלי מאגר של יוצר יומן"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"בחר גדלים של יוצר יומן לכל מאגר יומן"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"אפשר מיקומים מדומים"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"אפשר מיקומים מדומים"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"אפשר בדיקת תכונת תצוגה"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"תקשורת רשתות"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"‏אישור של תצוגת WiFi"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏הפעל רישום מפורט של Wi‑Fi ביומן"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏העברה אגרסיבית מ-Wi‑Fi לרשת סלולרית"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"‏התר תמיד סריקות נדידה של Wi‑Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"‏השתמש בלקוח DHCP מדור קודם"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"‏הצג אפשרויות עבור אישור של תצוגת WiFi"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"‏העלה את רמת הרישום של Wi‑Fi ביומן, הצג לכל SSID RSSI ב-Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"‏כשתכונה זו מופעלת, Wi-Fi יתנהג בצורה אגרסיבית יותר בעת העברת חיבור הנתונים לרשת הסלולרית כשאות ה-Wi-Fi חלש."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"‏התר/מנע סריקות נדידה של Wi-Fi בהתבסס על נפח תנועת הנתונים הקיימת בממשק"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"גדלי מאגר של יוצר יומן"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"בחר גדלים של יוצר יומן לכל מאגר יומן"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"‏בחר תצורת USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"‏בחר תצורת USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"אפשר מיקומים מדומים"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"אפשר מיקומים מדומים"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"אפשר בדיקת תכונת תצוגה"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"‏השתמש בלקוח DHCP של Lollipop במקום לקוח DHCP החדש של Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏לאפשר ניקוי באגים של USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"‏ניקוי באגים באמצעות USB מיועד למטרות פיתוח בלבד. השתמש בו להעתקת נתונים בין המחשב והמכשיר שלך, להתקנת אפליקציות במכשיר ללא התראה ולקריאת נתוני יומן."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"‏האם לבטל את הגישה לניקוי באגים ב-USB מכל המחשבים שהענקת להם בעבר הרשאה?"</string>
@@ -1561,6 +1626,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"מגנטה"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"האם להשתמש ב<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> צריך:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"יש אפליקציה שמסתירה את בקשת ההרשאה, ולכן להגדרות אין אפשרות לאמת את התשובה."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"אם תפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>, המכשיר לא ישתמש בנעילת המסך כדי להגביר את הצפנת הנתונים."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"מפני שהפעלת שירות נגישות, המכשיר לא ישתמש בנעילת המסך כדי להגביר את הצפנת הנתונים."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את תבנית ביטול הנעילה שלך."</string>
@@ -1702,14 +1768,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> אפליקציות במשך <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"נעשה שימוש ב-<xliff:g id="USEDRAM">%1$s</xliff:g> מתוך <xliff:g id="TOTALRAM">%2$s</xliff:g> במשך <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</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_memory_status" msgid="4251599550196193093">"זיכרון המכשיר כעת הוא <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"‏שימוש ממוצע ב-RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"‏שימוש מרבי ב-RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"‏מערכת ההפעלה של Android"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"תהליכים"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"שירותים"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"משך זמן"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"פרטי זיכרון"</string>
@@ -1726,6 +1798,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 שעות"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"יום אחד"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"הצג מערכת"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"הסתר מערכת"</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>
@@ -1748,7 +1821,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"הגדרות ברירת המחדל שלמטה עוקפות את הגדרות האפליקציות"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"הגדרות ברירת מחדל"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"מנוע ברירת המחדל"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"מגדיר את מנוע סינתזת הדיבור לשימוש עבור טקסט מדובר"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"הגדר את מנוע סינתזת הדיבור שישמש עבור קריאת טקסט"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"קצב דיבור"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"מהירות שבה הטקסט נאמר"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"גובה צליל"</string>
@@ -1822,7 +1895,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"עליך לשרטט את קו ביטול הנעילה כדי לאשר התקנת הסמכות."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"הקלד את הסיסמה עבור אחסון אישורים."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"הסיסמה הנוכחית:"</string>
@@ -1847,12 +1919,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"אף חשבון אינו מאחסן כרגע נתונים מגובים"</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="5355557151569037197">"שירות הגיבוי אינו פעיל."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"העדפה זו מוגדרת על ידי מדיניות המכשיר."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"סיסמת גיבוי מקומי"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"גיבויים מלאים בשולחן העבודה אינם מוגנים כעת"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"גע כדי לשנות או להסיר את הסיסמה עבור גיבויים מלאים בשולחן העבודה"</string>
@@ -2024,6 +2094,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"קנה מידה של הנפשת מעבר"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"קנה מידת משך זמן למנפיש"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"צור הדמיית תצוגות משניות"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"מצב ריבוי חלונות"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"ריבוי פעילויות בו-זמניות במסך."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"האם להפעיל מצב של ריבוי חלונות?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"אזהרה: זוהי תכונה ניסיונית מאוד המאפשרת הצגה בו-זמנית של מספר פעילויות במסך באמצעות ממשק המשתמש של האפליקציות האחרונות. אפליקציות מסוימות עשויות לקרוס או לפעול באופן לא תקין כשייעשה בהן שימוש באמצעות התכונה הזו."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"אל תשמור פעילויות"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"השמד כל פעילות ברגע שהמשתמש עוזב אותה"</string>
@@ -2195,7 +2269,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="718192651887726259">"‏תוכל לשתף מכשיר זה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו, שהוא יכול להתאים אישית בעזרת אפליקציות, טפט ופריטים נוספים משלו. המשתמשים יכולים גם להתאים הגדרות של המכשיר כגון 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>
@@ -2226,13 +2300,13 @@
     <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="8310589470979488255">"התר שיחות טלפון"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"‏התר שיחות טלפון ו-SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"הפעל שיחות טלפון"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"‏הפעל שיחות טלפון ו-SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"הסרת משתמש"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"האם להתיר שיחות טלפון?"</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_sms_confirm_title" msgid="188164598768941316">"‏האם להתיר שיחות טלפון ו-SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"‏היסטוריית השיחות וה-SMS תשותף עם משתמש זה."</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="application_restrictions" msgid="8207332020898004394">"אפשר אפליקציות ותוכן"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"אפליקציות והגבלות"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"הרחב את ההגדרות עבור האפליקציה"</string>
@@ -2283,8 +2357,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"אפליקציה זו אינה נתמכת בפרופילים מוגבלים"</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>
@@ -2349,13 +2423,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi wi-fi חיבור רשת"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"הודעת טקסט שליחת הודעות טקסט הודעות העברת הודעות"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏סלולרי תא ספק אלחוטי נתונים 4 g ‏3g ‏2g ‏lte "</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"‏wifi wi-fi שיחה התקשרות"</string>
     <string name="keywords_home" msgid="3626170808219458848">"מפעיל האפליקציות"</string>
     <string name="keywords_display" msgid="6709007669501628320">"מסך מגע"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"מסך עמום סוללה מסך מגע"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"מסך עמום סוללה מסך מגע"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"התאם אישית רקע התאמה אישית תצוגה"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"עיצוב כהה, מצב לילה, עמעם מסך, הפוך בהירות"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"התאם אישית רקע ותצוגה"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"גודל טקסט"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"הקרן"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"הקרן העברה"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"שטח דיסק כונן קשיח מכשיר שימוש"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"חיוב על שימוש באספקת מתח"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"איות מילון בדיקת איות תיקון אוטומטי"</string>
@@ -2372,6 +2448,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"חשבון"</string>
     <string name="keywords_users" msgid="4673901601478559100">"הגבלה הגבל מוגבל"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"תיקון טקסט תקן צליל רטט אוטומטי שפה תנועה הצע הצעה עיצוב מילה פוגענית הקלד אמוג\'י בינלאומי"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"איפוס לברירת המחדל של העדפות"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"‏ברירת המחדל של אפליקציית חירום ICE"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"מערכת לבקשה של הורדת אפליקציות"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"אבטחה של הרשאות לאפליקציות"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ברירת מחדל לאפליקציות"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"‏החלקה סיסמה קו ביטול נעילה מספר PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏הגדר תג NFC של Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"כתוב"</string>
@@ -2386,11 +2467,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"הפרעות"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"כשנכנסות שיחות והודעות"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"התר תמיד הפרעות"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"התר רק הפרעות בעדיפות גבוהה"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"אל תתיר הפרעות"</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_option_important_interruptions" msgid="3903928008177972500">"רק הודעות בעדיפות"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"רק התראות"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ללא הפרעות"</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="ringtone_title" msgid="5379026328015343686">"רינגטון של טלפון"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"רינגטון להודעות המוגדר כברירת מחדל"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"הפעל גם רטט עבור שיחות"</string>
@@ -2416,62 +2498,133 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"רטט"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"גישה אל הודעות"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"אפליקציות לא יכולות לקרוא התראות"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"‏אפליקציה %d יכולה לקרוא התראות"</item>
-    <item quantity="other" msgid="980049191810249052">"‏%d אפליקציות יכולות לקרוא התראות"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="two">‏%d אפליקציות יכולות לקרוא הודעות</item>
+      <item quantity="many">‏%d אפליקציות יכולות לקרוא הודעות</item>
+      <item quantity="other">‏%d אפליקציות יכולות לקרוא הודעות</item>
+      <item quantity="one">‏אפליקציה %d יכולה לקרוא הודעות</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"לא מותקנים מאזינים להתראות."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"האם להפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> יוכל לקרוא את כל ההתראות שפורסמו על ידי המערכת או על ידי אפליקציה מותקנת כלשהי, והדבר עשוי לכלול מידע אישי כמו שמות אנשי קשר ואת הטקסט בהודעות שנשלחו אליך. הוא יוכל גם לסגור את ההתראות האלה או להשתמש בלחצני פעולה בתוכן."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"ספקי תנאים"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"אין אפליקציות המספקות תנאים"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"‏אפליקציה %d מספקת תנאים"</item>
-    <item quantity="other" msgid="358057362115673258">"‏%d אפליקציות מספקות תנאים"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"לא מותקנים ספקי תנאים."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"האם להפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> יוכל להוסיף תנאי יציאה למצב \'נא לא להפריע\'."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"חסום"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"חסום הכל"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"לעולם אל תציג הודעות מהאפליקציה הזו"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"עדיפות"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"הצג הודעות בחלק העליון של הרשימה והמשך לרענן אותן רק כאשר המכשיר מוגדר להצגת הפרעות בעדיפות גבוהה"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"רגיש"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"כאשר המכשיר נעול, הסתר תכנים רגישים מההודעות של אפליקציה זו"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"טפל כהודעה בעדיפות"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"התר השמעת צליל של הודעות מהאפליקציה הזו כשמצב \'נא לא להפריע\' מוגדר כ\'עדיפות בלבד\'"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"התר הצצה"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"התר לאפליקציה הזו להדגיש הודעות מסוימות על ידי הצגה שלהם לזמן קצר במסך הנוכחי"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"הסתר תוכן רגיש"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"כשהמכשיר נעול, הסתר תוכן בהודעות מהאפליקציה הזו אם הוא עשוי לחשוף מידע אישי"</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="zen_mode_default_option" msgid="6940069025071935243">"עד שתכבה"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"הפרעות בעדיפות גבוהה"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"זמן השבתה"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ימים"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ללא"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"הפרעות מותרות"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"עדיפות בלבד"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ללא"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"אוטומציה"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"הפעל אוטומטית"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"שם הכלל"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"הוסף כלל"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"מחק כלל"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"האם למחוק את הכלל \"<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="3201273040477861538">"כלל לוח זמנים"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"הכלל לא נמצא."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"אף פעם"</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_from" msgid="1033337300289871697">"שיחות/הודעות מאת"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"כל אחד"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"אנשי קשר בלבד"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"רק אנשי קשר המסומנים בכוכב"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"אירועים ותזכורות"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"התראות הן תמיד הפרעות בעדיפות גבוהה"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"התראות"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"תזכורות"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"אירועים"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"מתקשרים נבחרים"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"מתקשרים חוזרים"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"אם אותו אדם מתקשר בפעם השנייה בפרק זמן של <xliff:g id="MINUTES">%d</xliff:g> דקות, אפשר זאת"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"הפעל אוטומטית"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"אף פעם"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> למחרת"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> או במועד מוקדם יותר שבו הוגדרה התראה"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"הפרעות"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"כשנכנסות שיחות והודעות"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"מתי תרצה לאפשר הפרעות?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"למשך כמה זמן?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"הפרעות בכל מצב"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"כבוי,הכול,כל דבר"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"רק הפרעות בעדיפות גבוהה"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"התר התראות בלבד"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"ללא הפרעות"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"ללא הגבלה"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> דקות</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> דקות</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> דקות</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> דקה</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"שנה ל\'רק הודעות בעדיפות גבוהה\' ללא הגבלה"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="two">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="two">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">שנה ל‘רק הודעות בעדיפות גבוהה‘ למשך <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"שנה ל\'רק התראות\' ללא הגבלה"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="two">שנה ל‘רק התראות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">שנה ל‘רק התראות‘ למשך <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="two">שנה ל‘רק התראות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">שנה ל‘רק התראות‘ למשך <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"שנה ל\'ללא הפרעות\' ללא הגבלה"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="two">שנה ל‘אל תתיר הפרעות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> דקות (עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">שנה ל‘אל תתיר הפרעות‘ למשך <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="two">שנה ל‘אל תתיר הפרעות‘ למשך <xliff:g id="DURATION">%1$d</xliff:g> שעות, עד <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">שנה ל‘אל תתיר הפרעות‘ למשך <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"שנה ל\'הפרעות בכל מצב\'"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ללא הפסקה"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"הודעות אפליקציה"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
     <string name="device_feedback" msgid="3238056036766293294">"שלח משוב על המכשיר הזה"</string>
@@ -2512,4 +2665,69 @@
     <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="2184141780491382435">"הפעל כברירת מחדל"</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="app_launch_domain_links_title" msgid="458956710410857777">"קישורים לדומיין"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"פתיחת כתובות אתרים של הדומיין"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"התר לאפליקציה לפתוח ישירות את כתובות האתרים של הדומיין"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"כתובות אתרים של דומיינים נתמכים"</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="410824961149037234">"זיכרון הפנימי"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"זיכרון החיצוני"</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="storage_used" msgid="7128074132917008743">"שטח אחסון מנוצל"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"מופעל"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"חסום"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"הודעות רגישות"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"הודעות בעדיפות"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"הודעות בעדיפות והודעות רגישות"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="two">הוענקו <xliff:g id="COUNT_1">%d</xliff:g> הרשאות</item>
+      <item quantity="many">הוענקו <xliff:g id="COUNT_1">%d</xliff:g> הרשאות</item>
+      <item quantity="other">הוענקו <xliff:g id="COUNT_1">%d</xliff:g> הרשאות</item>
+      <item quantity="one">הוענקה הרשאה <xliff:g id="COUNT_0">%d</xliff:g></item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="two">הוענקו <xliff:g id="COUNT_2">%d</xliff:g> הרשאות מתוך <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many">הוענקו <xliff:g id="COUNT_2">%d</xliff:g> הרשאות מתוך <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">הוענקו <xliff:g id="COUNT_2">%d</xliff:g> הרשאות מתוך <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one">הוענקה הרשאה <xliff:g id="COUNT_0">%d</xliff:g> מתוך <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"הוגדרו כמה ברירת מחדל"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"לא הוגדרו ברירות מחדל"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"כל האפליקציות"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"מופעלות"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"אישיות"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"עבודה"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"חסומות"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"בעדיפות"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"רגישות"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"עם כתובות אתרים של דומיינים"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"הושבת על ידי מנהל המערכת"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"מתקדם"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"אפליקציה לא מוכרת"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"בחר פרופיל"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"הרשאות לאפליקציות"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> מתוך <xliff:g id="COUNT_1">%d</xliff:g> אפליקציות קיבלו גישה נוספת"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> מתוך <xliff:g id="COUNT_1">%d</xliff:g> אפליקציות קיבלו הרשאה"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"כתובות אתרים של דומיינים"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"לא פותחת כתובות אתרים של דומיינים"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"פותחת את \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"פותחת את \'<xliff:g id="DOMAIN">%s</xliff:g>\' וכתובות אתרים קשורות"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="two"><xliff:g id="COUNT">%d</xliff:g> אפליקציות יכולות לפתוח את כתובות האתרים של הדומיין שלהן</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> אפליקציות יכולות לפתוח את כתובות האתרים של הדומיין שלהן</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> אפליקציות יכולות לפתוח את כתובות האתרים של הדומיין שלהן</item>
+      <item quantity="one">אפליקציה אחת יכולה לפתוח את כתובות האתרים של הדומיין שלה</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"לא זוהתה"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"אפליקציות בברירת מחדל"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"אפליקציית דפדפן"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"אין דפדפן בברירת מחדל"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ברירת מחדל)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"אחסון אפליקציות"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index cac7959..6943599 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ボタンを押す"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"マイクをミュート/ミュート解除"</item>
     <item msgid="1148142988678569310">"メディアプロジェクション"</item>
     <item msgid="9130014005474445273">"VPNの有効化"</item>
+    <item msgid="1165192162975045562">"壁紙の書き込み"</item>
+    <item msgid="7129487923652967258">"ストラクチャのアシスト"</item>
+    <item msgid="1069023208100114540">"スクリーンショットのアシスト"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置情報"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"マイクをミュート/ミュート解除"</item>
     <item msgid="5906017727368097853">"メディアプロジェクション"</item>
     <item msgid="2486614710846178542">"VPNの有効化"</item>
+    <item msgid="5586547561693629602">"壁紙の書き込み"</item>
+    <item msgid="32794179825485062">"ストラクチャのアシスト"</item>
+    <item msgid="7872852746938272552">"スクリーンショットのアシスト"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短め"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"かなり不足"</item>
     <item msgid="4212263919458209842">"残りわずか"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"OFF"</item>
-    <item msgid="5656544177755411222">"制限付き割り込み"</item>
-    <item msgid="8735337502532332056">"割り込みなし"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"標準"</item>
     <item msgid="866544120205026771">"やや不足"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"ピンク"</item>
     <item msgid="6131821495505931173">"レッド"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP（Media Transfer Protocol）"</item>
+    <item msgid="8856820259201251036">"PTP（Picture Transfer Protocol）"</item>
+    <item msgid="216135047298423770">"RNDIS（USB Ethernet）"</item>
+    <item msgid="2686051673589572111">"オーディオソース"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6139aa4..383b04e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"許可"</string>
     <string name="deny" msgid="6947806159746484865">"許可しない"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"デベロッパーになるまであと<xliff:g id="STEP_COUNT">%1$d</xliff:g>ステップです。"</item>
-    <item quantity="other" msgid="6722953419953594148">"デベロッパーになるまであと<xliff:g id="STEP_COUNT">%1$d</xliff:g>ステップです。"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">デベロッパーになるまであと<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>ステップです。</item>
+      <item quantity="one">デベロッパーになるまであと<xliff:g id="STEP_COUNT_0">%1$d</xliff:g>ステップです。</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"これでデベロッパーになりました！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"必要ありません。既にデベロッパーです。"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"無線とネットワーク"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"SMS over IMSをOFFにする"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS登録をONにする必要があります"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS登録をOFFにする必要があります"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTEプロビジョンフラグをONにする"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTEプロビジョンフラグをOFFにする"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"LTE RAMダンプをオンにする"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"LTE RAMダンプをオフにする"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIMのアドレス帳を表示"</string>
@@ -137,16 +139,7 @@
     <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_connected" msgid="6038755206916626419">"接続"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"接続済み（電話を除く）"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"接続済み（メディアを除く）"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"接続済み（メッセージへのアクセスなし）"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"接続済み（電話/メディアを除く）"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"切断"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"切断中..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"接続中..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"ペアとして設定中..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"名前のないBluetoothデバイス"</string>
     <string name="progress_scanning" msgid="192587958424295789">"検索中"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"周辺にBluetoothデバイスが見つかりません"</string>
@@ -156,7 +149,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"受信済みファイルを表示"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetoothデバイスの選択"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth許可リクエスト"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"アプリがBluetoothをONにしようとしています。"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"この端末でアプリを使用するにはBluetoothをONにする必要があります。"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスにこのタブレットを表示しようとしています。"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスにこの携帯端末を表示しようとしています。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"アプリが他のBluetoothデバイスにこのタブレットを表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
@@ -277,12 +270,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"キャンセル"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"続行"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"はい"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"いいえ"</string>
-    <string name="forget" msgid="7267115980248732932">"切断"</string>
+    <string name="forget" msgid="1400428660472591263">"切断"</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>
@@ -327,9 +318,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"顔認識の精度を改善"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"生体検知"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"ロックを解除するにはまばたきが必要"</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_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>
@@ -350,6 +338,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"パスワード"</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="3453670509485083962">"追加"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"画面ロック"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"指紋の設定"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"画面ロックの解除や購入の確認に指紋を使うには、次の手順を行う必要があります。\n\n✓ 予備の画面ロック方式を設定 \n\n✓ 指紋を追加"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"センサーを探す"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"端末の背面にある指紋センサーを探します。"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名前"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"削除"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"登録の開始"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"指を指紋センサーに当て、振動したら指を離してください。"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"OK。繰り返してください"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"同じ指を指紋センサーに当て、振動したら指を離してください。"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指紋を追加しました。"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"このアイコンが表示されているときは、本人確認や購入の承認に指紋を使用できます。"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"追加"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"次へ"</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>
@@ -362,7 +374,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"電源に接続してもう一度お試しください。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"画面ロックのPIN/パスワードがありません"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"暗号化を開始するには、画面ロックのPINまたはパスワードを設定する必要があります。"</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"端末を暗号化するには、ロック解除パターンを入力する必要があります。"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"暗号化しますか？"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"この暗号化操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中でタブレットが何度か再起動されます。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"この暗号化操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中で端末が何度か再起動されます。"</string>
@@ -393,22 +404,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"フェイスアンロック"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"低レベルのセキュリティ、試験的"</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_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="current_screen_lock" msgid="4104091715420072219">"現在の画面ロック"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"端末保護機能は利用できなくなります。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"管理者、暗号化ポリシー、または認証情報により無効"</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_biometric_weak" msgid="3008473624490350142">"フェイスアンロック"</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_password" msgid="1203938057264146610">"パスワード"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"画面ロックの設定を完了したら、[設定]&gt;[セキュリティ]で指紋を追加することもできます。"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"画面ロックをOFFにする"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ロック解除パターンを削除"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"ロック解除PINを削除"</string>
@@ -429,30 +439,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"パスワードには英字が1文字以上必要です。"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"パスワードには数字が1つ以上必要です。"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"パスワードには記号が1つ以上必要です。"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"パスワードには英字が1文字以上必要です。"</item>
-    <item quantity="other" msgid="8186027808415585970">"パスワードには英字が%d文字以上必要です。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"パスワードには小文字の英字が1文字以上必要です。"</item>
-    <item quantity="other" msgid="2693910942679679225">"パスワードには小文字の英字が%d文字以上必要です。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"パスワードには大文字の英字が1文字以上必要です。"</item>
-    <item quantity="other" msgid="3030801209112209245">"パスワードには大文字の英字が%d文字以上必要です。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"パスワードには数字が1つ以上必要です。"</item>
-    <item quantity="other" msgid="4703982391407595924">"パスワードには数字が%d個以上必要です。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"パスワードには記号が1つ以上必要です。"</item>
-    <item quantity="other" msgid="1221290525051187757">"パスワードには記号が%d個以上必要です。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"パスワードには記号または数字が1つ以上必要です。"</item>
-    <item quantity="other" msgid="3952508584649046404">"パスワードには記号または数字が%d個以上必要です。"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">パスワードには英字が%d文字以上必要です。</item>
+      <item quantity="one">パスワードには英字が1文字以上必要です。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">パスワードには小文字の英字が%d文字以上必要です。</item>
+      <item quantity="one">パスワードには小文字の英字が1文字以上必要です。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">パスワードには大文字の英字が%d文字以上必要です。</item>
+      <item quantity="one">パスワードには大文字の英字が1文字以上必要です。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">パスワードには数字が%d個以上必要です。</item>
+      <item quantity="one">パスワードには数字が1つ以上必要です。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">パスワードには記号が%d個以上必要です。</item>
+      <item quantity="one">パスワードには記号が1つ以上必要です。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">パスワードには記号または数字が%d個以上必要です。</item>
+      <item quantity="one">パスワードには記号または数字が1つ以上必要です。</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"最近使用したパスワードは使用できません。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"一連の数字を昇順や降順にしたり、繰り返したりすることはできません"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -461,8 +471,8 @@
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"次へ"</string>
     <string name="lock_setup" msgid="3355847066343753943">"設定が完了しました。"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"デバイス管理"</string>
-    <string name="manage_device_admin" msgid="5059296715271077278">"端末管理者"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"端末管理者を表示または無効にする"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"端末管理アプリ"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"端末管理アプリを表示または無効にする"</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="6804319935640148441">"信頼できるエージェントを表示または無効にする"</string>
@@ -482,15 +492,8 @@
     <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_accept" msgid="6163520056536604875">"ペア設定する"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ペア設定する"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"キャンセル"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"ペア設定により、接続時に連絡先や通話履歴へのアクセスが許可されます。"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>をペアに設定できません。"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PINまたはパスキーが正しくないため、<xliff:g id="DEVICE_NAME">%1$s</xliff:g>をペアに設定できませんでした。"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>と通信できません。"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ペア設定が<xliff:g id="DEVICE_NAME">%1$s</xliff:g>に拒否されました。"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -517,16 +520,8 @@
     <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="3719383048635344071">"位置情報の精度を向上させるため、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_specific_profiles_title" msgid="6952214406025825164">"接続先..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"メディアの音声"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"電話の音声"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ファイル転送"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"入力デバイス"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"インターネットアクセス"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"連絡先の共有"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"連絡先の共有に使用"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"インターネット接続の共有"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"メッセージへのアクセス"</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>
@@ -539,28 +534,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"メディアの音声に接続"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"携帯電話の音声に接続"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ファイル転送サーバーに接続"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"地図に接続済み"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ファイル転送サーバーに接続しない"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"入力デバイスに接続されています"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"メディアの音声に使用"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"携帯電話の音声に使用"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ファイル転送に使用"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"入力に使用"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"インターネットアクセスに使用する"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"地図に使用"</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_assistant_title" msgid="2553267316621598101">"Wi-Fiアシスタント"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fiアシスタント経由で接続"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"画面のキャスト"</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>
@@ -572,6 +554,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -595,21 +579,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-FiをOFFにしています…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"エラー"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"機内モード"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ネットワークをスキャンできません"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ネットワークの通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"公衆通信回線が利用可能なときは通知する"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"接続不良のとき無効にする"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"安定したインターネット接続があるときのみWi-Fiネットワークを使用する"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"インターネット接続が安定したネットワークのみ使用する"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"スキャンを常に実行する"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"スキャンを常に許可する"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-FiがOFFになっていても、Googleの位置情報サービスと他のアプリでネットワークをスキャンする"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"オープンWi-Fiを自動的に使用"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fiアシスタントを使って高品質のオープンネットワークを自動的に判断して接続する"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"アシスタントの選択"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"証明書のインストール"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"位置情報の精度を向上させるため、Wi-FiがOFFの場合でもGoogleやその他のアプリは近くのネットワークをスキャンすることができます。このスキャンが必要ない場合は、[詳細設定] &gt; [スキャンを常に実行する]にアクセスします。"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-FiがOFFの場合でもアプリは近くのネットワークをスキャンできます。このスキャンが必要ない場合は、[詳細設定] &gt; [スキャンを常に実行する]にアクセスします。"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"位置情報の精度を向上させるため、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_remember_choice" msgid="5340097010842405981">"次回から表示しない"</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>
@@ -637,11 +616,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"別のネットワークを追加"</string>
     <string name="wifi_more" msgid="3195296805089107950">"その他"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定（WPS）"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"セットアップを完了するには、タブレットでWi-Fiに接続する必要があります。セットアップ後にモバイルデータ通信とWi-Fiを切り替えられます。"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"詳細設定項目"</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="5940801028985255304">"ルーターのWi-Fi保護設定ボタンを押します。「WPS」と表記されている場合や、次のような記号が表示されている場合もあります:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"ルーターのWi-Fi保護設定ボタンを押します。「WPS」と表記されている場合や、次のような記号が表示されている場合もあります:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Wi-FiルーターでPIN「<xliff:g id="NUMBER">%1$s</xliff:g>」を入力します。セットアップの完了まで最大2分ほどかかることがあります。"</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>
@@ -667,20 +645,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名ID"</string>
     <string name="wifi_password" msgid="5948219759936151048">"パスワード"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"パスワードを表示する"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"AP帯域幅を設定"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP設定"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"（変更なし）"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"（指定なし）"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"保存済み"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"無効"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP設定エラー"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi接続エラー"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"認証に問題"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"圏外"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"インターネットアクセスを検出できないため、自動的に再接続されません。"</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_security_none" msgid="7985461072596594400">"なし"</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>
@@ -688,6 +661,8 @@
     <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="1509171132175355674">"このネットワークはインターネットに接続していません。このネットワークを使用しますか？"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"このネットワークについて次回から表示しない"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"接続"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ネットワークに接続できませんでした"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"切断"</string>
@@ -753,6 +728,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSKポータブルWi‑Fiアクセスポイント"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>ポータブルWi-Fiアクセスポイント"</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_mode_title" msgid="2164073796253284289">"発信の設定"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi通話モード"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi優先"</item>
+    <item msgid="5267397515594230396">"モバイル優先"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi発信をONにすると、ユーザーの設定と信号の強度に応じて、スマートフォンからWi-Fiネットワークか携帯通信会社ネットワークのいずれかを経由して通話をルーティングできるようになります。この機能をONにする場合は、事前に料金などの条件について携帯通信会社にご確認ください。"</string>
     <string name="home_settings" msgid="212375129455718176">"ホーム"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音"</string>
@@ -816,6 +803,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"テーマ"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"ライト"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"ダーク"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"自動"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"スリープ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"画面がOFFになったとき"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
@@ -867,10 +859,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"優先SIMカードを更新しますか？"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"端末内のSIMは<xliff:g id="NEW_SIM">%1$s</xliff:g>のみです。このSIMをモバイルデータ、通話、SMSメッセージ用に使用しますか？"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PINコードが無効です。お使いの端末をロック解除するには携帯通信会社にお問い合わせいただく必要があります。"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM PINコードが無効です。入力できるのはあと<xliff:g id="NUMBER">%d</xliff:g>回です。この回数を超えると、お使いの端末をロック解除するのに携帯通信会社にお問い合わせいただく必要があります。"</item>
-    <item quantity="other" msgid="77103619544346451">"SIM PINコードが無効です。入力できるのはあと<xliff:g id="NUMBER">%d</xliff:g>回です。"</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM PINコードが無効です。入力できるのはあと<xliff:g id="NUMBER_1">%d</xliff:g>回です。</item>
+      <item quantity="one">SIM PINコードが無効です。入力できるのはあと<xliff:g id="NUMBER_0">%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>
@@ -919,12 +911,12 @@
     <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="2348501997988663688">"アプリ（データとコンテンツ）"</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_dcim_usage" msgid="558887013613822577">"画像、動画"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"音声（音楽、着信音、ポッドキャストなど）"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"その他"</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="default" msgid="6915293408836853020">"SDカードのマウント解除"</string>
@@ -957,6 +949,11 @@
     <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_mount" msgid="1014683672493425425">"マウント"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"取り出し"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"消去してフォーマット"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"消去して内部ストレージとしてフォーマット"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USBでパソコンに接続"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USBでパソコンに接続"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"次で接続:"</string>
@@ -964,8 +961,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Windowsから、またはMacでAndroid File Transfer（www.android.com/filetransfer）を使用してメディアファイルを転送できます"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"カメラ（PTP）"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"カメラソフトやMTP非対応パソコンからファイルを転送できるようにします"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ファイル転送ツールをインストール"</string>
+    <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_external_title" msgid="2723851748972673696">"リムーバブルストレージ"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"空き容量<xliff:g id="FREE">%1$s</xliff:g>（総容量<xliff:g id="TOTAL">%2$s</xliff:g>）"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g>をマウントしました"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>をフォーマットできませんでした"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ストレージの名前の変更"</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="3677827796634199714"><b>"この<xliff:g id="NAME_0">^1</xliff:g>を取り外すと、もう一度挿入するまでは保存されているアプリやメディアファイルを使用できなくなります。"</b>\n\n"この<xliff:g id="NAME_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_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_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="1259216693690378749">"フォーマット中は<xliff:g id="NAME">^1</xliff:g>を取り外さないでください。"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"データを新しいストレージに移動"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"写真、ファイル、アプリデータをこの新しい<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="5035719146373359329"><b>"移動にはおよそ<xliff:g id="TIME">^1</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="8641916179067596592">"移動中は:\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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>を移動"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"移動中は<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="battery_status_title" msgid="9159414319574976203">"電池の状態:"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電池残量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1009,10 +1046,15 @@
     <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_network_title" msgid="4557113742173895074">"ネットワーク設定のリセット"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"ネットワーク設定をすべてリセットします。以下の設定が含まれます。\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="4874737348054213767">"すべてのネットワーク設定をリセットしますか？この操作は元に戻せません。"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"設定をリセット"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"リセットしますか？"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"ネットワーク設定をリセットしました"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"端末をリセット"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"データの初期化"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"タブレット内のすべてのデータを消去する"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"携帯端末内のすべてのデータを消去する"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"この操作を行うと、タブレットの以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"この操作を行うと、携帯端末の以下のデータを含む"<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>
@@ -1026,9 +1068,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SDカード内の全データ（音楽、画像など）を消去します"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"タブレットをリセット"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"携帯端末をリセット"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"個人情報とダウンロードしたアプリをすべて削除しますか？この操作を元に戻すことはできません。"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"個人情報とダウンロードしたアプリをすべて削除しますか？この操作は元に戻せません。"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"すべて消去"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"データの初期化を確定するにはロック解除パターンを入力する必要があります。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"System Clearサービスが利用できないため、リセットされませんでした。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"リセットしますか？"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"このユーザーは出荷時設定へのリセットを許可されていません"</string>
@@ -1045,8 +1086,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USBストレージ内のデータを消去して、保存されているすべてのファイルを削除しますか？この操作は元に戻せません。"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SDカード内のデータを消去して、保存されているすべてのファイルを削除しますか？この操作は元に戻せません。"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"すべて消去"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USBストレージ内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SDカード内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</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>
@@ -1078,7 +1117,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ヘルプ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"モバイルネットワーク"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"モバイルプラン"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"デフォルトの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>
@@ -1090,8 +1129,8 @@
     <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_category" msgid="6992546457880004735">"ワークプロフィール"</string>
-    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ワークプロフィールの場所"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"仕事用プロファイル"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"仕事用プロファイルの場所"</string>
     <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"会社がOFFに設定しています"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"モード"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精度"</string>
@@ -1106,7 +1145,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置情報モード"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS、Wi‑Fi、モバイルネットワークで現在地を特定する"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wi‑Fiとモバイルネットワークで現在地を特定する"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPSで現在地を特定する"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPSで現在地を特定する"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"スキャン"</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="2070686681074461301">"Wi-FiがOFFの場合でもアプリやサービスにWi‑Fiネットワークのスキャンを許可することで、位置情報を向上させます"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetoothのスキャン"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"BluetoothがOFFの場合でもシステムサービスにBluetoothデバイスのスキャンを許可することで、位置情報を向上させます"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi/モバイル接続時の位置情報"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Googleの位置情報サービスで現在地をすばやく推定することをアプリに許可します。匿名の現在地データが収集され、Googleに送信されます。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fiで検出される現在地"</string>
@@ -1152,11 +1197,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"画面のセキュリティ"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"続行するには端末のパターンを使用してください。"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"続行するには端末のPINを入力してください。"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"続行するには端末のパスワードを入力してください。"</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_need_to_unlock" msgid="757935356911054465">"現在のパターンを入力"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"もう一度お試しください:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ロック解除パターンを入力"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"MENUキーでヘルプ表示"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"描き終わりの点で指を離します"</string>
@@ -1178,8 +1227,7 @@
     <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_header" msgid="819903817323783498">"誤った回数が多すぎます。"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g>秒後にやり直してください。"</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="manageapplications_settings_title" msgid="7041951105633616745">"アプリを管理"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"インストール済みアプリを管理、削除する"</string>
@@ -1230,6 +1278,7 @@
     <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>
@@ -1261,8 +1310,8 @@
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"このAndroidシステムアプリへのすべてのアップデートはアンインストールされます。"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"データのクリア"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"アプリのデータを消去できませんでした。"</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" 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>
@@ -1301,6 +1350,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"ストレージ使用状況"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"アプリのストレージ使用状況を表示する"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"実行中のサービス"</string>
@@ -1398,17 +1448,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"タブレット情報"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"携帯電話情報"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"電池情報"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"クイック起動"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"アプリの起動にショートカットキーを割り当てる"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"アプリを選択"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"ショートカットなし"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Search+<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"消去"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) のショートカットをクリアします。"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"キャンセル"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"アプリ"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"ショートカット"</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>
@@ -1443,23 +1482,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bluetooth HCIパケットをすべてファイルにキャプチャする"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEMロック解除"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ブートローダーによるロック解除を許可する"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PINを入力してください"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEMロック解除を有効にするには端末のPINを入力してください"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEMロック解除の許可"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告: この設定をONにしている場合、この端末では端末保護機能を利用できません。"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ログバッファのサイズ"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"各ログバッファのログサイズを選択"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"擬似ロケーションを許可"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"擬似ロケーションを許可する"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"表示属性検査を有効にする"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ネットワーク"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ワイヤレスディスプレイ認証"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi詳細ログの有効化"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fiを強制的にモバイル接続に切り替える"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fiローミングスキャンを常に許可する"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"従来のDHCPクライアントを使用する"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ワイヤレスディスプレイ認証のオプションを表示"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi-Fiログレベルを上げて、Wi-Fi選択ツールでSSID RSSIごとに表示します"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"有効にすると、Wi-Fiの電波強度が弱い場合は強制的にモバイルデータ接続に切り替わるようになります"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"インターフェースのデータトラフィック量に基づいたWi-Fiローミングスキャンを許可するかしないかを設定できます"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"ログバッファのサイズ"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"各ログバッファのログサイズを選択"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB設定の選択"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB設定の選択"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"擬似ロケーションを許可"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"擬似ロケーションを許可する"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"表示属性検査を有効にする"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"新しいAndroid DHCPクライアントの代わりにLollipopのDHCPクライアントを使用します。"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USBデバッグを許可しますか？"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USBデバッグは開発専用に設計されています。パソコンと端末の間でデータをコピーする場合や、アプリを通知なしで端末にインストールする場合、ログデータを読み取る場合に使用できます。"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"以前に許可したすべてのパソコンからのUSBデバッグへのアクセスを取り消しますか？"</string>
@@ -1563,6 +1610,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"マゼンタ"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>を利用しますか？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>では以下が必要:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"アプリが許可リクエストを隠しているため、設定側でユーザーの応答を確認できません。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにすると、端末データの暗号化の強化に画面ロックは使用されなくなります。"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"ユーザー補助サービスがONに設定されているため、端末データの暗号化の強化に画面ロックは使用されません。"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにするとデータの暗号化に影響するため、パターンの確認が必要となります。"</string>
@@ -1704,14 +1752,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g>アプリ（<xliff:g id="TIME">%2$s</xliff:g>）"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g>/<xliff:g id="TOTALRAM">%2$s</xliff:g>（<xliff:g id="TIMEDURATION">%3$s</xliff:g>）"</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_memory_status" msgid="4251599550196193093">"現在の端末メモリの状態は「<xliff:g id="MEMSTATE">%1$s</xliff:g>」です"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"平均RAM使用量"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"最大RAM使用量"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"プロセス"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"サービス"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"期間"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"メモリ情報"</string>
@@ -1728,6 +1782,7 @@
     <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_hide_system" msgid="4106826741703745733">"システムを表示しない"</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>
@@ -1750,7 +1805,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"アプリの設定を以下のデフォルト設定でオーバーライドする"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"デフォルト設定"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"デフォルトのエンジン"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"テキスト読み上げに使用する音声合成エンジンを設定する"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"テキスト読み上げに使用する音声合成エンジンを設定"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"音声の速度"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"テキストの読み上げ速度"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音の高さ"</string>
@@ -1828,7 +1883,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"認証情報をインストールするには、ロック解除パターンを入力する必要があります。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"認証情報ストレージのパスワードを入力してください。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"現在のパスワード:"</string>
@@ -1853,12 +1907,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"バックアップデータを保存しているアカウントはありません"</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="5355557151569037197">"バックアップサービスは無効"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"これは端末ポリシーで設定されています。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"PCバックアップパスワード"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"デスクトップのフルバックアップは現在保護されていません"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"デスクトップのフルバックアップ用のパスワードを変更または削除する場合にタップします"</string>
@@ -1872,7 +1924,7 @@
     <string name="remove_device_admin" msgid="3596845261596451437">"無効にする"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"デバイス管理者"</string>
     <string name="no_device_admins" msgid="702695100241728775">"有効なデバイス管理者がいません"</string>
-    <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"ワークプロフィールへの<xliff:g id="APP_NAME">%1$s</xliff:g>のアクセスを停止するには、[設定] &gt; [アカウント]でプロフィールを削除します"</string>
+    <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"仕事用プロファイルへの<xliff:g id="APP_NAME">%1$s</xliff:g>のアクセスを停止するには、[設定] &gt; [アカウント]でプロファイルを削除します"</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>
@@ -1925,8 +1977,8 @@
     <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="3489771164851107822">"ワークプロフィールがまだ利用できません"</string>
-    <string name="remove_managed_profile_label" msgid="3856519337797285325">"ワークプロフィールを削除"</string>
+    <string name="managed_profile_not_available_label" msgid="3489771164851107822">"仕事用プロファイルがまだ利用できません"</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>
@@ -2030,6 +2082,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"トランジションアニメスケール"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator再生時間スケール"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"2次画面シミュレート"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"マルチウィンドウモード"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"同時に画面上にある複数のアクティビティ。"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"マルチウィンドウモードを有効にしますか？"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"警告: これは、[最近使ったアプリ]を通して画面上で同時に複数のアクティビティを許可する非常に試験運用的な機能です。一部のアプリはこの機能で使用するとクラッシュしたり正常に動作しなくなったりする可能性があります。"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"アプリ"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"アクティビティを保持しない"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ユーザーが離れたアクティビティを直ちに破棄する"</string>
@@ -2191,7 +2247,7 @@
     <string name="user_set_lock_button" msgid="8311219392856626841">"ロックを設定"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"セットアップしていません"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"セットアップしていません - 制限付きプロフィール"</string>
-    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"セットアップしていません - ワークプロフィール"</string>
+    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"セットアップしていません - 仕事用プロファイル"</string>
     <string name="user_owner" msgid="3879126011135546571">"所有者"</string>
     <string name="user_you" msgid="1639158809315025986">"自分（<xliff:g id="NAME">%s</xliff:g>）"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ニックネーム"</string>
@@ -2201,7 +2257,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="718192651887726259">"追加ユーザーを作成して、この端末を他のユーザーと共有できます。各ユーザーは各自のスペースを所有でき、アプリや壁紙などを使用してカスタマイズできます。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>
@@ -2218,7 +2274,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="8167855311779740207">"このタブレットのスペースとデータが失われます。この操作は元に戻せません。"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"この携帯端末のスペースとデータが失われます。この操作は元に戻せません。"</string>
     <string name="user_confirm_remove_message" msgid="1020629390993095037">"すべてのアプリとデータが削除されます。"</string>
@@ -2232,13 +2288,13 @@
     <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="8310589470979488255">"通話を許可"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"通話とSMSを許可"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"通話をON"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"通話とSMSをON"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"ユーザーの削除"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"通話を許可しますか？"</string>
-    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"通話履歴がこのユーザーと共有されます。"</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"通話とSMSを許可しますか？"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"通話とSMSの履歴がこのユーザーと共有されます。"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"通話をONにしますか？"</string>
+    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"発信履歴がこのユーザーと共有されます。"</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"通話とSMSをONにしますか？"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話とSMSの履歴がこのユーザーと共有されます。"</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>
@@ -2289,8 +2345,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"このアプリは制限付きプロフィールではサポートされていません"</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>
@@ -2355,13 +2411,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ネットワーク 接続"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"テキスト メッセージ テキスト送信 メッセージ SMS"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"モバイル 携帯 携帯通信会社 無線 データ 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi 通話 発信"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ランチャー"</string>
     <string name="keywords_display" msgid="6709007669501628320">"画面 タッチスクリーン"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"暗くする 画面 タッチスクリーン 電池"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"暗くする 画面 タッチスクリーン 電池"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 パーソナライズ カスタマイズ 表示"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ダーク テーマ 夜間 モード 暗くする 画面 反転 明るさ"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"背景 パーソナライズ カスタマイズ 表示"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字 サイズ"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"プロジェクト"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"プロジェクトのキャスト"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"容量 ディスク ハード ドライブ 端末 使用量"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"電源 使用量 充電"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"スペル 辞書 スペルチェック 自動修正"</string>
@@ -2378,6 +2436,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"アカウント"</string>
     <string name="keywords_users" msgid="4673901601478559100">"制限 制限する 制限された"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"テキスト 補正 修正 音 バイブレーション 自動 言語 ジェスチャー 候補 テーマ 不適切 語 入力 絵文字 国際"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"リセット 設定 既定"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"既定の緊急連絡用アプリ"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"アプリ ダウンロード アプリ システム"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"アプリ 権限 セキュリティ"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"アプリ 既定"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"スライド パスワード パターン pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFCタグのセットアップ"</string>
     <string name="write_tag" msgid="8571858602896222537">"書き込む"</string>
@@ -2392,11 +2455,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"割り込み"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"通話の着信時と通知の受信時"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"常に割り込み"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"優先的な割り込みのみ許可"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"割り込みなし"</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_option_important_interruptions" msgid="3903928008177972500">"重要な通知のみ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"アラームのみ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"サイレント"</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="ringtone_title" msgid="5379026328015343686">"着信音"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"デフォルトの通知音"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"着信時もバイブレーションON"</string>
@@ -2422,62 +2486,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"バイブレーション"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"通知へのアクセス"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"アプリは通知を読み取ることができません"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d個のアプリが通知を読み取ることができます"</item>
-    <item quantity="other" msgid="980049191810249052">"%d個のアプリが通知を読み取ることができます"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d個のアプリが通知を読み取れます</item>
+      <item quantity="one">%d個のアプリが通知を読み取れます</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"通知リスナーはインストールされていません。"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g>を有効にしますか？"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>はシステムやインストール済みのアプリが投稿した通知をすべて読み取ることができます。通知には、連絡先名などの個人情報やユーザーに送信されたメールの本文が含まれる場合があります。また、これらの通知を非表示にしたり、通知内の操作ボタンをタップしたりすることもできます。"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"コンディションプロバイダ"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"条件を指定しているアプリはありません"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d個のアプリが条件を指定しています"</item>
-    <item quantity="other" msgid="358057362115673258">"%d個のアプリが条件を指定しています"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"コンディションプロバイダはインストールされていません。"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g>を有効にしますか？"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>では出口条件を[通知を非表示]モードに追加できます。"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"アプリを読み込んでいます..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"ブロック"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"すべてブロック"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"このアプリからの通知を表示しない"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"優先度"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"通知をリストの先頭に表示し、端末が優先的な割り込みのみ許可に設定されていても表示する"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"プライベート"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"端末がロックされている場合、このアプリの通知のプライベートな内容を表示しない"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"優先度"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"[通知を非表示]が[重要な通知のみ]に設定されている場合でも、このアプリの通知を鳴らす"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"強調を許可"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"現在の画面で通知をビューにスライドすると、このアプリで特定の通知が強調される"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"プライベートな内容を非表示"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"端末がロックされている場合、プライベートな情報を公開する可能性があるコンテンツをこのアプリの通知に表示しない"</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="zen_mode_default_option" msgid="6940069025071935243">"ユーザーがOFFにするまで"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"優先的な割り込み"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ダウンタイム"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"日数"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"なし"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"中断を許可"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"重要な通知のみ"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"なし"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"自動化"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動的にON"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"ルール名"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"ルールを追加"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ルールを削除"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"「<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="3201273040477861538">"スケジュールのルール"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"ルールが見つかりません。"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">"、 "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"なし"</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_from" msgid="1033337300289871697">"発信/送信元"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"全員"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"連絡先のみ"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"スター付きの連絡先のみ"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"予定とリマインダー"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"アラームは常に優先的な割り込みとなります"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"アラーム"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"リマインダー"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"イベント"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"選択した発信者"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"同一発信者による再発信"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"同じ人が<xliff:g id="MINUTES">%d</xliff:g>分以内に再度発信することを許可する"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自動的にON"</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_priority_next_day_summary_format" msgid="2910982148167785730">"翌日の<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>またはアラームが鳴るまで"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"翌日の<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_interruptions_voice_title" msgid="855256211259132964">"割り込み"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"通話の着信時と通知の受信時"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"どのようなときに割り込みますか？"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"期間を指定してください"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"常に割り込み"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"オフ、すべて、全部"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"優先的な割り込みのみ許可"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"アラームのみを許可"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"割り込みなし"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"期限なし"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>分</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>分</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"期限なしで、重要な通知のみに変更します"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで<xliff:g id="DURATION">%1$d</xliff:g>分間、重要な通知のみに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1分間、重要な通知のみに変更します</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">（<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで）<xliff:g id="DURATION">%1$d</xliff:g>時間、重要な通知のみに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1時間、重要な通知のみに変更します</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"期限なしで、アラームのみに変更します"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">（<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで）<xliff:g id="DURATION">%1$d</xliff:g>分間、アラームのみに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1分間、アラームのみに変更します</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで<xliff:g id="DURATION">%1$d</xliff:g>時間、アラームのみに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1時間、アラームのみに変更します</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"期限なしで、割り込みなしに変更します"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">（<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで）<xliff:g id="DURATION">%1$d</xliff:g>分間、割り込みなしに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1分間、割り込みなしに変更します</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>まで<xliff:g id="DURATION">%1$d</xliff:g>時間、割り込みなしに変更します</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>まで1時間、割り込みなしに変更します</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"常に割り込みに変更します"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ずっと"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"アプリの通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"この端末についてフィードバックを送信"</string>
@@ -2490,7 +2607,7 @@
     <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="managed_user_title" msgid="8101244883654409696">"ワークプロフィール"</string>
+    <string name="managed_user_title" msgid="8101244883654409696">"仕事用プロファイル"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"（試験運用）"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"端末が回転したとき"</string>
     <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"画面のコンテンツを回転させる"</string>
@@ -2518,4 +2635,63 @@
     <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="2184141780491382435">"既定で起動"</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="app_launch_domain_links_title" msgid="458956710410857777">"ドメインのリンク"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"ドメインURLを開く"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"ドメインURLを直接開くことをアプリに許可する"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"サポートされているドメインURL"</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="410824961149037234">"内部メモリ"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"外部メモリ"</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="storage_used" msgid="7128074132917008743">"使用されているストレージ"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"ON"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"ブロック"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"プライベート"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"重要"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"重要とプライベート"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>件の権限を付与</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>件の権限を付与</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g>/<xliff:g id="COUNT_3">%d</xliff:g>件の権限を付与</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>件の権限を付与</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"一部既定を設定"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"既定の設定なし"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"すべてのアプリ"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"有効"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"個人用"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"仕事用"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ブロック中"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"重要"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"プライベート"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ドメインURLあり"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"管理者によって無効にされています"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"詳細設定"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"不明なアプリ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"プロフィールの選択"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"アプリの権限"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>個のアプリに追加アクセスを許可"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>個のアプリを許可"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"ドメインURL"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"ドメインURLを開かない"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"「<xliff:g id="DOMAIN">%s</xliff:g>」を開く"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"「<xliff:g id="DOMAIN">%s</xliff:g>」と関連URLを開く"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>個のアプリがドメインURLを開くことができます</item>
+      <item quantity="one">1つのアプリがドメインURLを開くことができます</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"認識されませんでした"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"既定のアプリ"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ブラウザアプリ"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"既定のブラウザなし"</string>
+    <string name="default_app" msgid="6864503001385843060">"（既定）"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"アプリのストレージ"</string>
 </resources>
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml
index 1a4f75f..46cdc9f 100644
--- a/res/values-ka-rGE/arrays.xml
+++ b/res/values-ka-rGE/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push ღილაკი"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"მიკროფონის დადუმება/გააქტიურება"</item>
     <item msgid="1148142988678569310">"მედიის პროეცირება"</item>
     <item msgid="9130014005474445273">"VPN-ის აქტივაცია"</item>
+    <item msgid="1165192162975045562">"ფონის ჩაწერა"</item>
+    <item msgid="7129487923652967258">"დახმარების სტრუქტურა"</item>
+    <item msgid="1069023208100114540">"დახმარების ეკრანის ანაბეჭდი"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"მდებარეობა"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"მიკროფონის დადუმება/გააქტიურება"</item>
     <item msgid="5906017727368097853">"მედიის პროეცირება"</item>
     <item msgid="2486614710846178542">"VPN-ის აქტივაცია"</item>
+    <item msgid="5586547561693629602">"ფონის ჩაწერა"</item>
+    <item msgid="32794179825485062">"დახმარების სტრუქტურა"</item>
+    <item msgid="7872852746938272552">"დახმარების ეკრანის ანაბეჭდი"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"მოკლე"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"დაბალი"</item>
     <item msgid="4212263919458209842">"კრიტიკული"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"გამორთული"</item>
-    <item msgid="5656544177755411222">"შეზღუდული შეწყვეტები"</item>
-    <item msgid="8735337502532332056">"შეწყვეტების გარეშე"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ჩვეულებრივი"</item>
     <item msgid="866544120205026771">"ზომიერი"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"ვარდისფერი"</item>
     <item msgid="6131821495505931173">"წითელი"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"აუდიო წყარო"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 4b1c2ffc..8f5a985 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"ნების დართვა"</string>
     <string name="deny" msgid="6947806159746484865">"უარყოფა"</string>
     <string name="device_info_default" msgid="7847265875578739287">"უცნობი"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"დეველოპერობამდე <xliff:g id="STEP_COUNT">%1$d</xliff:g> ნაბიჯი დაგრჩათ."</item>
-    <item quantity="other" msgid="6722953419953594148">"დეველოპერობამდე რამდენიმე ნაბიჯი დაგრჩათ <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">დეველოპერობამდე <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ნაბიჯი დაგრჩათ.</item>
+      <item quantity="one">დეველოპერობამდე <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ნაბიჯი დაგრჩათ.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ახლა დეველოპერი ხართ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"არ არის საჭირო, თქვენ უკვე დეველოპერი ხართ."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"უსადენო კავშირი და ქსელები"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"SMS-ის გამორთვა IMS-ის საშუალებით"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"აუცილებელი IMS რეგისტრაციის ჩართვა"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"აუცილებელი IMS რეგისტრაციის გამორთვა"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE მოწოდების დროშის ჩართვა"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE მოწოდების დროშის გამორთვა"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ოპერატიული მეხსიერების დამპირების ჩართვა"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"გამორთე lte ოპერატიული მეხსიერების დამპირება"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM მისამართების წიგნის დათვალიერება"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"შეერთებულია"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"დაკავშირებულია (ტელეფონის გარდა)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"მიერთებულია (მედიის გარდა)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"დაკავშირებულია (შეტყობინებაზე წვდომა არ არის)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"დაკავშირება (გარდა ტელეფონისა და მედიისა)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"კავშირი გაწყვეტილია"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"მიმდინარეობს გათიშვა…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"მიმდინარეობს დაკავშირება…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"დაწყვილება…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"უსახელო Bluetooth მოწყობილობა"</string>
     <string name="progress_scanning" msgid="192587958424295789">"მიმდინარეობს ძიება"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ახლომახლო Bluetooth მოწყობილობების მოძიება ვერ მოხერხდა."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"მიღებული ფაილების ნახვა"</string>
     <string name="device_picker" msgid="4978696506172252813">"აირჩიეთ Bluetooth მოწყობილობა"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-ის ჩართვის ნებართვის მოთხოვნა"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"აპლიკაციას სურს Bluetooth-ის ჩართვა."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"აპს სურს ამ მოწყობილობაზე Bluetooth-ის ჩართვა."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"აპს სურს, გახადოს თქვენი ტაბლეტი ხილვადი სხვა Bluetooth მოწყობილობებისთვის <xliff:g id="TIMEOUT">%1$d</xliff:g> წამით."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"აპს სურს, გახადოს თქვენი ტელეფონი ხილვადი სხვა Bluetooth მოწყობილობებისთვის <xliff:g id="TIMEOUT">%1$d</xliff:g> წამით."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"აპს სურს, გახადოს თქვენი ტაბლეტი შესამჩნევი სხვა Bluetooth მოწყობილობებისთვის. ამის შეცვლა შეგიძლიათ მოგვიანებით Bluetooth პარამეტრებში."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"გაუქმება"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"გაგრძელება"</string>
     <string name="okay" msgid="1997666393121016642">"კარგი"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"დიახ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"არა"</string>
-    <string name="forget" msgid="7267115980248732932">"დავიწყება"</string>
+    <string name="forget" msgid="1400428660472591263">"დავიწყება"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"სახეების შესატყვისობის გაუმჯობესება"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"შემოწმება, რომ განბლოკვისთვის არ იყენებენ სურათს"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"განბლოკვისას თვალის დახამხამების მოთხოვნა"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"„ჩემი მდებარეობის“ პარამეტრების დაყენება, ეკრანის განბლოკვა და SIM ბარათის დაბლოკვა, ავტორიზაციის მონაცემების საცავის დაბლოკვა"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"დააყენე ჩემი მდებარეობის, ეკრანის განბლოკვისა და ავტორიზაციის მონაცემთა საცავის პარამეტრები"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"პაროლები"</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="3453670509485083962">"დამატება"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ეკრანის დაბლოკვა"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"თითის ანაბეჭდის დაყენება"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"ეკრანის განბლოკვის ან შესყიდვის დადასტურებისათვის თითის ანაბეჭდის გამოსაყენებლად, ჩვენ დაგვჭირდება: \n\n✓ თქვენი სარეზერვო ეკრანის დაბლოკვის მეთოდის დაყენება \n\n✓ თქვენი თითის ანაბეჭდის დამატება"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"სენსორის პოვნა"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"იპოვეთ თქვენი ტელეფონის უკანა ნაწილზე მდებარე თითის ანაბეჭდების სენსორი."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"დავიწყოთ!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"განათავსეთ თქვენი თითის ანაბეჭდი სენსორზე. ვიბრაციის შემდეგ აიღეთ თითი."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"მშვენიერია! ახლა გაიმეორეთ."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"განათავსეთ თქვენი იგივე თითის ანაბეჭდი სენსორზე. ვიბრაციის შემდეგ აიღეთ თითი."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ანაბეჭდი დამატებულია!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"როდესად ამ ხატულას დაინახავთ, იდენტიფიცირების ან თქვენი შესყიდვის ავტორიზებისათვის შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"დამატება"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"შემდეგი"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"შეაერთეთ დამტენი და სცადეთ ხელახლა."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ეკრანის დაბლოკვის PIN კოდი ან პაროლი არ არის დაყენებული"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"დაშიფვრის დაწყებამდე უნდა დააყენოთ ეკრანის ჩაკეტვის PIN-კოდი ან პაროლი."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"თქვენი მოწყობილობის დაშიფვრის დასადასტურებლად უნდა დახაზოთ თქვენი განბლოკვის ნიმუში."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"დავშიფრო?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"დაშიფვრის ოპერაციის შეწყვეტა არ შეიძლება. თუ შეწყვიტავთ დაკარგავთ მონაცემებს. დაშიფვრას დასჭირდება საათი ან მეტი, რომლის განმავლობაშიც ტაბლეტი რამდენჯერმე გადაიტვირთება."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"დაშიფვრის ოპერაციის შეწყვეტა არ შეიძლება, წინააღმდეგ შემთხვევაში თქვენ დაკარგავთ ყველა მონაცემს. დაშიფვრას დასჭირდება საათი ან მეტი, რომლის განმავლობაშიც ტელეფონი რამდენჯერმე გადაიტვირთება."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"განბლოკვა სახით"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"უსაფრთხოების დაბალი დონე, ექსპერიმენტული ფუნქცია"</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_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="current_screen_lock" msgid="4104091715420072219">"მიმდინარე ეკრანის დაბლოკვა"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"მოწყობილობის დაცვის ფუნქციები აღარ იმუშავებს."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by administrator, encryption policy, or credential storage"</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_biometric_weak" msgid="3008473624490350142">"განბლოკვა სახით"</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_password" msgid="1203938057264146610">"პაროლი"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"ეკრანის დაბლოკვის დაყენების შემდეგ, თითის ანაბეჭდის დაყენებაც შეგიძლიათ მენიუში: პარამეტრები &gt; უსაფრთხოება."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ეკრანის დაბლოკვის გამორთვა"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"განბლოკვის ნიმუშის ამოღება"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"განბლოკვის PIN-კოდის წაშლა"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"პაროლს უნდა ჰქონდეს სულ მცირე ერთი ასო მაინც."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"პაროლი უნდა შეიცავდეს სულ მცირე ერთ ციფრს."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"პაროლი უნდა შეიცავდეს სულ მცირე ერთ სიმბოლოს."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"პაროლი უნდა შეიცავდეს სულ მცირე 1 ასოს."</item>
-    <item quantity="other" msgid="8186027808415585970">"პაროლი უნდა შეიცავდეს სულ მცირე %d ასოს."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"პაროლი უნდა შეიცავდეს სულ მცირე 1 ქვედა რეგისტრის ასოს."</item>
-    <item quantity="other" msgid="2693910942679679225">"პაროლი უნდა შეიცავდეს სულ მცირე %d ქვედა რეგისტრის ასოს."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"პაროლი უნდა შეიცავდეს სულ მცირე 1 ზედა რეგისტრის ასოს."</item>
-    <item quantity="other" msgid="3030801209112209245">"პაროლი უნდა შეიცავდეს სულ მცირე %d ზედა რეგისტრის ასოს."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"პაროლი უნდა შეიცავდეს სულ ცოტა 1 ციფრს."</item>
-    <item quantity="other" msgid="4703982391407595924">"პაროლი უნდა შეიცავდეს სულ მცირე %d ციფრულ ნიშანს."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"პაროლი უნდა შეიცავდეს სულ მცირე 1 სპეციალურ სიმბოლოს."</item>
-    <item quantity="other" msgid="1221290525051187757">"პაროლი უნდა შეიცავდეს სულ ცოტა %d სპეციალურ სიმბოლოს."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"პაროლი უნდა შეიცავდეს სულ მცირე 1 არაანბანურ სიმბოლოს."</item>
-    <item quantity="other" msgid="3952508584649046404">"პაროლი უნდა შეიცავდეს სულ მცირე %d არაანბანურ სიმბოლოს."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">პაროლი უნდა შეიცავდეს, სულ მცირე, %d ასოს.</item>
+      <item quantity="one">პაროლი უნდა შეიცავდეს, სულ მცირე, 1 ასოს.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">პაროლი უნდა შეიცავდეს, სულ მცირე, %d ქვედა რეგისტრის ასოს.</item>
+      <item quantity="one">პაროლი უნდა შეიცავდეს, სულ მცირე, 1 ქვედა რეგისტრის ასოს.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">პაროლი უნდა შეიცავდეს, სულ მცირე, %d ზედა რეგისტრის ასოს.</item>
+      <item quantity="one">პაროლი უნდა შეიცავდეს, სულ მცირე, 1 ზედა რეგისტრის ასოს.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">პაროლი უნდა შეიცავდეს, სულ მცირე, %d ციფრს.</item>
+      <item quantity="one">პაროლი უნდა შეიცავდეს, სულ მცირე, 1 ციფრს.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">პაროლი უნდა შეიცავდეს, სულ მცირე, %d სპეციალურ სიმბოლოს.</item>
+      <item quantity="one">პაროლი უნდა შეიცავდეს, სულ მცირე, 1 სპეციალურ სიმბოლოს.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">პაროლი უნდა შეიცავდეს, სულ მცირე, %d არაანბანურ სიმბოლოს.</item>
+      <item quantity="one">პაროლი უნდა შეიცავდეს, სულ მცირე, 1 არაანბანურ სიმბოლოს.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"მოწყობილობის ადმინისტრატორს აკრძალული აქვს წინა პაროლის ხელახალი გამოყენება."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ციფრების აღმავალი, დაღმავალი ან გამეორებული მიმდევრობა აკრძალულია"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"კარგი"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"დაწყვილება"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"დაწყვილება"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"გაუქმება"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"დაწყვილების შემთხვევაში დაკავშირებულ რეჟიმში ყოფნისას მიენიჭება თქვენს კონტაქტებზე და ზარის ისტორიაზე წვდომის ნებართვა."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"ვერ დაწყვილდა <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან დაწყვილება ვერ მოხერხდა, რადგან PIN ან გასაღები არასწორია."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"შეუძლებელია <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან კომუნიკაცია."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"დაწყვილება უარყოფილია <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ის მიერ."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"მდებარეობის სიზუსტის გასაუმჯობესებლად, აპები და მომსახურებები Bluetooth მოწყობილობების სკანირებას მოახდენენ, მაშინაც კი, როცა Bluetooth გამორთულია. ამის შეცვლა <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>სკანირების პარამეტრებში<xliff:g id="LINK_END_1">LINK_END</xliff:g> შეგიძლიათ."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"დაუკავშირდი…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"მედია აუდიო"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ტელეფონის აუდიო"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ფაილების გადაცემა"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"შეყვანის მოწყობილობა"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ინტერნეტზე წვდომა"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"კონტაქტის გაზიარება"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"კონტაქტის გაზიარებისთვის გამოყენება"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ინტერნეტ კავშირის გაზიარება"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"შეტყობინებებზე წვდომა"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"დაკავშირებულია აუდიო მულტიმედიურ სისტემასთან"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"დაკავშირებულია ტელეფონის აუდიო მოწყობილობასთან"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"დაკავშირებულია ფაილების გადაცემის სერვერთან"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"რუკასთან დაკავშირებული"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"არ არის დაკავშირებული ფაილების ტრანსფერის სერვერთან"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"დაკავშირებულია შეყვანის მოწყობილობასთან"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"მედია აუდიოსთვის გამოყენება"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"გამოიყენეთ ტელეფონის აუდიომოწყობილობაში"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ფაილების ტრანსფერისათვის გამოყენება"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"შეტანისთვის გამოყენება"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"გამოიყენე ინტერნეტთან წვდომისთვის"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"რუკაზე გამოყენება"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi ასისტენტი"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"დაკავშირებულია Wi-Fi თანაშემწით"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"ეკრანის გადაცემა"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"WiFi-ის გამორთვა…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"შეცდომა"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"თვითმფრინავის რეჟიმში"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ქსელების სკანირება არა არის შესაძლებელი"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ქსელის შესახებ შეტყობინება"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"შემატყობინება, როდესაც საჯარო ქსელი ხელმისაწვდომი იქნება"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Wi-Fi ქსელების ფილტრი"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"არ გამოიყენო Wi‑Fi ქსელი, თუ მას არ აქვს კარგი ინტერნეტ კავშირი"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"მხოლოდ იმ ქსელების გამოყენება, რომლებსაც კარგი ინტერნეტ-კავშირი გააჩნია"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"ყოველთვის ეძებე ქსელი"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"სკანირების მუდამ დაშვება"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google მდებარეობის განმსაზღვრელმა სერვისმა და სხვა აპებმა მოახდინონ  ქსელების სკანირება, მაშინაც კი, როცა Wi-Fi გამორთულია"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ავრომატურად გამოიყენეოს ღია Wi-Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"მიეცით Wi-Fi თანაშემწეს ავტომატურად დაუკავშირდეს ღია ქსელებს განისაზღვრება, როგორც მაღალი ხარისხის"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"აირჩიეთ თანაშემწე"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"სერთიფიკატების ინსტალაცია"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"მდებარეობის ზუსტი განსაზღვრისა და სხვა ფუნქციების გასაუმჯობესებლად Google-მა და სხვა აპებმა შეიძლება მოიძიონ ახლომდებარე ქსელები, მაშინაც კი, როცა Wi-Fi გამორთულია. თუ ეს არ გსურთ, გადადით „ყოველთვის ხელმისაწვდომ გაფართოებულ &gt; ძიებაზე“."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"აპებს შეუძლია ახლომდებარე ქსელების მოძიება, თუნდაც იმ შემთხვევაში, თუ Wi-Fi გამორთულია. ამ პარამეტრების შესაცვლელად შეგიძლიათ გადახვიდეთ გაფართოებულ ძიებაზე."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"მდებარეობის სიზუსტის გასაუმჯობესებლად, აპები და მომსახურებები Wi‑Fi ქსელების სკანირებას მოახდენენ, მაშინაც კი, როცა 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="5340097010842405981">"აღარ მაჩვენო"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"სხვა ქსელის დამატება"</string>
     <string name="wifi_more" msgid="3195296805089107950">"მეტი"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"ავტომატური დაყენება (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"პარამეტრების დაყენების პროცესის დასასრულებლად თქვენს ტაბლეტს ესაჭიროება Wi-Fi-ზე წვდომა. პარამეტრების დაყანების შემდეგ შეგიძლიათ გადაერთოთ მობილური მონაცემებიდან Wi-Fi-ზე და პირიქით."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"გაფართოებული ვარიანტები"</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="5940801028985255304">"დააჭირეთ თქვენს როუტერზე Wi‑Fi პარამეტრების უსაფრთხო დაყენების ღილაკს. მას შეიძლება ერქვას \"WPS\" ან შეიცავდეს სიმბოლოს:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"თქვენს როუტერზე დააჭირეთ ღილაკს „Wi Fi პარამეტრების უსაფრთხო დაყენება“. მას ასევე შეიძლება ერქვას „WPS“ ან აღინიშნებოდეს შემდეგი სიმბოლოთი:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"შეიყვანეთ  Wi‑Fi როუტერში <xliff:g id="NUMBER">%1$s</xliff:g> PIN კოდი. პარამეტრების დაყენებას შეიძლება დასჭირდეს 2 წუთამდე."</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>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"წვდომის წერტილის დიაპაზონის კონფიგურაცია"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(უცვლელი)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(არ არის მითითებული)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"დამახსოვრებულია"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"გამორთულია"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP კონფიგურაციის შეფერხება"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi კავშირის შეფერხება"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ავთენტიკაციის პრობლემა"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"არ არის დიაპაზონში"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"ინტერნეტთან წვდომის ამოცნობა ვერ მოხერხდა. ავტომატურად ხელახლა დაკავშირება არ განხორციელდება."</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_security_none" msgid="7985461072596594400">"არცერთი"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"ამ ქსელს არ აქვს ინტერნეტზე წვდომა. მაინც გამოიყენებთ ამ ქსელს?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"აღარ მოითხოვოთ ეს ქსელი კიდევ ერთხელ."</string>
     <string name="wifi_connect" msgid="1076622875777072845">"დაკავშირება"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ქსელთან დაკავშირება ვერ ხერხდება"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"წაშლა"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK პორტაბელური Wi‑Fi უსადენო ქსელი"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> პორტატიული Wi‑Fi hotspot"</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_mode_title" msgid="2164073796253284289">"ზარის პრეფერენციები"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-თი დარეკვის რეჟიმი"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"სასურველია Wi-Fi"</item>
+    <item msgid="5267397515594230396">"სასურველია ფიჭური ინტერნეტი"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"როდესაც Wi-Fi ზარი ჩართულია, თქვენს ტელეფონს შეუძლია გადაამისამართოს ზარი Wi-Fi ან თქვენს ოპერატორ ქსელზე, თქვენი პრეფერენციებისა და სიგნალის სიძლიერის მიხედვით. ამ ფუნქციის ჩართვამდე, დააზუსტეთ თქვენს ოპერატორთან შესაძლო თანხები და სხვა დეტალები."</string>
     <string name="home_settings" msgid="212375129455718176">"სახლი"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ეკრანი"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ხმა"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"თემა"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"ნათურა"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"მუქი"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"ავტომატური"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"განახლდეს უპირატესი სიმ ბარათი?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> არის ერთადერთი სიმი თქვენს მოწყობილობაში. გსურთ, გამოიყენოთ ეს სიმი ფიჭური მონაცემების, ზარებისა და SMS შეტყობინებებისათვის?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM-ის არასწორი PIN კოდი. თქვენ ახლა მოგიწევთ მოწყობილობის განსაბლოკად მიმართოთ ოპერატორს."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM-ის არასწორი PIN კოდი. თქვენ დაგრჩათ <xliff:g id="NUMBER">%d</xliff:g> მცდელობა, სანამ მოგიწევთ თქვენი მოწყობილობის განსაბლოკად ოპერატორთან დაკავშირება."</item>
-    <item quantity="other" msgid="77103619544346451">"არასწორი SIM-ის PIN კოდი. თქვენ დაგრჩათ <xliff:g id="NUMBER">%d</xliff:g> მცდელობა."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM-ის PIN არასწორია. დაგრჩათ <xliff:g id="NUMBER_1">%d</xliff:g> მცდელობა.</item>
+      <item quantity="one">SIM-ის PIN არასწორია. დაგრჩათ <xliff:g id="NUMBER_0">%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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"აპები (აპების მონაცემები და მედია კონტენტი)"</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_dcim_usage" msgid="558887013613822577">"სურათები, ვიდეოები"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"აუდიო (მუსიკა, ზარები, პოდკასტები და ა.შ.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"სხვადასხვა"</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="default" msgid="6915293408836853020">"გამოაერთე SD ბარათი"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"მიმდინარეობს გამოერთება"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"მეხსიერება ივსება"</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">"გადარქმევა"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"მიერთება"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"გამოღება"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"წაშლა და ფორმატირება"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"წაშლა და ფორმატირება შიდა მეხსიერებაში"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB კავშირი კომპიუტერთან"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB კავშირი კომპიუტერთან"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"დაკავშირება როგორც"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"შესაძლებელს ხდის მედია ფაილების გადაცემას Windows-ში, ან Android File Transfer-ის გამოყენებით Mac-ში (იხილეთ www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"კამერა ( PTP )"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"იძლევა ფოტოების კამერის პროგრამული უზერუნველყოფის საშუალებით გადაცემის და ასევე კომპიუტერებზე MTP-ს მხარდაჭერის მქონე ნებისმიერი ფაილების გადაცემის საშუალებას."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ფაილების გადაცემის ინსტრუმენტების დაყენება"</string>
+    <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_external_title" msgid="2723851748972673696">"ამოღებადი მეხსიერება"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"თავისუფალია <xliff:g id="FREE">%1$s</xliff:g> (სულ: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> მიერთებულია"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>-ის ფორმატირება ვერ მოხერხდა"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"მეხსიერების სახელის გადარქმევა"</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="3677827796634199714"><b>"ამ <xliff:g id="NAME_0">^1</xliff:g>-ის გამოღებისას, მასზე შენახული აპები შეწყვეტენ მუშაობას, ხოლო მასზე შენახული მედია ფაილები ხელახლა ჩასმამდე მიუწვდომელი იქნება."</b>" \n\nეს <xliff:g id="NAME_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_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_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="1259216693690378749">"არ ამოიღოთ <xliff:g id="NAME">^1</xliff:g> დაფორმატებისას."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"გადააადგილეთ მონაც. ახალ საცავში"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"შეგიძლიათ ამ ახალ <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="5035719146373359329"><b>"გადაადგილებას დაახლოებით <xliff:g id="TIME">^1</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="8641916179067596592">"გადაადგილებისას: \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_move_confirm_title" msgid="292782012677890250">"გადაადგილეთ <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"გადაადგილებისას, არ ამოიღოთ <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="battery_status_title" msgid="9159414319574976203">"ბატარეის სტატუსი"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ბატარეის დატენვის დონე"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"ქსელის პარამეტრების ჩამოყრა"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"ამ მოქმედებით ქსელის ყველა პარამეტრი ჩამოიყრება, მათ შორის:\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="4874737348054213767">"გსურთ ქსელის ყველა პარამეტრის ჩამოყრა? ამ მოქმედების გაუქმება შეუძლებელია!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"პარამეტრების ჩამოყრა"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ჩამოვყაროთ პარამეტრები?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"ქსელის პარამეტრები ჩამოიყარა"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"მოწყობილობის საწყისზე დაბრ."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ქარხნული მონაცემების აღდგენა"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"წაიშლება ყველა მონაცემი ტაბლეტზე"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"მთლიანად შლის ტელეფონზე არსებულ მონაცემებს და აღადგენს მას ქარნულ მდგომარეობაში"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტაბლეტის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტელეფონის "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"წაიშალოს SD ბარათის ყველა მონაცემი, როგორიცაა მუსიკა და ფოტოები"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ტაბლეტის მონაცემების ჩამოყრა"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ტელეფონის საწყისი მდგომარეობის აღდგენა"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"გსურთ, ყველა თქვენი პირადი ინფორმაციისა და ჩამოტვირთული აპების წაშლა? ამ ქმედების უკან დაბრუნება შეუძლებელია."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"გსურთ მთელი თქვენი პირადი ინფორმაციისა და ჩამოტვირთული აპების წაშლა? ამ მოქმედების გაუქმება შეუძლებელია!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ყველაფრის წაშლა"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ქარხნული მონაცემების აღდგენის დასადასტურებლად საჭიროა გრაფიკული გასახების დახაზვა."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"არ ჩამოყრილა, რადგან System Clear სამსახური მიუწვდომელია."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ჩამოვყაროთ პარამეტრები?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ქარხნულ პარამეტრებზე დაბრუნება ამ მომხმარებლისათვის მიუწვდომელია"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"გასუფთავდეს USB მეხსიერება და წაიშალოს მასში შენახული ყველა ფაილი? ამ მოქმედების უკან დაბრუნება შეუძლებელია!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"გასუფთავდეს SD ბარათი და წაიშალოს მასში შენახული ყველა ფაილი? ამ მოქმედების დაბრუნება შეუძლებელია!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"წაშალე ყველაფერი"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB მეხსიერების წაშლის დასადასტურებლად უნდა დახაზოთ თქვენი განბლოკვის გრაფიკული გასაღები."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"უნდა დახაზოთ გრაფიკული გასაღები, რათა დაადასტუროთ, რომ გსურთ SD ბარათის წაშლა."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"დახმარება"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"ფიჭური ქსელები"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"მობილური სატარიფო გეგმა"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"ნაგულისხმევი 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"მდებარეობის რეჟიმი"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"მდებარეობის დასადგენად GPS, Wi‑Fi და ფიჭური ქსელების გამოყენება"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"მდებარეობის დასადგენად Wi‑Fi-ს და ფიჭური ქსელების გამოყენება"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"თქვენი მდებარეობის დასადგენად GPS-ის გამოყენება"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ადგილმდებარეობის განსაზღვრისათვის, გამოიყენეთ GPS"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"სკანირება"</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="2070686681074461301">"გააუმჯობესეთ მდებარეობის სიზუსტე აპებისთვის და მომსახურებებისთვის Wi‑Fi ქსელების სკანირების ნების მიცემით, მაშინაც კი, როცა Wi‑Fi გამორთულია"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth სკანირება"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"გააუმჯობესეთ მდებარეობის სიზუსტე სისტემური მომსახურებებისთვის Bluetooth მოწყობილობების სკანირების ნების მიცემით, მაშინაც კი, როცა Bluetooth გამორთულია"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ფიჭური ქსელის მდებარეობა"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"თქვენი ადგილმდებარეობის უფრო სწრაფად დასადგენად დართეთ აპებს ნება, გამოიყენონ Google-ის მდებარეობის სერვისი. ანონიმური მდებარეობის მომაცემები შეგროვდება და გაეგზავნება Google-ს."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi-ს მიერ დადგენილი ადგილმდებარეობა"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"ეკრანის დაბლოკვა"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"გასაგრძელებლად გამოიყენეთ თქვენი მოწყობილობის ნიმუში."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"გასაგრძელებლად შეიყვანეთ თქვენი მოწყობილობის PIN."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"გასაგრძელებლად შეიყვანეთ თქვენი მოწყობილობის პაროლი."</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_need_to_unlock" msgid="757935356911054465">"დაადასტურეთ შენახული ნიმუში"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"სცადეთ ხელახლა:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"ძალიან ბევრი არასწორი მცდელობა!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"სცადეთ ხელახლა <xliff:g id="NUMBER">%d</xliff:g> წამში."</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="manageapplications_settings_title" msgid="7041951105633616745">"აპების მართვა"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"დაყენებული აპების მართვა და წაშლა"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"მეხსიერების გამოყენება"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"აპების მიერ გამოყენებული მეხსიერების ნახვა"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"მიმდინარე სერვისები"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ინფორმაცია ტაბლეტის შესახებ"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ინფორმაცია ტელეფონის შესახებ"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"ინფორმაცია ბატარეის შესახებ"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"სწრაფი გაშვება"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"აპების გასაშვებად მალსახმობების პარამეტრების დაყენება"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"აპის დანიშვნა"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"მალსახობი არ არის"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"ძებნა + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"წაშლა"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)-ის მალსახმობი წაიშლება."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"კარგი"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"გაუქმება"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"აპები"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"მალსახმობები"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ყველა bluetooth HCI პაკეტის ფაილში ჩაწერა"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM განბლოკვა"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ნება დართოს განბლოკოს ჩამტვირთველმა"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"შეიყვანეთ თქვენი PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM განბლოკვის ჩასართავად შეიყვანეთ თქვენი მოწყობილობის PIN"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"მისცეს ნება OEM განბლოკვას?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"გაფრთხილება: სანამ ეს პარამეტრი ჩართულია, მოწყობილობის დაცვის ფუნქცია ამ მოწყობილობაზე, ვერ იმუშავებს."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ჟურნალიზაციის ბუფერის ზომები"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"აირჩიეთ ჟურნ. ზომა / ჟურნ. ბუფერზე"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ფიქტიური მდებარეობების დაშვება"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"ფიქტიური მდებარეობების დაშვება"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"ნახვის ატრიბუტის ინსპექტირების ჩართვა"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ქსელი"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"უსადენო ეკრანის სერტიფიცირება"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi-ს დაწვრილებითი აღრიცხვის ჩართვა"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi-დან ფიჭურ კავშირზე პროაქტიური ჰენდოვერი"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi Roam სკანირების მუდამ დაშვება"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"მოძველებული DHCP კლიენტის გამოყენება"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"უსადენო ეკრანის სერტიფიცირების ვარიანტების ჩვენება"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi-ს აღრიცხვის დონის გაზრდა, Wi‑Fi ამომრჩეველში ყოველ SSID RSSI-ზე ჩვენება"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"თუ ჩართულია, Wi‑Fi სიგნალის შესუსტების შემთხვევაში Wi-Fi უფრო აქტიურად შეეცდება გადაიყვანოს ინტერნეტ-კავშირი მობილურ ინტერნეტზე"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Wifi Roam სკანირების დაშვება/აკრძალვა, ინტერფეისზე არსებული მონაცემთა ტრაფიკზე დაფუძნებით"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"ჟურნალიზაციის ბუფერის ზომები"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"აირჩიეთ ჟურნ. ზომა / ჟურნ. ბუფერზე"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"აირჩიეთ USB კონფიგურაცია"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"აირჩიეთ USB კონფიგურაცია"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"ფიქტიური მდებარეობების დაშვება"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ფიქტიური მდებარეობების დაშვება"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"ნახვის ატრიბუტის ინსპექტირების ჩართვა"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ახალი Android DHCP კლიენტის ნაცვლად, Lollipop-ის DHCP კლიენტის გამოყენება."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"ჩავრთო USB გამართვა?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB გამართვა განკუთვნილია მხოლოდ დეველოპერული მიზნებისთვის. გამოიყენეთ კომპიუტერსა და თქვენ მოწყობილობას შორის მონაცემების გადასატანად, თქვენ მოწყობილობაზე აპების შეტყობინების გარეშე დასაყენებლად და ჟურნალის მონაცემების წასაკითხად."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"გავაუქმოთ ყველა იმ კომპიუტერიდან USB გამართვაზე წვდომა, რომლებიდანაც აქამდე განახორციელეთ შესვლა?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"მეწამული"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"გსურთ <xliff:g id="SERVICE">%1$s</xliff:g>-ის გამოყენება?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>-ს ესაჭიროება:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"აპის მიერ ნებართვის მოთხოვნის დაფარვის გამო, ვერ ხერხდება თქვენი პასუხის დადასტურება პარამეტრებით."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>-ს თუ ჩართავთ, მონაცემთა დაშიფვრის გასაფართოებლად თქვენი მოწყობილობა ჩაკეტვის ეკრანს არ გამოიყენებს."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"ვინაიდან ხელმისაწვდომობის სერვისი ჩართეთ, მონაცემთა დაშიფვრის გასაფართოებლად თქვენი მოწყობილობა ჩაკეტვის ეკრანს არ გამოიყენებს."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"ვინაიდან <xliff:g id="SERVICE">%1$s</xliff:g>-ის ჩართვას მონაცემთა დაშიფვრაზე აქვს გავლენა, გთხოვთ, ხელახლა შეიყვანოთ ნიმუში."</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> აპი, <xliff:g id="TIME">%2$s</xliff:g>-ის ფარგლებში"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<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_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_memory_status" msgid="4251599550196193093">"ამჟამად მოწყობილობის მეხსიერება არის <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM-ის საშუალო გამოყენება"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM-ის მაქსიმალური გამოყენება"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android-ის ოპერაციული სისტემა"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"პროცესები"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"სერვისები"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ხანგრძლივობა"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"მეხსიერების დეტალები"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"სისტემური პროცესების დამალვა"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Default settings below override app settings"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"ნაგულისხმევი პარამეტრები"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"ნაგულისხმევი სისტემა"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"დააყენებს მეტყველების სინთეზის ძრავას წარმოსათქმელი ტექსტისთვის"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"მეტყველების სინთეზის ძრავის დაყენება სალაპარაკო ტექსტზე გამოსაყენებლად"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"მეტყველების ტემპი"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"ტექსტის თხრობის სიჩქარე"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"სიმაღლე"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"ავტორიზაციის დაყენების დასადასტურებლად უნდა დახაზოთ თქვენი განბლოკვის ნიმუში."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"შეიყვანეთ ავტორიზაციის მონაცემთა საცავის პაროლი."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"მიმდინარე პაროლი:"</string>
@@ -1847,12 +1901,10 @@
     <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="backup_configure_account_default_summary" msgid="2436933224764745553">"ამჟამად არცერთი ანგარიში არ ინახავს დამარქაფებულ მონაცემებს"</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="5355557151569037197">"სარეზერვო სამსახური არ არის აქტიური."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"ეს დაყენებულია თქვენი მოწყობილობის პოლიტიკით."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"დესკტოპის სარეზერვო ასლის პაროლი"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"დესკტოპის სრული სარეზერვო ასლები ამჟამად დაცული არ არის"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"შეეხეთ დესკტოპის სრული სარეზერვო ასლების პაროლის შესაცვლელად ან წასაშლელად"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"გადასვლის მასშტაბი"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"ანიმაციების ხანგრძლივობის მასშტაბი"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"მეორადი ეკრანების სიმულაცია"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"მრავალი ფანჯრის რეჟიმი"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"ერთდროულად რამდენიმე აქტივობა ეკრანზე."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"ჩავრთოთ მრავალი ფანჯრის რეჟიმი?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"გაფრთხილება: ეს არის ექსპერიმენტული ფუნქცია, რომლის საშუალებითაც შესაძლებელია ერთდროულად რამდენიმე აქტივობის შესრულება ეკრანზე „ბოლო აპების“ UI-ს მეშვეობით. ზოგიერთი აპი შეიძლება გაუმართავი გახდეს ან ვერ იმუშაოს სწორად ამ ფუნქციის გამოყენების შემთხვევაში."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"აპები"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"ნუ შეინარჩუნებ მოქმედებებს"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ნებისმიერი აქტივობის განადგურება დასრულებისთანავე"</string>
@@ -2195,7 +2251,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="718192651887726259">"ეს მოწყობილობა შეგიძლიათ სხვებს გაუზიაროთ, დამატებითი მომხმარებლების შექმნით. ყოველ მომხმარებელს საკუთარი სივრცე ექნება, რომლის მორგებაც საკუთარი აპებით, ფონით და ა.შ. შეეძლებათ. მომხმარებლებს ასევე შეუძლიათ შეცვალოთ ისეთი პარამეტრები, რაც ყველას შეეხება, მაგ. 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"სატელეფონო ზარების დაშვება"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"სატელეფონო ზარების და SMS-ის დაშვება"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"სატელეფონო ზარების ჩართვა"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"სატელეფონო ზარები &amp; amp; SMS-ის ჩართვა"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"მომხმარებლის ამოღება"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"გსურთ სატელეფონო ზარების დაშვება?"</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_sms_confirm_title" msgid="188164598768941316">"გსურთ სატელეფონო ზარების და SMS-ის დაშვება?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"ზარის და SMS ისტორია გაზიარდება ამ მომხმარებელთან."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ჩაირთოს სატელეფონო ზარები &amp; amp; SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ზარის და SMS ისტორია გაზიარდება ამ მომხმარებელთან."</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>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"შეზღუდულ პროფილებში ეს აპი მხარდაუჭერელია"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ქსელის კავშირი"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ტექსტი შეტყობინება SMS დამესიჯება მესიჯი"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"მობილური ფიჭური ოპერატორი უსადენო ინტერნეტი 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi ზარი დარეკვა"</string>
     <string name="keywords_home" msgid="3626170808219458848">"გამშვები"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ეკრანის სენსორი"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ეკრანის ჩაბნელება სენსორული ეკრანი ბატარეა"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ეკრანის ჩაბნელება სენსორული ეკრანი ბატარეა"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ფონი პერსონალიზაცია მორგება დისპლეი"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ღამის მუქი თემა ქმნის ეკრანის ინვერტულ ნათებას"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"მორგებული ეკრანის პერსონალიზირებული ფონი"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ტექსტის ზომა"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"პროექტი"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"პროექტის ტრანსლირება"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"დივრცე დისკი მყარი დისკი მოწყობილობა გამოყენება"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"ენერგიის გამოყენება დატენვა"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"მართლწერის ლექსიკონი მართლწერა ავტოშესწორება"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"ანგარიში"</string>
     <string name="keywords_users" msgid="4673901601478559100">"შეზღუდვა შეზღუდული"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ტექსტის კორექცია შესწორება ხმა ვიბრაცია ავტო ენა ჟესტი შეთავაზება თემა შეურაცხმყოფელი სიტყვა აკრეფა emoji საერთაშორისო"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"გადაყენება პარამეტრები ნაგულისხმევი"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"სასწრაფო გადაუდებელი შემთვევების ნაგულისხმევი აპლიკაცია"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"აპები ჩამოტვირთვა აპლიკაციები სისტემა"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"აპლიკაციების ნებართვების უსაფრთხოება"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"აპები ნაგულისხმევი"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"გასრიალება პაროლი ნიმუში pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC თეგის დაყენება"</string>
     <string name="write_tag" msgid="8571858602896222537">"ჩაწერა"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"შეწყვეტები"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"ზარების და შეტყობინებების შემოსვლისას"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"შეწყვეტა ნებისმიერ დროს"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"მხოლოდ პრიორიტეტული შეწყვეტების დაშვება"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"არ დაუშვა შეწყვეტა"</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_option_important_interruptions" msgid="3903928008177972500">"მხოლოდ პრიორიტეტული"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"მხოლოდ მაღვიძარები"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"შეფერხებების გარეშე"</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="ringtone_title" msgid="5379026328015343686">"ტელეფონის ზარი"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"შეტყობინებების ნაგულისხმევი ზარის მელოდია"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ზარებზე ასევე ვიბრირება"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ვიბრაცია"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"შეტყობინებებზე წვდომა"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"აპები ვერ კითხულობს შეტყობინებებს"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"შეტყობინებების წაკითხვა შეუძლია %d აპლიკაციას"</item>
-    <item quantity="other" msgid="980049191810249052">"%d აპს შეუძლია შეტყობინებების წაკითხვა"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d აპს შეუძლია შეტყობინებების წაკითხვა</item>
+      <item quantity="one">%d აპს შეუძლია შეტყობინებების წაკითხვა</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"არცერთი შეტყობინებების მსმენელი არ არის დაინსტალირებული."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"ჩავრთოთ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> შეძლებს სისტემური ან ნებისმიერი დაყენებული აპლიკაციის შეტყობინებების წაკითხვას, რომლებიც შეიძლება შეიცავდნენ პერსონალურ ინფორმაციას, მაგ.: კონტაქტების სახელებს ან თქვენთვის გამოგზავნილ ტექსტურ შეტყობინებებს. მას ასევე შეეძლება შეტყობინებების დახურვა და მათში არსებული ღილაკების დაჭერა."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"პირობების პროვაიდერები"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"პირობებს არცერთი აპი არ გაწვდით"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d აპი გაწვდით პირობებს"</item>
-    <item quantity="other" msgid="358057362115673258">"%d აპი გაწვდით პირობებს"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"პირობების პროვაიდერები ინსტალირებული არ არის."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"ჩაირთოს <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> შეძლებს გასვლის პირობები დაამატოს „არ შემაწუხოთ“ რეჟიმს."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"აპები იტვირთება..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"დაბლოკვა"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"ყველას დაბლოკვა"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ამ აპზე შეტყობინებები არასდროს აჩვენო"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"პრიორიტეტი"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"შეტყობინებების სიის თავში ჩვენება, მაშინაც კი, როდესაც მოწყობილობა მხოლოდ პრიორიტეტული შეწყვეტების რეჟიმშია"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"სენსიტიური"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"როდესაც მოწყობილობა დაბლოკილია, დამალეთ ნებისმიერი სენსიტიური ინფორმაცია ამ აპის შეტყობინებებისგან."</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"პრიორიტეტულად განხილვა"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"ამ აპის შეტყობინებების მოსმენის დაშვება, როცა „არ შემაწუხოთ“ დაყენებულია პარამეტრზე „მხოლოდ პრიორიტეტული“"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"თვალის შევლების დაშვება"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ამ აპისთვის ზოგიერთი შეტყობინების ხაზგასმის დაშვება, მიმდინარე ეკრანზე მათი ხანმოკლე დროით გამოსრიალებით"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"სენსიტიური კონტენტის დამალვა"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"პირადი ინფორმაციის შემცველი აპის შეყობინებების კონტენტის დამალვა, როცა მოწყობილობა ჩაკეტილია"</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="zen_mode_default_option" msgid="6940069025071935243">"სანამ ამას გამორთავდეთ"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"პრიორიტეტული შეწყვეტები"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ავარიული პაუზა"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"დღეები"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"არცერთი"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"დაშვებულია შეწყვეტები"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"მხოლოდ პრიორიტეტული"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"არცერთი"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"ავტომატიზაცია"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ავტომატურად ჩაირთოს"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"წესის სახელი"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"წესის დამატება"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"წესის წაშლა"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"წაიშალოს წესი „<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="3201273040477861538">"განრიგის წესი"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"წესი ვერ მოიძებნა."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"არასოდეს"</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_from" msgid="1033337300289871697">"ზარები/შეტყობინებები ავტორისგან:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ნებისმიერი"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"მხოლოდ კონტაქტები"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"მხოლოდ ვარსკვლავ. კონტაქტები"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"ღონისძიებები და შეხსენებები"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"მაღვიძარები მუდამ პრიორიტეტულ შეწყვეტად ითვლება"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"მაღვიძარები"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"შეხსენებები"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ღონისძიებები"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"არჩეული აბონენტები"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"აბონენტების გამეორება"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"თუ პიროვნება <xliff:g id="MINUTES">%d</xliff:g> წუთის მანძილზე მეორედ დარეკავს, დაიშვას"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ავტომატურად ჩაირთოს"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"არასოდეს"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> შემდეგი დღე"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ან ნებისმიერი წინა შეტყობინება"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"შეწყვეტები"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"ზარებისა და შეტყობინებების შემოსვლისას"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"როდის გსურთ შეწყვეტა?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"რამდენი ხნით?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"შეწყვეტა ყოველთვის"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"გამორთული,ყველა,ყველაფერი"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"მხოლოდ პრიორიტეტული შეწყვეტების დაშვება"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"მხოლოდ გაფრთხილებების დაშვება"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"არ დაუშვა შეწყვეტა"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"განუსაზღვრელი დროით"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> წუთი</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> წუთი</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"პრიორიტეტულ შეტყობინებებზე მხოლოდ განუსაზღვრელი დროით გადაყვანა"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_0">%2$s</xliff:g>-მდე</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g>-მდე</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"მაღვიძარებზე მხოლოდ განუსაზღვრელი დროით გადაყვანა"</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>
+      <item quantity="one">მაღვიძარებზე მხოლოდ ერთი წუთით გადაყვანა <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">მაღვიძარებზე მხოლოდ <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_0">%2$s</xliff:g>-მდე</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"„შეწყვეტის გარეშე“ რეჟიმზე განუსაზღვრელი დროით გადაყვანა"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g>-მდე</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_0">%2$s</xliff:g>-მდე</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"„მუდმივად შეწყვეტის“ რეჟიმზე გადაყვანა"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"სამუდამოდ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"აპის შეტყობინებები"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
     <string name="device_feedback" msgid="3238056036766293294">"გამოხმაურება ამ მოწყობილობის შესახებ"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"გაშვება ნაგულისხმევად"</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="app_launch_domain_links_title" msgid="458956710410857777">"დომენის ბმულები"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"დომენის URL-ების გახსნა"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"აპლიკაციის ნებართვა, პირდაპირ გახსნას დომენის URL-ები"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"მხარდაჭერილი დომენის URL-ები"</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="410824961149037234">"შიდა მეხსიერება"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"გარე მეხსიერება"</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="storage_used" msgid="7128074132917008743">"გამოყენებული მეხსიერება"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"ჩართული"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"დაბლოკვა"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"სენსიტიური"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"პრიორიტეტი"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"პრიორიტეტი და სენსიტიური"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ნებართვა გაცემულია</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ნებართვა გაცემულია</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g>-დან <xliff:g id="COUNT_2">%d</xliff:g> ნებართვა გაცემულია</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>-დან <xliff:g id="COUNT_0">%d</xliff:g> ნებართვა გაცემულია</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"ზოგიერთი ნაგულისხმევი პარამეტრი დაყენებულია"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"ნაგულისხმევი პარამეტრები არ არის დაყენებული."</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"ყველა აპი"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"ჩართული"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"პირადი"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"სამუშაო"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"დაბლოკილი"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"პრიორიტული"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"სენსიტიური"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"დომენის URL-ებით"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"გათიშულია ადმინისტრატორის მიერ"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"გაფართოებული"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"უცნობი აპი"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"პროფილის არჩევა"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"აპის უფლებები"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>-დან <xliff:g id="COUNT_0">%d</xliff:g> აპლიკაციის დამატებითი წვდომის უფლება"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>-დან <xliff:g id="COUNT_0">%d</xliff:g> დაშვებული აპლიკაცია"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"დომენის URL-ები"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"არ გახსნას ნებისმიერი დომენის URL"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"„<xliff:g id="DOMAIN">%s</xliff:g>“-ის გახსნა"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"„<xliff:g id="DOMAIN">%s</xliff:g>“-ის და მასთან დაკავშირებული URL-ების გახსნა"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> აპლიკაციებს შეუძლიათ გახსნან მათი დომენი URL-ები</item>
+      <item quantity="one">ერთ აპლიკაციას შეუძლია გახსნას მისი დომენი URL-ები</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"არ არის ამოცნობილი"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ნაგულისხმევი აპები"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ბრაუზერის აპი"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ნაგულისხმები ბრაუზერი არ არის"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ნაგულისხმევი)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"აპების საცავი"</string>
 </resources>
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk-rKZ/arrays.xml
index bb6ed9c..01aa2f5 100644
--- a/res/values-kk-rKZ/arrays.xml
+++ b/res/values-kk-rKZ/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Итеру түймесі"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"микрофон дыбысын өшіру/қосу"</item>
     <item msgid="1148142988678569310">"жоба тасушысы"</item>
     <item msgid="9130014005474445273">"VPN функциясын белсендіру"</item>
+    <item msgid="1165192162975045562">"артқы фонды жазу"</item>
+    <item msgid="7129487923652967258">"көмекші құрылым"</item>
+    <item msgid="1069023208100114540">"көмекші скриншот"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Аймақ"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Микрофон дыбысын өшіру/қосу"</item>
     <item msgid="5906017727368097853">"Жоба тасушысы"</item>
     <item msgid="2486614710846178542">"VPN функциясын белсендіру"</item>
+    <item msgid="5586547561693629602">"Артқы фонды жазу"</item>
+    <item msgid="32794179825485062">"Көмекші құрылым"</item>
+    <item msgid="7872852746938272552">"Көмекші скриншот"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Қысқа"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"төмен"</item>
     <item msgid="4212263919458209842">"өте төмен"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Өшірулі"</item>
-    <item msgid="5656544177755411222">"Шектеулі үзілістер"</item>
-    <item msgid="8735337502532332056">"Нөл үзілістер"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Қалыпты"</item>
     <item msgid="866544120205026771">"Орташа"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Қызғылт"</item>
     <item msgid="6131821495505931173">"Қызыл"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (медианы тасымалдау протоколы)"</item>
+    <item msgid="8856820259201251036">"PTP (сурет тасымалдау протоколы)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Аудио көзі"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 510cadd..2ace09d 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Рұқсат беру"</string>
     <string name="deny" msgid="6947806159746484865">"Бас тарту"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Белгісіз"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Сіз қазір дамытушы болудан <xliff:g id="STEP_COUNT">%1$d</xliff:g> қадам қашықсыз."</item>
-    <item quantity="other" msgid="6722953419953594148">"Сіз қазір дамытушы болудан  <xliff:g id="STEP_COUNT">%1$d</xliff:g> қадам қашықсыз."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Сіз қазір әзірлеуші болудан <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> қадам қашықсыз.</item>
+      <item quantity="one">Сіз қазір әзірлеуші болудан <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> қадам қашықсыз.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Қазір сіз дамытушысыз!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Қажет емес, сіз қазір дамытушысыз."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Сымсыз желілер және желілер"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"SMS хабарын IMS арқылы жіберуді өшіру"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Қажетті IMS тіркелімін қосу"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Қажетті IMS тіркеуін өшіру"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE қамтамасыз ету жалаушасын қосу"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE қамтамасыз ету жалаушасын өшіру"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Телефонның жедел жадтау құрылғысының дампын қосу"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Жедел жадтау құрылғысының дампын өшіру"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM мекенжай кітапшасын қарау"</string>
@@ -135,16 +137,7 @@
     <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;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Жалғанған"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Жалғанған (телефон жоқ)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Жалғанған (медиа жоқ)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Жалғанған (хабарлар қол жетімсіз)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Жалғанған (телефон және медиа жоқ)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ажыратылған"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Ажыратылуда…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Жалғауда..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Жұптауда..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Атауы жоқ Bluetooth құрылғысы"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Іздеуде..."</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Маңайдан Bluetooth құрылғылары табылмалды."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Алынған файлдарды көрсету"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth құрылғысын таңдау"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth рұқсат өтініші"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Қолданба Bluetooth қызметін қосуды қалайды."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Қолданба осы құрылғы үшін Bluetooth функциясын ҚОСҚЫСЫ келеді."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Қолданба планшетіңіздің басқа Bluetooth құрылғыларына <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд аралығында көрсетілуін қалайды."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Қолданба телефоныңыздың басқа Bluetooth құрылғыларына <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд аралығында көрсетілуін қалайды."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Қолданба планшетіңіздің басқа  Bluetooth құрылғыларына көрсетілуін қалайды. Бұны кейін Bluetooth параметрлері арқылы өзгертуге болады."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"БАС ТАРТУ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ЖАЛҒАСТЫРУ"</string>
     <string name="okay" msgid="1997666393121016642">"Жарайды"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ИӘ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ЖОҚ"</string>
-    <string name="forget" msgid="7267115980248732932">"ҰМЫТУ"</string>
+    <string name="forget" msgid="1400428660472591263">"Ұмыту"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Бет-әлпет сәйкестігін жетілдіру"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Жандылығын тексеру"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Бекітпесін ашқанда көз қысуды қажет етеді"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Aвтоматты бекіту"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Менің аймағым, экран бекіту, SIM картасын бекіту, растау дерекқорын бекітуді орнату"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Менің аймағым, экран бекітпесі, растау деректері жадының бекітпесін реттеу"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Кілтсөздер"</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="3453670509485083962">"Қосу"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"экранды бекіту"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"Саусақ ізін орнату"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Экран бекітпесін ашу немесе сатып алуларды растау мақсатында саусақ таңбасын пайдалану үшін мына әрекеттерді орындау қажет: \n\n✓ Сақтық көшірме экранды бекіту әдісін орнату \n\n✓ Саусақ таңбасын қосу"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Тетікті табу"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Телефонның артқы жағындағы саусақ таңбасы тетігін табыңыз."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Бастайық!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Саусақты саусақ ізі датчигіне қойыңыз. Дірілді сезгеннен кейін көтеріңіз."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Тамаша! Енді қайталаңыз."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Саусақ ізі датчигіне бірдей саусақты қойып, дірілді сезгеннен кейін көтеріңіз."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Саусақ ізі қосылды!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Осы белгішені көргенде идентификациялау немесе сатып алуды авторизациялау үшін саусақ ізін пайдалануға болады."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Қосу"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Келесі"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Зарядтағышты жалғап, қайта әрекеттеніңіз."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Экран бекіту PIN коды немесе кілтсөзі жоқ"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Кодтауды бастағанша экран бекіту PIN кодын немесе кілтсөзді тағайындап алуыңыз қажет."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Құрылғыны шифрлауды растау үшін бекітпесін ашу өрнегін салу керек."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Кодтау?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Кодтау жұмысын тоқтату мүмкін емес, сондықтан, егер үрдіс үзілсе, деректеріңізді жоғалтасыз. Кодтауға бір сағат немесе одан көбірек уақыт керек, бұл уақытта планшетті бірнеше рет қайта бастау қажет болады."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Кодтау жұмысын тоқтату мүмкін емес, сондықтан, егер үрдіс үзілсе, деректеріңізді жоғалтасыз. Кодтауға бір сағат немесе одан көбірек уақыт керек, бұл уақытта телефонды бірнеше рет қайта бастау қажет болады."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Бет-әлпет арқылы ашу"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Қауіпсіздігі төмен, тексеру үшін"</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_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="current_screen_lock" msgid="4104091715420072219">"Ағымдағы экран құлпы"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Құрылғыны қорғау мүмкіндіктері енді жұмыс істемейді."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Әкімші, кодтау саясаты немесе растау дерекқоры арқылы өшірілген"</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_biometric_weak" msgid="3008473624490350142">"Бет-әлпет арқылы ашу"</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_password" msgid="1203938057264146610">"Кілтсөз"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Экран құлпын орнатқаннан кейін де Параметрлер &gt; Қауіпсіздік ішінен саусақ таңбасын орната аласыз."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Экран бекітпесін өшіру"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Бекітпе ашу кескінін алып тастау"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Бекітпесін ашу PIN кодын алып тастау"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Кілтсөзде кем дегенде бір әріп болуы тиіс."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Кілсөзде кем дегенде бір бірлік болуы тиіс."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Кілтсөзде кем дегенде бір таңба болуы тиіс."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Кілтсөзде кем дегенде 1 әріп болуы керек."</item>
-    <item quantity="other" msgid="8186027808415585970">"Кілтсөзде кем дегенде %d әріп болуы керек."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Кілтсөзде кем дегенде кішкене әріпті 1 таңба болуы тиіс."</item>
-    <item quantity="other" msgid="2693910942679679225">"Кілтсөзде кем дегенде %d кішкене әріпті таңба болуы тиіс."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Кілтсөзде кем дегенде 1 үлкен әріпті таңба болуы тиіс."</item>
-    <item quantity="other" msgid="3030801209112209245">"Кілтсөзде кем дегенде %d үлкен әріпті таңба болуы тиіс."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Кілтсөзде кем дегенде 1 сандық бірлік болуы керек."</item>
-    <item quantity="other" msgid="4703982391407595924">"Кілтсөзде кем дегенде %d сандық таңба болуы тиіс."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Кілтсөзде кем дегенде 1 ерекше таңба болуы тиіс."</item>
-    <item quantity="other" msgid="1221290525051187757">"Кілтсөзде кем дегенде %d ерекше таңба болуы тиіс."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Кілтсөзде кем дегенде 1 әріп емес таңба болуы тиіс."</item>
-    <item quantity="other" msgid="3952508584649046404">"Кілтсөзде кем дегенде %d әріп емес таңба болуы тиіс."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Құпия сөзде кемінде %d әріп болуы керек.</item>
+      <item quantity="one">Құпия сөзде кемінде 1 әріп болуы керек.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Құпия сөзде кемінде %d кіші әріп болуы керек.</item>
+      <item quantity="one">Құпия сөзде кемінде 1 кіші әріп болуы керек.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Құпия сөзде кемінде %d бас әріп болуы тиіс.</item>
+      <item quantity="one">Құпия сөзде кемінде 1 бас әріп болуы тиіс.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Құпия сөзде кемінде %d сандық бірлік болуы керек.</item>
+      <item quantity="one">Құпия сөзде кемінде 1 сандық бірлік болуы керек.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Құпия сөзде кемінде %d арнайы таңба болуы тиіс.</item>
+      <item quantity="one">Құпия сөзде кемінде 1 арнайы таңба болуы тиіс.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Құпия сөзде кемінде %d әріп емес таңба болуы тиіс.</item>
+      <item quantity="one">Құпия сөзде кемінде 1 әріп емес таңба болуы тиіс.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Құрылғы әкімшісі жуықтағы кілтсөзді қолдануға рұқсат бермейді."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Артатын, кемитін немесе қайталанатын цифрлар ретіне тыйым салынған"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Жарайды"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"Жұптау"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ЖҰПТАУ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Бас тарту"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Жұптау қосылған кезде контактілеріңізге және қоңыраулар тарихына қатынас береді."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> жұпталу орындалмады."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен жұптала алмады, себебі PIN немесе кілтсөз дұрыс емес."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен қатынаса алмайды"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысы жұпталудан бас тартты."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"Орналасу жақсарту үшін тіпті Bluetooth өшірулі кезде де, қолданбалар мен қызметтер Bluetooth құрылғыларын іздейді. Бұны <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>іздеу параметрлерінен<xliff:g id="LINK_END_1">LINK_END</xliff:g> өзгерте аласыз."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"…қосылу"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Meдиа аудиосы"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Телефон аудиосы"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Файл жіберу"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Кіріс құрылғысы"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Интернетке қосылу"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Контактіні бөлісу"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Контактіні бөлісу үшін пайдалану"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Интернет байланысын ортақ қолдану"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Хабарға кіру"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"Медиа аудиосына жалғанған"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Телефон аудиосына қосылған"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Файл жіберу серверіне жалғанған"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Картаға жалғанған"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Файл жіберу серверіне жалғанбаған"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Кіріс құрылғысына косылған"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Медиа аудиосы үшін қолдану"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Телефон аудиосы үшін қолдану"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Файлды жіберу үшін қолдану"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Кіріс үшін қолдану"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Интернетке кіру үшін қолдану"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Карта үшін қолдану"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi көмекшісі арқылы қосылу орындалды"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Экран дисплейі"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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="default" msgid="5237208142892767592">"Телефон басқа құрылғымен қатынасқанда дерек алмастыру мүмкіндігін береді"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi байланысын өшіруде…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Қателік"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Ұшақ режимі"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Желілерді шолу мүмкін емес"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Желі хабарлары"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Қоғамдық желі қол жетімді болғанда хабарлау"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Нашар байланыстарды қолданбау"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Егер интернет байланысы жақсы болмаса Wi‑Fi желісін қолданбаңыз"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Тек жақсы интернет байланысы бар желілерді пайдалану"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Тексеру әрқашан қол жетімді"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Тексеруге әрқашан рұқсат ету"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google орынды анықтау қызметі және басқа қолданбалар тіпті Wi-Fi өшіріліп тұрса да желілердің бар-жоғын тексереді"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Wi‑Fi желісін автоматты түрде пайдалану"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi‑Fi көмекшісіне сапасы жоғары екені анықталған ашық желілерге автоматты түрде қосылуға мүмкіндік береді"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Көмекшіні таңдау"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификаттар орнату"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Аймақ нақтылығын жақсарту және басқа мақсаттар үшін Google және басқа қолданбалар маңайдағы желілерді тексеруі мүмкін, Wi-Fi өшіріліп тұрса да. Егер бұны қаламасаңыз, Жетілдірілген&gt; Тексеру әрқашан қол жетімді тармақтарына кіріңіз."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Қолданбалардың маңайдағы желілерді тексеру мүмкіндігі болады, Wi-Fi өшіріліп тұрса да. Егер бұны қаламасаңыз, Жетілдірілген&gt; Тексеру әрқашан қол жетімді тармақтарына кіріңіз."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Орналасу дәлдігін жақсарту үшін тіпті Wi-Fi өшірулі кезде де, қолданбалар мен қызметтерге 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="5340097010842405981">"Қайта көрсетпеңіз"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Басқа желіні қосу"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Басқа"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Aвтоматты орнату (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Орнатуды аяқтау үшін планшет Wi‑Fi желісіне қатынасты қажет етеді. Орнатудан кейін ұялы деректер мен Wi‑Fi арасында ауысуға болады."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Кеңейтілген опциялар"</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="5940801028985255304">"Рутердегі Wi‑Fi қорғалған орнату түймесін басыңыз. Ол \"WPS\" аталуы мүмкін немесе құрамында келесі таңба бар:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Маршрутизатордағы 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">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Wi‑Fi желісіне қосылған"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"Config AP диапазоны"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 ГГц диапазоны"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 ГГц диапазоны"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP параметрлері"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(өзгермеген)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(анықталмаған)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Сақталды"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Өшірілген"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP конфигурациясының қатесі"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi байланысының қатесі"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Растау мәселесі"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Аумақта жоқ"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Интернетке қатынас анықталмады, автоматты түрде қайта қосылу орындалмайды."</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_security_none" msgid="7985461072596594400">"Ешқандай"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"Бұл желі арқылы интернетке кіру мүмкін емес. Бәрібір осы желіні пайдаланасыз ба?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Осы желі үшін енді сұралмасын"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Жалғау"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Желіге қосылу орындалмады"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Ұмыту"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK жылжымалы Wi‑Fi хотспоты"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> жиналмалы Wi‑Fi хотспот"</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_mode_title" msgid="2164073796253284289">"Қоңырау шалу қалауы"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi қоңырау шалу режимі"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi ұсынылған"</item>
+    <item msgid="5267397515594230396">"Ұялы байланыс ұсынылған"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi қоңырау шалу қосулы кезде қалауыңызға және қайсы сигнал күштілігіне байланысты телефоныңыз қоңырауларды Wi-Fi желілері не жабдықтаушы желісі арқылы бағыттауы мүмкін. Бұл мүмкіндікті қосудан бұрын жабдықтаушыңыздың қатысты алымдары мен басқа мәліметтерді тексеріңіз."</string>
     <string name="home_settings" msgid="212375129455718176">"Негізгі"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дыбыс"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"Тақырып"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Аз"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Айқын емес"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Aвтоматты"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Таң-лы SIM кар. жаң. керек пе?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> – құрылғыңыздағы жалғыз SIM картасы. Осы SIM картасын ұялы деректер, қоңыраулар және SMS хабарлары үшін пайдалану керек пе?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN коды дұрыс емес қазір сізге құрылғыны ашу өтінішімен жабдықтаушыға хабарласу қажет."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM PIN коды дұрыс емес, жабдықтаушыға құрылғыны бекіту өтінішімен хабарласуға дейін <xliff:g id="NUMBER">%d</xliff:g> рет әрекеттену мүмкіндігіңіз бар."</item>
-    <item quantity="other" msgid="77103619544346451">"SIM PIN коды дұрыс емес,  <xliff:g id="NUMBER">%d</xliff:g> рет әрекеттену мүмкіндігіңіз қалды."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM PIN коды дұрыс емес, <xliff:g id="NUMBER_1">%d</xliff:g> әрекет қалды.</item>
+      <item quantity="one">SIM PIN коды дұрыс емес, операторға құрылғы бекітпесін ашуы үшін хабарласуға дейін <xliff:g id="NUMBER_0">%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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"Қолданбалар (қолданба дерекқоры және медиа мазмұны)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Қолданбалар мен қолданба деректері"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Meдиа"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Жүктеулер"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Фотосуреттер, видеолар"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Aудио (музыка, әуендер, подкастар, т.б.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Басқалар"</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="default" msgid="6915293408836853020">"SD картасын шығару"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"мазмұнды картадан жүктеу"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Шығару"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Өшіру және пішімдеу"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Өшіру және ішкі жад рет.піш-у"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB компьютер байланысы"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB компьютер байланысы"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Жалғау"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"Камераның компьютерлік бағдарламасын қолданып фотосуреттер жіберу және компьютердегі MTP қолдамайтын кез келген файлды жіберу мүмкіндігін береді."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Файл жіберу аспаптарын орнату"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI қолдайтын қолданбалар компьютеріңізде MIDI бағдарламасы көмегімен USB арқылы жұмыс істейді."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Басқа пайдаланушылар"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Құрылғы жады"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Алынбалы жад"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> бос орын (жалпы <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> орнатылған"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> пішімдеу мүмкін емес"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Жад атауын өзгерту"</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="3677827796634199714"><b>"Бұл <xliff:g id="NAME_0">^1</xliff:g> шығарылғанда, ондағы қолданбалар жұмысын тоқтатып, қайта енгізілмейінше, ішінде сақталған медиа файлдар қолжетімсіз болады."</b>\n\n"Бұл <xliff:g id="NAME_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_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_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="1259216693690378749">"Пішімделіп жатқан <xliff:g id="NAME">^1</xliff:g> ұясынан шығарылмауы тиіс."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Деректерді жаңа жадқа аудару"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Фотосуреттеріңізді, файлдарыңызды және қолданба деректеріңізді осы жаңа <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="5035719146373359329"><b>"Аудару үшін шамамен <xliff:g id="TIME">^1</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="8641916179067596592">"Деректер аударылып жатқанда: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> қолданбасын аудару"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"Аудару барысында <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="battery_status_title" msgid="9159414319574976203">"Батарея күйі"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Батарея деңгейі"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN (Apple хабар жіберу қызметі)"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Бастапқы APN параметрлерін қалпына келтіру."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Бастапқы параметрлеріне қайта реттеу"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Бастапқы қол жетімділік нүктесі атауының параметрлерін қайта орнату аяқталды."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Желі параметрлерін қалпына келтіру"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Бұл келесілерді қоса барлық желі параметрлерін қалпына келтіреді:\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="4874737348054213767">"Барлық желі параметрлерін қалпына келтіресіз бе? Бұл әрекетті болдырмау мүмкін емес!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Параметрлерді қалпына келтіру"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Қалпына келтіру қажет пе?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Желі параметрлері қалпына келтірілген"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Құрылғыны ысыру"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Зауыттық деректерді қалпына келтіру"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Планшеттегі барлық деректерді өшіреді"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Телефондағы барлық деректерді өшіреді"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Бұл сіздің планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерекқорды өшіреді, келесі деректерді қоса:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе және қолданба дерекқоры және параметрлері"</li>\n<li>"Жүктелген қолданбалар"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Бұл телефонның "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD картадағы музыка және фотосуреттер сияқты деректерді өшіріңіз."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Планшетті қайта реттеу"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Телефонды қайта реттеу"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Барлық жеке ақпаратыңыз бен жүктелген қолданбаларыңыз жойылсын ба? Бұл әрекетті кері орындау мүмкін болмайды!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Барлық жеке ақпаратыңыз бен жүктелген қолданбаларды өшіресіз бе? Бұл әрекетті болдырмау мүмкін емес!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Барлығын өшіру"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Зауыттық дерекқорды қайта реттеуді растау үшін бектіпе ашу кескінін сызуыңыз қажет."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Қайта реттеулер орындалмады, себебі Жүйе Тазалау қызметі қол жетімсіз."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Қайта реттелсін бе?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Зауыттық параметрлерді қалпына келтіру бұл пайдаланушы үшін қол жетімді емес"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB жады ішінде сақталған барлық деректерімен бірге өшірілісін бе? Бұл әрекетті кері орындау мүмкін болмайды!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD картасы ішінде сақталған барлық деректерімен бірге өшірілісін бе? Бұл әрекетті кері орындау мүмкін болмайды!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Барлығын өшіріңіз"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB жадын өшіруді қалайтыныңызды растау үшін бекітпе ашу кескінін қайта сызуыңыз қажет."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD картасын өшіруді қалайтыныңызды растау үшін бектіпе ашу кескінін сызуыңыз қажет."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Көмек"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Ұялы желілер"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Ұялы жоспар"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Бастапқы 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Аймақ режимі"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Орынды анықтау үшін GPS, Wi‑Fi және ұялы желілерді пайдалану"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Орынды анықтау үшін Wi‑Fi және ұялы желілерді пайдалану"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Аймақты анықтау үшін GPS қолдану"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Орынды анықтау үшін GPS пайдаланыңыз"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Тексеруде"</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="2070686681074461301">"Тіпті Wi-Fi өшірулі кезде де, қолданбалар мен қызметтерге Wi-Fi желілерін іздеу рұқсатын беру арқылы орналасуды жақсартыңыз"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth іздеу"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Тіпті Bluetooth өшірулі кезде де, жүйелік қызметтерut Bluetooth құрылғыларын іздеуге рұқсат беру арқылы орналасуды жақсартыңыз"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi және ұялы желі арқылы орынды анықтау"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Аймағыңызды жылдамырақ анықтау үшін қолданбаларға Google\' аймақтар қызметін қолдануға рұқсат етіңіз. Аймақ туралы деректер анонимді түрде жинақталып, Google-ға жіберіледі."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Аймақ Wi‑Fi арқылы анықталды"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"Экран қауіпсіздігі"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Жалғастыру үшін құрылғыңыз үлгісін пайдаланыңыз."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Жалғастыру үшін құрылғыңыз PIN кодын енгізіңіз."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Жалғастыру үшін құрылғыңыз құпия сөзін енгізіңіз."</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_need_to_unlock" msgid="757935356911054465">"Сақталған кескінді растау"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Қайта әрекеттену:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"Тым көп қате әрекеттенулер!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> секундтан кейін қайта әрекеттеніңіз."</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="manageapplications_settings_title" msgid="7041951105633616745">"Қолданбаларды алу"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Орнатылған қолданбаларды басқару және алу"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Жад қолданысы"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Қолданбалар қолданатын жадты көру"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Қосылып тұрған қызметтер"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Планшет ақпараты"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Телефон ақпараты"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Батарея ақпараты"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Жылдам бастау"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Қолданбаларды қосатын төте пернелер тағайындау"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Қолданбаны тағайындау"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Төте пернелер жоқ"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Іздеу + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Өшіру"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) төте пернелері өшіріледі."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Жарайды"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Өшіру"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Қолданбалар"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Төте пернелер"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Барлық bluetooth HCI жинақтарын файлға сақтаңыз"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM бекітпесін ашу"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Жүктеуші бекітпесін ашуға рұқсат ету"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN кодын енгізіңіз"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM бекітпесін ашуды қосу үшін құрылғының PIN кодын енгізіңіз"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM бекітпесін ашуға рұқсат ету керек пе?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ЕСКЕРТУ: осы параметр қосулы кезде осы құрылғыда құрылғыны қорғау мүмкіндіктері жұмыс істемейді."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Журналға тіркеуші буферінің өлшемдері"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Әр журнал буфері үшін журналға тіркеуші өлшемдерін таңдау"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Жасанды аймақтарға рұқсат беру"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Аймақтарға еліктеу әрекетіне рұқсат беру"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Көру төлсипатын тексеруді қосу"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Желі орнату"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сымсыз дисплей сертификаты"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi егжей-тегжейлі журналға тір. қосу"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агрессивті Wi‑Fi жел. ұялы жел. ауыстыру"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi роумингін іздеулерге әрқашан рұқсат ету"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Бұрынғы DHCP клиентін пайдалану"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Сымсыз дисплей растау опцияларын көрсету"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi жур. тір. дең. арт., Wi‑Fi желісін таңдағышта әр SSID RSSI бойынша көрсету"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Қосылған болса, Wi‑Fi сигналы төмен болса, Wi‑Fi деректер байланысын ұялы желіге ауыстыруда көбірек агрессивті болады"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Интерфейсте бар деректер трафигінің мөлшерінің негізінде Wi-Fi роумингін іздеулерге рұқсат ету/тыйым салу"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Журналға тіркеуші буферінің өлшемдері"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Әр журнал буфері үшін журналға тіркеуші өлшемдерін таңдау"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB конфигурациясын таңдау"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB конфигурациясын таңдау"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Жасанды аймақтарға рұқсат беру"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Аймақтарға еліктеу әрекетіне рұқсат беру"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Көру төлсипатын тексеруді қосу"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Жаңа Android DHCP клиентінің орнына Lollipop ішіндегі DHCP клиентін пайдаланыңыз."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB жөндеулеріне рұқсат берілсін бе?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB жөндеу дамыту мақсаттарына ғана арналған. Оны компьютер және құрылғы арасында дерек көшіру, құрылғыға ескертусіз қолданба орнату және тіркелім деректерін оқу үшін қолданыңыз."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Бұған дейін рұқсат берген барлық компьютерлерден USB жөндеуге қол жетімділік тоқтатылсын ба?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Қызылкүрең"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> қолданылсын ба?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> қызметіне қажет:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Бағдарлама рұқсат сұрауын жасырып тұрғандықтан, Параметрлер жауабыңызды тексере алмайды."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> қоссаңыз, құрылғыңыз деректерді шифрлау үшін экранды бекітуді пайдаланбайды."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Сіз арнайы мүмкіндіктер қызметін қосқандықтан, құрылғыңыз деректерді шифрлау үшін экранды бекітуді пайдаланбайды."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> қосу деректерді шифрлауға әсер ететіндіктен, өрнекті растау керек."</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> қолданбалары <xliff:g id="TIME">%2$s</xliff:g> артық"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="TOTALRAM">%2$s</xliff:g> ішінен <xliff:g id="USEDRAM">%1$s</xliff:g> <xliff:g id="TIMEDURATION">%3$s</xliff:g> бойы пайдаланылған"</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_memory_status" msgid="4251599550196193093">"Құрылғы жады қазір <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM жадын орташа қолдану"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM жадын ең көп қолдану"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android амалдық жүйесі"</string>
+    <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_ram_use" msgid="976912589127397307">"ЖЖҚ пайдалану"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"ЖЖҚ пайдалану (фондық)"</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>
     <string name="mem_details_title" msgid="6548392825497290498">"Жад туралы мәліметтер"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"Жасыру жүйесі"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Бастапқы параметрлер қолданба параметрлерінің үстінен жазады"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Бастапқы параметрлер"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Бастапқы қозғалтқыш"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Сөйлеу мәтіні үшін сөйлеуді синтездеу қозғалтқышын орнатады"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Сөйленетін мәтін үшін пайдаланылатын сөзді синтездеу механизмін орнату"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Сөйлеу рейтингі"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Мәтіннің оқылу жылдамдығы"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Дауыс жиілігі"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"Растау деректері қорын орнатуды растау үшін бекітпені ашатын кескінді сызуыңыз қажет."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Растау деректерінің жадының кілсөзін енгізіңіз."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Ағымдағы кілтсөз:"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"Ешқандай есептік жазба қазір сақтық көшірмесі жасалған деректерді сақтап жатқан жоқ"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Қолданба деректерін қамту"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Aвтоматтық қалпына келтіру"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Қолданбаны қайта орнатқанда параметрлер және деректердің сақтық көшірмесін қалпына келтіріңіз"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Сақтық көшірме жасау қызметі белсенді емес."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Бұл құрылғы саясаты арқылы орнатылған."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Компьютер үстелінің сақтық көшірмесі"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Жұмыс үстелінің сақтық көшірмелері қазір қорғалмаған"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Жұмыс үстелінің толық сақтық көшірмесінің кілтсөзін өзгерту немесе жою үшін түртіңіз"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Ауысу анимациясының өлшемі"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Аниматор ұзақтығының межесі"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Қосымша дисплейлерге еліктеу"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Көп терезе режимі"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Бір уақытта экрандағы бірнеше әрекет."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Көп терезе режимін қосу керек пе?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ЕСКЕРТУ: бұл «Жақындағы қолданбалар» ПИ арқылы бір мезгілде экранда бірнеше әрекетке мүмкіндік беретін жоғары эксперименттік мүмкіндік. Кейбір қолданбалар осы мүмкіндікті пайдалану кезінде жаңылуы немесе дұрыс жұмыс істемеуі мүмкін."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Қолданбалар"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Әрекеттерді сақтамау"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Әр әрекетті пайдаланушы аяқтай салысымен жою"</string>
@@ -2195,7 +2251,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="718192651887726259">"Қосымша пайдаланушыларды жасау арқылы осы құрылғыны басқа адамдармен бөлісуге болады. Әр пайдаланушыда өз кеңістігі бар. Пайдаланушы оны жеке қолданбалармен, экранның артқы фонымен және т.с.с. теңшей алады. Сондай-ақ, пайдаланушылар барлығына әсер ететін Wi‑Fi сияқты құрылғы параметрлерін реттей алады.\n\nЖаңа пайдаланушыны қосқанда сол адам өз кеңістігін реттеуі керек.\n\nКез келген пайдаланушы барлық басқа пайдаланушылар үшін қолданбаларды жаңарта алады."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Қосымша пайдаланушыларды жасау арқылы осы құрылғыны басқа адамдармен бөлісуге болады. Әр пайдаланушыда өз кеңістігі бар. Пайдаланушы оны жеке қолданбалармен, экранның артқы фонымен және т.с.с. теңшей алады. Сондай-ақ, пайдаланушылар барлығына әсер ететін Wi‑Fi сияқты құрылғы параметрлерін реттей алады.\n\nЖаңа пайдаланушыны қосқанда сол адам өз кеңістігін реттеуі керек.\n\nBREAK_2BREAK_3Кез келген пайдаланушы барлық басқа пайдаланушылар үшін қолданбаларды жаңарта алады."</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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"Телефон қоңырауларына рұқсат ету"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Телеф. қоң-на және SMS хабарларына рұқсат ету"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Телефон қоңырауларын қосу"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Телефон қоңырауларын және SMS қосу"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Пайдаланушыны жою"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Телефон қоңырауларына рұқ. ету керек пе?"</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_sms_confirm_title" msgid="188164598768941316">"Телефон қоң-на және SMS рұқсат ету керек пе?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Қоңыраулар және SMS тарихы осы пайдаланушымен бөлісіледі."</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="application_restrictions" msgid="8207332020898004394">"Қолданбалар мен мазмұнға рұқсат беру"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Шектеулері бар қолданбалар"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Қолданба параметрлерін кеңейту"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"Бұл қолданбаның шектелген профайлдарда қолдауы жоқ"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi желі байланысы"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"мәтіндік хабар мәтіндік хабарлар жіберу хабар алмасу"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ұялы ұялы оператор сымсыз деректер 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi қоңырау шалу"</string>
     <string name="keywords_home" msgid="3626170808219458848">"қосқыш"</string>
     <string name="keywords_display" msgid="6709007669501628320">"сенсорлы экран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"экранды күңгірттеу сенсорлы экран батарея"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"экранды күңгірттеу сенсорлы экран батарея"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон жекелендіру теңшеу дисплей"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"күңгірт тақырып түнгі режим экранды күңгірт ету жарықтықты инверсиялау"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"фонды жекелендіру дисплейді теңшеу"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"мәтін өлшемі"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"жоба"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"жоба енгізілген"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"бос орын диск қатты диск құрылғы пайдалану"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"қуат пайдалану заряд"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"емле сөздігі емлені тексеру авто түзету"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"есептік жазба"</string>
     <string name="keywords_users" msgid="4673901601478559100">"шектеу шектелген"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"мәтінді түзету түзету дыбыс дірілдету авто тіл қимыл ұсыну ұсыныс тақырып тіл тигізетін сөз түрі эмодзи халықаралық"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"әдепкі параметрлерді қалпына келтіру"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"төтенше мұз қолданбасының әдепкі мәні"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"қолданбаларды жүктеу қолданбалар жүйесі"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"қолданбалар рұқсаттарының қауіпсіздігі"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"әдепкі қолданбалар"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"сырғыту құпия сөз өрнек PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC белгісін реттеу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазу"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Үзулер"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Қоңыраулар және хабарландырулар келгенде"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Әрқашан үзу"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Тек басым үзулерге рұқсат беру"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Үзбеу"</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_option_important_interruptions" msgid="3903928008177972500">"Тек басымдық"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Тек дабылдар"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Кедергілерсіз"</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="ringtone_title" msgid="5379026328015343686">"Телефон әуені"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Әдепкі хабарландыр. қоң. әуені"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Сондай-ақ, қоңыраулар үшін дірілдету"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Дірілдеу"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Хабарландыруға қатынасу"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Қолданбалар хабарларды оқи алмайды."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d қолданбасы хабарларды оқи алады"</item>
-    <item quantity="other" msgid="980049191810249052">"%d қолданбасы хабарларды оқи алады"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d қолданба хабарларды оқи алады</item>
+      <item quantity="one">%d қолданба хабарларды оқи алады</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Хабар тыңдаушылар орнатылмаған."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g>қосылсын ба?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> жүйе немесе орнатылған қолданба қойған барлық хабарларды оқи алады, оған байланыс аттары және сізге жіберілген хабар мәтіні сияқты жеке ақпараттар да кіреді. Сондай-ақ бұл хабарларды өшіру немесе ішіндегі әрекет түймелерін түрту де мүмкін болады."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Шарт провайдерлері"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ешбір қолданба шарттарды қамтамасыз етпейді"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d қолданбасы шарттарды қамтамасыз етеді"</item>
-    <item quantity="other" msgid="358057362115673258">"%d қолданба шарттарды қамтамасыз етеді"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Шарт провайдерлері орнатылмаған."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> қосылсын ба?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> «Мазаламау» режиміне шығу шарттарын қоса алады."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Қолданбаларды жүктеу…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Бөгеу"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Барлығын бұғаттау"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Осы қолданбадан келген хабарландыруларды ешқашан көрсетпеу"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Басымдық"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Құрылғы тек басым үзулерге орнатылған болса, хабарландыруларды тізімнің жоғарғы жағында көрсету және олардың келуін сақтау"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Құпия"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Құрылғы бекітілген болса, осы қолданба хабарландыруларындағы кез келген құпия мазмұнды жасыру"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Басымды ретінде белгілеу"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Осы қолданба хабарландыруларын Мазаламаңыз күйі Басымдық күйіне орнатылғанда ғана естілуіне рұқсат етіңіз"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Ақпаратты оқуға рұқсат ету"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Қолданбаның ағымдағы экрандағы көрініске сырғыту арқылы белгілі бір хабарландыруларды ерекше белгілеуіне рұқсат етіңіз"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Маңызды мазмұнды жасыру"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Құрылғы бекітілген кезде, жеке ақпаратты ашуы мүмкін осы қолданба хабарландыруларының мазмұнын жасыру"</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="zen_mode_default_option" msgid="6940069025071935243">"Сіз осыны өшіргенше"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Басым үзулер"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Бос тұру уақыты"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Күндер"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ешқандай"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Үзілістерге рұқсат етілген"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Тек басымдық"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ешқандай"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматтандыру"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Автоматты түрде қосу"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Ереже атауы"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Ереже қосу"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ережені жою"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"«<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="3201273040477861538">"Ережені жоспарлау"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Ереже табылмады."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ешқашан"</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_from" msgid="1033337300289871697">"Мынадан қоңыраулар/хабарлар"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Кез келген адам"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Тек контактілер"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Тек жұлдызшалы контактілер"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Оқиғалар және еске салғыштар"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Дабылдар әрқашан басым үзулер болып табылады"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Дабылдар"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Еске салғыштар"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Оқиғалар"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Таңдалған қоңырау шалушылар"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Қайта қоңырау шалушылар"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Сол адам <xliff:g id="MINUTES">%d</xliff:g> минуттың ішінде қайта қоңырау шалса, бұл мүмкіндікті іске қосыңыз"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Автоматты түрде қосу"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Ешқашан"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"келесі күні <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> немесе оның алдындағы кез келген дабыл"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"келесі күні <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_interruptions_voice_title" msgid="855256211259132964">"Үзулер"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Қоңыраулар және хабарландырулар келгенде"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Қай кезде үзіліс алғыңыз келеді?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Қанша уақыт бойы?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Әрқашан үзу"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"өшірулі,барлығы,әрбірі"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Тек басым үзулерге рұқсат беру"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Тек дабылдарға рұқсат ету"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Үзбеу"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Белгісіз уақыт бойы"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минут</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> минут</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Тек шексіз басымдық хабарландыруларына өзгерту"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін <xliff:g id="DURATION">%1$d</xliff:g> минутқа басымдық хабарландыруларына ғана өзгерту</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> дейін бір минутқа басымдық хабарландыруларына ғана өзгерту</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g> дейін бір сағатқа басымдық хабарландыруларына ғана өзгерту</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Шексіз дабылдарға ғана өзгерту"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Дабылдарды (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін) <xliff:g id="DURATION">%1$d</xliff:g> минутқа ғана өзгерту</item>
+      <item quantity="one">Дабылдарды <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">Дабылдарды <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін <xliff:g id="DURATION">%1$d</xliff:g> сағатқа ғана өзгерту</item>
+      <item quantity="one">Дабылдарды <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> дейін бір сағатқа ғана өзгерту</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Шексіз тоқтатпауға өзгерту"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g> дейін бір минут кедергі жасамауға өзгерту</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін <xliff:g id="DURATION">%1$d</xliff:g> сағат кедергі жасамауға өзгерту</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> дейін бір сағат кедергі жасамауға өзгерту</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Әрқашан тоқтатуға өзгерту"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"мәңгілік"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Қолданба хабар-лары"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Хабарландыру параметрлері"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Осы құрылғы туралы пікір жіберу"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"Бастапқы ретінде бастау"</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="app_launch_domain_links_title" msgid="458956710410857777">"Домен сілтемелері"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Ашық домен URL мекенжайлары"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Қолданбаға домен URL мекенжайларын тікелей ашуға рұқсат беру"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Қолдау көрсетілген домен URL мекенжайлары"</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="410824961149037234">"ішкі жад"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"сыртқы жад"</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="notifications_enabled" msgid="6983396130566021385">"Қосулы"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Бөгеу"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Құпия"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Басымдық"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Басым және құпия"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> рұқсат берілген</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> рұқсат берілген</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g>/<xliff:g id="COUNT_3">%d</xliff:g> рұқсат берілген</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> рұқсат берілген</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Кейбір әдепкі параметрлер орнатылған"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Әдепкі параметрлер орнатылмаған"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Барлық қолданбалар"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Қосылған"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Жеке"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Жұмыс"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Бөгелген"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Басымдық"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Құпия"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домен URL мекенжайларымен"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Әкімші өшірген"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Кеңейтілген"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Белгісіз қолданба"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Профильді таңдау"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Қолданба рұқсаттары"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> қолданбадан <xliff:g id="COUNT_0">%d</xliff:g> қосымша кіруге рұқсат етілген"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> қолданбадан <xliff:g id="COUNT_0">%d</xliff:g> рұқсат етілген"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Домен URL мекенжайлары"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Ешбір домен URL мекенжайын ашпаңыз"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"«<xliff:g id="DOMAIN">%s</xliff:g>» ашу"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"«<xliff:g id="DOMAIN">%s</xliff:g>» және қатысты URL мекенжайларын ашу"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> қолданба олардың домен URL мекенжайын ашуы мүмкін</item>
+      <item quantity="one">Бір қолданба оның домен URL мекенжайларын ашуы мүмкін</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Анықталмаған"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Әдепкі қолданбалар"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Браузер қолданбасы"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Әдепкі браузер жоқ"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Әдепкі)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Қолданбалар қоймасы"</string>
 </resources>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index 41d20e9..a9248cb 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ប៊ូតុង​ចុច"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"បិទ/បើក​សំឡេង​មីក្រូហ្វូន"</item>
     <item msgid="1148142988678569310">"មេឌៀ​គម្រោង"</item>
     <item msgid="9130014005474445273">"ធ្វើឲ្យ VPN សកម្ម"</item>
+    <item msgid="1165192162975045562">"ការបង្កើតផ្ទាំងរូបភាព"</item>
+    <item msgid="7129487923652967258">"រចនាសម្ព័ន្ធជំនួយ"</item>
+    <item msgid="1069023208100114540">"រូបថតអេក្រង់ជំនួយ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ទី​តាំង​"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"បិទ/បើក​សំឡេង​មីក្រូហ្វូន"</item>
     <item msgid="5906017727368097853">"មេឌៀ​គម្រោង"</item>
     <item msgid="2486614710846178542">"ធ្វើឲ្យ VPN សកម្ម"</item>
+    <item msgid="5586547561693629602">"ការបង្កើតផ្ទាំងរូបភាព"</item>
+    <item msgid="32794179825485062">"រចនាសម្ព័ន្ធជំនួយ"</item>
+    <item msgid="7872852746938272552">"រូបថតអេក្រង់ជំនួយ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ខ្លី"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"ទាប"</item>
     <item msgid="4212263919458209842">"សំខាន់​"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"បិទ"</item>
-    <item msgid="5656544177755411222">"ការ​រំខាន​បាន​កំណត់"</item>
-    <item msgid="8735337502532332056">"ការ​រំខាន​សូន្យ"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ធម្មតា"</item>
     <item msgid="866544120205026771">"មធ្យម"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"ផ្កាឈូក"</item>
     <item msgid="6131821495505931173">"ពណ៌ក្រហម"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (ពិធីកា​ផ្ទេរ​មេឌៀ)"</item>
+    <item msgid="8856820259201251036">"PTP (ពិធីការ​ផ្ទេរ​រូបភាព)"</item>
+    <item msgid="216135047298423770">"RNDIS (អ៊ីសឺណិត​យូអេសប៊ី)"</item>
+    <item msgid="2686051673589572111">"ប្រភព​អូឌីយ៉ូ"</item>
+    <item msgid="7014054229609338176">"មីឌី"</item>
+  </string-array>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 4cb82db..49bb2a2 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"អនុញ្ញាត"</string>
     <string name="deny" msgid="6947806159746484865">"បដិសេធ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"មិន​ស្គាល់"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"ឥឡូវ​អ្នក​ស្ថិតនៅ <xliff:g id="STEP_COUNT">%1$d</xliff:g> ជំហាន​ពី​ការ​ក្លាយ​ជា​អ្នក​អភិវឌ្ឍ។"</item>
-    <item quantity="other" msgid="6722953419953594148">"ឥឡូវ​អ្នក​ស្ថិត​នៅ​ចម្ងាយ <xliff:g id="STEP_COUNT">%1$d</xliff:g> ជំហាន​ពី​ការ​ក្លាយ​ជា​អ្នក​អភិវឌ្ឍ។"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">ឥឡូវនេះអ្នកនៅសល់ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ជំហានទៀតដើម្បីក្លាយជាអ្នកអភិវឌ្ឍន៍។</item>
+      <item quantity="one">ឥឡូវនេះអ្នកនៅសល់ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ជំហានទៀតដើម្បីក្លាយជាអ្នកអភិវឌ្ឍន៍។</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ឥឡូវ​អ្នក​ក្លាយ​ជា​អ្នក​អភិវឌ្ឍ​ហើយ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"មិន​ចាំបាច់​ទេ អ្នក​ជា​អ្នក​អភិវឌ្ឍ​រួច​ហើយ។"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ឥត​ខ្សែ &amp; បណ្ដាញ​"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"បិទ​សារ SMS លើ IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"ទាមទារ​ឲ្យ​បើក​ការ​ចុះឈ្មោះ IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"បិទ​ការ​ឈ្មោះ​ IMS ដែល​ទាមទារ"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"បើក VoLTE provisioned flag"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"បិទ VoLTE provisioned flag"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"បើក lte ram dump"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"បិទ lte ram dump"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"មើល​សៀវភៅ​អាសយដ្ឋាន​ក្នុង​ស៊ីម​កាត"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"បាន​តភ្ជាប់"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"បាន​តភ្ជាប់ (គ្មាន​ទូរស័ព្ទ)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"បាន​តភ្ជាប់ (គ្មាន​មេឌៀ)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"បាន​ភ្ជាប់ (គ្មាន​ការ​ចូល​ដំណើរការ​សារ)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"បាន​តភ្ជាប់ (គ្មាន​ទូរស័ព្ទ ឬ​មេឌៀ)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"បាន​ផ្ដាច់"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"កំពុង​ផ្ដាច់…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"កំពុង​ត​ភ្ជាប់​…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"កំពុង​ផ្គូផ្គង..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"ឧបករណ៍​ប៊្លូធូស​គ្មាន​ឈ្មោះ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"ស្វែងរក"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"រក​មិន​ឃើញ​ឧបករណ៍​ប៊្លូធូស​ដែល​នៅ​ជិត។"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"បង្ហាញ​ឯកសារ​បាន​ទទួល"</string>
     <string name="device_picker" msgid="4978696506172252813">"ជ្រើស​ឧបករណ៍​ប៊្លូ​ធូ​ស"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"សំណើ​សិទ្ធិ​ប៊្លូធូស"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"កម្មវិធី​ចង់​បើក​ប៊្លូធូស។"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"កម្មវិធី​ចង់​​បើក​ប៊្លូធូស​សម្រាប់​ឧបករណ៍​នេះ។"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"កម្មវិធី​ចង់​ឲ្យ​​ធ្វើ​ឲ្យ​ឧបករណ៍​ប៊្លូធូស​ផ្សេង​មើល​ឃើញ​​កុំព្យូទ័រ​បន្ទះ​​របស់​​អ្នក​រយៈ​ពេល <xliff:g id="TIMEOUT">%1$d</xliff:g> វិនាទី។"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"កម្មវិធី​​ចង់​ឲ្យ​ឧបករណ៍​ប៊្លូធូស​ផ្សេង​ទៀត​អាច​មើល​ឃើញ​​ទូរស័ព្ទ​របស់​អ្នក​រយៈ​ពេល <xliff:g id="TIMEOUT">%1$d</xliff:g> វិនាទី។"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"កម្មវិធី​ចង់​ឲ្យ​ឧបករណ៍​ប៊្លូធូស​ផ្សេង​អាច​មើល​ឃើញ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក។ អ្នក​អាច​ប្ដូរ​វា​ពេល​ក្រោយ​ក្នុង​ការ​កំណត់​ប៊្លូធូស។"</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"កាត​អេសឌី"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ការ​កំណត់​ប្រូកស៊ី"</string>
     <string name="cancel" msgid="6859253417269739139">"បោះ​បង់​"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"បោះបង់"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"បន្ត"</string>
     <string name="okay" msgid="1997666393121016642">"យល់ព្រម"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"បាទ/ចាស"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ទេ"</string>
-    <string name="forget" msgid="7267115980248732932">"បំភ្លេច"</string>
+    <string name="forget" msgid="1400428660472591263">"បំភ្លេច"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"កែ​លម្អ​ការ​ផ្គូផ្គង​ទម្រង់​មុខ"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"ពិនិត្យ​ភាព​រស់រវើក"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"តម្រូវ​ឲ្យ​ប្រិច​ភ្នែក​ពេល​ដោះ​សោ"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"កំណត់​ទីតាំង​ខ្ញុំ, ការ​ដោះ​សោ​អេក្រង់, សោ​ឧបករណ៍​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ពាក្យ​សម្ងាត់"</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="3453670509485083962">"បន្ថែម"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ការចាក់សោអេក្រង់"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"ដំឡើងស្នាមម្រាមដៃ"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"ដើម្បីប្រើស្នាមម្រាមដៃរបស់អ្នកដោះសោអេក្រង់ ឬបញ្ជាក់ការទិញ អ្នកត្រូវ៖ \n\n✓ ដំឡើងវិធីសាស្ត្រដោះសោអេក្រង់បម្រុងរបស់អ្នក \n\n✓ បន្ថែមស្នាមម្រាមដៃរបស់អ្នក"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ស្វែងរកឧបករណ៍ចាប់សញ្ញា"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ដាក់ឧបករណ៍ចាប់សញ្ញាស្នាមម្រាមដៃនៅខាងក្រោយទូរស័ព្ទរបស់អ្នក។"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"តោះចាប់ផ្តើម!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"ដាក់ម្រាមដៃរបស់អ្នកនៅលើឧបករណ៍ផ្តិតម្រាមដៃ។ លើកវាឡើងបន្ទាប់ពីមានភាពរំញ័រ។"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"ល្អណាស់! ឥឡូវនេះធ្វើម្តងទៀត។"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"ដាក់ម្រាមដៃដដែលនៅលើឧបករណ៍ផ្តិតម្រាមដៃ ហើយលើកវាឡើងបន្ទាប់ពីមានភាពរំញ័រ។"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"បានបន្ថែមស្នាមម្រាមដៃ!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ អ្នកអាចប្រើស្នាមម្រាមដៃដើម្បីធ្វើជាអត្តសញ្ញាណ ឬដើម្បីអនុញ្ញាតការទិញ។"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"បន្ថែម"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"បន្ទាប់"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"បញ្ចូល​ថ្ម ហើយ​ព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"គ្មាន​ពាក្យ​សម្ងាត់ ឬ​​កូដ PIN ចាក់​សោ​អេក្រង់"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"អ្នក​ត្រូវ​តែ​កំណត់​កូដ​ PIN ឬ​ពាក្យ​សម្ងាត់​ចាក់សោ​អេក្រង់​​ មុន​ពេល​អ្នក​ចាប់ផ្ដើម​ដាក់លេខ​កូដ។"</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"អ្នក​ត្រូវ​គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក​ ដើម្បី​បញ្ជាក់​ការ​ដាក់លេខ​កូដ​ឧបករណ៍​របស់​អ្នក។"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"ដាក់លេខ​កូដ?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"ប្រតិបត្តិការ​ដាក់​លេខ​កូដ​មិន​អាច​ត្រឡប់​វិញ​បានទេ ហើយ​បើ​អ្នក​ផ្អាក​វា អ្នក​នឹង​បាត់បង់​ទិន្នន័យ។ ការ​ដាក់​លេខ​កូដ​ចំណាយ​ពេល​ប្រហែល ១ ម៉ោង​ ឬ​ច្រើន​ជាង​នេះ អំឡុង​ពេល​នោះ​កុំព្យូទ័រ​បន្ទះ​នឹង​ចាប់ផ្ដើម​ឡើងវិញ​ច្រើន​ដង។"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"ប្រតិបត្តិការ​ដាក់លេខ​កូដ​មិន​អាច​ត្រឡប់​វិញ​បាន​ទេ ហើយ​ប្រសិន​បើ​អ្នក​ផ្អាក​វា អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​ទាំងអស់។ ការ​ដាក់​លេខ​កូដ​ចំណាយ​ពេល​មួយ​ម៉ោង ឬ​ច្រើន​ជាង​នេះ អំឡុង​ពេល​នោះ​ទូរស័ព្ទ​នឹង​ចាប់ផ្ដើម​ឡើងវិញ​ច្រើន​ដង។"</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"ដោះ​សោ​តាម​​ទម្រង់​មុខ"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"សុវត្ថិភាព​ទាប, ពិសោធន៍"</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_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="current_screen_lock" msgid="4104091715420072219">"ការចាក់សោអេក្រង់បច្ចុប្បន្ន"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"លក្ខណៈពិសេសការពារឧបករណ៍មិនដំណើរការទៀតទេ។"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"បាន​បិទ​ដោយ​​អ្នក​គ្រប់គ្រង ការ​ដាក់​លេខ​កូដ​គោលនយោបាយ ឬ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</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_biometric_weak" msgid="3008473624490350142">"ដោះ​សោ​តាម​​ទម្រង់​មុខ"</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_password" msgid="1203938057264146610">"ពាក្យសម្ងាត់​"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"បន្ទាប់ពីអ្នកបានកំណត់ការចាក់សោអេក្រង់រួចហើយ អ្នកក៏អាចកំណត់ស្នាមម្រាមដៃរបស់អ្នកបានផងដែនៅក្នុង ការកំណត់ &gt; សុវត្ថិភាព។"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"បិទ​ការ​ចាក់​សោ​អេក្រង់"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"លុប​​លំនាំ​ដោះ​សោ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"លុប​កូដ​ PIN ដោះ​សោ"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់​តួអក្សរ​មួយ។"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​លេខ​​យ៉ាង​ហោច​ណាស់​មួយ។"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"ពាក្យសម្ងាត់​ត្រូវ​មាន​​យ៉ាង​ហោច​និមិត្តសញ្ញា​មួយ។"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"ពាក្យសម្ងាត់​ត្រូវ​មាន​យ៉ាង​ហោច​មួយ​តួអក្សរ។"</item>
-    <item quantity="other" msgid="8186027808415585970">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់ %d តួអក្សរ។"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​អក្សរ​តូច​យ៉ាង​ហោច​មួយ"</item>
-    <item quantity="other" msgid="2693910942679679225">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់​អក្សរ​តូច %d ។"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​អក្សរ​ធំ​យ៉ាង​ហោច​ណាស់​មួយ។"</item>
-    <item quantity="other" msgid="3030801209112209245">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​អក្សរ​ធំ​យ៉ាង​ហោច​ណាស់ %d ។"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​លេខ​​យ៉ាង​ហោច​ណាស់​មួយ"</item>
-    <item quantity="other" msgid="4703982391407595924">"ពាក្យសម្ងាត់​ត្រូវ​មាន​យ៉ាង​ហោច %d តួលេខ។"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​និមិត្តសញ្ញា​ពិសេស​យ៉ាង​ហោច​ណាស់​មួយ។"</item>
-    <item quantity="other" msgid="1221290525051187757">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់​និមិត្តសញ្ញា​ពិសេស​ %d ។"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មិន​មាន​​តួអក្សរ​​យ៉ាង​ហោច​ណាស់​មួយ។"</item>
-    <item quantity="other" msgid="3952508584649046404">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់​តួអក្សរ​មិន​មែ​ន​ជា​អក្សរ %d ។"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់អក្សរ %d តួ។</item>
+      <item quantity="one">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់អក្សរ 1 តួ។</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់អក្សរតូច %d តួ។</item>
+      <item quantity="one">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់អក្សរតូច 1 តួ។</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់អក្សរធំ %d តួ។</item>
+      <item quantity="one">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់អក្សរធំ 1 តួ។</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់លេខ %d ខ្ទង់។</item>
+      <item quantity="one">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់លេខ 1 ខ្ទង់។</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់និមិត្តសញ្ញាពិសេស %d។</item>
+      <item quantity="one">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់និមិត្តសញ្ញាពិសេស 1។</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់តួមិនមែនអក្សរ %d។</item>
+      <item quantity="one">ពាក្យសម្ងាត់ត្រូវមានយ៉ាងហោចណាស់តួមិនមែនអក្សរ 1។</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"អ្នក​គ្រប់គ្រង​ឧបករណ៍​មិន​អនុញ្ញាត​ឲ្យ​ប្រើ​ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន​ទេ។"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ឡើង, ចុះ ឬ​លំដាប់​តួលេខ​ស្ទួន​ត្រូវ​បាន​ហាមឃាត់"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"យល់​ព្រម​"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"ផ្គូផ្គង"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ផ្គូផ្គង"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"បោះ​បង់​"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"ការ​ផ្គូផ្គង​ដើម្បី​ចូល​ដំណើរការ​ទំនាក់ទំនង និង​ប្រវត្តិ​ហៅ​របស់​អ្នក ពេល​បាន​តភ្ជាប់។"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"មិន​អាច​ផ្គូផ្គង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"មិន​អាច​ផ្គូផ្គង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ព្រោះ​​​កូដ PIN ឬ​លេខ​កូដ​មិន​ត្រឹមត្រូវ។"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"មិន​អាច​ទាក់ទង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ការ​ផ្គូផ្គង​បាន​បដិសេធ​ដោយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"មិន​អាច​តភ្ជាប់​ទៅ <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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"ដើម្បីធ្វើឲ្យភាពសុក្រិតនៃទីតាំងមានភាពប្រសើរឡើង កម្មវិធី និងសេវាកម្មនឹងស្កេនរកឧបករណ៍ប៊្លូធូស បើទោះបីជាប៊្លូធូសបិទក៏ដោយ។ អ្នកអាចប្តូរវានៅក្នុង<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_specific_profiles_title" msgid="6952214406025825164">"តភ្ជាប់​ជា​មួយ…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"សំឡេង​មេឌៀ"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"សំឡេង​ទូរស័ព្ទ"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ផ្ទេរ​ឯកសារ"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ឧបករណ៍​បញ្ចូល"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ចូល​អ៊ីនធឺណិត"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"ការ​ចែករំលែក​​ទំនាក់ទំនង"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"ប្រើ​សម្រាប់​ការ​ចែករំលែក​ទំនាក់ទំនង"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ចែករំលែក​ការ​តភ្ជាប់​អ៊ីនធឺណិត"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"​​ចូល​ដំណើរការ​សារ"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"បា​ន​ភ្ជាប់​ទៅ​អូឌីយ៉ូ​មេឌៀ"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"តភ្ជាប់​ទៅ​អូឌីយ៉ូ​ទូរស័ព្ទ"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"បាន​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​មេ​ផ្ទេរ​ឯកសារ"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"បាន​ភ្ជាប់​ទៅ​​​ផែនទី"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"មិន​បាន​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​មេ​ផ្ទេរ​ឯកសារ"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"បាន​តភ្ជាប់​ទៅ​ឧបករណ៍​បញ្ចូល"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ប្រើ​សម្រាប់​សំឡេង​មេឌៀ"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ប្រើ​សម្រាប់​​អូឌីយ៉ូ​ទូរស័ព្ទ"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ប្រើ​សម្រាប់​ផ្ទេរ​ឯកសារ"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ប្រើ​សម្រាប់​បញ្ចូល"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ប្រើ​សម្រាប់​ចូល​អ៊ីនធឺណិត"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ប្រើ​សម្រាប់​ផែនទី"</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_assistant_title" msgid="2553267316621598101">"ជំនួយការ​វ៉ាយហ្វាយ"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"បានភ្ជាប់តាមរយៈជំនួយការ Wi‑Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"ខាស​អេក្រង់"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"កំពុង​បិទ​វ៉ាយហ្វាយ..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"កំហុស"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ពេល​ជិះ​យន្ត"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"មិន​អាច​វិភាគ​រក​បណ្ដាញ"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ការ​ជូន​ដំណឹង​បណ្ដាញ"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"ជូនដំណឹង​រាល់​ពេល​មាន​បណ្ដាញ​សាធារណៈ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ជៀសវាង​ការ​តភ្ជាប់​ដែល​ខ្សោយ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"កុំ​ប្រើ​បណ្ដាញ​វ៉ាយហ្វាយ លុះ​ត្រា​វា​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ល្អ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ប្រើ​តែ​បណ្ដាញ​ដែល​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ល្អ"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"វិភាគ​រក​​គ្រប់ពេល"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"អនុញ្ញាត​ឲ្យ​វិភាគ​រក​ជានិច្ច"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"អនុញ្ញាត​ឲ្យ​សេវាកម្ម​ទីតាំង​របស់ Google និង​កម្មវិធី​ផ្សេងៗ​វិភាគ​រក​បណ្ដាញ សូម្បីតែ​បិទ​វ៉ាយហ្វាយ"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ប្រើ Wi‑Fi បើកដោយស្វ័យប្រវត្តិ"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"អនុញ្ញាតឲ្យជំនួយការ Wi‑Fi ភ្ជាប់ទៅបណ្តាញបើកដែលត្រូវបានកំណត់ថាមានគុណភាពសេវាខ្ពស់ដោយស្វ័យប្រវត្តិ"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"ជ្រើសរើសជំនួយការ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ដំឡើង​វិញ្ញាបនបត្រ"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"ដើម្បី​បង្កើន​ភាព​ត្រឹមត្រូវ​ទីតាំង និង​សម្រាប់​គោលបំណង​ផ្សេងៗ Google និង​កម្មវិធី​ផ្សេង​អាច​វិភាគ​រក​បណ្ដាញ​ដែល​នៅ​ជិត​ៗ សូម្បី​តែ​បិទ​វ៉ាយហ្វាយ​ក៏​ដោយ។ បើ​អ្នក​មិន​ចង់​​ឲ្យ​កើត​ឡើង ចូល​ទៅ​កម្រិត​ខ្ពស់ &gt; វិភាគ​រ​ក​ជា​និច្ច​ពេល​អាច​ប្រើ​បាន។"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"កម្មវិធី​អាច​វិភាគ​រក​បណ្ដាញ​ដែល​នៅ​ជិត ​សូម្បីតែ​​បិទ​វ៉ាយហ្វាយ។ បើ​អ្នក​មិន​ចង់​ឲ្យ​កើត​ឡើង ចូល​ទៅ កម្រិត​ខ្ពស់ &gt; ការ​វិភាគ​រក​អាច​ប្រើ​បាន​ជា​និច្ច។"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"ដើម្បីធ្វើឲ្យភាពសុក្រិតនៃទីតាំងមានភាពប្រសើរឡើង កម្មវិធី និងសេវាកម្មនឹងស្កេនរកបណ្តាញ Wi-Fi បើទោះបីជា 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="5340097010842405981">"កុំ​បង្ហាញ​ម្ដង​ទៀត"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"បើក​វ៉ាយហ្វាយ​​អំឡុង​ពេល​ដេក"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"បើក​វ៉ាយហ្វាយ​អំឡុង​ពេល​ដេក"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"បន្ថែម​បណ្ដាញ​ផ្សេង"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ច្រើន​ទៀត"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"រៀបចំ​ស្វ័យ​ប្រវត្តិ (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"ដើម្បី​បញ្ចប់​ការ​រៀបចំ កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​ត្រូវ​ចូល​ដំណើរការ​វ៉ាយហ្វាយ។ បន្ទាប់​ពី​រៀបចំ អ្នក​អាច​ប្ដូរ​រវាង​ទិន្នន័យ​ចល័ត និង​វ៉ាយហ្វាយ។"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"ជម្រើស​កម្រិត​ខ្ពស់"</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="5940801028985255304">"ចុច​ប៊ូតុង​រៀបចំ​ការពារ​វ៉ាយហ្វាយ​លើ​រ៉ោតទ័រ​របស់​អ្នក។ វា​អាច​ហៅ​ថា \"WPS\" ឬ​មាន​និមិត្តសញ្ញា​នេះ៖"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"ចុចប៊ូតុងដំឡើងការការពារ Wi-Fi នៅលើរ៉ោតទ័ររបស់អ្នក។ វាអាចត្រូវបានហៅថា  \"WPS\" ឬត្រូវបានសម្គាល់ដោយសញ្ញានេះ៖"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"បញ្ចូល​កូដ pin <xliff:g id="NUMBER">%1$s</xliff:g> លើ​រ៉ោតទ័រ​​វ៉ាយហ្វាយ​របស់​អ្នក។ ការ​រៀបចំ​អាច​ចំណាយ​ពេល​ពីរ​នាទី​ដើម្បី​បញ្ចប់។"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS ជោគជ័យ។ កំពុង​តភ្ជាប់​បណ្ដាញ…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"បាន​តភ្ជាប់​ទៅ​បណ្ដាញ​វ៉ាយហ្វាយ <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"កំណត់រចនាសម្ព័ន្ធក្រុម AP"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(មិន​ផ្លាស់ប្ដូរ)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(មិន​បាន​បញ្ជាក់)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"បាន​រក្សាទុក"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"បាន​បិទ"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"ការ​កំណត់​រចនាសម្ព័ន្ធ IP បរាជ័យ"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"ការ​ភ្ជាប់​ WiFi បរាជ័យ"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"បញ្ហា​ក្នុង​ការ​ផ្ទៀងផ្ទាត់"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"នៅ​ក្រៅ​តំបន់"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"រក​មិន​ឃើញ​ការ​ចូល​ដំណើរការ​អ៊ីនធឺណិត, នឹង​មិន​ភ្ជាប់​ឡើង​វិញ​ដោយ​ស្វ័យ​ប្រវត្តិ​ទេ។"</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_security_none" msgid="7985461072596594400">"គ្មាន"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"បណ្តាញនេះមិនមានអ៊ីនធឺណិតនោះទេ។ ប្រើបណ្តាញនេះទោះយ៉ាងណាក៏ដោយ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"កុំសួរម្តងទៀតអំពីបណ្តាញនេះ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"តភ្ជាប់"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់​បណ្ដាញ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"បំភ្លេច"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK ហតស្ប៉ត​វ៉ាយហ្វាយចល័ត"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<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_mode_title" msgid="2164073796253284289">"ចំណូលចិត្តលើការហៅ"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"របៀបហៅតាម Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"គួរប្រើ Wi-Fi"</item>
+    <item msgid="5267397515594230396">"គួរប្រើប្រព័ន្ធទូរស័ព្ទ"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"នៅពេលការហៅតាម Wi-Fi បានបើក ទូរស័ព្ទរបស់អ្នកអាចធ្វើការហៅចេញតាមរយៈបណ្តាញ Wi-Fi ឬបណ្តាញរបស់ក្រុមហ៊ុនរបស់អ្នក ដោយផ្អែកលើចំណូលចិត្តរបស់អ្នក និងថាតើ signal ណាមួយខ្លាំងជាង។ មុនពេលបើកលក្ខណៈពិសេសនេះ សូមត្រួតពិនិត្យជាមួយក្រុមហ៊ុនរបស់អ្នកពាក់ព័ន្ធនឹងតម្លៃ និងព័ត៌មានលម្អិតផ្សេងទៀត។"</string>
     <string name="home_settings" msgid="212375129455718176">"ដើម"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"បង្ហាញ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"សំឡេង"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"រូបរាង"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"ពន្លឺ"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"ងងឹត"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"ស្វ័យប្រវត្តិ"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"ធ្វើបច្ចុប្បន្នភាពស៊ីមកាតដែលបានប្រើ?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> គឺជាស៊ីមតែមួយគត់នៅក្នុងឧបករណ៍របស់អ្នក។ តើអ្នកចង់ប្រើស៊ីមនេះសម្រាប់ប្រើទិន្នន័យប្រព័ន្ធទូរស័ព្ទ និងសារ SMS ទេ?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"លេខ​កូដ PIN ស៊ីម​មិន​ត្រឹមត្រូវ អ្នក​ត្រូវ​​ទាក់ទង​ក្រុមហ៊ុន​បញ្ជូន​របស់​អ្នក​ឥឡូវ​នេះ​ដើម្បី​ដោះ​សោ​ឧបករណ៍​របស់​អ្នក។"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"លេខ​កូដ PIN ស៊ីម​មិន​ត្រឹមត្រូវ, អ្នក​​មាន​ <xliff:g id="NUMBER">%d</xliff:g> ការ​ព្យាយាម​ដែល​នៅ​សល់​​​​មុន​ពេល​ដែល​អ្នក​ត្រូវ​​ទាក់ទង​​ក្រុមហ៊ុន​បញ្ជូន​​ដើម្បី​ដោះ​សោ​ឧបករណ៍​របស់​អ្នក។"</item>
-    <item quantity="other" msgid="77103619544346451">"លេខ​កូដ PIN ស៊ីម​មិន​ត្រឹមត្រូវ, អ្នក​មាន <xliff:g id="NUMBER">%d</xliff:g> ការ​ប៉ុនប៉ង​ដែល​នៅ​សល់។"</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">លេខកូដសម្ងាត់ស៊ីមមិនត្រឹមត្រូវ អ្នកនៅសល់ការព្យាយាម <xliff:g id="NUMBER_1">%d</xliff:g> ដងទៀត។</item>
+      <item quantity="one">លេខកូដសម្ងាត់ស៊ីមមិនត្រឹមត្រូវ អ្នកនៅសល់ការព្យាយាម <xliff:g id="NUMBER_0">%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="default" msgid="475872867864762157">"ស្ថានភាព​ទូរស័ព្ទ"</string>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"កម្មវិធី (ទិន្នន័យ​កម្មវិធី &amp; មាតិកា​មេឌៀ)"</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_dcim_usage" msgid="558887013613822577">"រូបភាព និង​វីដេអូ"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"អូឌីយ៉ូ (តន្ត្រី សំឡេង​រោទ៍ ផតខាស់ ។ល។)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"ផ្សេងៗ"</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="default" msgid="6915293408836853020">"ផ្ដាច់​កាត​អេសឌី"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"ភ្ជាប់"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ដកចេញ"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"លុប និងសម្អាត"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"លុប និងសម្អាតឧបករណ៍ផ្ទុកខាងក្នុង"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"ការ​តភ្ជាប់​កុំព្យូទ័រ​តាម​យូអេសប៊ី"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"ការ​តភ្ជាប់​កុំព្យូទ័រ​តាម​យូអេសប៊ី"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"តភ្ជាប់​ជា"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"អនុញ្ញាត​ឲ្យ​អ្នក​ផ្ទេរ​ឯកសារ​មេឌៀ​លើ​ Windows, ឬ​ប្រើ​ការ​ផ្ទេរ​ឯកសារ Android នៅ​លើ Mac (see www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"ម៉ាស៊ីន​ថត (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"អនុញ្ញាត​ឲ្យ​អ្នក​ផ្ទេរ​រូបថត​ដោយ​ប្រើ​កម្មវិធី​ម៉ាស៊ីន​ថត និង​ផ្ទេរ​ឯកសារ​​តាម​កុំព្យូទ័រ​ដែល​មិន​គាំទ្រ MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ដំឡើង​ឧបករណ៍​ផ្ទេរ​ឯកសារ"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"មីឌី"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"អនុញ្ញាតឲ្យកម្មវិធីដែលគាំទ្រមីឌីដំណើរកាលើ USB ជាមួយកម្មវិធីមីឌីនៅលើកុំព្យូទ័របស់អ្នក។"</string>
     <string name="storage_other_users" msgid="808708845102611856">"អ្នក​ប្រើ​ផ្សេង"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ឧបករណ៍ផ្ទុក"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ឧបករណ៍ផ្ទុកចល័ត"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"ទំនេរ <xliff:g id="FREE">%1$s</xliff:g> (សរុប <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"បានភ្ជាប់ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"មិនអាចដក <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="4161722509712992231">"មិនអាចដក <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="8343688274191391889">"មិនអាចសម្អាត <xliff:g id="NAME">%1$s</xliff:g> បានទេ"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ប្តូរឈ្មោះឧបករណ៍ផ្ទុក"</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="3677827796634199714"><b>"នៅពេលដែលអ្នកដក <xliff:g id="NAME_0">^1</xliff:g> នេះចេញ កម្មវិធីដែលបានផ្ទុកនៅក្នុងនោះនឹងឈប់ដំណើរការ ហើយឯកសារមេឌៀដែលបានផ្ទុកនៅលើនោះនឹងមានទេ រហូតទាល់តែអ្នកដោតចូលវិញ។"</b>" \n\nការសម្អាត <xliff:g id="NAME_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_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_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="1259216693690378749">"កុំដក <xliff:g id="NAME">^1</xliff:g> ចេញខណៈពេលកំពុងធ្វើការសម្អាត។"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ផ្លាស់ទីទិន្នន័យទៅឧបករណ៍ផ្ទុកថ្មី"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"អ្នកអាចផ្លាស់ទីទិន្នន័យកម្មវិធី រូបភាព និងឯកសារទៅ <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="5035719146373359329"><b>"ការផ្លាស់ទីនេះចំណាយពេលប្រហែល <xliff:g id="TIME">^1</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="8641916179067596592">"អំឡុងពេលធ្វើការផ្លាស់ទី \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_move_confirm_title" msgid="292782012677890250">"ផ្លាស់ទី <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"ការផ្លាស់ទី <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="4288580957960820740">"កុំដក <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="battery_status_title" msgid="9159414319574976203">"ស្ថានភាព​ថ្ម"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"កម្រិត​ថ្ម"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"បានកំណត់ការកំណត់បណ្តាញឡើងវិញ"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"វានឹងកំណត់ការកំណត់បណ្តាញទាំងអស់ឡើងវិញ រួមបញ្ចូលទាំង៖\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="4874737348054213767">"កំណត់ការកំណត់បណ្តាញទាំងអស់ឡើងវិញ? អ្នកមិនអាចធ្វើសកម្មភាពនេះវិញបានទេ!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"កំណត់ការកំណត់ឡើងវិញ"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"កំណត់ឡើងវិញ?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"បានកំណត់ការកំណត់បណ្តាញឡើងវិញ"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"កំណត់​ឧបករណ៍​ឡើងវិញ"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"កំណត់​ទិន្នន័យ​ដូច​ចេញពី​រោងចក្រ"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"លុប​ទិន្នន័យ​ទាំងអស់​ក្នុង​កុំព្យូទ័រ​បន្ទះ"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"លុប​ទិន្នន័យ​ទាំងអស់​ក្នុង​ទូរស័ព្ទ"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"វា​នឹង​លុប​ទិន្នន័យ​ពី​ "<b>"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</b>"នៃ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក រួម​មាន៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ការកំណត់ និង​ទិន្នន័យ​កម្មវិធី និង​ប្រព័ន្ធ"</li>\n<li>"កម្មវិធី​បាន​ទាញ​យក"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"វា​នឹង​លុប​ទិន្នន័យ​ទាំងអស់​ពី​ "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"លុប​ទិន្នន័យ​ទាំងអស់​លើ​កាត​អេសឌី ដូច​ជា​តន្ត្រី ឬ​រូបថត"</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="7209547812233487345">"លុប​ព័ត៌មាន​​ផ្ទាល់ខ្លួន​ និង​កម្មវិធី​បាន​ទាញ​យក​របស់​អ្នក​ទាំងអស់? អ្នក​មិន​អាច​ត្រឡប់​សកម្មភាព​នេះ​បា​ន​ទេ!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"លុបព័ត៌មានផ្ទាល់ខ្លួន និងកម្មវិធីដែលបានទាញយករបស់អ្នកទាំងអស់? អ្នកមិនអាចធ្វើសកម្មភាពនេះវិញបានទេ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"លុប​អ្វីៗ​ទាំងអស់"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"អ្នក​ត្រូវ​តែ​គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក ដើម្បី​បញ្ជាក់​ការ​កំណត់​ទិន្នន័យ​ដូច​ចេញ​ពី​រោងចក្រ"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"គ្មាន​ការ​កំណត់​ឡើងវិញ​ត្រូវ​បាន​អនុវត្ត ព្រោះ​សេវាកម្ម​សម្អាត​ប្រព័ន្ធ​មិន​អាច​ប្រើ​បាន។"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"កំណត់​ឡើងវិញ?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ការ​កំណត់​ដូច​ចេញ​ពី​រោងចក្រ​ឡើង​វិញ​មិន​អាច​ប្រើ​បាន​សម្រាប់​អ្នក​ប្រើ​ម្នាក់​នេះ"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"លុប​ទិន្នន័យ​ក្នុង​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី នឹង​លុប​ឯកសារ​ទាំងអស់​ដែល​មាន? អ្នក​មិន​អាច​ត្រឡប់​សកម្មភាព​នេះ​​វិញ​បាន​ទេ!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"លុប​កាត​​អេសឌី នឹង​លុប​ឯកសារ​ទាំងអស់? អ្នក​មិន​អាច​ត្រឡប់​សកម្មភាព​នេះ​វិញ​បាន​ទេ!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"លុប​​​ទាំងអស់"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"អ្នក​ត្រូវតែ​គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក ដើម្បី​បញ្ជក់​ថា​អ្នក​ចង់​លុប​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី។"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"អ្នក​ត្រូវ​គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក ដើម្បី​បញ្ជាក់​ថា​អ្នក​ចង់​លុប​កាត​អេសឌី។"</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">"ការ​ភ្ជាប់​យូអេសប៊ី"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ជំនួយ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"បណ្ដាញ​ចល័ត"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ផែនការ​ទិន្នន័យ​ចល័ត"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"កម្មវិធី​ផ្ញើ​សារ 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"របៀបកំណត់​ទីតាំង"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ប្រើ ជីភីអេស, វ៉ាយហ្វាយ និង​បណ្ដាញ​ចល័ត ដើម្បី​កំណត់​ទីតាំង"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ប្រើ​វ៉ាយហ្វាយ និង​បណ្ដាញ​ចល័ត ដើម្បី​កំណត់​ទីតាំង"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ប្រើ​ជីភីអេស ដើម្បី​កំណត់​ទីតាំង​របស់​អ្នក"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ប្រើ GPS ដើម្បីកំណត់ទីតាំងរបស់អ្នក"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"ការស្កេន"</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="2070686681074461301">"ធ្វើឲ្យទីតាំងមានភាពប្រសើរឡើងដោយអនុញ្ញាតឲ្យកម្មវិធី និងសេវាកម្មស្កេនរកបណ្តាញ Wi-Fi បើទោះបីជា Wi-Fi បិទក៏ដោយ។"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ការស្កេនប៊្លូធូស"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ធ្វើឲ្យទីតាំងមានភាពប្រសើរឡើងដោយអនុញ្ញាតឲ្យសេវាកម្មប្រព័ន្ធស្កេនរកឧបករណ៍ប៊្លូធូស បើទោះបីជាប៊្លូធូសបិទក៏ដោយ។"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ទីតាំងបណ្ដាញចល័ត &amp; វ៉ាយហ្វាយ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ឲ្យ​កម្មវិធី​ប្រើ​សេវាកម្ម​ទីតាំង​របស់ Google ដើម្បី​ស្មាន​ទីតាំង​របស់​អ្នក​កាន់តែ​លឿន។ ទិន្នន័យ​ទីតាំង​អនាមិក​នឹង​ត្រូវ​បាន​ប្រមូល​ រួច​ផ្ញើ​ទៅ Google ។"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ទីតាំង​បាន​កំណត់​ដោយ​វ៉ាយហ្វាយ"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"សុវត្ថិភាព​អេក្រង់"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ប្រើលំនាំឧបករណ៍របស់អ្នកដើម្បីបន្ត។"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"បញ្ចូលកូដ PIN របស់អ្នកដើម្បីបន្ត។"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"បញ្ចូលពាក្យសម្ងាត់ឧបករណ៍របស់អ្នកដើម្បីបន្ត។"</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_need_to_unlock" msgid="757935356911054465">"បញ្ជាក់​លំនាំ​បាន​រក្សាទុក"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"ព្យាយាម​ម្ដង​ទៀត៖"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"មាន​ការ​ព្យាយាម​មិន​ត្រឹមត្រូវ​ច្រើន​ពេក!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"ព្យាយាម​ម្ដង​ទៀត​ក្នុង​រយៈ​ពេល <xliff:g id="NUMBER">%d</xliff:g> វិនាទី។"</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="manageapplications_settings_title" msgid="7041951105633616745">"គ្រប់គ្រង​កម្មវិធី"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"គ្រប់គ្រង និង​លុប​កម្មវិធី​ដែល​បាន​ដំឡើង"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"ប្រើការ​ផ្ទុក"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"មើល​ការ​ផ្ទុក​បាន​ប្រើ​តាម​កម្មវិធី"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"សេវាកម្ម​កំពុង​ដំណើរការ"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ព័ត៌មាន​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ព័ត៌មាន​ទូរស័ព្ទ"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"ព័ត៌មាន​ថ្ម"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"ចាប់ផ្ដើម​រហ័ស"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"កំណត់​ផ្លូវកាត់​ក្ដារ​ចុច ដើម្បី​ចាប់ផ្ដើម​កម្មវិធី"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"ផ្ដល់​កម្មវិធី"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"គ្មាន​ផ្លូវកាត់"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"ស្វែងរក + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"សម្អាត"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"ផ្លូវកាត់​របស់​អ្នក​សម្រាប់ <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) នឹង​ត្រូវ​បាន​សម្អាត។"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"យល់​ព្រម​"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"បោះ​បង់​"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"កម្មវិធី"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"ផ្លូវកាត់"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ចាប់​យក​​​កញ្ចប់​ HCI​ ប៊្លូ​ធូ​ស ទាំង​អស់​នៅ​ក្នុង​ឯកសារ"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"ការដោះសោ OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"អនុញ្ញាតឲ្យដោះសោកម្មវិធីចាប់ផ្តើមប្រព័ន្ធ"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"បញ្ចូល​កូដ PIN របស់​អ្នក"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"បញ្ចូល​កូដ PIN ឧបករណ៍​របស់​អ្នក ដើម្បី​បើក​ការ​ដោះ​សោ OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"អនុញ្ញាតការដោះសោ OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ព្រមាន៖ លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនដំណើរការនៅលើឧបករណ៍នេះទេ ខណៈពេលដែលការកំណត់នេះត្រូវបានបើក។"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ទំហំ buffer របស់ Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ជ្រើស​ទំហំ Logger per log buffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ឲ្យ​ក្លែង​ទីតាំង"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"អនុញ្ញាត​ទីតាំង​ក្លែងក្លាយ"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"បើក​ការ​ត្រួតពិនិត្យ​គុណ​លក្ខណៈ​ទិដ្ឋភាព"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ការភ្ជាប់បណ្ដាញ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"បង្ហាញ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ឥត​ខ្សែ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"បើក​កំណត់ហេតុ​រៀបរាប់​វ៉ាយហ្វាយ"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"វ៉ាយហ្វាយ​បង្ខំ​ទៅ​ការ​បញ្ជូន​ចល័ត"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"តែងតែ​អនុញ្ញាត​​​ការវិភាគ​រ៉ូម​វ៉ាយហ្វាយ"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"ប្រើម៉ាស៊ីនកូន DHCP ចាស់"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"បង្ហាញ​ជម្រើស​សម្រាប់​វិញ្ញាបនបត្រ​បង្ហាញ​ឥត​ខ្សែ"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"បង្កើនកម្រិតកំណត់ហេតុវ៉ាយហ្វាយបង្ហាញក្នុង SSID RSSI ក្នុងកម្មវិធីជ្រើស​វ៉ាយហ្វាយ"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ពេល​បាន​បើក វ៉ាយហ្វាយ​នឹង​កាន់តែ​បង្ខំ​ក្នុង​ការ​បញ្ជូន​ការ​ភ្ជាប់​ទិន្នន័យ​ទៅ​បណ្ដាញ​ចល័ត នៅ​ពេល​សញ្ញា​វ៉ាយហ្វាយ​យឺត"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"អនុញ្ញាត/មិន​អនុញ្ញាត​ការ​វិភាគ​រ៉ូម​​វ៉ាយហ្វាយ​ផ្អែក​លើ​​​ចំនួន​ការ​បង្ហាញ​ចរាចរណ៍​ទិន្នន័យ​​នៅ​ចំណុច​ប្រទាក់"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"ទំហំ buffer របស់ Logger"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ជ្រើស​ទំហំ Logger per log buffer"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"ជ្រើស​ការ​កំណត់​រចនាសម្ព័ន្ធ​យូអេសប៊ី"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"ជ្រើស​ការ​កំណត់​រចនាសម្ព័ន្ធ​យូអេសប៊ី"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"ឲ្យ​ក្លែង​ទីតាំង"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"អនុញ្ញាត​ទីតាំង​ក្លែងក្លាយ"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"បើក​ការ​ត្រួតពិនិត្យ​គុណ​លក្ខណៈ​ទិដ្ឋភាព"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ប្រើម៉ាស៊ីនកូន DHCP ចេញពី Lollipop ជំនួសឲ្យម៉ាស៊ីនកូន Android DHCP ថ្មី។"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"អនុញ្ញាត​ការ​កែ​កំហុស​យូអេសប៊ី?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"ការ​កែ​កំហុស​​យូអេសប៊ី​គឺ​សម្រាប់​តែ​ការ​អភិវឌ្ឍ​ប៉ុណ្ណោះ។ ប្រើ​វា​ដើម្បី​ចម្លង​ទិន្នន័យ​រវាង​កុំព្យូទ័រ និង​ឧបករណ៍​របស់​អ្នក ដំឡើង​កម្មវិធី​ក្នុង​ឧបករណ៍​របស់​អ្នក​ដោយ​មិន​ជូន​ដំណឹង និង​អាន​ទិន្នន័យ​កំណត់ហេតុ។"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"ដក​សិទ្ធិ​ចូល​ការ​កែ​កំហុស​តាម​យូអេសប៊ី​ពី​គ្រប់​កុំព្យូទ័រ​ដែល​អ្នក​បាន​ផ្ដល់​សិទ្ធិ​ពី​មុន?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"ពណ៌ក្រហម​ស្វាយ"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"ប្រើ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ត្រូវ​ការ៖"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"ដោយសារកម្មវិធីមួយកំពុងធ្វើឲ្យសំណើរអនុញ្ញាតមានភាពមិនច្បាស់ ការកំណត់នេះមិនអាចផ្ទៀងផ្ទាត់ការឆ្លើយតបរបស់អ្នកបានទេ។"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"បើ​អ្នក​បើក <xliff:g id="SERVICE">%1$s</xliff:g>, ឧបករណ៍របស់​អ្នកនឹង​មិន​ប្រើ​អេក្រង់​ជាប់សោ​របស់​អ្នក​ដើម្បី​បង្កើន​ការ​អ៊ិនគ្រីប​ទិន្នន័យ​ទេ។"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"ព្រោះ​អ្នក​​បាន​បើក​សេវាកម្ម​ភាព​ងាយស្រួល ឧបករណ៍របស់​អ្នក​នឹង​មិន​ប្រើ​អេក្រង់​ជាប់​សោ​របស់​អ្នក​ដើម្បី​បង្កើន​ការ​អ៊ិនគ្រីប​ទិន្នន័យ។"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"ព្រោះ​បើក <xliff:g id="SERVICE">%1$s</xliff:g> ប៉ះពាល់​ដល់​ការ​អ៊ិនគ្រីប​ទិន្នន័យ អ្នក​ត្រូវតែ​បញ្ជាក់​​លំនាំ​​របស់​អ្នក។"</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> កម្មវិធី​ចប់​នៅ <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> នៃ <xliff:g id="TOTALRAM">%2$s</xliff:g> បានប្រើក្នុងរយៈពេល <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</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_memory_status" msgid="4251599550196193093">"​អង្គ​ចងចាំ​ឧបករណ៍ <xliff:g id="MEMSTATE">%1$s</xliff:g> បច្ចុប្បន្ន"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"ការ​ប្រើ​អង្គ​ចងចាំ​មធ្យម"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ការ​ប្រើ​អង្គ​ចងចាំ​អតិបរមា"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"ប្រព័ន្ធប្រតិបត្តិការ Android"</string>
+    <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_ram_use" msgid="976912589127397307">"ការប្រើប្រាស់អង្គចងចាំ"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"ការប្រើប្រាស់អង្គចងចាំ (ផ្ទៃខាងក្រោយ)"</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>
     <string name="mem_details_title" msgid="6548392825497290498">"ព័ត៌មាន​លម្អិត​អង្គ​ចងចាំ"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"លាក់ប្រព័ន្ធ"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ការ​កំណត់​លំនាំដើម​ខាង​ក្រោម​បដិសេធ​ការ​កំណត់​កម្មវិធី"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"ការកំណត់​លំនាំដើម"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"ម៉ាស៊ីន​លំនាំដើម"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"កំណត់​ម៉ាស៊ីន​សំយោគ​ការ​និយាយ​​ត្រូវ​ប្រើ​ សម្រាប់​អត្ថបទ​ដែល​បាន​និយាយ"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"កំណត់​ម៉ាស៊ីន​សំយោគ​សំឡេង​ត្រូវ​ប្រើ​សម្រាប់​អត្ថបទ​បាន​អាន"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"អត្រា​និយាយ"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"ល្បឿន​ពេល​អាន​​អត្ថបទ"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ឡើង​-ចុះ"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"អ្នក​ត្រូវ​គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក ដើម្បី​បញ្ជាក់​ការ​ដំឡើង​ព័ត៌មាន​សម្ងាត់។"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"បញ្ចូល​ពាក្យ​សម្ងាត់​សម្រាប់​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់។"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន៖"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"បម្រុង​ទុក​ទិន្នន័យ​របស់​ខ្ញុំ"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"បម្រុង​ទុក​ទិន្នន័យ​កម្មវិធី, ពាក្យ​សម្ងាត់​វ៉ាយហ្វាយ និង​ការ​កំណត់​ផ្សេងៗ​ទៅ​ម៉ាស៊ីន​មេ Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"បម្រុង​ទុក​គណនី"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"បច្ចុប្បន្ន​ គ្មាន​គណនី​រក្សាទុក​ទិន្នន័យ​បម្រុង​ទុក​ទេ"</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="5355557151569037197">"សេវាកម្មបម្រុងអសកម្ម។"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"វាត្រូវបានកំណត់ដោយគោលការណ៍ឧបករណ៍របស់អ្នក។"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ពាក្យ​សម្ងាត់​បម្រុង​ទុក​លើ​ផ្ទៃតុ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ការ​បម្រុង​ទុក​ពេញលេញ​លើ​ផ្ទៃតុ​បច្ចុប្បន្ន​មិន​ត្រូវ​បាន​ការពារ​ទេ។"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ប៉ះ ដើម្បី​ប្ដូរ ឬ​លុប​ពាក្យ​សម្ងាត់​សម្រាប់​ការ​បម្រុងទុក​ពេញលេញ​លើ​ផ្ទៃតុ"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"មាត្រដ្ឋាន​ដំណើរ​ផ្លាស់ប្ដូរ​ចលនា"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"មាត្រដ្ឋាន​រយៈពេល​នៃ​កម្មវិធី​ចលនា"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"ក្លែង​ធ្វើ​ការ​បង្ហាញ​ទី​ពីរ"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"របៀបពហុផ្ទាំងវិនដូ"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"សកម្មភាពច្រើនក្នុងពេលតែមួយលើអេក្រង់។"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"បើកដំណើរការរបៀបពហុផ្ទាំងវិនដូ?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ព្រមាន៖ នេះជាលក្ខណៈពិសេសម្រាប់ពិសោធន៍កម្រិតខ្ពស់ដែលអនុញ្ញាតឲ្យមានសកម្មភាពច្រើនក្នុងពេលតែមួយលើអេក្រង់តាមរយៈចំនុចប្រទាក់នៃកម្មវិធី Recent។ កម្មវិធីមួយចំនួនអាចនឹងគាំង ឬដំណើរការមិនត្រឹមត្រូវនៅពេលប្រើលក្ខណៈពិសេសនេះ។"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"កម្មវិធី"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"កុំ​រក្សា​ទុកសកម្មភាព"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"បំផ្លាញ​គ្រប់​សកម្មភាព ពេល​អ្នក​ប្រើ​ចាកចេញ"</string>
@@ -2195,7 +2251,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="718192651887726259">"អ្នក​អាច​ចែករំលែក​ឧបករណ៍​​ជា​មួយ​មនុស្ស​ផ្សេង​ដោយ​បង្កើត​អ្នកប្រើ​បន្ថែម។ អ្នក​ប្រើ​ម្នាក់ៗ​មាន​ទំហំ​ផ្ទាល់​របស់​ពួកគេ​ ដែល​ពួកគេ​អាច​ប្ដូរ​តាម​តម្រូវ​ការ​ជាមួយ​កម្មវិធី, ផ្ទាំង​រូបភាព និង​អ្វី​ផ្សេងៗ​ទៀត​ផ្ទាល់​របស់​ពួកគេ។ អ្នកប្រើ​ក៏​អាច​កែ​ការ​កំណត់​ឧបករណ៍​ដូច​ជា វ៉ាយហ្វាយ​ដែល​ប៉ះពាល់​ដល់​អ្នក​គ្រប់គ្នា។\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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"អនុញ្ញាត​ការ​ហៅ​តាម​ទូរស័ព្ទ"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"អនុញ្ញាត​ការ​ហៅ​ទូរស័ព្ទ និង​សារ 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="440218975766968124">"អនុញ្ញាត​ការ​ហៅ​ទូរស័ព្ទ?"</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_sms_confirm_title" msgid="188164598768941316">"អនុញ្ញាត​ការ​ហៅ​ទូរស័ព្ទ និង​សារ SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"ប្រវត្តិ​ហៅ និង​សារ 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="application_restrictions" msgid="8207332020898004394">"អនុញ្ញាត​កម្មវិធី និង​មាតិកា"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"កម្មវិធី​មាន​ការ​ដាក់កម្រិត"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ពង្រីក​ការ​កំណត់​សម្រាប់​កម្មវិធី"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"កម្មវិធី​នេះ​មិន​គាំទ្រ​​​ប្រវត្តិរូប​បាន​ដាក់​កម្រិត។"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"ការ​ភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"សារ​អត្ថបទ សរសេរ​សារ​អត្ថបទ ការ​ផ្ញើ​សារ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ចល័ត ចល័ត​ ក្រុមហ៊ុន​បញ្ជូន ឥត​ខ្សែ ទិន្នន័យ 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"កម្មវិធី​ចាប់ផ្ដើម"</string>
     <string name="keywords_display" msgid="6709007669501628320">"អេក្រង់ ប៉ះ​អេក្រង់"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ធ្វើ​ឲ្យ​អេក្រង់​ព្រិល​ពេល​ប៉ះ​ថ្ម"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ធ្វើ​ឲ្យ​អេក្រង់​ព្រិល​ពេល​ប៉ះ​ថ្ម"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ធ្វើ​ផ្ទៃ​ខាង​ក្រោយ​តាម​បុគ្គល​ប្ដូរ​ការ​បង្ហាញ​តាម​បំណង"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"រូបរាងងងឹត របៀបពេលយប់ អេក្រង់ងងឺត ពន្លឺបញ្ច្រាស"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"ធ្វើឲ្យផ្ទៃខាងក្រោយមានលក្ខណៈផ្ទាល់ខ្លួន ប្តូរអេក្រង់តាមបំណង"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ទំហំ​អត្ថបទ"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"គម្រោង"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"ការខាសគម្រោង"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ទំហំ ថាស​រឹង ដ្រាយ ឧបករណ៍ ការ​ប្រើ"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"គិតលុយ​ការ​ប្រើ​ថាមពល"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ប្រកប វចនានុក្រម ពិនិត្យ​អក្ខរាវិរុទ្ធ កែ​ស្វ័យ​ប្រវត្តិ"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"គណនី"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ការ​ដាក់​កម្រិត ដាក់កម្រិត បាន​ដាក់​កម្រិត"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ការ​កែ​អត្ថបទ កែ សំឡេង ញ័រ ស្វ័យប្រវត្តិ ភាសា កាយវិការ ស្នើ ការ​ស្នើ រូបរាង បំពាន ពាក្យ វាយ​បញ្ចូល សញ្ញា​អារម្មណ៍ អន្តរជាតិ"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"កំណត់លំនាំដើមចំណូលចិត្តឡើងវិញ"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"កម្មវិធីក្នុងគ្រាមានអាសន្នលំនាំដើម"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"កម្មវិធីទាញយកប្រព័ន្ធកម្មវិធី"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"សុវត្ថិភាពសិទ្ធិកម្មវិធី"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"លំនាំដើមកម្មវិធី"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"រុញ​ពាក្យសម្ងាត់ លំនាំ កូដ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"រៀបចំ​ស្លាក​អិនអេហ្វ​ស៊ី​វ៉ាយហ្វាយ"</string>
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"​ផ្អាក"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"ពេល​មាន​ការ​ហៅ និង​ការ​ជូន​ដំណឹង"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"ផ្អាក​ជា​និច្ច"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"អនុញ្ញាត​តែ​ការ​​​ផ្អាក​​អាទិភាព​ប៉ុណ្ណោះ"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"កុំ​ផ្អាក"</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_option_important_interruptions" msgid="3903928008177972500">"អាទិភាពប៉ុណ្ណោះ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"សម្លេងរោទ៍ប៉ុណ្ណោះ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"គ្មានការរំខាន"</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="ringtone_title" msgid="5379026328015343686">"សំឡេង​រោទ៍​ទូរស័ព្ទ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"សំឡេង​រោទ៍​ការ​ជូនដំណឹង​លំនាំដើម"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ញ័រ​សម្រាប់​ការ​ហៅ​ដែរ"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ញ័រ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"ចូល​ដំណើរការ​ការ​ជូន​ដំណឹង"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"កម្មវិធី​មិន​អាច​អាន​ការ​ជូន​ដំណឹង"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"កម្មវិធី %d អាច​អាន​ការ​ជូន​ដំណឹង"</item>
-    <item quantity="other" msgid="980049191810249052">"កម្មវិធី %d អាច​អាន​ការ​ជូន​ដំណឹង"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">កម្មវិធី %d អាចអានការជូនដំណឹង</item>
+      <item quantity="one">កម្មវិធី %d អាចអានការជូនដំណឹង</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"គ្មាន​កម្មវិធី​ស្ដាប់ការ​ជូន​ដំណឹង​បាន​ដំឡើង។"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"បើក <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> នឹង​អាច​អាន​ការ​ជូន​ដំណឹង​ទាំងអស់​ដែល​បាន​ប្រកាស​ដោយ​ប្រព័ន្ធ ឬ​កម្មវិធី​បាន​ដំឡើង ដែល​អាច​មាន​ព័ត៌មាន​ផ្ទាល់​ខ្លួន​ដូច​ជា ឈ្មោះ​ទំនាក់ទំនង និង​អត្ថបទ​សារ​បាន​ផ្ញើ​ឲ្យ​អ្នក។ វា​ក៏​អាច​បដិសេធ​ការ​ជូន​ដំណឹង​ទាំង​នេះ​ ឬ​ប៉ះ​ប៊ូតុង​សកម្មភាព​​។"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"គ្មាន​កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</item>
-    <item quantity="other" msgid="358057362115673258">"%d កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"មិន​បាន​ដំឡើង​​កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ។"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"បើក <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> នឹង​អាច​បន្ថែម​លក្ខខណ្ឌ​ចេញ​ទៅកាន់​របៀប​កុំ​រំខាន។"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"ទប់ស្កាត់"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"រារាំងទាំងអស់"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"កុំ​បង្ហាញ​ការ​ជូន​ដំណឹង​សម្រាប់​កម្មវិធី​នេះ"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"អាទិភាព"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"បង្ហាញ​ការ​ជូន​ដំណឹង​នៅ​ផ្នែក​ខាង​លើ​បញ្ជី ហើយ​ឲ្យ​ពួក​វា​បង្ហាញ​នៅ​ពេល​ឧបករណ៍​បាន​កំណត់​​តែ​ការ​ផ្អាក​ដែល​មាន​អាទិភាព"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"ជាក់លាក់"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"ពេល​ឧបករណ៍​ជាប់​សោ, វា​នឹង​លាក់​មាតិកា​សម្ងាត់​មួយ​ចំនួន​ពី​ការ​ជូនដំណឹង​របស់​កម្មវិធី​នេះ"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"ដាក់ជាអាទិភាព"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"អនុញ្ញាតឲ្យការជូនដំណឹងនេះបន្លឺសម្លេង នៅពេលដែលរបៀប កុំរំខាន ត្រូវបានកំណត់ជាអាទិភាពប៉ុណ្ណោះ"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"អនុញ្ញាតការមើលមួយភ្លែត"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"អនុញ្ញាតឲ្យកម្មវិធីនេះផ្តោតលើការជូនដំណឹងជាក់លាក់ដោយការអូសពួកវាបន្តិចទៅក្នុងទិដ្ឋភាពនៅលើអេក្រង់បច្ចុប្បន្ន"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"លាក់មាតិការសើប"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"នៅពេលដែលឧបករណ៍នេះជាប់សោ វានឹងលាក់មាតិកានៅក្នុងការជូនដំណឹងរបស់កម្មវិធីនេះដែលអាចបង្ហាញព័ត៌មានឯកជន"</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="zen_mode_default_option" msgid="6940069025071935243">"រហូត​ដល់ពេល​​អ្នក​បិទ​វា"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"ការ​​ផ្អាក​​​អាទិភាព"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"រាប់​ថយក្រោយ"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ថ្ងៃ"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"គ្មាន"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"បាន​អនុញ្ញាត​ការ​ផ្អាក"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"តែ​អាទិភាព​ប៉ុណ្ណោះ"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"គ្មាន"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"ស្វ័យ​ប្រវត្តិ"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"បើក​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"ឈ្មោះច្បាប់"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"បន្ថែមច្បាប់"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"លុបច្បាប់"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"លុបច្បាប់ \"<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="3201273040477861538">"កំណត់កាលវិភាគច្បាប់"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"រកមិនឃើញច្បាប់ទេ។"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"កុំ"</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_from" msgid="1033337300289871697">"ការ​ហៅ​ទូរស័ព្ទ/​ផ្ញើ​សារ​ពី"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"គ្រប់គ្នា"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"តែ​ទំនាក់ទំនង​​ប៉ុណ្ណោះ"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"តែទំនាក់ទំនងមានផ្កាយប៉ុណ្ណោះ"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"ព្រឹត្តិការណ៍​ និង​កម្មវិធី​រំលឹក"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"ការ​ជូន​ដំណឹង​គឺ​ជា​ការ​ផ្អាក​មាន​អាទិភាព​ជា​និច្ច"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"សំឡេងរោទ៍"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"កម្មវិធីរំលឹក"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ព្រឹត្តិការណ៍"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"អ្នកហៅចូលបានជ្រើស"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"អ្នកហៅចូលសារជាថ្មី"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ប្រសិនបើមនុស្សតែមួយហៅចូលមកលើកទីពីរនៅក្នុងរយៈពេល <xliff:g id="MINUTES">%d</xliff:g> នាទី អនុញ្ញាតចំពោះការហៅចូលនេះ។"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"បើកដោយស្វ័យ​ប្រវត្តិ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"កុំ"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ថ្ងៃបន្ទាប់"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ឬការដាស់តឿនណាមួយមុននោះ"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"ផ្អាក"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"ពេលមានការហៅ និងការជូនដំណឹង"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"តើអ្នកចង់ឲ្យមានការរំខាននៅពេលណា?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"សម្រាប់រយៈពេលប៉ុន្មាន?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"ផ្អាកជានិច្ច"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"បិទ,ទាំងអស់,គ្រប់យ៉ាង"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"អនុញ្ញាតតែការផ្អាកអាទិភាពប៉ុណ្ណោះ"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"អនុញ្ញាតតែសំឡេងរោទិ៍ប៉ុណ្ណោះ"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"កុំផ្អាក"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"គ្មានកំណត់"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> នាទី</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> នាទី</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"ប្តូរទៅការជូនដំណឹងអាទិភាពប៉ុណ្ណោះដោយគ្មានកំណត់"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"ប្តូរទៅសំឡេងរោទិ៍ប៉ុណ្ណោះដោយគ្មានកំណត់"</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>
+      <item quantity="one">ប្តូរទៅសំឡេងរោទិ៍តែមួយនាទីប៉ុណ្ណោះរហូតដល់ <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">ប្តូរទៅសំឡេងរោទិ៍តែ <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"ប្តូរទៅកុំរំខានដោយគ្មានកំណត់"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ប្តូរទៅរំខានជានិច្ច"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ជានិច្ច"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ការជូន​ដំណឹងកម្មវិធី"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​កំណត់​ការ​ជូនដំណឹង"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ផ្ដល់​មតិ​ស្ថាបនា​អំពី​ឧបករណ៍​នេះ"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"ចាប់ផ្ដើមតាមលំនាំដើម"</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="app_launch_domain_links_title" msgid="458956710410857777">"តំណដែន"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"បើកដែន URLs"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"អនុញ្ញាតឲ្យកម្មវិធីបើកដែន URLs របស់ខ្លួនដោយផ្ទាល់"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"ដែន URLs ដែលត្រូវបានគាំទ្រ"</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="410824961149037234">"អង្គចងចាំខាងក្នុង"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"អង្គចងចាំខាងក្រៅ"</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="storage_used" msgid="7128074132917008743">"ឧបករណ៍ផ្ទុកដែលបានប្រើ"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"បើក"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"ទប់ស្កាត់"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"ជាក់លាក់"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"អាទិភាព"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"អាទិភាព &amp; ជាក់លាក់"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>ការអនុញ្ញាតដែលទទួលបាន</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>ការអនុញ្ញាតដែលទទួលបាន</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">បានទទួលការអនុញ្ញាត <xliff:g id="COUNT_2">%d</xliff:g> នៃ <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one">បានទទួលការអនុញ្ញាត <xliff:g id="COUNT_0">%d</xliff:g> នៃ <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"លំនាំដើមមួយចំនួនត្រូវបានកំណត់"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"គ្មានការកំណត់លំនាំដើម"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"កម្មវិធីទាំងអស់"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"បានបើកដំណើរការ"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"ផ្ទាល់ខ្លួន"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"កន្លែងធ្វើការ"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"បានទប់ស្កាត់"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"អាទិភាព"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"រសើប"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ដោយមានដែន URLs"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"បាន​បិទ​ដោយ​អ្នក​គ្រប់គ្រង"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"កម្រិតខ្ពស់"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"កម្មវិធីមិនស្គាល់"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ជ្រើសប្រវត្តិរូប"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"សិទ្ធិ​កម្មវិធី"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"កម្មវិធី <xliff:g id="COUNT_0">%d</xliff:g> នៃ <xliff:g id="COUNT_1">%d</xliff:g> បានអនុញ្ញាតការចូលប្រើបន្ថែម"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"បានអនុញ្ញាតកម្មវិធី <xliff:g id="COUNT_0">%d</xliff:g> នៃ <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"ដែន URLs"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"កុំបើកដែន URLs ណាមួយ"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"បើក \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"បើក \'<xliff:g id="DOMAIN">%s</xliff:g>\' និង URLs ដែលពាក់ព័ន្ធ"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> កម្មវិធីអាចបើកដែន URLs របស់ពួកវា</item>
+      <item quantity="one">កម្មវិធីមួយអាចបើកដែន URLs របស់ខ្លួន</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"មិនអាចសម្គាល់បានទេ"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"កម្មវិធីលំនាំដើម"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"កម្មវិធីរុករក"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"គ្មានកម្មវិធីលំនាំដើមទេ"</string>
+    <string name="default_app" msgid="6864503001385843060">"(លំនាំដើម)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ទំហំផ្ទុកកម្មវិធី"</string>
 </resources>
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn-rIN/arrays.xml
index f71abee..b644c92 100644
--- a/res/values-kn-rIN/arrays.xml
+++ b/res/values-kn-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"ಸಿಮ್"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ಒತ್ತುವ ಬಟನ್"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್/ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಿ"</item>
     <item msgid="1148142988678569310">"ಪ್ರಾಜೆಕ್ಟ್ ಮೀಡಿಯಾ"</item>
     <item msgid="9130014005474445273">"VPN ಸಕ್ರಿಯಗೊಳಿಸಿ"</item>
+    <item msgid="1165192162975045562">"ವಾಲ್‌ಪೇಪರ್‌ ಬರೆಯಿರಿ"</item>
+    <item msgid="7129487923652967258">"ವಿನ್ಯಾಸಕ್ಕೆ ಸಹಾಯ"</item>
+    <item msgid="1069023208100114540">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌‌ಗೆ ಸಹಾಯ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ಸ್ಥಾನ"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್/ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಿ"</item>
     <item msgid="5906017727368097853">"ಪ್ರಾಜೆಕ್ಟ್ ಮೀಡಿಯಾ"</item>
     <item msgid="2486614710846178542">"VPN ಸಕ್ರಿಯಗೊಳಿಸಿ"</item>
+    <item msgid="5586547561693629602">"ವಾಲ್‌ಪೇಪರ್‌ ರೈಟ್‌ ಮಾಡಿ"</item>
+    <item msgid="32794179825485062">"ವಿನ್ಯಾಸಕ್ಕೆ ಸಹಾಯ"</item>
+    <item msgid="7872852746938272552">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ಗೆ ಸಹಾಯ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ಚಿಕ್ಕದು"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"ಕಡಿಮೆ"</item>
     <item msgid="4212263919458209842">"ವಿಷಮಸ್ಥಿತಿ"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ಆಫ್ ಆಗಿದೆ"</item>
-    <item msgid="5656544177755411222">"ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ಆಗಾಗ ತಡೆಹಾಕು"</item>
-    <item msgid="8735337502532332056">"ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳಿಗೆ ತಡೆಹಾಕದಿರು"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ಸಾಮಾನ್ಯ"</item>
     <item msgid="866544120205026771">"ಮಧ್ಯಮ"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"ಗುಲಾಬಿ ಬಣ್ಣ"</item>
     <item msgid="6131821495505931173">"ಕೆಂಪು"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (ಮೀಡಿಯಾ ಟ್ರಾನ್ಸ್‌ಫರ್ ಪ್ರೊಟೊಕಾಲ್)"</item>
+    <item msgid="8856820259201251036">"PTP (ಪಿಕ್ಚರ್ ಟ್ರಾನ್ಸ್‌ಫರ್ ಪ್ರೊಟೊಕಾಲ್)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB ಎಥರ್ನೆಟ್)"</item>
+    <item msgid="2686051673589572111">"ಆಡಿಯೊ ಮೂಲ"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 3c9e3a4..765777f 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"ಅನುಮತಿಸು"</string>
     <string name="deny" msgid="6947806159746484865">"ನಿರಾಕರಿಸು"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ಅಜ್ಞಾತ"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"ಡೆವಲಪರ್‌ ಆಗುವುದಕ್ಕಾಗಿ ಇದೀಗ ನೀವು ಕೇವಲ <xliff:g id="STEP_COUNT">%1$d</xliff:g> ಹೆಜ್ಜೆ ದೂರದಲ್ಲಿರುವಿರಿ."</item>
-    <item quantity="other" msgid="6722953419953594148">"ಡೆವಲಪರ್ ಆಗುವುದರಿಂದ ನೀವು ಇದೀಗ <xliff:g id="STEP_COUNT">%1$d</xliff:g> ಹೆಜ್ಜೆಗಳು ದೂರದಲ್ಲಿರುವಿರಿ."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">ಡೆವಲಪರ್‌ ಆಗಲು ಇದೀಗ ನೀವು ಕೇವಲ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ಹೆಜ್ಜೆಗಳು ದೂರದಲ್ಲಿರುವಿರಿ.</item>
+      <item quantity="other">ಡೆವಲಪರ್‌ ಆಗಲು ಇದೀಗ ನೀವು ಕೇವಲ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ಹೆಜ್ಜೆಗಳು ದೂರದಲ್ಲಿರುವಿರಿ.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ಇದೀಗ ನೀವು ಡೆವಲಪರ್‌!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ಅಗತ್ಯವಿಲ್ಲ, ನೀವು ಈಗಾಗಲೇ ಡೆವಲಪರ್‌ ಆಗಿರುವಿರಿ."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ವೈರ್‌ಲೆಸ್ &amp; ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS ಮೂಲಕ SMS ಅನ್ನು ಆಫ್ ಮಾಡಿ"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS ನೋಂದಣಿ ಆನ್‌ ಮಾಡುವ ಅಗತ್ಯವಿದೆ"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS ನೋಂದಣಿ ಅಗತ್ಯತೆಯನ್ನು ಆಫ್ ಮಾಡು"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE ನಿಯೋಜಿಸಲಾದ ಫ್ಲ್ಯಾಗ್‌ ಆನ್‌ ಮಾಡಿ"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE ನಿಯೋಜಿಸಲಾದ ಫ್ಲ್ಯಾಗ್‌ ಆಫ್‌ ಮಾಡಿ"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram ಡಂಪ್ ಅನ್ನು ಆನ್ ಮಾಡಿ"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram ಡಂಪ್ ಅನ್ನು ಆಫ್‌ ಮಾಡಿ"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"ಸಿಮ್‌ ವಿಳಾಸ ಪುಸ್ತಕವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ಸಂಪರ್ಕಗೊಂಡಿದೆ (ಫೋನ್ ಇಲ್ಲ)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ಸಂಪರ್ಕಗೊಂಡಿದೆ (ಮಾಧ್ಯಮವಿಲ್ಲ)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ (ಯಾವುದೇ ಸಂದೇಶ ಪ್ರವೇಶವಿಲ್ಲ)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ಸಂಪರ್ಕಗೊಂಡಿದೆ (ಫೋನ್ ಅಥವಾ ಮಾಧ್ಯಮವಿಲ್ಲ)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"ಸಂಪರ್ಕಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"ಜೋಡಿಸಲಾಗುತ್ತಿದೆ..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"ಹೆಸರಿಲ್ಲದ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ಯಾವುದೇ ಸಮೀಪದ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳು ಕಂಡುಬಂದಿಲ್ಲ."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ಸ್ವೀಕರಿಸಿದ ಫೈಲ್‌ಗಳನ್ನು ತೋರಿಸು"</string>
     <string name="device_picker" msgid="4978696506172252813">"ಬ್ಲೂಟೂತ್ ಸಾಧನ ಆರಿಸಿ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"ಬ್ಲೂಟೂತ್‌‌ ಅನುಮತಿ ವಿನಂತಿ"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"ಬ್ಲೂಟೂತ್‌‌ ಆನ್‌ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ ಬಯಸುತ್ತದೆ."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"ಈ ಸಾಧನಕ್ಕಾಗಿ ಬ್ಲೂಟೂತ್ ಆನ್ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್ ಬಯಸುತ್ತದೆ."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"<xliff:g id="TIMEOUT">%1$d</xliff:g> ಸೆಕೆಂಡುಗಳವರೆಗೆ ಇತರ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳಿಗೆ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಗೋಚರಿಸುವಂತೆ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ ಬಯಸುತ್ತದೆ."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"<xliff:g id="TIMEOUT">%1$d</xliff:g> ಸೆಕೆಂಡುಗಳವರೆಗೆ ಇತರ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳಿಗೆ ನಿಮ್ಮ ಫೋನ್‌ ಗೋಚರಿಸುವಂತೆ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ ಬಯಸುತ್ತದೆ."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"ಇತರ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳಿಗೆ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಗೋಚರಿಸುವಂತೆ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ ಬಯಸುತ್ತದೆ. ಇದನ್ನು ನೀವು ನಂತರ ಬ್ಲೂಟೂತ್‌‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ರದ್ದುಮಾಡು"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ಮುಂದುವರಿಸು"</string>
     <string name="okay" msgid="1997666393121016642">"ಸರಿ"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ಹೌದು"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ಇಲ್ಲ"</string>
-    <string name="forget" msgid="7267115980248732932">"ಮರೆತುಬಿಡು"</string>
+    <string name="forget" msgid="1400428660472591263">"ಮರೆತುಬಿಡಿ"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"ಮುಖ ಹೊಂದಾಣಿಕೆಯನ್ನು ಸುಧಾರಿಸಿ"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"ಲೈವ್‌ನೆಸ್‌‌ ಪರಿಶೀಲಿಸು"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"ಅನ್‌ಲಾಕ್‌‌ ಮಾಡುವಾಗ ಕಣ್ಣು ಮಿಟುಕಿಸುವ ಅಗತ್ಯವಿದೆ"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ಪಾಸ್‌ವರ್ಡ್‌ಗಳು"</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="3453670509485083962">"ಸೇರಿಸು"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ಪರದೆ ಲಾಕ್"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆಟಪ್"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"ನಿಮ್ಮ ಪರದೆಯನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಲು ನೀವು ಹೀಗೆ ಮಾಡಬೇಕಾಗಿದೆ: \n\n✓ ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಪರದೆ ಲಾಕ್ ವಿಧಾನವನ್ನು ಹೊಂದಿಸಿ \n\n✓ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೇರಿಸಿ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ಸೆನ್ಸಾರ್ ಪತ್ತೆಹಚ್ಚಿ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸಾರ್ ಅನ್ನು ನಿಮ್ಮ ಫೋನ್ ಹಿಂಬದಿಯಲ್ಲಿ ಕಂಡುಹಿಡಿಯಿರಿ."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"ಇದೀಗ ಪ್ರಾರಂಭಿಸೋಣ!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸಾರ್ ಮೇಲೆ ನಿಮ್ಮ ಬೆರಳನ್ನು ಇರಿಸಿ. ನಿಮಗೆ ವೈಬ್ರೇಷನ್ ಅನುಭವವಾದ ನಂತರ ಸರಿಸಿ."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"ಅದ್ಭುತ! ಈಗ ಪುನರಾವರ್ತಿಸಿ."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸಾರ್ ಮೇಲೆ ಅದೇ ಬೆರಳನ್ನು ಇರಿಸಿ ಮತ್ತು ನಿಮಗೆ ವೈಬ್ರೇಷನ್ ಅನುಭವವಾದ ನಂತರ ಸರಿಸಿ."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೇರಿಸಲಾಗಿದೆ!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ನೀವು ಈ ಐಕಾನ್ ವೀಕ್ಷಿಸಿದಾಗ, ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ನೀವು ಗುರುತಿಸುವಿಕೆಗೆ ಅಥವಾ ಖರೀದಿಯನ್ನು ಪ್ರಮಾಣೀಕರಿಸಲು ಬಳಸಬಹುದು."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"ಸೇರಿಸು"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ಮುಂದೆ"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"ನಿಮ್ಮ ಸಾಧನ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡುವಿಕೆಯನ್ನು ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ನೀವು ಚಿತ್ರಿಸುವ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"ಎನ್‌ಕ್ರಿಪ್ಟ್‌‌ ಮಾಡುವುದೇ?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ ಕಾರ್ಯಾಚರಣೆಯನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ನೀವು ಅದನ್ನು ಅಡ್ಡಿಪಡಿಸಿದರೆ, ನೀವು ಡೇಟಾವನ್ನು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ. ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನೇಕ ಬಾರಿ ಮರುಪ್ರಾರಂಭಗೊಳ್ಳುವ ಅವಧಿಯಲ್ಲಿ, ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ ಒಂದು ಗಂಟೆ ಅಥವಾ ಹೆಚ್ಚಿನ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ ಕಾರ್ಯಾಚರಣೆಯನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ನೀವು ಅದನ್ನು ಅಡ್ಡಿಪಡಿಸಿದರೆ, ನೀವು ಡೇಟಾವನ್ನು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ. ಫೋನ್ ಅನೇಕ ಬಾರಿ ಮರುಪ್ರಾರಂಭಗೊಳ್ಳುವ ಅವಧಿಯಲ್ಲಿ, ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ ಒಂದು ಗಂಟೆ ಅಥವಾ ಹೆಚ್ಚಿನ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"ಫೇಸ್ ಅನ್‌ಲಾಕ್"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"ಕಡಿಮೆ ಭದ್ರತೆ, ಪ್ರಾಯೋಗಿಕ"</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>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ಅಧಿಕ ಭದ್ರತೆ"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"ಪ್ರಸ್ತುತ ಪರದೆ ಲಾಕ್"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಇನ್ನು ಮುಂದೆ ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ನಿರ್ವಾಹಕ, ಎನ್‌ಕ್ರಿಪ್ಷನ್, ಅಥವಾ ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</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_biometric_weak" msgid="3008473624490350142">"ಫೇಸ್ ಅನ್‌ಲಾಕ್"</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="7579210814842056547">"ಒಮ್ಮೆ ನೀವು ಪರದೆ ಲಾಕ್‌ ಹೊಂದಿಸಿದರೆ, ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳು &gt; ಭದ್ರತೆಯಲ್ಲಿ ನಿಮ್ಮ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್‌ ಕೂಡಾ ಹೊಂದಿಸಬಹುದಾಗಿರುತ್ತದೆ."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ಪರದೆ ಲಾಕ್ ಆಫ್ ಮಾಡು"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ತೆಗೆದುಹಾಕು"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"ಅನ್‌ಲಾಕ್ ಪಿನ್‌ ತೆಗೆದುಹಾಕು"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ ಒಂದು ಅಕ್ಷರವನ್ನು ಹೊಂದಿರಬೇಕು."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ ಒಂದು ಸಂಖ್ಯಾತ್ಮಕ ಅಂಕಿಯನ್ನು ಹೊಂದಿರಬೇಕು."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ ಒಂದು ಚಿಹ್ನೆಯನ್ನು ಹೊಂದಿರಬೇಕು."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ 1 ಅಕ್ಷರವನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-    <item quantity="other" msgid="8186027808415585970">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ %d ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ 1 ಸಣ್ಣ ಅಕ್ಷರವನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-    <item quantity="other" msgid="2693910942679679225">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ %d ಸಣ್ಣ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ 1 ದೊಡ್ಡ ಅಕ್ಷರವನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-    <item quantity="other" msgid="3030801209112209245">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ %d ದೊಡ್ಡ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ 1 ಸಂಖ್ಯಾತ್ಮಕ ಅಂಕಿಯನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-    <item quantity="other" msgid="4703982391407595924">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ %d ಸಂಖ್ಯಾತ್ಮಕ ಅಂಕಿಗಳನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ 1 ವಿಶೇಷ ಚಿಹ್ನೆಯನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-    <item quantity="other" msgid="1221290525051187757">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ %d ವಿಶೇಷ ಚಿಹ್ನೆಗಳನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ 1 ಅಕ್ಷರವಲ್ಲದ ಅಕ್ಷರವನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-    <item quantity="other" msgid="3952508584649046404">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ %d ಅಕ್ಷರವಲ್ಲದ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ  %d ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+      <item quantity="other">ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ  %d ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ  %d ಸಣ್ಣ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+      <item quantity="other">ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ  %d ಸಣ್ಣ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ %d ದೊಡ್ಡ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+      <item quantity="other">ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ %d ದೊಡ್ಡ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ  %d ಸಂಖ್ಯಾತ್ಮಕ ಅಂಕಿಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+      <item quantity="other">ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ  %d ಸಂಖ್ಯಾತ್ಮಕ ಅಂಕಿಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">ಪಾಸ್‌ವರ್ಡ್ ಕನಿಷ್ಠ  %d ವಿಶೇಷ ಚಿಹ್ನೆಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+      <item quantity="other">ಪಾಸ್‌ವರ್ಡ್ ಕನಿಷ್ಠ  %d ವಿಶೇಷ ಚಿಹ್ನೆಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ  %d ಅಕ್ಷರವಲ್ಲದ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+      <item quantity="other">ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ  %d ಅಕ್ಷರವಲ್ಲದ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"ಸಾಧನ ನಿರ್ವಾಹಕ ಇತ್ತೀಚಿನ ಪಾಸ್‌ವರ್ಡ್‌ ಬಳಸಲು ಅನುಮತಿಸುವುದಿಲ್ಲ."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ಅಂಕಿಗಳ ಆರೋಹಣ, ಅವರೋಹಣ ಅಥವಾ ಪುನಾವರ್ತಿತ ಅನುಕ್ರಮವನ್ನು ನಿಷೇಧಿಸಲಾಗಿದೆ"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ಸರಿ"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"ಜೋಡಿ"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ಜೋಡಿ ಮಾಡು"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ರದ್ದುಮಾಡು"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"ಸಂಪರ್ಕಪಡಿಸಿದಾಗ, ಜೋಡಿಸುವಿಕೆಯು ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುತ್ತದೆ."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ಜೋಡಣೆ ಮಾಡಲಾಗಲಿಲ್ಲ."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ತಪ್ಪಾಗಿರುವ ಪಿನ್‌ ಅಥವಾ ಪಾಸ್‌ಕೀ ಕಾರಣದಿಂದಾಗಿ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ಜೋಡಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ಸಂವಹನ ನಡೆಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ಜೋಡಿಸುವಿಕೆಯನ್ನು <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ತಿರಸ್ಕರಿಸಿದೆ"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"ಬ್ಲೂಟೂತ್ ಆಫ್ ಆಗಿರುವಾಗಲೂ, ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಲು ಬ್ಲೂಟೂತ್‌ಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳು ಸ್ಕ್ಯಾನ್ ಮಾಡುತ್ತವೆ. ನೀವು ಇದನ್ನು <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_specific_profiles_title" msgid="6952214406025825164">"ಇದಕ್ಕೆ ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"ಮಾಧ್ಯಮ ಆಡಿಯೋ"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ಫೋನ್ ಆಡಿಯೋ"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ಫೈಲ್ ವರ್ಗಾವಣೆ"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ಇನ್‌ಪುಟ್‌ ಸಾಧನ"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ಇಂಟರ್ನೆಟ್ ಪ್ರವೇಶ"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"ಸಂಪರ್ಕ ಹಂಚಿಕೆ"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"ಸಂಪರ್ಕ ಹಂಚಿಕೆಗಾಗಿ ಬಳಸಿ"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕ ಹಂಚಿಕೊಳ್ಳುವಿಕೆ"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"ಸಂದೇಶ ಪ್ರವೇಶಿಸುವಿಕೆ"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"ಮಾಧ್ಯಮ ಆಡಿಯೋಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ಫೋನ್ ಆಡಿಯೋಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ಫೈಲ್ ವರ್ಗಾವಣೆ ಸರ್ವರ್‌ಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"ನಕ್ಷೆಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ಫೈಲ್ ವರ್ಗಾವಣೆ ಸರ್ವರ್‌ಗೆ ಸಂಪರ್ಕಗೊಳ್ಳಲಿಲ್ಲ"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ಇನ್‌ಪುಟ್‌ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ಮಾಧ್ಯಮ ಆಡಿಯೋ ಬಳಸು"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ಫೋನ್‌ ಆಡಿಯೋಗಾಗಿ ಬಳಕೆ"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ಫೈಲ್‌ ವರ್ಗಾವಣೆಗಾಗಿ ಬಳಸು"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ಇನ್‌ಪುಟ್‌ಗಾಗಿ ಬಳಸು"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ಇಂಟರ್ನೆಟ್ ಪ್ರವೇಶಕ್ಕಾಗಿ ಬಳಸಿ"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ನಕ್ಷೆಗಾಗಿ ಬಳಸಿ"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi ಸಹಾಯಕ"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi ಸಹಾಯಕದ ಮೂಲಕ ಸಂಪರ್ಕಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"ಬಿತ್ತರಿಸುವಿಕೆ ಪರದೆ"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi ಆಫ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"ದೋಷ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್‌ನಲ್ಲಿ"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗಾಗಿ ಸ್ಕ್ಯಾನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ನೆಟ್‌ವರ್ಕ್‌ ಅಧಿಸೂಚನೆ"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"ಎಲ್ಲಿಯಾದರೂ ಸಾರ್ವಜನಿಕ ನೆಟ್‌ವರ್ಕ್‌ ಲಭ್ಯವಿದ್ದಲ್ಲಿ ಸೂಚಿಸಿ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ಕಳಪೆ ಸಂಪರ್ಕಗಳಿಂದ ದೂರವಿರು"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ ಉತ್ತಮ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲದಿದ್ದರೆ ಅದನ್ನು ಬಳಸಬೇಡ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ಉತ್ತಮ ಇಂಟರ್ನೆಟ್‌ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿರುವ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಮಾತ್ರ ಬಳಸಿ"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"ಸ್ಕ್ಯಾನಿಂಗ್ ಯಾವಾಗಲೂ ಲಭ್ಯ"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"ಯಾವಾಗಲೂ ಸ್ಕ್ಯಾನಿಂಗ್ ಅನುಮತಿಸು"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi‑Fi ಆಫ್‌ ಆಗಿದ್ದಾಗಲೂ ಕೂಡ Google ನ ಸ್ಥಳ ಸೇವೆಗಳು ಮತ್ತು ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಸ್ಕ್ಯಾನ್‌ ಮಾಡುತ್ತವೆ"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮುಕ್ತ Wi‑Fi ಬಳಸಿ"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"ಉತ್ತಮ ಗುಣಮಟ್ಟದ್ದೆಂದು ದೃಢೀಕರಿಸಲಾಗಿರುವ ಮುಕ್ತ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸಂಪರ್ಕಪಡಿಸಲು Wi‑Fi ಸಹಾಯಕವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅನುಮತಿಸಿ"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"ಸಹಾಯಕ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸು"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"ಸ್ಥಳ ನಿಖರತೆಯನ್ನು ಸುಧಾರಿಸಲು ಮತ್ತು ಇತರ ಉದ್ದೇಶಗಳಿಗಾಗಿ, Wi-Fi ಆಫ್‌ ಇದ್ದಾಗಲೂ ಸಹ, ಹತ್ತಿರದ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗಾಗಿ Google ಮತ್ತು ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸ್ಕ್ಯಾನ್‌ ಮಾಡಬಹುದು. ನೀವು ಇದನ್ನು ಮಾಡಲು ಬಯಸದಿದ್ದರೆ, ಸುಧಾರಿತ &gt; ಸ್ಕ್ಯಾನಿಂಗ್‌ಗೆ ಹೋಗಿ ಯಾವಾಗಲೂ ಲಭ್ಯವಿರುತ್ತದೆ."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi ಆಫ್‌ ಇದ್ದಾಗಲೂ ಸಹ, ಹತ್ತಿರದ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗಾಗಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸ್ಕ್ಯಾನ್‌ ಮಾಡಬಹುದು. ನೀವು ಇದನ್ನು ಬಯಸದಿದ್ದರೆ, ಸುಧಾರಿತ &gt; ಸ್ಕ್ಯಾನಿಂಗ್‌‌ಗೆ ಹೋಗಿ ಯಾವಾಗಲೂ ಲಭ್ಯವಿರುತ್ತದೆ."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"ವೈ-ಫೈ ಆಫ್‌ ಇದ್ದಾಗಲೂ ಕೂಡಾ ಸ್ಥಳ ನಿಖರತೆ, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸಲು ವೈ-ಫೈ ಸಾಧನಗಳನ್ನು ಸ್ಕ್ಯಾನ್‌ ಮಾಡುತ್ತವೆ. ನೀವು ಇದನ್ನು <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="5340097010842405981">"ಮತ್ತೊಮ್ಮೆ ತೋರಿಸಬೇಡ"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"ಮತ್ತೊಂದು ನೆಟ್‌ವರ್ಕ್ ಸೇರಿಸಿ"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ಇನ್ನಷ್ಟು"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"ಸ್ವಯಂಚಾಲಿತ ಸೆಟಪ್ (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"ಸೆಟಪ್‌ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ಗೆ Wi‑Fi ಪ್ರವೇಶದ ಅಗತ್ಯವಿದೆ. ಸೆಟಪ್‌ನ ನಂತರ, ನೀವು ಸೆಲ್ಯುಲಾರ್‌‌ ಡೇಟಾ ಮತ್ತು Wi‑Fi ನಡುವೆ ಬದಲಾಯಿಸಬಹುದು."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"ಸುಧಾರಿತ ಆಯ್ಕೆಗಳು"</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="5940801028985255304">"ನಿಮ್ಮ ರೂಟರ್‌ನಲ್ಲಿ Wi‑Fi ಸಂರಕ್ಷಿತ ಸೆಟಪ್ ಬಟನ್‌ ಒತ್ತಿ. ಇದನ್ನು \"WPS\" ಎಂದು ಕರೆಯಬಹುದು ಈ ಚಿಹ್ನೆಯನ್ನು ಹೊಂದಿರಬಹುದು:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"ನಿಮ್ಮ ರೂಟರ್‌ನಲ್ಲಿ ವೈ-ಫೈ ಸಂರಕ್ಷಿತ ಸೆಟಪ್ ಬಟನ್‌ ಒತ್ತಿರಿ. ಇದನ್ನು \"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> Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"AP ಬ್ಯಾಂಡ್ ಸಂರಚಿಸಿ"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ಬದಲಾವಣೆಯಾಗದ)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ನಿರ್ದಿಷ್ಟಪಡಿಸದ)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"ಉಳಿಸಲಾಗಿದೆ"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP ಕಾನ್ಫಿಗರೇಶನ್ ವಿಫಲತೆ"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi ಸಂಪರ್ಕ ವಿಫಲತೆ"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ಪ್ರಮಾಣೀಕರಣ ಸಮಸ್ಯೆ"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"ವ್ಯಾಪ್ತಿಯಲ್ಲಿಲ್ಲ"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"ಯಾವುದೇ ಇಂಟರ್ನೆಟ್‌ ಪ್ರವೇಶ ಪತ್ತೆಯಾಗಿಲ್ಲ, ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮರುಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</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_security_none" msgid="7985461072596594400">"ಯಾವುದೂ ಇಲ್ಲ"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"ಈ ನೆಟ್‌ವರ್ಕ್‌ ಯಾವುದೇ ಇಂಟರ್ನೆಟ್ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿಲ್ಲ. ಆದರೂ ಬಳಸುವುದೇ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ಈ ನೆಟ್‌ವರ್ಕ್ ಮತ್ತೆ ಕೇಳಬೇಡ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ಸಂಪರ್ಕಪಡಿಸು"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ನೆಟ್‌ವರ್ಕ್‌ ಸಂಪರ್ಕಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ಮರೆತುಬಿಡು"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK ಪೋರ್ಟಬಲ್‌ Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ಪೋರ್ಟಬಲ್ Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌"</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_mode_title" msgid="2164073796253284289">"ಕರೆ ಮಾಡುವಿಕೆ ಪ್ರಾಶಸ್ತ್ಯ"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಮೋಡ್"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"ವೈ-ಫೈಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ"</item>
+    <item msgid="5267397515594230396">"ಸೆಲ್ಯುಲಾರ್‌ಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಆನ್‌ ಆದಾಗ, ನಿಮ್ಮ ಫೋನ್‌ ನಿಮ್ಮ ಆದ್ಯತೆ ಮತ್ತು ಯಾವ ಸಿಗ್ನಲ್ ಬಲವಾಗಿದೆ ಎಂಬುದರ ಅನುಗುಣವಾಗಿ, ಕರೆಗಳನ್ನು ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಅಥವಾ ನಿಮ್ಮ ವಾಹಕದ ನೆಟ್‌ವರ್ಕ್ ಮೂಲಕ ರವಾನಿಸುತ್ತದೆ. ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆನ್‌ ಮಾಡವ ಮೊದಲು, ಶುಲ್ಕಗಳು  ಮತ್ತು ಇತರ ವಿವರಗಳಿಗೆ ಸಂಬಂಧಿಸಿದಂತೆ ನಿಮ್ಮ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="home_settings" msgid="212375129455718176">"ಮುಖಪುಟ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ಪ್ರದರ್ಶನ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ಧ್ವನಿ"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"ಥೀಮ್"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"ಹಗುರ"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"ಗಾಢ ಹಿನ್ನೆಲೆ"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"ಸ್ವಯಂಚಾಲಿತ"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"ಪ್ರಾಶಸ್ತ್ಯದ ಸಿಮ್‌ ಕಾರ್ಡ್ ನವೀಕರಿಸುವುದೇ?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ <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">
-    <item quantity="one" msgid="4840607930166101114">"ಸಿಮ್‌ ಪಿನ್‌ ಕೋಡ್ ತಪ್ಪಾಗಿದೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡುವ ಸಲುವಾಗಿ ನಿಮ್ಮ ವಾಹಕವನ್ನು ನೀವು ಸಂಪರ್ಕಿಸುವುದಕ್ಕೂ ಮೊದಲು ನಿಮ್ಮಲ್ಲಿ <xliff:g id="NUMBER">%d</xliff:g> ಪ್ರಯತ್ನಗಳು ಬಾಕಿ ಉಳಿದಿವೆ."</item>
-    <item quantity="other" msgid="77103619544346451">"ತಪ್ಪಾಗಿರುವ ಸಿಮ್‌ ಪಿನ್‌ ಕೋಡ್, ನಿಮ್ಮಲ್ಲಿ <xliff:g id="NUMBER">%d</xliff:g> ಪ್ರಯತ್ನಗಳು ಬಾಕಿ ಉಳಿದಿವೆ."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">ಸಿಮ್‌ ಪಿನ್ ಕೋಡ್‌ ತಪ್ಪಾಗಿದೆ, ನಿಮ್ಮಲ್ಲಿ <xliff:g id="NUMBER_1">%d</xliff:g> ಪ್ರಯತ್ನಗಳು ಬಾಕಿ ಉಳಿದಿವೆ.</item>
+      <item quantity="other">ಸಿಮ್‌ ಪಿನ್ ಕೋಡ್‌ ತಪ್ಪಾಗಿದೆ, ನಿಮ್ಮಲ್ಲಿ <xliff:g id="NUMBER_1">%d</xliff:g> ಪ್ರಯತ್ನಗಳು ಬಾಕಿ ಉಳಿದಿವೆ.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"ಸಿಮ್‌ ಪಿನ್‌ ಕಾರ್ಯಾಚರಣೆ ವಿಫಲವಾಗಿದೆ!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ಟ್ಯಾಬ್ಲೆಟ್ ಸ್ಥಿತಿ"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"ಫೋನ್ ಸ್ಥಿತಿ"</string>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು (ಅಪ್ಲಿಕೇಶನ್‌ ಡೇಟಾ &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_media_misc_usage" msgid="235452944021647124">"ಇತರೆ."</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="default" msgid="6915293408836853020">"SD ಕಾರ್ಡ್ ಅನ್‌ಮೌಂಟ್‌ ಮಾಡಿ"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"ಅಳವಡಿಸಿ"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ತೆಗೆದುಹಾಕು"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"ಅಳಿಸಿ &amp; ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿ"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಂತೆ ಅಳಿಸಿ &amp; ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿ"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB ಕಂಪ್ಯೂಟರ್ ಸಂಪರ್ಕ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB ಕಂಪ್ಯೂಟರ್ ಸಂಪರ್ಕ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"ಇದರಂತೆ ಸಂಪರ್ಕಪಡಿಸು"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"ಕಂಪ್ಯೂಟರ್‌ನಲ್ಲಿ ಕ್ಯಾಮೆರಾ ಸಾಫ್ಟ್‌ವೇರ್‌ ಬಳಸಿಕೊಂಡು ಫೋಟೋಗಳನ್ನು ವರ್ಗಾಯಿಸಲು, ಮತ್ತು MTP ಅನ್ನು ಬೆಂಬಲಿಸದ ಯಾವುದೇ ಫೈಲ್‌ಗಳನ್ನು ವರ್ಗಾಯಿಸಲು ನಿಮಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ಫೈಲ್ ವರ್ಗಾವಣೆ ಪರಿಕರಗಳನ್ನು ಸ್ಥಾಪಿಸಿ"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್‌ನಲ್ಲಿ MIDI ಸಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು MIDI ಸಾಫ್ಟ್‌ವೇರ್‌ನೊಂದಿಗೆ USB ಮೂಲಕ ಕಾರ್ಯನಿರ್ವಹಿಸಲು ಅನುಕೂಲ ಕಲ್ಪಿಸಿ."</string>
     <string name="storage_other_users" msgid="808708845102611856">"ಇತರ ಬಳಕೆದಾರರು"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ಸಾಧನ ಸಂಗ್ರಹಣೆ"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ತೆಗೆದು ಹಾಕಬಹುದಾದ ಸಂಗ್ರಹಣೆ"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ಉಚಿತ (ಒಟ್ಟು <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ಅಳವಡಿಸಲಾಗಿದೆ"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> ಅನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ಸಂಗ್ರಹಣೆಯನ್ನು ಮರುಹೆಸರಿಸಿ"</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="3677827796634199714"><b>"ನೀವು <xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಎಜೆಕ್ಟ್ ಮಾಡಿದಾಗ, ಅದರಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದನ್ನು ನಿಲ್ಲಿಸುತ್ತವೆ ಮತ್ತು ಅದರಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಮಾಧ್ಯಮ ಫೈಲ್‌ಗಳು ಅದನ್ನು ಮರು ಸೇರಿಸುವವರಗೆ ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</b>" \n\n<xliff:g id="NAME_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_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_next" msgid="2774557300531702572">"ಅಳಿಸು &amp; ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡು"</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="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> ಫಾರ್ಮ್ಯಾಟ್ ಆಗುತ್ತಿರುವಾಗ ಅದನ್ನು ತೆಗೆದುಹಾಕಬೇಡಿ."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ಡೇಟಾವನ್ನು ಹೊಸ ಸಂಗ್ರಹಣೆಗೆ ಸರಿಸಿ"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"ನಿಮ್ಮ ಫೋಟೋಗಳು, ಫೈಲ್‌ಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ನೀವು ಈ ಹೊಸ <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="5035719146373359329"><b>"ಸರಿಸಲು <xliff:g id="TIME">^1</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="8641916179067596592">"ಸರಿಸುವಾಗ: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ಅನ್ನು ಸರಿಸಿ"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"ಸರಿಸುವಾಗ <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="battery_status_title" msgid="9159414319574976203">"ಬ್ಯಾಟರಿ ಸ್ಥಿತಿ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ಬ್ಯಾಟರಿ ಮಟ್ಟ"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN ಗಳು"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಾಣಿಕೆ"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"ಇವುಗಳನ್ನು ಸೇರಿದಂತೆ ಇದು ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ:\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="4874737348054213767">"ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ? ನಿಮಗೆ ಈ ಕ್ರಮವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ಮರುಹೊಂದಿಸುವುದೇ?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಮರುಹೊಂದಿಕೆ"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"ಟ್ಯಾಬ್ಲೆಟ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ ಡೇಟಾವನ್ನೂ ಅಳಿಸುತ್ತದೆ"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"ಫೋನ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ ಡೇಟಾವನ್ನೂ ಅಳಿಸುತ್ತದೆ"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ಇದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಅವುಗಳೆಂದರೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ಇದು ನಿಮ್ಮ ಫೋನ್‌ನ "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ಸಂಗೀತ ಅಥವಾ ಫೋಟೋಗಳು, ಹೀಗೆ SD ಕಾರ್ಡ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸು"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಮರುಹೊಂದಿಸು"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ಫೋನ್‌ ಅನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"ನಿಮ್ಮ ಎಲ್ಲ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಳಿಸಬೇಕೆ? ಈ ಕ್ರಿಯೆಯನ್ನು ಹಿಮ್ಮುಖಗೊಳಿಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಿಲ್ಲ!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"ನಿಮ್ಮ ಎಲ್ಲ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಳಿಸಬೇಕೇ? ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ಎಲ್ಲವನ್ನೂ ಅಳಿಸು"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಮರುಹೊಂದಿಕೆ ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಅನ್‌‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ನೀವು ಎಳೆಯುವ ಅಗತ್ಯವಿದೆ."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"ಸಿಸ್ಟಂ ತೆರವುಗೊಳಿಸುವ ಸೇವೆಯು ಲಭ್ಯವಿಲ್ಲದಿರುವ ಕಾರಣ ಮರುಹೊಂದಿಸುವಿಕೆಯನ್ನು ನಿರ್ವಹಿಸಲಾಗಲಿಲ್ಲ."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ಮರುಹೊಂದಿಸುವುದೇ?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ಈ ಬಳಕೆದಾರರಿಗೆ ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಕೆ ಲಭ್ಯವಿಲ್ಲ"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB ಸಂಗ್ರಹಣೆಯಲ್ಲಿ  ಸಂಗ್ರಹವಾಗಿರುವ ಎಲ್ಲ ಫೈಲ್‌ಗಳನ್ನು ಅಳಿಸುವ ಮೂಲಕ ಅದನ್ನು ಅಳಿಸುವುದೇ? ಈ ಕ್ರಿಯೆಯನ್ನು ನೀವು ಹಿಮ್ಮುಖಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD ಕಾರ್ಡ್‌‌ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಎಲ್ಲ ಫೈಲ್‌ಗಳನ್ನು ಅಳಿಸುವ ಮೂಲಕ ಅದನ್ನು ಅಳಿಸುವುದೇ? ಈ ಕ್ರಿಯೆಯನ್ನು ನೀವು ಹಿಮ್ಮುಖಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ಎಲ್ಲವನ್ನೂ ಅಳಿಸು"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಿಹಾಕಲು ನೀವು ಬಯಸುತ್ತೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ನೀವು ಚಿತ್ರಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD ಕಾರ್ಡ್‌ ಅನ್ನು ಅಳಿಸಿಹಾಕಲು ನೀವು ಬಯಸಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ನೀವು ಎಳೆಯುವ ಅಗತ್ಯವಿದೆ."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ಸಹಾಯ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ಮೊಬೈಲ್ ಯೋಜನೆ"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"ಡೀಫಾಲ್ಟ್ 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ಸ್ಥಾನ ಮೋಡ್"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS, Wi-Fi ಮತ್ತು ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ​​ಬಳಸಿ"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು Wi-Fi ಮತ್ತು ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ​​ಬಳಸಿ"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS ಬಳಸಿ"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS ಬಳಸಿ"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</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="2070686681074461301">"ವೈ-ಫೈ ಆಫ್ ಆಗಿರುವಾಗಲೂ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ಬ್ಲೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ಬ್ಲೂಟೂತ್ ಆಫ್ ಆಗಿರುವಾಗಲೂ, ಬ್ಲೂಟೂತ್‌ಗೆ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಸಿಸ್ಟಮ್ ಸೇವೆಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್ ಸ್ಥಾನ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ನಿಮ್ಮ ಸ್ಥಾನವನ್ನು ಅತಿ ವೇಗವಾಗಿ ಅಂದಾಜು ಮಾಡಲು Google ನ ಸ್ಥಾನ ಸೇವೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸಿ. ಅನಾಮಧೇಯ ಸ್ಥಳದ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲಾಗುವುದು ಮತ್ತು Google ಗೆ ಕಳುಹಿಸಲಾಗುವುದು."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi ಮೂಲಕ ನಿರ್ಧರಿಸಲಾಗಿರುವ ಸ್ಥಳ"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"ಪರದೆ ಸರಕ್ಷತೆ"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಸಾಧನದ ನಮೂನೆಯನ್ನು ಬಳಸಿ."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಸಾಧನದ ಪಿನ್‌ ನಮೂದಿಸಿ."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಸಾಧನದ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ."</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_need_to_unlock" msgid="757935356911054465">"ಉಳಿಸಿದ ನಮೂನೆಯನ್ನು ದೃಢೀಕರಿಸಿ"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"ಸಾಕಷ್ಟು ತಪ್ಪಾದ ಪ್ರಯತ್ನಗಳು!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</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="manageapplications_settings_title" msgid="7041951105633616745">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ ಮತ್ತು ತೆಗೆದುಹಾಕಿ"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"ಸಂಗ್ರಹಣೆ ಬಳಕೆ"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಬಳಸಿರುವ ಸಂಗ್ರಹಣೆಯನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"ಚಾಲನೆಯಲ್ಲಿರುವ ಸೇವೆಗಳು"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ಟ್ಯಾಬ್ಲೆಟ್ ಮಾಹಿತಿ"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ಫೋನ್ ಮಾಹಿತಿ"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"ಬ್ಯಾಟರಿ ಮಾಹಿತಿ"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"ಶೀಘ್ರ ಪ್ರಾರಂಭ"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಪ್ರಾರಂಭಿಸಲು ಕೀಬೋರ್ಡ್‌ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಯೋಜಿಸು"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"ಶಾರ್ಟ್‌ಕಟ್ ಇಲ್ಲ"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"ಹುಡುಕಾಟ + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"ತೆರವುಗೊಳಿಸು"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) ಗೆ ನಿಮ್ಮ ಶಾರ್ಟ್‌ಕಟ್‌ ಅನ್ನು ತೆರವುಗೊಳಿಸಲಾಗುವುದು."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ಸರಿ"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ರದ್ದುಮಾಡು"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ಫೈಲ್‌ನಲ್ಲಿ ಎಲ್ಲ bluetooth HCI ಪ್ಯಾಕೆಟ್‌ಗಳನ್ನು ಸೆರೆಹಿಡಿಯಿರಿ"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM ಅನ್‌ಲಾಕ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ಬೂಟ್‌ಲೋಡರ್‌ ಅನ್‌ಲಾಕ್‌ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"ನಿಮ್ಮ PIN ನಮೂದಿಸಿ"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM ಅನ್‌ಲಾಕ್ ಸಕ್ರಿಯಗೊಳಿಸಲು ನಿಮ್ಮ ಸಾಧನದ PIN ನಮೂದಿಸಿ"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM ಅನ್‌ಲಾಕ್‌ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ಎಚ್ಚರಿಕೆ: ಈ ಸೆಟ್ಟಿಂಗ್‌ ಆನ್‌ ಇರುವಾಗ ಈ ಸಾಧನದಲ್ಲಿ ಸಾಧನ ಸಂರಕ್ಷಣಾ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯ ನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ಲಾಗರ್ ಬಫರ್ ಗಾತ್ರಗಳು"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ಪ್ರತಿ ಲಾಗ್ ಬಫರ್‌ಗೆ ಲಾಗರ್ ಗಾತ್ರಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"ವೀಕ್ಷಣೆ ಆಟ್ರಿಬ್ಯೂಟ್ ಪರಿಶೀಲನೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ನೆಟ್‌ವರ್ಕಿಂಗ್"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ವೈರ್‌ಲೆಸ್ ಪ್ರದರ್ಶನ ಪ್ರಮಾಣೀಕರಣ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi ವೆರ್ಬೋಸ್ ಲಾಗಿಂಗ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ಸೆಲ್ಯುಲರ್‌ ಹಸ್ತಾಂತರಿಸಲು ಆಕ್ರಮಣಕಾರಿ Wi‑Fi"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"ವೈ-ಫೈ ರೋಮ್ ಸ್ಕ್ಯಾನ್‌ಗಳನ್ನು ಯಾವಾಗಲೂ ಅನುಮತಿಸಿ"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"ಹಿಂದಿನ DHCP ಕ್ಲೈಂಟ್ ಬಳಸಿ"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ವೈರ್‌ಲೆಸ್‌‌‌ ಪ್ರದರ್ಶನ ಪ್ರಮಾಣೀಕರಣಕ್ಕಾಗಿ ಆಯ್ಕೆಗಳನ್ನು ತೋರಿಸು"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi ಲಾಗಿಂಗ್ ಮಟ್ಟನ್ನು ಹೆಚ್ಚಿಸಿ, Wi‑Fi ಆಯ್ಕೆಯಲ್ಲಿ ಪ್ರತಿಯೊಂದು SSID RSSI ತೋರಿಸಿ"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ಸಕ್ರಿಯಗೊಂಡರೆ, Wi‑Fi ಸಿಗ್ನಲ್ ದುರ್ಬಲವಾಗಿದ್ದರೂ ಕೂಡ, ಸೆಲ್ಯುಲರ್‌ಗೆ ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಹಸ್ತಾಂತರಿಸುವಲ್ಲಿ Wi‑Fi ಹೆಚ್ಚು ಆಕ್ರಮಣಕಾರಿಯಾಗಿರುತ್ತದೆ"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"ಇಂಟರ್‌ಫೇಸ್‌ನಲ್ಲಿ ಲಭ್ಯವಿರುವ ಡೇಟಾ ಟ್ರಾಫಿಕ್ ಆಧಾರದ ಮೇಲೆ Wi‑Fi ರೋಮ್ ಸ್ಕ್ಯಾನ್‌ಗಳನ್ನು ಅನುಮತಿಸಿ/ನಿರಾಕರಿಸಿ"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"ಲಾಗರ್ ಬಫರ್ ಗಾತ್ರಗಳು"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ಪ್ರತಿ ಲಾಗ್ ಬಫರ್‌ಗೆ ಲಾಗರ್ ಗಾತ್ರಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB ಕಾನ್ಫಿಗರೇಶನ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB ಕಾನ್ಫಿಗರೇಶನ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"ವೀಕ್ಷಣೆ ಆಟ್ರಿಬ್ಯೂಟ್ ಪರಿಶೀಲನೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ಹೊಸ Android DHCP ಕ್ಲೈಂಟ್ ಬದಲಾಗಿ Lollipop ನಿಂದ DHCP ಕ್ಲೈಂಟ್ ಬಳಸಿ."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯು ಅಭಿವೃದ್ಧಿ ಉದ್ದೇಶಗಳಿಗೆ ಮಾತ್ರ ಆಗಿದೆ. ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದ ನಡುವೆ ಡೇಟಾವನ್ನು ನಕಲಿಸಲು, ಅಧಿಸೂಚನೆ ಇಲ್ಲದೆ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಲು ಮತ್ತು ಲಾಗ್ ಡೇಟಾ ಓದಲು ಅದನ್ನು ಬಳಸಿ."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"ನೀವು ಹಿಂದೆ ಅಧಿಕೃತಗೊಳಿಸಿದ ಎಲ್ಲ ಕಂಪ್ಯೂಟರ್‌ಗಳಿಂದ USB ಡೀಬಗ್‌ಗೆ ಪ್ರವೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವುದೇ?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"ಕೆನ್ನೇರಿಳೆ"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ಬಳಸುವುದೇ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ಗೆ ಅಗತ್ಯವಿದೆ:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"ಅನುಮತಿ ವಿನಂತಿಯನ್ನು ಅಪ್ಲಿಕೇಶನ್ ಮರೆಮಾಚುತ್ತಿರುವ ಕಾರಣ, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ನಿಮ್ಮ ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಪರಿಶೀಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> ಅನ್ನು ನೀವು ಆನ್‌ ಮಾಡಿದರೆ, ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್ ಅನ್ನು ವರ್ಧಿಸಲು ನಿಮ್ಮ ಸಾಧನವು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸುವುದಿಲ್ಲ."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"ನೀವು ಪ್ರವೇಶಿಸುವಿಕೆ ಸೇವೆಯನ್ನು ಆನ್‌ ಮಾಡಿರುವುದರರಿಂದ, ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್ ಅನ್ನು ವರ್ಧಿಸಲು ನಿಮ್ಮ ಸಾಧನವು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸುವುದಿಲ್ಲ."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> ಆನ್‌ ಮಾಡುವುದರಿಂದಾಗಿ ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್‌ಗೆ ಪರಿಣಾಮಬೀರುವ ಕಾರಣ, ನಿಮ್ಮ ನಮೂನೆಯನ್ನು ನೀವು ಖಚಿತಡಿಸಬೇಕಾದ ಅಗತ್ಯವಿದೆ."</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮುಗಿದಿವೆ <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<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_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_memory_status" msgid="4251599550196193093">"ಸಾಧನದ ಸ್ಮರಣೆಯು  ಪ್ರಸ್ತುತ <xliff:g id="MEMSTATE">%1$s</xliff:g> ಆಗಿದೆ"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"ಸರಾಸರಿ RAM ಬಳಕೆ"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ಗರಿಷ್ಠ RAM ಬಳಕೆ"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"ಪ್ರಕ್ರಿಯೆಗಳು"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"ಸೇವೆಗಳು"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ಅವಧಿ"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"ಸ್ಮರಣೆ ವಿವರಗಳು"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"ಸಿಸ್ಟಮ್ ಮರೆಮಾಡು"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ಅತಿಕ್ರಮಿಸುವ ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಕೆಳಗೆ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"ಡೀಫಾಲ್ಟ್ ಎಂಜಿನ್"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"ಮಾತಿನ ಪಠ್ಯಕ್ಕಾಗಿ ಬಳಸುವ ಧ್ವನಿ ಸಮನ್ವಯ ಎಂಜಿನ್ ಅನ್ನು ಹೊಂದಿಸುತ್ತದೆ"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"ಹೇಳಲಾಗುವ ಪಠ್ಯದ ಬಳಕೆಗೆ ಧ್ವನಿ ಸಿಂಥೆಸಿಸ್ ಎಂಜಿನ್ ಹೊಂದಿಸಿ"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"ಧ್ವನಿಯ ದರ"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"ಪಠ್ಯವನ್ನು ಹೇಳಿದ ವೇಗ"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ಪಿಚ್"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"ನೀವು ರುಜುವಾತು ಸ್ಥಾಪನೆಯನ್ನು ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ನೀವು ಡ್ರಾ ಮಾಡುವ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆಗಾಗಿ ಪಾಸ್‌ವರ್ಡ್‌ ಅನ್ನು ನಮೂದಿಸಿ."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"ಪ್ರಸ್ತುತ ಪಾಸ್‌ವರ್ಡ್‌:"</string>
@@ -1847,12 +1901,10 @@
     <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="backup_configure_account_default_summary" msgid="2436933224764745553">"ಬ್ಯಾಕ್‌ ಅಪ್‌ ಆಗಿರುವ ಡೇಟಾವನ್ನು ಯಾವುದೇ ಖಾತೆಯು ಪ್ರಸ್ತುತವಾಗಿ ಸಂಗ್ರಹಿಸುತ್ತಿಲ್ಲ"</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="5355557151569037197">"ಬ್ಯಾಕಪ್ ಸೇವೆಯು ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"ನಿಮ್ಮ ಸಾಧನ ನೀತಿಯ ಮೂಲಕ ಇದನ್ನು ಹೊಂದಿಸಲಾಗುತ್ತದೆ."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ಡೆಸ್ಕ್‌ಟಾಪ್ ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ಡೆಸ್ಕ್‌ಟಾಪ್‌‌ನ ಪೂರ್ಣ ಬ್ಯಾಕಪ್‌‌ಗಳನ್ನು ಪ್ರಸ್ತುತ ರಕ್ಷಿಸಲಾಗಿಲ್ಲ"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ಡೆಸ್ಕ್‌ಟಾಪ್‌ನ ಪೂರ್ಣ ಬ್ಯಾಕಪ್‌ಗಳಿಗೆ ಪಾಸ್‌ವರ್ಡ್‌ ಅನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ತೆಗೆದುಹಾಕಲು ಸ್ಪರ್ಶಿಸಿ"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"ಪರಿವರ್ತನೆ ಅನಿಮೇಶನ್ ಮಾಪಕ"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"ಅನಿಮೇಟರ್ ಅವಧಿಯ ಪ್ರಮಾಣ"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"ಮಾಧ್ಯಮಿಕ ಪ್ರದರ್ಶನಗಳನ್ನು ಅನುಕರಿಸು"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"ಬಹು-ವಿಂಡೊ ಮೋಡ್"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"ಒಂದೇ ಬಾರಿಗೆ ಪರದೆಯ ಮೇಲೆ ಬಹು ಚಟುವಟಿಕೆಗಳು."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"ಬಹು-ವಿಂಡೊ ಮೋಡ್ ಸಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ಎಚ್ಚರಿಕೆ: ಇದು ಇತ್ತೀಚಿನ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ UI ಮೂಲಕ ಒಂದೇ ಬಾರಿಗೆ ಪರದೆಯ ಮೇಲೆ ಬಹು ಚಟುವಟಿಕೆಗಳನ್ನು ಅನುಮತಿಸುವಂತಹ ಹೆಚ್ಚು ಪ್ರಯೋಗಾತ್ಮಕ ವೈಶಿಷ್ಟ್ಯವಾಗಿದೆ. ಈ ವೈಶಿಷ್ಟ್ಯದೊಂದಿಗೆ ಬಳಸಿದಾಗ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕ್ರ್ಯಾಶ್ ಆಗಬಹುದು ಅಥವಾ ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದೆ ಇರಬಹುದು."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"ಚಟುವಟಿಕೆಗಳನ್ನು ಇರಿಸದಿರು"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ಬಳಕೆದಾರರು ಇದರಿಂದ ನಿರ್ಗಮಿಸುತ್ತಿದ್ದಂತೆಯೆ ತಕ್ಷಣ ಪ್ರತಿ ಚಟುವಟಿಕೆಯನ್ನು ನಾಶಪಡಿಸು"</string>
@@ -2195,7 +2251,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="718192651887726259">"ನೀವು ಹೆಚ್ಚುವರಿ ಬಳಕೆದಾರರನ್ನು ರಚಿಸುವ ಮೂಲಕ ಇತರ ಜನರ ಜೊತೆಗೆ ಈ ಸಾಧನವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು. ಪ್ರತಿ ಬಳಕೆದಾರರು ತಮ್ಮದೇ ಸ್ಥಳವನ್ನು ಹೊಂದಿರುತ್ತಾರೆ, ಇದರಲ್ಲಿ ಅವರು ತಮ್ಮದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ವಾಲ್‌ಪೇಪರ್ ಮತ್ತು ಮುಂತಾದವುಗಳ ಮೂಲಕ ಕಸ್ಟಮೈಸ್ ಮಾಡಬಹುದು. ಎಲ್ಲರ ಮೇಲೂ ಪರಿಣಾಮ ಬೀರುವಂತೆ 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"ಪೋನ್ ಕರೆಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"ಫೋನ್ ಕರೆಗಳು ಮತ್ತು 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="440218975766968124">"ಫೋನ್ ಕರೆಗಳಿಗೆ ಅನುಮತಿಸುವುದೇ?"</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_sms_confirm_title" msgid="188164598768941316">"ಫೋನ್ ಕರೆಗಳು ಮತ್ತು SMS ಅನುಮತಿಸುವುದೇ?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"ಕರೆ ಮತ್ತು 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="application_restrictions" msgid="8207332020898004394">"ಅಪ್ಲಿಕೇಶನ್‌‌ಗಳು ಮತ್ತು ವಿಷಯವನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ನಿರ್ಬಂಧಗಳೊಂದಿಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ಅಪ್ಲಿಕೇಶನ್‌ಗಾಗಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ವಿಸ್ತರಿಸಿ"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"ನಿರ್ಬಂಧಿತ ಪ್ರೊಫೈಲ್‌‌ಗಳಲ್ಲಿ ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"ವೈಫೈ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ ಸಂಪರ್ಕ"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ಪಠ್ಯ ಸಂದೇಶ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ಸಂದೇಶಗಳು ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ಸೆಲ್ಯುಲಾರ್ ಸೆಲ್ ವಾಹಕ ವೈರ್‌ಲೆಸ್ ಡೇಟಾ 4g 3g 2g ಎಲ್‌ಟಿಇ"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"ವೈಫೈ ವೈ-ಫೈ ಕರೆ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ಲಾಂಚರ್"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ಡಿಮ್‌‌ ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್ ಬ್ಯಾಟರಿ"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ಡಿಮ್‌‌ ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್ ಬ್ಯಾಟರಿ"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ಹಿನ್ನೆಲೆ ವೈಯಕ್ತೀಕರಿಸು ಕಸ್ಟಮೈಸ್ ಪ್ರದರ್ಶನ"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ಕಪ್ಪು ಥೀಮ್ ರಾತ್ರಿ ಮೋಡ್ ಮಂದ ಪರದೆ ಪ್ರಕಾಶಮಾನ ತಿರುಗಿಸಿ"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"ಹಿನ್ನೆಲೆ ವೈಯಕ್ತೀಕರಿಸು ಕಸ್ಟಮೈಸ್ ಪ್ರದರ್ಶನ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ಪಠ್ಯದ ಗಾತ್ರ"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ಪ್ರಾಜೆಕ್ಟ್"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"ಪ್ರಾಜೆಕ್ಟ್ ಬಿತ್ತರಿಸುವಿಕೆ"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ಸ್ಥಳ ಡಿಸ್ಕ್ ಹಾರ್ಡ್ ಡ್ರೈವ್ ಸಾಧನ ಬಳಕೆ"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"ವಿದ್ಯುತ್ ಬಳಕೆ ಶುಲ್ಕ"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ಕಾಗುಣಿತ ನಿಘಂಟು ಕಾಗುಣಿತ ಪರಿಶೀಲನೆ ಸ್ವಯಂ-ಸರಿಪಡಿಸುವಿಕೆ"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"ಖಾತೆ"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ನಿರ್ಬಂಧ ನಿರ್ಬಂಧಿಸು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ಪಠ್ಯ ತಿದ್ದುಪಡಿ ಸರಿಪಡಿಸು ಶಬ್ದ ವೈಬ್ರೇಟ್ ಸ್ವಯಂ ಭಾಷೆ ಸನ್ನೆ ಸಲಹೆ ನೀಡಿ ಸಲಹೆ ಥೀಮ್ ಆಕ್ರಮಣಕಾರಿ ಶಬ್ದ ಪ್ರಕಾರ ಎಮೊಜಿ ಅಂತರರಾಷ್ಟ್ರೀಯ"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"ಮರುಹೊಂದಿಸಿ ಆದ್ಯತೆಗಳು ಡೀಫಾಲ್ಟ್"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"ತುರ್ತು ಐಸ್ ಅಪ್ಲಿಕೇಶನ್ ಡೀಫಾಲ್ಟ್"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಡೌನ್‌ಲೋಡ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸಿಸ್ಟಮ್"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅನುಮತಿಗಳು ಭದ್ರತೆ"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಡೀಫಾಲ್ಟ್"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ಸ್ಲೈಡ್ ಪಾಸ್‌ವರ್ಡ್ ಮಾದರಿ ಪಿನ್"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ಟ್ಯಾಗ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ಬರೆಯಿರಿ"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ತಡೆಹಾಕು"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"ಕರೆಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು ಬಂದಾಗ"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"ಯಾವಾಗಲೂ ಅಡಚಣೆ ಮಾಡು"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ಆದ್ಯತೆಯ ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ತಡೆಹಾಕಲು ಅನುಮತಿಸು"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ಅಡಚಣೆ ಮಾಡಬೇಡ"</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_option_important_interruptions" msgid="3903928008177972500">"ಪ್ರಾಶಸ್ತ್ಯ ಮಾತ್ರ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ಅಲಾರಮ್‌ಗಳು ಮಾತ್ರ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ಯಾವುದೇ ಅಡಚಣೆಗಳಿಲ್ಲ"</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="ringtone_title" msgid="5379026328015343686">"ಫೋನ್ ರಿಂಗ್‌ಟೋನ್"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"ಡೀಫಾಲ್ಟ್ ಅಧಿಸೂಚನೆ ರಿಂಗ್‌ಟೋನ್‌"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ಕರೆಗಳಿಗೂ ಸಹ ವೈಬ್ರೇಟ್‌"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ವೈಬ್ರೇಟ್‌‌"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"ಅಧಿಸೂಚನೆ ಪ್ರವೇಶ"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಧಿಸೂಚನೆಗಳನ್ನು ಓದಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d ಅಪ್ಲಿಕೇಶನ್ ಅಧಿಸೂಚನೆಗಳನ್ನು ಓದಬಹುದು"</item>
-    <item quantity="other" msgid="980049191810249052">"%d ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಧಿಸೂಚನೆಗಳನ್ನು ಓದಬಹುದು"</item>
-  </plurals>
+    <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="2767405417723149879">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಯನ್ನು ಕೇಳುಗರನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> ಸಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"ಸಿಸ್ಟಮ್ ಅಥವಾ ಯಾವುದೇ ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ನಿಂದ ಪೋಸ್ಟ್‌ ಮಾಡಲಾದ ಎಲ್ಲ ಅಧಿಸೂಚನೆಗಳನ್ನು <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ಅವರಿಗೆ ಓದಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ, ಇದು ಸಂಪರ್ಕ ಹೆಸರುಗಳು ಮತ್ತು ನಿಮಗೆ ಕಳುಹಿಸಿರುವಂತಹ ಸಂದೇಶಗಳ ಪಠ್ಯದಂತಹ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಿರಬಹುದು. ಇದಕ್ಕೆ ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ವಜಾಗೊಳಿಸಲು ಅಥವಾ ಅವುಗಳಲ್ಲಿನ ಕ್ರಿಯೆ ಬಟನ್‌ಗಳನ್ನು ಸ್ಪರ್ಶಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"ಕಂಡೀಶನ್ ಪೂರೈಕೆದಾರರು"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ಯಾವುದೇ ಪೂರೈಕೆದಾರರು ಕಂಡೀಶನ್‌‌ಗಳ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಲ್ಲ"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d ಅಪ್ಲಿಕೇಶನ್‌ ಪೂರೈಕೆದಾರರ ಪರಿಸ್ಥಿತಿಗಳು"</item>
-    <item quantity="other" msgid="358057362115673258">"%d ಅಪ್ಲಿಕೇಶನ್‌‌ಗಳ ಪೂರೈಕೆದಾರರ ಪರಿಸ್ಥಿತಿಗಳು"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"ಯಾವುದೇ ಕಂಡೀಶನ್‌‌ ಪೂರೈಕೆದಾರರನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> ಸಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಮೋಡ್‌ಗೆ ನಿರ್ಗಮನ ಪರಿಸ್ಥಿತಿಗಳನ್ನು <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ಅವರಿಗೆ ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"ನಿರ್ಬಂಧಿಸು"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"ಎಲ್ಲವನ್ನೂ ನಿರ್ಬಂಧಿಸಿ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ನ ಅಧಿಸೂಚನೆಗಳನ್ನು ಎಂದಿಗೂ ತೋರಿಸಬೇಡ"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"ಆದ್ಯತೆ"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"ಪಟ್ಟಿಯ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಿ. ಸಾಧನವನ್ನು ಆದ್ಯತೆಯ ಅಡಚಣೆಗಳಿಗೆ ಹೊಂದಿಸಿದಾಗ ಮಾತ್ರ ಅದು ಕಾಣಿಸಿಕೊಳ್ಳುವಂತೆ ಮಾಡಿ"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"ಸೂಕ್ಷ್ಮ"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"ಸಾಧನವನ್ನು ಲಾಕ್‌ ಮಾಡಿದಾಗ, ಈ ಅಪ್ಲಿಕೇಶನ್‌‌ನ ಅಧಿಸೂಚನೆಗಳಿಂದ ಯಾವುದೇ ಸೂಕ್ಷ್ಮ ವಿಷಯವನ್ನು ಮರೆಮಾಡಿ"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"ಆದ್ಯತೆಯಂತೆ ಹೊಂದಿಸಿ"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ನ ಅಧಿಸೂಚನೆಗಳನ್ನು ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಆದ್ಯತೆಗೆ ಹೊಂದಿಸಿದಾಗ ಮಾತ್ರ ಕೇಳಲು ಅನುಮತಿಸಿ"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"ಇಣುಕು ನೋಟವನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ಪ್ರಸ್ತುತ ಪರದೆಯಲ್ಲಿ ಸಂಕ್ಷಿಪ್ತ ವೀಕ್ಷಣೆಗೆ ಸ್ಲೈಡ್ ಮಾಡುವ ಮೂಲಕ ಕೆಲವು ಅಧಿಸೂಚನೆಗಳಿಗೆ ಮಹತ್ವವನ್ನು ನೀಡಲು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಸಿ"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"ಸೂಕ್ಷ್ಮ ವಿಷಯವನ್ನು ಮರೆಮಾಡಿ"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"ಸಾಧನವನ್ನು ಲಾಕ್‌ ಮಾಡಿದಾಗ, ಖಾಸಗಿ ಮಾಹಿತಿಯನ್ನು ಬಹಿರಂಗಪಡಿಸಬಹುದಾದ ಈ ಅಪ್ಲಿಕೇಶನ್‌ನ ಅಧಿಸೂಚನೆಗಳಲ್ಲಿನ ವಿಷಯವನ್ನು ಮರೆಮಾಡಿ"</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="zen_mode_default_option" msgid="6940069025071935243">"ನೀವು ಇದನ್ನು ಆಫ್‌ ಮಾಡುವವರೆಗೂ"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"ಆದ್ಯತೆಯ ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ತಡೆಹಾಕು"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ಸ್ಥಗಿತಕಾಲ"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ದಿನಗಳು"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"ಅಡಚಣೆಗಳನ್ನು ಅನುಮತಿಸಲಾಗಿದೆ"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ಆದ್ಯತೆ ಮಾತ್ರ"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"ಸ್ವಯಂಚಾಲನೆ"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್‌ ಆಗುವಿಕೆ"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"ನಿಯಮದ ಹೆಸರು"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"ನಿಯಮವನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ನಿಯಮವನ್ನು ಅಳಿಸಿ"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<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="3201273040477861538">"ನಿಯಮವನ್ನು ನಿಗದಿಪಡಿಸಿ"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"ನಿಯಮ ಕಂಡು ಬಂದಿಲ್ಲ."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ಎಂದಿಗೂ ಬೇಡ"</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_from" msgid="1033337300289871697">"ಇವರಿಂದ ಕರೆಗಳು/ಸಂದೇಶಗಳು"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ಯಾರಾದರೂ"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"ಸಂಪರ್ಕಗಳು ಮಾತ್ರ"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"ನಕ್ಷತ್ರ ಹಾಕಿರುವ ಸಂಪರ್ಕಗಳು ಮಾತ್ರ"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"ಈವೆಂಟ್‌ಗಳು ಮತ್ತು ಜ್ಞಾಪನೆಗಳು"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"ಅಲಾರಮ್‌ಗಳು ಯಾವಾಗಲೂ ಆದ್ಯತೆಯ ಅಡಚಣೆಗಳು"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"ಅಲಾರಮ್‌ಗಳು"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"ಜ್ಞಾಪನೆಗಳು"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ಈವೆಂಟ್‌ಗಳು"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ಆಯ್ಕೆಮಾಡಲಾದ ಕರೆದಾರರು"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ಪುನರಾವರ್ತಿತ ಕರೆದಾರರು"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ಒಂದು ವೇಳೆ ಅದೇ ವ್ಯಕ್ತಿ <xliff:g id="MINUTES">%d</xliff:g> ನಿಮಿಷದೊಳಗಿನ ಅವಧಿಯಲ್ಲಿ ಎರಡನೇ ಬಾರಿಗೆ ಕರೆ ಮಾಡಿದರೆ, ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್‌ ಆಗುವಿಕೆ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ಎಂದಿಗೂ ಬೇಡ"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ಮುಂದಿನ ದಿನ"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ಅಥವಾ ಮೊದಲೇ ಯಾವುದೇ ಎಚ್ಚರಿಕೆ"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"ತಡೆಗಳು"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"ಕರೆಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು ಬಂದಾಗ"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"ನಿಮ್ಮನ್ನು ಯಾವಾಗ ಅಡಚಣೆ ಮಾಡಬಹುದು?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ಎಷ್ಟು ಹೊತ್ತು?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"ಯಾವಾಗಲೂ ಅಡಚಣೆ ಮಾಡು"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ಆಫ್‌,ಎಲ್ಲಾ,ಎಲ್ಲವೂ"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"ಆದ್ಯತೆಯ ತಡೆಗಳನ್ನು ಮಾತ್ರ ಅನುಮತಿಸು"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"ಅಲಾರಮ್‌ಗಳನ್ನು ಮಾತ್ರ ಅನುಮತಿಸಿ"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"ಅಡಚಣೆ ಮಾಡಬೇಡ"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"ಅನಿರ್ದಿಷ್ಟವಾಗಿ"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <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="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"ಪ್ರಾಶಸ್ತ್ಯದ ಸೂಚನೆಗಳನ್ನು ಅನಿರ್ದಿಷ್ಟವಾಗಿ ಮಾತ್ರ ಬದಲಾಯಿಸಿ"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"ಅಲಾರಮ್‌ಗಳನ್ನು ಅನಿರ್ದಿಷ್ಟವಾಗಿ ಮಾತ್ರ ಬದಲಾಯಿಸಿ"</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>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <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_no_interruptions_indefinite" msgid="5705225870569410806">"ಅನಿರ್ದಿಷ್ಟವಾಗಿ ಅಡಚಣೆ ಮಾಡಬೇಡಿಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_always" msgid="6172985102689237703">"ಯಾವಾಗಲೂ ಅಡಚಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ಎಂದೆಂದಿಗೂ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ಈ ಸಾಧನದ ಕುರಿತು ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಕಳುಹಿಸಿ"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"ಡೀಫಾಲ್ಟ್ ಆಗಿ ಪ್ರಾರಂಭಿಸು"</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="app_launch_domain_links_title" msgid="458956710410857777">"ಡೊಮೇನ್‌ ಲಿಂಕ್‌ಗಳು"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"ಡೊಮೇನ್‌ URL ಗಳನ್ನು ತೆರೆಯಿರಿ"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"ಡೊಮೇನ್‌ URL ಗಳನ್ನು ನೇರವಾಗಿ ತೆರೆಯಲು ಅಪ್ಲಿಕೇಶನ್‌‌ಗೆ ಅನುಮತಿಸಿ"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"ಬೆಂಬಲಿತ ಡೊಮೇನ್‌ಗಳ URL ಗಳು"</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="410824961149037234">"ಆಂತರಿಕ ಮೆಮೊರಿ"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"ಬಾಹ್ಯ ಮೆಮೊರಿ"</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="notifications_enabled" msgid="6983396130566021385">"ಆನ್"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"ನಿರ್ಬಂಧಿಸು"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"ಸೂಕ್ಷ್ಮ"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"ಆದ್ಯತೆ"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"ಆದ್ಯತೆ &amp; ಸೂಕ್ಷ್ಮವಾಗಿದೆ"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <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="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_3">%d</xliff:g> ರಲ್ಲಿ <xliff:g id="COUNT_2">%d</xliff:g> ಅನುಮತಿಗಳನ್ನು ನೀಡಲಾಗಿದೆ</item>
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> ರಲ್ಲಿ <xliff:g id="COUNT_2">%d</xliff:g> ಅನುಮತಿಗಳನ್ನು ನೀಡಲಾಗಿದೆ</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"ಕೆಲವು ಡೀಫಾಲ್ಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಲಾಗಿದೆ"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"ಡೀಫಾಲ್ಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"ವೈಯಕ್ತಿಕ"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"ಕೆಲಸ"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ಆದ್ಯತೆ"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"ಸೂಕ್ಷ್ಮ"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ಡೊಮೇನ್‌ URL ಗಳ ಜೊತೆಗೆ"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"ನಿರ್ವಾಹಕರಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"ಸುಧಾರಿತ"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"ಅಜ್ಞಾತ ಅಪ್ಲಿಕೇಶನ್"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ಪ್ರೊಫೈಲ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಗಳು"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> ನಲ್ಲಿ <xliff:g id="COUNT_0">%d</xliff:g> ಅಪ್ಲಿ. ಹೆಚ್ಚುವರಿ ಪ್ರವೇಶ ಅನುಮತಿಸಲಾಗಿದೆ"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> ನಲ್ಲಿ <xliff:g id="COUNT_0">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅನುಮತಿಸಲಾಗಿದೆ"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"ಡೊಮೇನ್‌ URL ಗಳು"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"ಯಾವುದೇ ಡೊಮೇನ್ URL ತೆರೆಯಬೇಡಿ"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' ತೆರೆಯಿರಿ"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' ಮತ್ತು ಸಂಬಂಧಿತ URL ಗಳನ್ನು ತೆರೆಯಿರಿ"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅದರ ಡೊಮೇನ್ URL ಗಳನ್ನು ತೆರೆಯಬಹುದು</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅದರ ಡೊಮೇನ್ URL ಗಳನ್ನು ತೆರೆಯಬಹುದು</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"ಗುರುತಿಸಲಾಗಿಲ್ಲ"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ಡೀಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ಬ್ರೌಸರ್ ಅಪ್ಲಿಕೇಶನ್"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಬ್ರೌಸರ್ ಇಲ್ಲ"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ಡೀಫಾಲ್ಟ್)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಸಂಗ್ರಹ"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index b962bf2..f10b869 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"누름 버튼"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"마이크 음소거/음소거 해제"</item>
     <item msgid="1148142988678569310">"프로젝트 미디어"</item>
     <item msgid="9130014005474445273">"VPN 활성화"</item>
+    <item msgid="1165192162975045562">"배경화면 작성"</item>
+    <item msgid="7129487923652967258">"구조 지원"</item>
+    <item msgid="1069023208100114540">"스크린샷 지원"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"위치"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"마이크 음소거/음소거 해제"</item>
     <item msgid="5906017727368097853">"프로젝트 미디어"</item>
     <item msgid="2486614710846178542">"VPN 활성화"</item>
+    <item msgid="5586547561693629602">"배경화면 작성"</item>
+    <item msgid="32794179825485062">"구조 지원"</item>
+    <item msgid="7872852746938272552">"스크린샷 지원"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"짧게"</item>
@@ -375,7 +384,7 @@
     <item msgid="1770533843436933500">"검정색 바탕에 흰색"</item>
     <item msgid="758587126802411846">"흰색 바탕에 검정색"</item>
     <item msgid="1495307195241623402">"검정색 바탕에 노란색"</item>
-    <item msgid="6039700130994371612">"파란색 바탕에 흰색"</item>
+    <item msgid="6039700130994371612">"파란색 바탕에 노란색"</item>
     <item msgid="7169235156349580064">"맞춤설정"</item>
   </string-array>
   <string-array name="select_logd_size_titles">
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"낮음"</item>
     <item msgid="4212263919458209842">"심각"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"사용 안함"</item>
-    <item msgid="5656544177755411222">"제한적 중단"</item>
-    <item msgid="8735337502532332056">"중단 없음"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"보통"</item>
     <item msgid="866544120205026771">"중간"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"분홍색"</item>
     <item msgid="6131821495505931173">"빨간색"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP(Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP(Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS(USB 이더넷)"</item>
+    <item msgid="2686051673589572111">"오디오 소스"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 87ca93f..62e59cd 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"허용"</string>
     <string name="deny" msgid="6947806159746484865">"거부"</string>
     <string name="device_info_default" msgid="7847265875578739287">"알 수 없음"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"개발자가 되려면 <xliff:g id="STEP_COUNT">%1$d</xliff:g>단계가 남았습니다."</item>
-    <item quantity="other" msgid="6722953419953594148">"개발자가 되려면 <xliff:g id="STEP_COUNT">%1$d</xliff:g>단계가 남았습니다."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g>단계만 더 완료하면 개발자가 될 수 있습니다.</item>
+      <item quantity="one"><xliff:g id="STEP_COUNT_0">%1$d</xliff:g>단계만 더 완료하면 개발자가 될 수 있습니다.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"개발자가 되셨습니다."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"이미 개발자입니다."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"무선 및 네트워크"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS로 SMS 끄기"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS 등록을 사용해야 합니다."</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS 등록을 사용 중지해야 합니다."</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE 프로비저닝 신고 사용"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE 프로비저닝 신고 사용 중지"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram 덤프 사용"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram 덤프 사용안함"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM 주소록 보기"</string>
@@ -135,16 +137,7 @@
     <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="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;의 &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;이(가) 사용 중지됩니다."</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"연결됨"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"연결됨(전화 없음)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"연결됨(미디어 없음)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"연결됨(메시지 액세스 없음)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"연결됨(전화 또는 미디어 없음)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"연결 끊김"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"연결을 끊는 중…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"연결 중…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"페어링 중..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"이름이 없는 블루투스 기기"</string>
     <string name="progress_scanning" msgid="192587958424295789">"검색 중"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"근처에 블루투스 기기가 없습니다."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"받은 파일 보기"</string>
     <string name="device_picker" msgid="4978696506172252813">"블루투스 기기 선택"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"블루투스 권한 요청"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"앱에서 블루투스를 사용하도록 설정하려고 합니다."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"앱에서 이 기기에 블루투스를 사용 설정하려고 합니다."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"앱에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"앱에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"앱에서 다른 블루투스 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"취소"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"계속"</string>
     <string name="okay" msgid="1997666393121016642">"확인"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"예"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"아니요"</string>
-    <string name="forget" msgid="7267115980248732932">"삭제"</string>
+    <string name="forget" msgid="1400428660472591263">"저장 안함"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"얼굴 인식 잠금해제 개선"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"동적 이미지 확인"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"잠금 해제하려면 눈 깜박임 필요"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"비밀번호"</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="3453670509485083962">"추가"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"화면 잠금"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"지문 설정"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"지문을 사용하여 화면 잠금을 해제하거나 구매를 확인하려면 다음을 수행해야 합니다. \n\n✓ 백업 화면 잠금 방법 설정 \n\n✓ 지문 추가"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"센서 찾기"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"휴대전화 뒷면에 있는 지문 센서를 찾으세요."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"시작"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"지문 센서에 손가락을 올려놓은 뒤 진동이 느껴지면 뗍니다."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"좋습니다. 이를 반복하세요."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"지문 센서에 같은 손가락을 올려놓은 뒤 진동이 느껴지면 뗍니다."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"지문이 추가되었습니다."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"이 아이콘이 표시되면 지문을 사용하여 사용자 본인임을 증명하거나 구매를 승인할 수 있습니다."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"추가"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"다음"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"충전기를 연결한 다음 다시 시도하세요."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"화면 잠금 PIN 또는 비밀번호 없음"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"암호화를 시작하기 전에 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"기기를 암호화하려면 잠금 해제 패턴을 그려야 합니다."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"암호화하시겠습니까?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"암호화 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화는 한 시간 이상이 걸리며 그 동안 태블릿은 몇 번 다시 시작됩니다."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"암호화 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화는 한 시간 이상이 걸리며 그 동안 휴대전화는 몇 번 다시 시작됩니다."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"얼굴인식 잠금해제"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"낮은 보안(베타)"</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_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="current_screen_lock" msgid="4104091715420072219">"현재 화면 잠금"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"기기 보호 기능이 더 이상 작동하지 않습니다."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"관리자, 암호화 정책 또는 자격증명 저장소로 인해 사용 중지됨"</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_biometric_weak" msgid="3008473624490350142">"얼굴인식 잠금해제"</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_password" msgid="1203938057264146610">"비밀번호"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"화면 잠금 설정을 완료하면 설정 &gt; 보안에서 지문도 추가할 수 있습니다."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"화면 잠금 사용 안함"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"잠금해제 패턴 삭제"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"잠금해제 PIN 삭제"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"비밀번호에는 적어도 하나의 문자가 포함되어야 합니다."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"비밀번호에는 적어도 하나의 숫자가 포함되어야 합니다."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"비밀번호에는 적어도 하나의 기호가 포함되어야 합니다."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"비밀번호에는 적어도 하나의 문자가 포함되어야 합니다."</item>
-    <item quantity="other" msgid="8186027808415585970">"비밀번호에는 적어도 %d개의 문자가 포함되어야 합니다."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"비밀번호에는 적어도 하나의 소문자가 포함되어야 합니다."</item>
-    <item quantity="other" msgid="2693910942679679225">"비밀번호에는 적어도 %d개의 소문자가 포함되어야 합니다."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"비밀번호에는 적어도 하나의 대문자가 포함되어야 합니다."</item>
-    <item quantity="other" msgid="3030801209112209245">"비밀번호에는 적어도 %d개의 대문자가 포함되어야 합니다."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"비밀번호에는 적어도 하나의 숫자가 포함되어야 합니다."</item>
-    <item quantity="other" msgid="4703982391407595924">"비밀번호에는 적어도 %d개의 숫자가 포함되어야 합니다."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"비밀번호에는 적어도 하나의 특수 기호가 포함되어야 합니다."</item>
-    <item quantity="other" msgid="1221290525051187757">"비밀번호에는 적어도 %d개의 특수 기호가 포함되어야 합니다."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"비밀번호에는 글자가 아닌 문자가 한 개 이상 포함되어야 합니다."</item>
-    <item quantity="other" msgid="3952508584649046404">"비밀번호에는 적어도 %d개 이상의 글자가 아닌 문자가 포함되어야 합니다."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">비밀번호에는 문자가 %d자 이상 포함되어야 합니다.</item>
+      <item quantity="one">비밀번호에는 문자가 1자 이상 포함되어야 합니다.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">비밀번호에는 소문자가 %d자 이상 포함되어야 합니다.</item>
+      <item quantity="one">비밀번호에는 소문자가 1자 이상 포함되어야 합니다.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">비밀번호에는 대문자가 %d자 이상 포함되어야 합니다.</item>
+      <item quantity="one">비밀번호에는 대문자가 1자 이상 포함되어야 합니다.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">비밀번호에는 숫자가 %d개 이상 포함되어야 합니다.</item>
+      <item quantity="one">비밀번호에는 숫자가 1개 이상 포함되어야 합니다.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">비밀번호에는 특수 기호가 %d개 이상 포함되어야 합니다.</item>
+      <item quantity="one">비밀번호에는 특수 기호가 1개 이상 포함되어야 합니다.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">비밀번호에는 글자가 아닌 문자가 %d개 이상 포함되어야 합니다.</item>
+      <item quantity="one">비밀번호에는 글자가 아닌 문자가 1개 이상 포함되어야 합니다.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"기기 관리자가 최근 비밀번호 사용을 허용하지 않습니다."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"오름차순, 내림차순 또는 숫자의 반복된 순서는 금지됨"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"확인"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 페어링하려면&lt;br&gt;&lt;br&gt;이 패스키(&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;)가 표시되는지 확인하세요.&lt;br&gt;&lt;br&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"출처:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;이 기기와 페어링하시겠습니까?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>와(과) 페어링하려면 <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>을(를) 입력한 다음 Return 또는 Enter 키를 누르세요."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"페어링"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"페어링"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"취소"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"페어링하면 연결 시 주소록 및 통화 기록에 액세스할 수 있습니다."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하지 못했습니다."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN 또는 패스키가 잘못되어 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하지 못했습니다."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 통신할 수 없습니다."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에서 페어링을 거부했습니다."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"위치 정확도 개선을 위해 블루투스가 꺼져 있을 때에도 앱과 서비스에서 블루투스 기기를 검색합니다. 이 설정은 <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_specific_profiles_title" msgid="6952214406025825164">"연결..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"미디어 오디오"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"휴대폰 오디오"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"파일 전송"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"입력 장치"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"인터넷 액세스"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"연락처 공유"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"연락처 공유용"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"인터넷 연결 공유"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"메시지 액세스"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"미디어 오디오에 연결됨"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"휴대전화 오디오에 연결됨"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"파일 전송 서버에 연결됨"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"지도에 연결됨"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"파일 전송 서버에 연결되지 않았습니다."</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"입력 장치에 연결됨"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"미디어 오디오에 사용"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"휴대전화 오디오에 사용"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"파일 전송에 사용"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"입력에 사용"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"인터넷 액세스에 사용"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"지도에 사용"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi 도우미"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi 도우미를 통해 연결됨"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"화면 전송"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi 사용 중지 중..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"오류"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"비행기 모드"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"네트워크를 검색할 수 없습니다."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"네트워크 알림"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"공용 네트워크가 사용 가능한 경우 알림"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"불량 네트워크 방지"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"인터넷 연결이 원활하지 않은 경우 Wi-Fi 네트워크를 사용하지 않음"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"인터넷 연결이 안정적인 네트워크만 사용합니다."</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"네트워크 항상 검색"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"항상 검색 허용"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi‑Fi가 꺼진 경우에도 Google 위치 서비스 및 기타 앱이 네트워크를 검색하도록 합니다."</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"개방형 Wi‑Fi를 자동으로 사용"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"품질이 우수하다고 확인된 개방형 네트워크에 Wi‑Fi 도우미를 자동으로 연결"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"도우미 선택"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"인증서 설치"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"정확성 개선 등의 목적으로 Google 및 기타 앱이 근처 Wi-Fi 네트워크를 스캔할 수 있습니다. Wi-Fi가 꺼져 있을 때도 작동합니다. 이 기능을 사용하지 않으려면 고급 &gt; 네트워크 항상 검색으로 이동하세요."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"앱이 Wi-Fi가 꺼져 있을 때도 근처 네트워크를 스캔할 수 있습니다. 이 기능을 사용하지 않으려면 고급 &gt; 네트워크 항상 검색으로 이동하세요."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"위치 정확도 개선을 위해 Wi-Fi가 꺼져 있을 때에도 앱과 서비스에서 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="5340097010842405981">"다시 표시 안함"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"다른 네트워크 추가"</string>
     <string name="wifi_more" msgid="3195296805089107950">"더보기"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"자동 설정(WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"설정을 완료하려면 태블릿이 Wi‑Fi에 액세스해야 합니다. 설정 후에는 셀룰러 데이터와 Wi‑Fi 간에 전환할 수 있습니다."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"고급 옵션"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi Protected 설정"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS을 시작하는 중…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"공유기에서 Wi-Fi Protected 설정 버튼을 누르세요. \'WPS\'라고 줄여 부르기도 하며 다음 기호를 포함할 수도 있습니다."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"라우터에서 Wi‑Fi 보호 설정 버튼을 누르세요. \'WPS\'라고 쓰여있거나 이 기호가 표시되어 있을 수도 있습니다."</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Wi-Fi 공유기에 PIN(개인 식별 번호) <xliff:g id="NUMBER">%1$s</xliff:g>을(를) 입력하세요. 설정을 완료하는 데 최대 2분이 소요됩니다."</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>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"익명 ID"</string>
     <string name="wifi_password" msgid="5948219759936151048">"비밀번호"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"비밀번호 표시"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"AP 대역 설정"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4GHz 대역"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5GHz 대역"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP 설정"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(변경 안함)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(지정되지 않음)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"저장됨"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"사용 중지됨"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 설정 실패"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi 연결 실패"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"인증 문제"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"범위 내에 없음"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"감지된 인터넷 액세스가 없으며 자동으로 다시 연결되지 않습니다."</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_security_none" msgid="7985461072596594400">"없음"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"이 네트워크에는 인터넷이 연결되어 있지 않습니다. 그래도 이 네트워크를 사용하시겠습니까?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"이 네트워크를 다시 요청하지 마세요."</string>
     <string name="wifi_connect" msgid="1076622875777072845">"연결"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"네트워크 연결 실패"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"저장 안함"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK 휴대용 Wi‑Fi 핫스팟"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SECURITY">%2$s</xliff:g><xliff:g id="NETWORK_SSID">%1$s</xliff:g> 휴대용 Wi-Fi 핫스팟"</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_mode_title" msgid="2164073796253284289">"통화 환경설정"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi 통화 모드"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi를 기본으로 설정"</item>
+    <item msgid="5267397515594230396">"모바일 데이터를 기본으로 설정"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi 통화가 켜져 있으면 휴대전화에서 환경설정과 신호 강도에 따라 Wi-Fi 네트워크나 데이터 네트워크를 통해 통화를 연결할 수 있습니다. 이 기능을 사용하기 전에 이동통신사에 문의하여 요금과 기타 세부정보를 알아보세요."</string>
     <string name="home_settings" msgid="212375129455718176">"홈"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"테마"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"밝게"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"어둡게"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"자동"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"기본 SIM 카드 업데이트"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g>은(는) 기기에 있는 유일한 SIM입니다. 이 SIM을 모바일 데이터, 통화, SMS 메시지에 사용하시겠습니까?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN 코드가 잘못되었습니다. 이동통신사에 문의하여 기기를 잠금 해제해야 합니다."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM PIN 코드가 잘못되었습니다. <xliff:g id="NUMBER">%d</xliff:g>회 이상 실패할 경우 이동통신사에 문의하여 기기를 잠금 해제해야 합니다."</item>
-    <item quantity="other" msgid="77103619544346451">"SIM PIN 코드가 잘못되었습니다. <xliff:g id="NUMBER">%d</xliff:g>번의 기회가 남았습니다."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM PIN 코드가 잘못되었습니다. <xliff:g id="NUMBER_1">%d</xliff:g>번 더 시도할 수 있습니다.</item>
+      <item quantity="one">SIM PIN 코드가 잘못되었습니다. <xliff:g id="NUMBER_0">%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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"앱(앱 데이터 및 미디어 콘텐츠)"</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_dcim_usage" msgid="558887013613822577">"사진, 동영상"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"오디오(음악, 벨소리, podcast 등)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"기타"</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="default" msgid="6915293408836853020">"SD 카드 마운트 해제"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"마운트"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"꺼내기"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"삭제 및 포맷"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"내부 저장소 삭제 및 포맷"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB 컴퓨터 연결"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB 컴퓨터 연결"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"다음으로 연결"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"카메라 소프트웨어를 사용하여 사진을 전송하고, MTP를 지원하지 않는 컴퓨터의 파일을 전송할 수 있습니다."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"파일 전송 도구 설치"</string>
+    <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_external_title" msgid="2723851748972673696">"이동식 저장소"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> 사용 가능(총 <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g>이(가) 마운트되었습니다."</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>을(를) 포맷하지 못했습니다."</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"저장소 이름 바꾸기"</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="3677827796634199714"><b>"<xliff:g id="NAME_0">^1</xliff:g>을(를) 제거하면 저장된 앱의 작동이 중단되며, 다시 삽입할 때까지 저장된 미디어 파일을 사용할 수 없습니다."</b>" \n\n<xliff:g id="NAME_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_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_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="1259216693690378749">"포맷 중에 <xliff:g id="NAME">^1</xliff:g>을(를) 삭제하지 마세요."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"새로운 저장소로 데이터 이동"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"사진, 파일, 앱 데이터를 이 새로운 <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="5035719146373359329"><b>"이동에 소요되는 시간은 약 <xliff:g id="TIME">^1</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="8641916179067596592">"이동 중 주의사항: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> 이동"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"이동 중에 <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="battery_status_title" msgid="9159414319574976203">"배터리 상태"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"배터리 수준"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"네트워크 설정 초기화"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"다음을 포함한 모든 네트워크 설정이 재설정됩니다.\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="4874737348054213767">"모든 네트워크 설정을 재설정하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"설정 초기화"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"초기화하시겠습니까?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"네트워크 설정이 재설정되었습니다."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"기기 재설정"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"공장 초기화"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"태블릿의 모든 데이터 지우기"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"휴대전화의 모든 데이터 지우기"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"공장 초기화하면 태블릿의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"공장 초기화하면 휴대전화 "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD 카드에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"태블릿 초기화"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"휴대전화 초기화"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"모든 개인 정보와 다운로드한 앱을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"모든 개인정보와 다운로드한 앱을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"모두 지우기"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"초기화를 실행하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"시스템 지우기 서비스를 사용할 수 없어 초기화하지 못했습니다."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"초기화하시겠습니까?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"초기화를 수행할 권한이 없는 사용자입니다."</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB 저장소를 지워서 저장된 모든 파일을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD 카드를 지워서 저장된 모든 파일을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"모두 지우기"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB 저장소를 지우려면 잠금해제 패턴을 그려야 합니다."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD 카드를 지우려면 잠금해제 패턴을 그려야 합니다."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"도움말"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"이동통신망"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"모바일 요금제"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"기본 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"위치 모드"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, Wi‑Fi 및 이동통신망을 사용하여 위치를 찾습니다."</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wi‑Fi와 이동통신망을 사용하여 위치를 찾습니다."</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS를 사용하여 내 위치를 찾습니다."</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS를 사용하여 위치를 찾습니다."</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"검색 중"</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="2070686681074461301">"Wi-Fi가 꺼져 있을 때에도 앱과 서비스에서 Wi-Fi 네트워크를 검색하도록 허용하여 위치 정확도를 개선합니다."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"블루투스 검색 중"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"블루투스가 꺼져 있을 때에도 시스템 서비스에서 블루투스 기기를 검색하도록 허용하여 위치 정확도를 개선합니다."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi 및 이동통신망 위치"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"사용자의 위치를 빠르게 파악하도록 앱에서 Google의 위치 서비스를 사용합니다. 익명의 위치 정보가 수집되어 Google로 전송됩니다."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi에서 측정된 위치"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"화면 보안"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"계속하려면 기기 패턴을 사용하세요."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"계속하려면 기기 PIN을 입력하세요."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"계속하려면 기기 비밀번호를 입력하세요."</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_need_to_unlock" msgid="757935356911054465">"저장된 패턴 확인"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"다시 시도:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"잘못된 시도 횟수가 너무 많습니다."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g>초 후에 다시 시도하세요."</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="manageapplications_settings_title" msgid="7041951105633616745">"앱 관리"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"설치된 앱 관리 및 제거"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"저장공간 사용량"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"앱에서 사용 중인 용량 보기"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"실행 중인 서비스"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"태블릿 정보"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"휴대전화 정보"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"배터리 정보"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"빠른실행"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"앱을 실행하는 바로가기 설정"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"앱 할당"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"바로가기 없음"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"검색 + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"지우기"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">" <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>(<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)에 대한 바로가기가 지워집니다."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"확인"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"취소"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"앱"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"바로가기"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"모든 블루투스 HCI 패킷을 하나의 파일에 캡처"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM 잠금 해제"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"부트로더 잠금 해제 허용"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN 입력"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM 잠금 해제를 사용하도록 설정하려면 기기 PIN을 입력하세요."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM 잠금 해제를 허용하시겠습니까?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"경고: 이 설정을 사용하는 동안에는 이 기기에서 기기 보호 기능이 작동하지 않습니다."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"로거 버퍼 크기"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"로그 버퍼당 로거 크기 선택"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"모의 위치 허용"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"모의 위치 허용"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"보기 속성 검사 사용"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"네트워크"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"무선 디스플레이 인증서"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi 상세 로깅 사용"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi에서 데이터 네트워크로 적극 핸드오버"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi 로밍 스캔 항상 허용"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"이전 DHCP 클라이언트 사용"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"무선 디스플레이 인증서 옵션 표시"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi 로깅 수준을 높이고, Wi‑Fi 선택도구에서 SSID RSSI당 값을 표시합니다."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"사용 설정하면 Wi-Fi 신호가 약할 때 데이터 연결을 Wi-Fi에서 데이터 네트워크로 더욱 적극적으로 핸드오버합니다."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"인터페이스에 표시되는 데이터 트래픽의 양을 기반으로 Wi-Fi 로밍 스캔을 허용하거나 허용하지 않습니다."</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"로거 버퍼 크기"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"로그 버퍼당 로거 크기 선택"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB 설정 선택"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB 설정 선택"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"모의 위치 허용"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"모의 위치 허용"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"보기 속성 검사 사용"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"새로운 Android DHCP 클라이언트 대신 Lollipop의 DHCP 클라이언트 사용"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB 디버깅을 허용하시겠습니까?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB 디버깅은 개발용으로만 설계되었습니다. 이 기능을 사용하면 컴퓨터와 기기 간에 데이터를 복사하고 알림 없이 기기에 앱을 설치하며 로그 데이터를 읽을 수 있습니다."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"이전에 승인한 모든 컴퓨터에서 USB 디버깅에 대한 액세스 권한을 취소하시겠습니까?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"자홍색"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>에 필요한 기능:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"권한 요청을 보이지 않게 하는 앱이 있어서 설정에서 내 응답을 확인할 수 없습니다."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 기기에서 데이터 암호화를 개선하기 위해 화면 잠금을 사용하지 않습니다."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"접근성 서비스를 사용 설정했으므로 기기에서 데이터 암호화를 개선하기 위해 화면 잠금을 사용하지 않습니다."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 데이터 암호화에 영향을 주기 때문에 패턴 확인이 필요합니다."</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TIME">%2$s</xliff:g>을(를) 초과하는 <xliff:g id="TYPE">%1$s</xliff:g> 앱"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="TIMEDURATION">%3$s</xliff:g> 동안 <xliff:g id="USEDRAM">%1$s</xliff:g>/<xliff:g id="TOTALRAM">%2$s</xliff:g> 사용"</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_memory_status" msgid="4251599550196193093">"현재 기기 메모리 수준: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"평균 RAM 사용"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"최대 RAM 사용"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"프로세스"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"서비스"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"기간"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"메모리 세부정보"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"시스템 숨기기"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS(Unique Set Size) 사용"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"통계 유형"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"백그라운드"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"아래 기본 설정으로 앱 설정 덮어쓰기"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"기본 설정"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"기본 엔진"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"음성 텍스트에 대해 음성 합성 엔진을 사용하도록 설정"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"음성 텍스트에 사용될 음성 합성 엔진을 설정하세요."</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"말하는 속도"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"텍스트를 읽어주는 빠르기"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"피치"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"자격증명 설치를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"자격증명 저장소 비밀번호를 입력하세요."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"현재 비밀번호:"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"현재 백업한 데이터가 저장된 계정이 없습니다."</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="5355557151569037197">"백업 서비스가 비활성 상태입니다."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"기기 정책에 따라 설정되었습니다."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"데스크톱 백업 비밀번호"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"데스크톱 전체 백업에 비밀번호가 설정되어 있지 않음"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"데스크톱 전체 백업에 대한 비밀번호를 변경하거나 삭제하려면 터치하세요."</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"전환 애니메이션 배율"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator 길이 배율"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"보조 디스플레이 시뮬레이트"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"멀티 윈도우 모드"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"화면에서 여러 작업을 동시에 수행합니다."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"멀티 윈도우 모드를 사용하시겠습니까?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"경고: 이 기능은 매우 실험적인 기능으로 최근 사용 앱 UI를 통해 화면에서 여러 작업을 동시에 수행할 수 있도록 지원합니다. 이 기능을 사용하는 경우 일부 앱이 충돌하거나 제대로 작동하지 않을 수 있습니다."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"앱"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"액티비티 유지 안함"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"사용자가 종료하는 즉시 바로 제거"</string>
@@ -2195,7 +2251,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="718192651887726259">"사용자를 추가하여 이 기기를 다른 사람들과 공유할 수 있습니다. 각 사용자는 앱, 배경화면 등으로 꾸밀 수 있는 자신만의 공간을 갖습니다. 또한 사용자는 모든 사람에게 적용되는 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"전화 통화 허용"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"전화 통화 및 SMS 허용"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"통화 기능 사용"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"통화 및 SMS 기능 사용"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"사용자 삭제"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"전화 통화를 허용하시겠습니까?"</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_sms_confirm_title" msgid="188164598768941316">"전화 통화 및 SMS를 허용하시겠습니까?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"통화 및 SMS 기록이 이 사용자와 공유됩니다."</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="application_restrictions" msgid="8207332020898004394">"앱 및 콘텐츠 허용"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"애플리케이션 제한"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"애플리케이션을 위한 설정 확장"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"이 앱은 제한된 프로필에 지원되지 않습니다."</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi 네트워크 연결"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"문자 메시지 문자 메시지 전송 메시지"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"휴대전화 셀 이동통신사 무선 데이터 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"Wi-Fi Wi-Fi 전화 통화"</string>
     <string name="keywords_home" msgid="3626170808219458848">"런처"</string>
     <string name="keywords_display" msgid="6709007669501628320">"화면 터치스크린"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"화면 어둡게 하기 터치스크린 배터리"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"화면 어둡게 하기 터치스크린 배터리"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"백그라운드 맞춤설정 맞춤설정 디스플레이"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"어둡게 테마 야간 모드 화면 어둡게 반전 밝기"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"백그라운드 맞춤설정 맞춤설정 디스플레이"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"텍스트 크기"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"프로젝트"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"프로젝트 전송"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"공간 디스크 하드 드라이브 기기 사용"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"전원 사용 충전"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"철자 사전 맞춤법 검사 자동 수정"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"계정"</string>
     <string name="keywords_users" msgid="4673901601478559100">"제한 제한하다 제한됨"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"텍스트 수정 수정 사운드 진동 자동 언어 제스처 추천하기 추천 테마 불쾌감을 주는 단어 유형 그림 이모티콘 전 세계"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"환경설정 기본값 초기화"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"긴급 상황 앱(기본)"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"앱 다운로드 애플리케이션 시스템"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"앱 권한 보안"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"앱 기본"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"슬라이드 비밀번호 패턴 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC 태그 설정"</string>
     <string name="write_tag" msgid="8571858602896222537">"쓰기"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"소리/진동 알림"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"전화 및 알림 수신 시"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"항상 소리/진동 알림"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"중요 소리/진동 알림만 허용"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"소리/진동 알림 차단"</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_option_important_interruptions" msgid="3903928008177972500">"중요 알림만"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"알람만 수신"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"방해 금지"</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="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"기본 알림 벨소리"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"전화 올 때 벨소리와 함께 진동"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"진동"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"알림 액세스"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"앱에서 알림을 읽을 수 없습니다."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d개의 앱이 알림을 읽을 수 있습니다."</item>
-    <item quantity="other" msgid="980049191810249052">"%d개의 앱이 알림을 읽을 수 있습니다."</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d개 앱이 알림을 읽을 수 있습니다.</item>
+      <item quantity="one">%d개 앱이 알림을 읽을 수 있습니다.</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"알림 수신기가 설치되지 않았습니다."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>이(가) 시스템 또는 설치된 앱이 게시하는 모든 알림(연락처 이름 및 수신된 이메일 텍스트와 같은 개인정보가 포함될 수 있음)을 읽을 수 있습니다. 또한 이러한 알림을 닫거나 알림 내에 있는 작업 버튼을 터치할 수도 있습니다."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"조건 제공자"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"조건을 제공하는 앱이 없음"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d개의 앱이 조건을 제공"</item>
-    <item quantity="other" msgid="358057362115673258">"%d개의 앱이 조건을 제공"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"조건 제공자가 설치되지 않았습니다."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하도록 설정하시겠습니까?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>은(는) 알림 일시중지 모드에 종료 조건을 추가할 수 있습니다."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"앱 로드 중..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"차단"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"모두 차단"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"이 앱의 알림 표시 안함"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"최우선만 수신"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"목록 상단에 알림 표시(기기에 최우선 알림만 표시되도록 설정한 경우에만 계속 표시)"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"중요"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"기기가 잠겨 있는 경우 앱 알림에서 중요한 콘텐츠를 모두 숨깁니다."</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"최우선으로 취급"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"알림 일시중지가 최우선만 수신으로 설정되어 있을 때 이 앱의 알림이 표시되도록 허용합니다."</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"엿보기 허용"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"특정 알림을 짧게 슬라이드하여 현재 화면에 표시했을 때 앱에서 알림을 강조하도록 허용합니다."</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"민감한 내용 숨기기"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"기기가 잠겨 있는 경우 이 앱의 알림에서 개인 정보를 노출할 수 있는 내용을 숨깁니다."</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="zen_mode_default_option" msgid="6940069025071935243">"이 기능을 사용 중지할 때까지"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"중요 소리/진동 알림"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"다운타임"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"일"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"없음"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"알림 허용"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"중요 알림만"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"선택 안함"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"자동"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"자동 사용 설정"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"규칙 이름"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"규칙 추가"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"규칙 삭제"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\'<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="3201273040477861538">"규칙 예약"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"규칙을 찾을 수 없습니다."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"사용 안함"</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_from" msgid="1033337300289871697">"통화/메시지 발신자"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"누구나"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"주소록에 있는 사용자만"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"별표 표시한 주소록에 있는 사용자만"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"일정 및 알림"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"알람은 항상 중요 소리/진동 알림입니다."</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"알람"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"알림"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"이벤트"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"선택한 발신자"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"반복 발신자"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g>분 이내에 같은 사람이 다시 전화를 걸면 통화를 허용합니다."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"자동 사용 설정"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"사용 안함"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"다음 날 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> 또는 알람이 울리기 전"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"다음 날 <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_interruptions_voice_title" msgid="855256211259132964">"소리/진동 알림"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"전화 및 알림 수신 시"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"언제 알림을 받으시겠습니까?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"기간"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"항상 소리/진동 알림"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"끄기,모두,전체"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"중요 소리/진동 알림만 허용"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"알람만 허용"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"소리/진동 알림 차단"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"무제한"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>분</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>분</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"무제한으로 중요 알림만 허용 모드로 변경"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>까지 <xliff:g id="DURATION">%1$d</xliff:g>분 동안 중요 알림만 허용 모드로 변경</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>까지 1분 동안 중요 알림만 허용 모드로 변경</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g>까지 1시간 동안 중요 알림만 허용 모드로 변경</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"무제한으로 알람만 수신 모드로 변경"</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>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>까지 1분 동안 알람만 수신 모드로 변경</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>까지 <xliff:g id="DURATION">%1$d</xliff:g>시간 동안 알람만 수신 모드로 변경</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>까지 1시간 동안 알람만 수신 모드로 변경</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"무제한으로 방해 금지 모드로 변경"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g>까지 1분 동안 방해 금지 모드로 변경</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>까지 <xliff:g id="DURATION">%1$d</xliff:g>시간 동안 방해 금지 모드로 변경</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>까지 1시간 동안 방해 금지 모드로 변경</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"항상 알림 모드로 변경"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"계속"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"앱 알림"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"알림 설정"</string>
     <string name="device_feedback" msgid="3238056036766293294">"이 기기에 대한 의견 보내기"</string>
@@ -2479,7 +2596,7 @@
     <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="1137904524037468263">"이 설정이 사용 설정되어 있는 경우 화면 고정을 사용하여 고정 해제하기 전까지 현재 화면을 계속 표시할 수 있습니다.\n\n화면 고정을 사용하려면 다음 단계를 따르세요.\n\n1. 화면 고정을 사용하도록 설정했는지 확인합니다.\n\n2. 고정하려는 화면을 엽니다.\n\n3. 개요를 터치합니다.\n\n4. 위로 스와이프한 다음 핀 아이콘을 터치합니다."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"이 설정이 사용 설정되어 있는 경우 화면 고정을 사용하여 고정 해제하기 전까지 현재 화면을 계속 표시할 수 있습니다.\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>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"기본으로 실행"</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="app_launch_domain_links_title" msgid="458956710410857777">"도메인 링크"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"도메인 URL 열기"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"앱에서 도메인 URL을 직접 열도록 허용"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"지원되는 도메인 URL"</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="410824961149037234">"내부 메모리"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"외부 메모리"</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="notifications_enabled" msgid="6983396130566021385">"사용"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"차단"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"중요"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"최우선"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"최우선 및 중요"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other">권한 <xliff:g id="COUNT_1">%d</xliff:g>개 부여받음</item>
+      <item quantity="one">권한 <xliff:g id="COUNT_0">%d</xliff:g>개 부여받음</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">권한 <xliff:g id="COUNT_3">%d</xliff:g>개 중 <xliff:g id="COUNT_2">%d</xliff:g>개가 부여됨</item>
+      <item quantity="one">권한 <xliff:g id="COUNT_1">%d</xliff:g>개 중 <xliff:g id="COUNT_0">%d</xliff:g>개가 부여됨</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"일부 기본값이 설정되었습니다."</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"기본값이 설정되지 않았습니다."</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"모든 앱"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"사용"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"개인"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"직장"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"차단됨"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"최우선"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"중요"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"도메인 URL이 있는 앱"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"관리자가 사용 중지함"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"고급"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"알 수 없는 앱"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"프로필 선택"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"앱 권한"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>개 앱 추가 액세스 허용됨"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>개 앱 허용됨"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"도메인 URL"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"도메인 URL 열지 않음"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' 열기"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' 및 관련 URL 열기"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>개 앱에서 도메인 URL을 열 수 있습니다.</item>
+      <item quantity="one">1개 앱에서 도메인 URL을 열 수 있습니다.</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"인식할 수 없습니다."</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"기본 앱"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"브라우저 앱"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"기본 브라우저 없음"</string>
+    <string name="default_app" msgid="6864503001385843060">"(기본)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"앱 저장소"</string>
 </resources>
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky-rKG/arrays.xml
index f77cba9..ed49449 100644
--- a/res/values-ky-rKG/arrays.xml
+++ b/res/values-ky-rKG/arrays.xml
@@ -227,6 +227,9 @@
     <item msgid="3073734345226842233">"микрофондун үнүн басуу/чыгаруу"</item>
     <item msgid="1148142988678569310">"долбоор медиясы"</item>
     <item msgid="9130014005474445273">"VPN\'ди жандыруу"</item>
+    <item msgid="1165192162975045562">"тушкагаз жазуу"</item>
+    <item msgid="7129487923652967258">"жардам структурасы"</item>
+    <item msgid="1069023208100114540">"жардам скриншоту"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Орду"</item>
@@ -276,6 +279,9 @@
     <item msgid="1312534577834048535">"Микрофондун үнүн басуу/чыгаруу"</item>
     <item msgid="5906017727368097853">"Долбоор медиясы"</item>
     <item msgid="2486614710846178542">"VPN\'ди жандыруу"</item>
+    <item msgid="5586547561693629602">"Тушкагаз жазуу"</item>
+    <item msgid="32794179825485062">"Жардам структурасы"</item>
+    <item msgid="7872852746938272552">"Жардам скриншоту"</item>
   </string-array>
     <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
     <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
@@ -427,11 +433,6 @@
     <item msgid="406385694840950802">"төмөн"</item>
     <item msgid="4212263919458209842">"опурталдуу"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Өчүрүү"</item>
-    <item msgid="5656544177755411222">"Чектелген үзгүлтүктөр"</item>
-    <item msgid="8735337502532332056">"Нөл үзгүлтүк"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Кадимки"</item>
     <item msgid="866544120205026771">"Орточо"</item>
@@ -441,7 +442,7 @@
   <string-array name="proc_stats_process_states">
     <item msgid="5069825997142785829">"Туруктуу"</item>
     <item msgid="5779398140277006695">"Көп аткарылган иш"</item>
-    <item msgid="1439598363694578255">"Маанилүү (алдыңкы көрүнуштө)"</item>
+    <item msgid="1439598363694578255">"Маанилүү (алдыңкы көрүнүштө)"</item>
     <item msgid="3396458970745718652">"Маанилүү (арткы көрүнүштө)"</item>
     <item msgid="5214825238247511992">"Камдык көчүрмөнү сактоо"</item>
     <item msgid="311372689168254967">"Оор"</item>
@@ -462,4 +463,11 @@
     <item msgid="4608643045752965568">"Кызгылтым"</item>
     <item msgid="6131821495505931173">"Кызыл"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Медиа өткөрүүчү протокол)"</item>
+    <item msgid="8856820259201251036">"PTP (Сүрөт өткөрүүчү протокол)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Аудио булак"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 32d7930..171e5e0 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -25,10 +25,10 @@
     <string name="deny" msgid="6947806159746484865">"Тыюу салуу"</string>
     <!-- no translation found for device_info_default (7847265875578739287) -->
     <skip />
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Сиздин өндүрүүчү болушуңузга <xliff:g id="STEP_COUNT">%1$d</xliff:g> кадам калды."</item>
-    <item quantity="other" msgid="6722953419953594148">"Сиздин өндүрүүчү болушуңузга <xliff:g id="STEP_COUNT">%1$d</xliff:g> кадам калды."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Сиздин иштеп чыгуучу болушуңузга <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кадам калды.</item>
+      <item quantity="one">Сиздин иштеп чыгуучу болушуңузга <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> кадам калды.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Сиз өндүрүүчү болдуңуз!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Кереги жок, сиз өндүрүүчү болгонсуз."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Зымсыз &amp; тармактар"</string>
@@ -45,6 +45,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS аркылуу SMS\' жөнөтүүнү өчүрүү"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Талап кылынган IMS каттоосун жандыруу"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Талап кылынган IMS каттоосун өчүрүү"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE шарттаган желекчени күйгүзүү"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE шарттаган желекчени өчүрүү"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte\'нин ram дампын жандыруу"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte\'нин ram дампын өчүрүү"</string>
     <!-- no translation found for radioInfo_menu_viewADN (8743377494429930831) -->
@@ -211,21 +213,7 @@
     <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;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <!-- no translation found for bluetooth_connected (6038755206916626419) -->
-    <skip />
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Туташып турат (телефониясыз)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Туташып турат (медиасыз)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Байланышта (билдирүү алмашуу жок)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Туташып турат (телефониясыз же медиасыз)"</string>
-    <!-- no translation found for bluetooth_disconnected (6557104142667339895) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnecting (8913264760027764974) -->
-    <skip />
-    <!-- no translation found for bluetooth_connecting (8555009514614320497) -->
-    <skip />
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <!-- no translation found for bluetooth_pairing (1426882272690346242) -->
-    <skip />
     <string name="bluetooth_device" msgid="5291950341750186887">"Аты жок Bluetooth-түзмөк"</string>
     <!-- no translation found for progress_scanning (192587958424295789) -->
     <skip />
@@ -239,7 +227,7 @@
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth түзмөгүн тандоо"</string>
     <!-- no translation found for bluetooth_permission_request (1523129741266262748) -->
     <skip />
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Колдонмо Bluetooth\'ду жандырууну каалайт."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Колдонмо бул түзмөктө Bluetooth\'ду КҮЙГҮЗГӨНҮ жатат"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Колдонмо сиздин планшетиңизди Bluetooth аркылуу башка түзмөктөргө <xliff:g id="TIMEOUT">%1$d</xliff:g> секундка көрүнүктүү кылат."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Колдонмо сиздин телефонуңузду Bluetooth аркылуу башка түзмөктөргө <xliff:g id="TIMEOUT">%1$d</xliff:g> секундка көрүнүктүү кылат."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Колдонмо сиздин планшетиңизди башка Bluetooth\'дуу түзмөктөргө көрүнүктүү кылгысы келет. Сиз муну кийин Bluetooth тууралоолорунан өзгөртө аласыз."</string>
@@ -437,12 +425,10 @@
     <skip />
     <!-- no translation found for cancel (6859253417269739139) -->
     <skip />
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ЖОККО ЧЫГАРУУ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"УЛАНТУУ"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ООБА"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ЖОК"</string>
-    <string name="forget" msgid="7267115980248732932">"УНУТУУ"</string>
+    <string name="forget" msgid="1400428660472591263">"Унутуу"</string>
+    <string name="save" msgid="879993180139353333">"Сактоо"</string>
+    <string name="done" msgid="6942539184162713160">"Даяр"</string>
     <!-- no translation found for settings_label (1626402585530130914) -->
     <skip />
     <!-- no translation found for settings_label_launcher (8344735489639482340) -->
@@ -513,9 +499,6 @@
     <skip />
     <!-- no translation found for time_picker_title (483460752287255019) -->
     <skip />
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Жүздү далдаштырууну жакшыртуу"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Тирүүлүгүн текшерүү"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Ачып жатканда көз ирмегенди талап кылуу"</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_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>
@@ -542,6 +525,30 @@
     <skip />
     <!-- no translation found for security_passwords_title (2930627259125138363) -->
     <skip />
+    <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="3453670509485083962">"Кошуу"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"экранды бөгөттөө"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"Манжа изин орнотуу"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Манжа изиңизди экраныңыздын кулпусун ачуу же сатып алууларды ырастоо үчүн колдонуу максатынды биз төмөнкүдөй кылышыбыз керек болот: \n\n✓ Камдык экранды кулпулоо ыкмаңызды орнотуу \n\n✓ Манжа изиңизди кошуу"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Сенсорду табуу"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Манжа изинин сенсорун телефонуңуздун артына жайгаштырыңыз."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Баштадык!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Манжаңызды манжа изинин сенсоруна коюңуз. Титирөөнү сезгениңизде көтөрүңүз."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Укмуш! Эми кайтала."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Ошол эле манжаны манжа изинин сенсоруна коюп, титирөөнү сезгениңизде көтөрүңүз."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Манжа изи кошулду!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Бул сөлөкөттү качан көрсөңүз да аныктоо же сатып алууга уруксат берүү үчүн манжа изиңизди пайдалана аласыз."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Кошуу"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Кийинки"</string>
     <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
@@ -561,7 +568,6 @@
     <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Шифрлөөнү баштаардан мурун, сиз экранды бөгөтөөчү PIN же сырсөз коюшуңуз керек."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Түзмөгүңүздүн шифрленгендигин ырастоо үчүн, үлгү ачкычты чийишиңиз керек."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Шифрлейлиби?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Шифрлөө - кайтарылбас процесс. Эгер аны үзгүлтүккө учуратсаңыз, берилиштериңиз жоголот. Шифрлөө бир сааттан ашык убакыт алат, жана анын жүрүшүндө планшетиңиз бир нече жолу өчүрүлүп кайра жүктөлөт."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Шифрлөө - кайтарылбас процесс. Эгер аны үзгүлтүккө учуратсаңыз, берилиштериңиз жоголот. Шифрлөө бир сааттан ашык убакыт алат, жана анын жүрүшүндө телефонуңуз бир нече жолу өчүрүлүп кайра жүктөлөт."</string>
@@ -595,8 +601,6 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Жүзүнөн таануу"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Коопсуздугу төмөн, сыноодогу"</string>
     <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
     <skip />
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Коопсуздугу орто"</string>
@@ -606,15 +610,16 @@
     <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
     <skip />
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Коопсуздугу жогору"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Учурдагы экран кулпусу"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Мындан ары түзмөктү коргоо мүмкүнчүлүктөрү иштебейт."</string>
     <!-- no translation found for unlock_set_unlock_disabled_summary (2120729867788851674) -->
     <skip />
     <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_biometric_weak" msgid="3008473624490350142">"Жүзүнөн таануу"</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_password" msgid="1203938057264146610">"Сырсөз"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Экран кулпусун койгонуңуздан кийин, Жөндөөлөр &gt; Коопсуздуктан манжа изиңизди да койсоңуз болот."</string>
     <!-- no translation found for unlock_disable_lock_title (1427036227416979120) -->
     <skip />
     <!-- no translation found for unlock_disable_lock_pattern_summary (6801602880568869201) -->
@@ -645,30 +650,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Сырсөз кеминде бир тамганы камтышы керек."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Сырсөз кеминде бир санды камтышы керек."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Сырсөз кеминде бир белгини камтышы керек."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Сырсөз кеминде 1 тамгадан турушу керек."</item>
-    <item quantity="other" msgid="8186027808415585970">"Сырсөз кеминде %d тамгадан турушу керек."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Сырсөз кеминде 1 кичине тамганы камтышы керек."</item>
-    <item quantity="other" msgid="2693910942679679225">"Сырсөз кеминде %d кичине тамганы камтышы керек."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Сырсөз кеминде 1 баш тамганы камтышы керек."</item>
-    <item quantity="other" msgid="3030801209112209245">"Сырсөз кеминде %d баш тамганы камтышы керек."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Сырсөз кеминде %d сандык цифрадан турушу керек."</item>
-    <item quantity="other" msgid="4703982391407595924">"Сырсөз кеминде %d цифраны камтышы керек."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Сырсөз кеминде 1 цифраны камтышы керек."</item>
-    <item quantity="other" msgid="1221290525051187757">"Сырсөз кеминде %d атайын белгини камтышы керек."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Сырсөз кеминде 1 тамга эмес белгини камтышы керек."</item>
-    <item quantity="other" msgid="3952508584649046404">"Сырсөз кеминде %d тамга эмес белгини камтышы керек."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Сырсөз кеминде %d тамгадан турушу керек.</item>
+      <item quantity="one">Сырсөз кеминде 1 тамгадан турушу керек.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Сырсөз кеминде %d кичине тамга камтышы керек.</item>
+      <item quantity="one">Сырсөз кеминде 1 кичине тамга камтышы керек.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Сырсөз кеминде %d баш тамга камтышы керек.</item>
+      <item quantity="one">Сырсөз кеминде 1 баш тамга камтышы керек.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Сырсөз кеминде %d сандык орундан турушу керек.</item>
+      <item quantity="one">Сырсөз кеминде 1 сандык орундан турушу керек.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Сырсөз кеминде %d атайын белги камтышы керек.</item>
+      <item quantity="one">Сырсөз кеминде 1 атайын белги камтышы керек.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Сырсөз кеминде %d тамга эмес белги камтышы керек.</item>
+      <item quantity="one">Сырсөз кеминде 1 тамга эмес белги камтышы керек.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Администратор акыркы сырсөздү колдонууга тыюу салган."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Сандардын чоңойгон, кичирейген же кайталанган ырааттына тыюу салынган"</string>
     <!-- no translation found for lockpassword_ok_label (313822574062553672) -->
@@ -711,17 +716,8 @@
     <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>
-    <!-- no translation found for bluetooth_pairing_accept (6163520056536604875) -->
-    <skip />
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ЖУПТАШТЫРУУ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Баш тартуу"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Жупташканда байланыштарыңыз менен чалуу таржымалыңызды пайдалана аласыз."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен жупташуу мүмкүн эмес."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN же код туура эмес болгондуктан <xliff:g id="DEVICE_NAME">%1$s</xliff:g> туташуу мүмкүн эмес."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен байланышуу мүмкүн эмес."</string>
-    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
-    <skip />
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен байланыша албай жатат."</string>
     <!-- no translation found for bluetooth_preference_scan_title (2277464653118896016) -->
     <skip />
@@ -761,18 +757,9 @@
     <!-- no translation found for bluetooth_advanced_titlebar (2142159726881547669) -->
     <skip />
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth күйгүзүлгөндө түзмөгүңүз жакын арадагы башка Bluetooth түзмөктөрү менен байланыша алат."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Жайгашкан жердин тактыгын жакшыртуу үчүн, колдонмолор жана кызматтар Bluetooth түзмөктөрүн Bluetooth өчүрүлгөн учурда да издейт. Аны <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>скандоо жөндөөлөрүнөн<xliff:g id="LINK_END_1">LINK_END</xliff:g> өзгөртө аласыз."</string>
     <!-- no translation found for bluetooth_connect_specific_profiles_title (6952214406025825164) -->
     <skip />
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Аудио"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Телефон"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Файл алмашуу"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Киргизүү түзмөгү"</string>
-    <!-- no translation found for bluetooth_profile_pan (3391606497945147673) -->
-    <skip />
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Байланышты бөлүшүү"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Байланышты бөлүшүү үчүн колдонуу"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Интернет байланышын бөлүшүү"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Билдирүү алмашуу"</string>
     <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
     <skip />
     <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
@@ -794,32 +781,10 @@
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Атын өзгөртүү"</string>
     <!-- no translation found for bluetooth_device_advanced_enable_opp_title (8222550640371627365) -->
     <skip />
-    <!-- no translation found for bluetooth_a2dp_profile_summary_connected (963376081347721598) -->
-    <skip />
-    <!-- no translation found for bluetooth_headset_profile_summary_connected (7661070206715520671) -->
-    <skip />
-    <!-- no translation found for bluetooth_opp_profile_summary_connected (2611913495968309066) -->
-    <skip />
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"MAP\'ка байланышты"</string>
-    <!-- no translation found for bluetooth_opp_profile_summary_not_connected (1267091356089086285) -->
-    <skip />
-    <!-- no translation found for bluetooth_hid_profile_summary_connected (3381760054215168689) -->
-    <skip />
     <!-- no translation found for bluetooth_pan_user_profile_summary_connected (4602294638909590612) -->
     <skip />
     <!-- no translation found for bluetooth_pan_nap_profile_summary_connected (1561383706411975199) -->
     <skip />
-    <!-- no translation found for bluetooth_a2dp_profile_summary_use_for (4630849022250168427) -->
-    <skip />
-    <!-- no translation found for bluetooth_headset_profile_summary_use_for (8705753622443862627) -->
-    <skip />
-    <!-- no translation found for bluetooth_opp_profile_summary_use_for (1255674547144769756) -->
-    <skip />
-    <!-- no translation found for bluetooth_hid_profile_summary_use_for (232727040453645139) -->
-    <skip />
-    <!-- no translation found for bluetooth_pan_profile_summary_use_for (5664884523822068653) -->
-    <skip />
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"MAP үчүн колдонуу"</string>
     <!-- no translation found for bluetooth_dock_settings (3218335822716052885) -->
     <skip />
     <!-- no translation found for bluetooth_dock_settings_title (5543069893044375188) -->
@@ -831,8 +796,7 @@
     <!-- no translation found for bluetooth_dock_settings_remember (5551459057010609115) -->
     <skip />
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Жардамчысы"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi жардамчысы аркылуу туташып турат"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Сырткы экранга чыгаруу"</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>
@@ -844,6 +808,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <!-- no translation found for nfc_quick_toggle_title (6769159366307299004) -->
     <skip />
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Планшет башка түзмөккө тийгенде берилиштердин алмашуусуна уруксат берүү"</string>
@@ -870,22 +836,17 @@
     <!-- no translation found for wifi_error (3207971103917128179) -->
     <skip />
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Учак тартибинде"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Түйүндөрдү издөө мүмкүн эмес"</string>
     <!-- no translation found for wifi_notify_open_networks (3755768188029653293) -->
     <skip />
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Коомдук тармак жеткиликтүү болгондо эскертме берилсин"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Начар байланыштарга кошулбоо"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Жакшы интернет байланыш болмоюнча Wi‑Fi түйүнүн колдонбоо"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Туруктуу Интернет туташуусу менен камсыз кылган тармактар гана колдонулсун"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Дайым жеткиликтүүнү скандоо"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Ар дайым иликтей алышсын"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-Fi өчүп турса да, Google\'дун жайгашкан жерди аныктоо кызматына жана башка колдонмолорго тармактарды иликтөөгө мүмкүндүк берүү"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Автоматтык түрдө ачык Wi‑Fi пайдалануу"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Жогорку сапаттуу болуп аныкталган ачык тармктрга Wi‑Fi жардамчысы авт-к түрдө тутшсуна уруксат берүү"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Жардамчы тандоо"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификаттарды орнотуу"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Жайгаштыруунун тактыгын жогорулатуу жана башка максаттарда, Google жана башка колдонмолор, Wi-Fi өчүк болсо да түйүндөрдү скандашы мүмкүн. Эгер сиз муну каалабасаңыз, Илгерилетилген &gt; Скандоо дайым жеткиликтүүгө барыңыз."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Колдонмолор Wi-Fi өчүк болсо да, жакын арадагы түйүндөрдү скандай алышат. Эгер сиз муну каалабасаңыз, Илгерилетилген &gt; Скандоо дайым жеткиликтүүгө барыңыз."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Жайгашкан жердин тактыгын жакшыртуу үчүн, колдонмолор жана кызматтар Wi‑Fi тармактарын 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="5340097010842405981">"Экинчи көргөзбө"</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>
@@ -920,11 +881,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Башка тармак кошуу"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Дагы"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Автоматтык тууралоо (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Орнотууну аягына чыгаруу үчүн, планшетиңиз Wi‑Fi\'га туташышы керек. Орнотулуп бүткөндөн кийин, уюктук дайындар тармагы менен Wi‑Fi\'ды которуштурсаңыз болот."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Өркүндөтүлгөн параметрлер"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup (Корголгон орнотмо)"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS башталууда…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Роутериңиздеги Wi‑Fi Protected Setup баскычын басыңыз. Ал \"WPS\" деп аталышы же мындай белгилениши мүмкүн:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Роутериңиздеги Wi‑Fi менен корголгон орнотуу баскычын басыңыз. Ал \"WPS\" деп аталышы же төмөнкү символ менен белгилениши мүмкүн:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Wi‑Fi роутериңизге <xliff:g id="NUMBER">%1$s</xliff:g> pin-кодун киргизиңиз. Орнотуу эки мүнөткө чейин созулушу мүмкүн."</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> Wi‑Fi түйүнүнө туташты"</string>
@@ -963,24 +923,18 @@
     <skip />
     <!-- no translation found for wifi_show_password (6461249871236968884) -->
     <skip />
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"AP жыштыгын конфигурациялоо"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 ГГц жыштыгы"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 ГГц жыштыгы"</string>
     <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
     <skip />
     <!-- no translation found for wifi_unchanged (3410422020930397102) -->
     <skip />
     <!-- no translation found for wifi_unspecified (5431501214192991253) -->
     <skip />
-    <string name="wifi_remembered" msgid="4955746899347821096">"Сакталды"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Өчүрүлгөн"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP конфигурациясы бузулду"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi туташуусу бузулду"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Аутентификация маселеси бар"</string>
-    <!-- no translation found for wifi_not_in_range (1136191511238508967) -->
-    <skip />
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Интернетке кирүү мүмкүнчүлүгү табылган жок, андыктан автоматтык түрдө кайра туташпайт."</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_security_none" msgid="7985461072596594400">"Жок"</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>
@@ -988,6 +942,8 @@
     <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="1509171132175355674">"Бул тармактын Интернетке мүмкүнчүлүгү жок. Баары бир ушул тармак колдонула берсинби?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Бул тармак үчүн экинчи сураба"</string>
     <!-- no translation found for wifi_connect (1076622875777072845) -->
     <skip />
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Түйүндгө байланышкан жок"</string>
@@ -1070,6 +1026,18 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> көчмө Wi‑Fi хотспоту"</string>
     <!-- no translation found for wifi_tether_configure_ssid_default (8467525402622138547) -->
     <skip />
+    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi чалуу"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Чалуунун жеке жөндөөлөрү"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi чалуу режими"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi тандалган"</item>
+    <item msgid="5267397515594230396">"Уюлдук тармак тандалган"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi чалуу күйгүзүлгөндө, телефонуңуз, жеке жөндөөлөрүңүзгө жана сигналдын күчтүүлүгүнө жараша, чалууларды Wi-Fi тармактары же операторуңуздун тармагы аркылуу багыттай алат. Бул өзгөчөлүктү күйгүзүүдөн мурун, акылары жана башка маалымат боюнча операторуңузга кайрылыңыз."</string>
     <string name="home_settings" msgid="212375129455718176">"Үйгө"</string>
     <!-- no translation found for display_settings_title (1708697328627382561) -->
     <skip />
@@ -1165,6 +1133,11 @@
     <skip />
     <string name="auto_brightness_title" msgid="6341042882350279391">"Ыңгайлаштырылуучу жарык"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Жарык деңгээлин учурдагы жарыкка ыңгайлаштыруу"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Тема"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Жеңил"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Күңүрт"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Автоматтык"</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>
@@ -1237,10 +1210,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Жактыргн SIM карта жаңртлснбы?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> – түзмөгүңүздөгү жалгыз SIM. Бул SIM\'ди уюлдук дайындар, чалуулар жана SMS билдирүүлөр үчүн колдоносузбу?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM-карта PIN-коду туура эмес. Эми түзмөктү бөгөттөн чыгарыш үчүн операторуңузга кайрылышыңыз керек."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM PIN-коду туура эмес, сизде <xliff:g id="NUMBER">%d</xliff:g> аракет калды. Болбосо, түзмөктү бөгөттөн чыгарыш үчүн операторуңузга кайрылышыңыз керек."</item>
-    <item quantity="other" msgid="77103619544346451">"SIM PIN-коду туура эмес, сизде <xliff:g id="NUMBER">%d</xliff:g> аракет калды."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM PIN-коду туура эмес, сизде <xliff:g id="NUMBER_1">%d</xliff:g> аракет калды.</item>
+      <item quantity="one">SIM PIN-коду туура эмес, түзмөк кулпусун ачуу үчүн операторуңузга кайрылуудан мурун <xliff:g id="NUMBER_0">%d</xliff:g> аракет калды.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM-карта PIN аракети кыйрады!"</string>
     <!-- no translation found for device_info_settings (1119755927536987178) -->
     <skip />
@@ -1327,15 +1300,14 @@
     <skip />
     <!-- no translation found for memory_calculating_size (2188358544203768588) -->
     <skip />
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Колдонмолор (берилиштери жана медиа мазмундар)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Колдонмолор жана колдонмо дайындары"</string>
     <!-- no translation found for memory_media_usage (3738830697707880405) -->
     <skip />
     <!-- no translation found for memory_downloads_usage (3755173051677533027) -->
     <skip />
     <string name="memory_dcim_usage" msgid="558887013613822577">"Сүрөттөр, видеолор"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музыка, рингтон, подкасттар, ж.б.)"</string>
-    <!-- no translation found for memory_media_misc_usage (235452944021647124) -->
-    <skip />
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Башка файлдар"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Кэштелген берилиштер"</string>
     <!-- no translation found for sd_eject (4988563376492400073) -->
     <skip />
@@ -1384,6 +1356,11 @@
     <skip />
     <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="8334422679047059459">"Тазалоо жана форматтоо"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Ички эсттм ктр тазл ж-а формтт"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB аркылуу компүтерге туташуу"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB аркылуу компүтерге туташуу"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Катары туташуу"</string>
@@ -1391,8 +1368,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Сизге Windows аркылуу медиа-файлдарды көчүрүү же MacOS чөйрөсүндө Android File Transfer менен иштөө мүмкүнчүлүгүн берет (караңыз: www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Камера софтун колдонуп, сүрөттөрдү көчүрүү, жана MTP колдобогон компүтерлерге, файлдардын бардык түрлөрүн көчүрүү мүмкүнчүлүгүн берет"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Файл өткөрүү жарактарын орнотуу"</string>
+    <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_external_title" msgid="2723851748972673696">"Ташыма сактагыч"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> акысыз (Жалпысынан <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> кошулду"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> форматталбай койду"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Сактагыч аталышын өзгөртүү"</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="3677827796634199714"><b>"Бул <xliff:g id="NAME_0">^1</xliff:g> чыгарылганда, анда сакталган колдонмолор иштебей калат жана андагы медиа файлдар ал кайра салынмайынча жеткиликтүү болбой калат."</b>" \n\nБул <xliff:g id="NAME_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_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_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="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> форматталып жатканда, аны чыгарбаңыз."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Дайындарды жаңы сактагычка жылдр"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Сүрөттөрүңүз, файлдарыңыз жана колдонмо дайындарын ушул жаңы <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="5035719146373359329"><b>"Жылдыруу болжол менен <xliff:g id="TIME">^1</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="8641916179067596592">"Жылдыруу учурунда: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> колдонмосун жылдыруу"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"Жылдыруу учурунда <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>
     <!-- no translation found for battery_status_title (9159414319574976203) -->
     <skip />
     <!-- no translation found for battery_level_title (2965679202786873272) -->
@@ -1466,13 +1483,16 @@
     <!-- no translation found for menu_restore (8260067415075573273) -->
     <skip />
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Абалкы APN тууралоолорун кайтаруу аяктады."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Тармак жөндөөлөрү баштапкы абалга келтирилди"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Бул тармак жөндөөлөрүнүн баарын баштапкы абалга келтирет, анын ичинде:\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="4874737348054213767">"Тармак жөндөөлөрүнүн баары баштапкы абалга келтирилсинби? Бул аракетти кайра кайтара албайсыз!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Жөндөөлөрдү баштапкы абалга келтирүү"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Баштапкы абалга келтирилсинби?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Тармак жөндөөлөрү баштапкы абалга келтирилди"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Түзмктү баштпкы абалга келтрүү"</string>
     <!-- no translation found for master_clear_title (5907939616087039756) -->
     <skip />
-    <!-- no translation found for master_clear_summary (4036344100254678429) -->
-    <skip />
-    <!-- no translation found for master_clear_summary (4986154238001088492) -->
-    <skip />
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Бул, планшетиңиздин "<b>"ички сактагычындагы"</b>" бардык берилиштерди кийинкилер менен кошо өчүрөт:\n\n"<li>"Сиздин Google эсебиңиз"</li>\n<li>"Систем, колдонмолордун берилиштери жана тууралоолору"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Бул, телефонуңуздун "<b>"ички сактагычындагы"</b>" бардык берилиштерди кийинкилер менен кошо өчүрөт:\n\n"<li>"Сиздин Google эсебиңиз"</li>\n<li>"Систем, колдонмолордун берилиштери жана тууралоолору"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
     <!-- no translation found for master_clear_accounts (6412857499147999073) -->
@@ -1492,10 +1512,9 @@
     <skip />
     <!-- no translation found for master_clear_button_text (7550632653343157971) -->
     <skip />
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Сиздин бардык жеке маалыматтарыңыз жана жүктөп алынган колдонмолоруңуз өчүрүлсүнбү? Сиз бул аракетти артка кайтара албайсыз!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Сиздин бардык жеке маалыматтарыңыз жана жүктөп алынган колдонмолоруңуз өчүрүлсүнбү? Сиз бул аракетти кайра кайтара албайсыз!"</string>
     <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
     <skip />
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Баштапкы абалга кайтаруу аракетин ырасташ үчүн, үлгү ачкычты тартышыңыз керек болот."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Тазалоо аткарылган жок, анткени System Clear кызматы жеткиликсиз."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Тазалансынбы?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Бул колдонуучу демейки абалга келтире албайт"</string>
@@ -1519,8 +1538,6 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Бардык сакталган файлдар өчүрүлүп, SD-карта тазалансынбы? Сиз бул аракетти артка кайтара албайсыз!"</string>
     <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
     <skip />
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB сактагычты тазалоону ырастоо үчүн, үлгү ачкычты тартышыңыз керек болот."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD-картаны тазалоо аракетин ырасташ үчүн үлгү ачкычты тартышыңыз керек болот."</string>
     <!-- no translation found for call_settings_title (5188713413939232801) -->
     <skip />
     <!-- no translation found for call_settings_summary (7291195704801002886) -->
@@ -1576,7 +1593,7 @@
     <skip />
     <string name="network_settings_title" msgid="4871233236744292831">"Уюктук тармактар"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифтик план"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Абалкы 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> SMS колдонмоңуз ордуна <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> SMS колдонмосу болсунбу?"</string>
@@ -1605,7 +1622,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Жайгашуу тартиби"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Жайгашкан жерди аныктоо үчүн GPS, Wi‑Fi жана уюктук тармактарды колдонуңуз"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Жайгашкан жерди аныктоо үчүн Wi‑Fi жана уюктук тармактарды колдонуңуз"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Жайгашууңузду GPS менен аныктоо"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Жайгашкан жерди аныктоо үчүн GPS колдонуңуз"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Скандалууда…"</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="2070686681074461301">"Колдонмолор менен кызматтарга Wi‑Fi өчүрүлгөн учурда да Wi‑Fi тармактарын издешине уруксат берүү менен жайгашкан жерди жакшыртыңыз"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth изделүүдө"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Тутум кызматтарына Bluetooth өчүрүлгөн учурда да Bluetooth түзмөктөрүн издешине уруксат берүү менен жайгашкан жерди жакшыртыңыз"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; уюкт тарм жайг жер"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Колдонмолорго Google жайгаштыруу м-н ордуңузду тактоого жол берүү. Жайгашуу берилиштери аноним. чогултулат ж-а Google\'га берилет."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Жайгашуу Wi‑Fi аркылуу аныкталды"</string>
@@ -1680,14 +1703,17 @@
     <skip />
     <!-- no translation found for lockpassword_pattern_set_toast (6867259621331406236) -->
     <skip />
-    <string name="lock_settings_title" msgid="335025124489630932">"Коопсуздук көшөгөсү"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Улантуу үчүн түзмөгүңүздүн кулпуну ачуу үлгүсүн колдонуңуз."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Улантуу үчүн түзмөгүңүздүн PIN кодун киргизиңиз."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Улантуу үчүн түзмөгүңүздүн сырсөзүн киргизиңиз."</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>
     <!-- no translation found for lockpattern_change_lock_pattern_label (5679630792003440352) -->
     <skip />
     <!-- no translation found for lockpattern_change_lock_pin_label (266707138486731661) -->
     <skip />
-    <!-- no translation found for lockpattern_need_to_unlock (757935356911054465) -->
-    <skip />
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Кайра бир аракет кылыңыз:"</string>
     <!-- no translation found for lockpattern_recording_intro_header (308287052221942814) -->
     <skip />
     <!-- no translation found for lockpattern_recording_intro_footer (1118579101409152113) -->
@@ -1721,10 +1747,7 @@
     <skip />
     <!-- no translation found for lockpattern_settings_help_how_to_record (2614673439060830433) -->
     <skip />
-    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_header (819903817323783498) -->
-    <skip />
-    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_footer (6759029360597122873) -->
-    <skip />
+    <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="manageapplications_settings_title" msgid="7041951105633616745">"Колдонмолорду башкаруу"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Орнотулган колдонмолорду өчүрүү жана башкаруу"</string>
@@ -1804,6 +1827,7 @@
     <skip />
     <!-- no translation found for show_background_processes (2009840211972293429) -->
     <skip />
+    <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>
@@ -1899,6 +1923,7 @@
     <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>
     <!-- no translation found for storageuse_settings_title (5657014373502630403) -->
     <skip />
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Колдонмолордун сактагычты колдонуусу"</string>
@@ -2038,25 +2063,6 @@
     <skip />
     <!-- no translation found for testing_battery_info (3497865525976497848) -->
     <skip />
-    <!-- no translation found for quick_launch_title (7904609846945905306) -->
-    <skip />
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Колдонмолорду тез чакырууну тергичтерге байлоо"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Колдонмого байлоо"</string>
-    <!-- no translation found for quick_launch_no_shortcut (5998005833838278693) -->
-    <skip />
-    <!-- no translation found for quick_launch_shortcut (5090405067413522300) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_dialog_title (5546543501250320220) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_dialog_message (3921015601470260722) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_ok_button (2634568926597586716) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_cancel_button (1892854652197747064) -->
-    <skip />
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Колдонмолор"</string>
-    <!-- no translation found for quick_launch_display_mode_shortcuts (4177934019174169042) -->
-    <skip />
     <!-- no translation found for input_methods_settings_title (6800066636850553887) -->
     <skip />
     <!-- no translation found for input_method (5434026103176856164) -->
@@ -2109,18 +2115,8 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Бардык Bluetooth HCI пакеттерин бир файлга жазуу"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM бөгөттөн чыгаруу"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Кайра жүктөгүчтү бөгөттөн чыгарууга уруксат берүү"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN\'иңизди киргизиңиз"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM кулпуну ачууну иштетүү үчүн түзмөгүңүздүн PIN\'ин киргизиңиз"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM бөгөттөн чыгарууга уруксатпы?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ЭСКЕРТҮҮ: Бул жөндөө күйгүзүлүп турганда түзмөктү коргоо өзгөчөлүктөрү иштебейт."</string>
-    <string name="wifi_display_certification" msgid="8611569543791307533">"Зымсыз дисплейди аныктоо"</string>
-    <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi дайын-даректүү протоколун иштетүү"</string>
-    <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Уюктук хэндоверге өжөр Wi-Fi"</string>
-    <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi-Fi Роуминг Скандоо мүмкүнчүлүгүнө ар дайым уруксат берилсин"</string>
-    <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Зымсыз дисплейди сертификатто мүмкүнчүлүктөрүн көргөзүү"</string>
-    <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi-Fi Кармагычта Wi‑Fi протокол деңгээлин жогорулатуу жана ар бир SSID RSSI үчүн көрсөтүү."</string>
-    <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Иштетилгенде, Wi-Fi байланышы үзүл-кесил болуп жатканда, Wi-Fi дайындарды уюктук операторго өжөрлүк менен өткөрөт."</string>
-    <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Интерфейстеги дайындар трафигинин көлөмүнө жараша Wi-Fi Роуминг скандоо мүмкүнчүлүгүн иштетүү/өчүрүү"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Каттагыч буферлеринин өлчөмдөрү"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Каттоо буфери үчүн Каттагычтын көлөмүн тандаңыз"</string>
     <!-- no translation found for allow_mock_location (2787962564578664888) -->
@@ -2128,6 +2124,26 @@
     <!-- no translation found for allow_mock_location_summary (317615105156345626) -->
     <skip />
     <string name="debug_view_attributes" msgid="6485448367803310384">"Аттрибут текшерүүсүнүн көрүнүшүн иштетүү"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Тармактык байланыштарды кеңейтүү"</string>
+    <string name="wifi_display_certification" msgid="8611569543791307533">"Зымсыз дисплейди аныктоо"</string>
+    <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi дайын-даректүү протоколун иштетүү"</string>
+    <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Уюктук хэндоверге өжөр Wi-Fi"</string>
+    <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi-Fi Роуминг Скандоо мүмкүнчүлүгүнө ар дайым уруксат берилсин"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Эскирген DHCP кардарын колдонуу"</string>
+    <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Зымсыз дисплейди сертификатто мүмкүнчүлүктөрүн көргөзүү"</string>
+    <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi-Fi Кармагычта Wi‑Fi протокол деңгээлин жогорулатуу жана ар бир SSID RSSI үчүн көрсөтүү."</string>
+    <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Иштетилгенде, Wi-Fi байланышы үзүл-кесил болуп жатканда, Wi-Fi дайындарды уюктук операторго өжөрлүк менен өткөрөт."</string>
+    <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Интерфейстеги дайындар трафигинин көлөмүнө жараша Wi-Fi Роуминг скандоо мүмкүнчүлүгүн иштетүү/өчүрүү"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Каттагыч буферлеринин өлчөмдөрү"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Каттоо буфери үчүн Каттагычтын көлөмүн тандаңыз"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB конфигурациясын тандоо"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB конфигурациясын тандоо"</string>
+    <!-- no translation found for allow_mock_location (2787962564578664888) -->
+    <skip />
+    <!-- no translation found for allow_mock_location_summary (317615105156345626) -->
+    <skip />
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Аттрибут текшерүүсүнүн көрүнүшүн иштетүү"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Жаңы Android DHCP кардарынын ордуна Lollipop\'тон DHCP кардарын колдонуңуз."</string>
     <!-- no translation found for adb_warning_title (6234463310896563253) -->
     <skip />
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-жөндөө - өндүрүү максатында гана  түзүлгөн. Аны компүтериңиз менен түзмөгүңүздүн ортосунда берилиштерди алмашуу, түзмөгүңүзгө колдонмолорду эскертүүсүз орнотуу жана лог берилиштерин окуу үчүн колдонсоңуз болот."</string>
@@ -2244,6 +2260,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Кочкул"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> колдонулсунбу?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> талап кылат:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Колдонмо уруксат суроо-талабын түшүнбөй жаткандыктан, Жөндөөлөр жообуңузду текшере албайт."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Эгер <xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлсө, түзмөгүңүз дайындарды шифрлөөнү күчтөндүрүү үчүн экраныңыздын кулпусун пайдаланбайт."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Атайын мүмкүнчүлүктөр кызматы күйгүзүлгөндүктөн, түзмөгүңүз дайындарды шифрлөөнү күчтөндүрүү үчүн экраныңыздын кулпусун пайдаланбайт."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлгөндө дайындарды шифрлөөгө таасир тийгизгендиктен, үлгүңүздү ырасташыңыз керек."</string>
@@ -2434,14 +2451,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> колдонмолор <xliff:g id="TIME">%2$s</xliff:g> ашык"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="TOTALRAM">%2$s</xliff:g> ичинен <xliff:g id="USEDRAM">%1$s</xliff:g> <xliff:g id="TIMEDURATION">%3$s</xliff:g> ашык колдонулду"</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_memory_status" msgid="4251599550196193093">"Түзмөктүн эс тутуму учурда <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Оперативдүү эстутумдун орточо колдонулушу"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Эстутумдун максималдуу колдонулушу"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"Иштеп чыгуулар"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Кызматтар"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Узактыгы"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Эстутумдун чоо-жайы"</string>
@@ -2458,6 +2481,7 @@
     <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_hide_system" msgid="4106826741703745733">"Тутумду жашыруу"</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>
@@ -2487,8 +2511,7 @@
     <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
     <skip />
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Абалкы жарак"</string>
-    <!-- no translation found for tts_default_synth_summary (6482936537135251690) -->
-    <skip />
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Айтылган текстке колдонула турган кеп синтезин коюу"</string>
     <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
     <skip />
     <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
@@ -2598,7 +2621,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"Сертификат сактагычты орнотууну ырастоо үчүн, үлгү ачкычты тартышыңыз керек."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Сертификат сактагычтын сырсөзүн териңиз."</string>
     <!-- no translation found for credentials_old_password (7553393815538684028) -->
@@ -2637,14 +2659,11 @@
     <string name="backup_data_summary" msgid="708773323451655666">"Колдонмолордун берилиштерин, Wi-Fi сырсөздөрүн жана башка тууралоолорду Google\'дун серверине сактап коюу."</string>
     <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
     <skip />
-    <!-- no translation found for backup_configure_account_default_summary (2436933224764745553) -->
-    <skip />
     <string name="include_app_data_title" msgid="2829970132260278394">"Колдонмо дайындарын кошуу"</string>
     <!-- no translation found for auto_restore_title (5397528966329126506) -->
     <skip />
     <string name="auto_restore_summary" msgid="4235615056371993807">"Колдонмону кайрадан орнотууда, бэкапталган тууралоолорду жана берилиштерди калыбына келтириңиз"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Камдык көчүрмөнү сактоо кызматы жандырылган эмес."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Бул түзмөгүңүздүн саясаты тарабынан коюлган."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Компүтердеги бэкаптын сырсөзү"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Компүтердеги толук бэкап учурда корголгон эмес"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Тийип, компүтердеги толук бэкаптын сырсөзүн өзгөртүңүз же жок кылыңыз"</string>
@@ -2876,6 +2895,10 @@
     <skip />
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Аниматор узактык масштабы"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Экинчи экран эмуляциясы"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Көп терезелүү режим"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Экранда бир убакта бир нече аракет."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Көп терезелүү режим иштетилсинби?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ЭСКЕРТҮҮ: Бул Акыркы колдонмолордун UI\'си аркылуу экранда бир убакта бир нече аракетке уруксат бере турган жогорку сынактагы өзгөчөлүк. Айрым колдонмолор бул өзгөчөлүк менен иштетилгенде бузулушу же туура иштебей калышы мүмкүн."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Колдонмолор"</string>
     <!-- no translation found for immediately_destroy_activities (8366775083630234121) -->
     <skip />
@@ -3097,7 +3120,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="718192651887726259">"Кошумча колдонуучуларды түзүү менен, бул түзмөктү башкалар менен бөлүшө аласыз. Ар бир колдонуучунун өзүнүн мейкиндиги болуп, аны алар өз колдонмолору, тушкагазы ж.б.у.с. нерселер менен өзгөчөлөштүрүп алышат. Мындан тышкары, колдонуучулардын 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>
@@ -3128,13 +3151,13 @@
     <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="8310589470979488255">"Телефон чалууларга уруксат берүү"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Телефон чалууга жана 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="440218975766968124">"Телефон чалууларга уруксат берилсинби?"</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_sms_confirm_title" msgid="188164598768941316">"Телефн чалуулрг жана SMS\'трге урукс берлснби?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Чалуу жана 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="application_restrictions" msgid="8207332020898004394">"Колдонмолорго жана мазмунга уруксат"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Чектелген колдонмолор"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Колдонмонун тууралоолорун ачуу"</string>
@@ -3185,8 +3208,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"Бул колдонмо чектелген профайлда иштебейт"</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>
@@ -3251,13 +3274,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi түйүнүнө байланышуу"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS билдирүү SMS билдирүүлөрүн жазышуу билдирүү жазышуу"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"уюлдук уюл оператор зымсыз дайындар 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi чалуу чалуу"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ишке киргизгич"</string>
     <string name="keywords_display" msgid="6709007669501628320">"экран, сенсордук экран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"күңүрт экран сенсордук экран батарея"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"күңүрт экран сенсордук экран батарея"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон жекечелештирүү өзгөчөлөштүрүү дисплей"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"күңүрт тема түнкү режим бүдөмүк экран жарыктыгын аңтаруу"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"фон жекелештирүү ыгайлаштыруу дисплей"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"текст өлчөмү"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"долбоор"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"долбоорду чыгаруу"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"бош орун диск катуу диск түзмөк колдонуу"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"кубаттын керектелиши кубаттоо"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"орфографиялык сөздүк орфография текшергичи авто-тууралоо"</string>
@@ -3274,6 +3299,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"каттоо эсеби"</string>
     <string name="keywords_users" msgid="4673901601478559100">"чектөө чектөө чектелген"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст тууралоо туура добуш дирилдөө авт тил жаңсоо сунуштоо сунуш тема адепсиз сөз түрү эмодзи эларалык"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"демейки жеке жөндөөлөрдү баштапкы абалга келтирүү"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"туруктуу өзгөчө кырдаал колдонмосунун демейки абалы"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"колдонмолор колдонмо тутумун жүктөп алат"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"колдонмолордун уруксаттарынын коопсуздугу"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"колдонмонун демейкиси"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"сырсөз үлгү төөнөгүчүн жылмыштыруу"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC тегин орнотуу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазуу"</string>
@@ -3288,11 +3318,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Үзгүлтүктөр"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Чалуулар же эскертмелер келгенде"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Ар дайым үзгүлтүккө учурасын"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Артыкчылыктуу үзгүлтүктөргө гана уруксат берилсин"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Үзгүлтүккө учурабасын"</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_option_important_interruptions" msgid="3903928008177972500">"Артыкчылык гана"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ойготкучтар гана"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Үзгүлтүксүз"</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>
     <!-- no translation found for ringtone_title (5379026328015343686) -->
     <skip />
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Эскертменин демейки шыңгыры"</string>
@@ -3320,62 +3351,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Дирилдөө"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Эскертмени колдонуу мүмкүнчлгү"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Колдонмолор эскертмелерди окуй алышпайт"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d колдонмо эскертүүлөрдү окуй алат"</item>
-    <item quantity="other" msgid="980049191810249052">"%d колдонмо эскертүүлөрдү окуй алат"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d колдонмо эскертмелерди окуй алат</item>
+      <item quantity="one">%d колдонмо эскертмелерди окуй алат</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Эскертме алуучу колдонмолор орнотулган эмес."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> жандырылсынбы?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> систем же башка орнотулган колдонмолор чыгарган эскертмелердин баарын окуганга мүмкүнчүлүк алат. Алардын ичинде, байланыш аттары жана тексттик билдирүүлөр сымал өздүк маалыматтар дагы болушу мүмкүн. Ошондой эле, ал бул эскертмелерди таратып жиберүү, же алардын ичиндеги иш-аракет бачкычтарын басканга дагы мүмкүнчүлүк алат."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Шарт түзүүчүлөр"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Бир да колдонмо шарттарды түзбөйт"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d колдонмосу шарттар менен камсыз кылат"</item>
-    <item quantity="other" msgid="358057362115673258">"%d колдонмолору шарттар менен камсыз кылышат"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Бир да шарт түзүүчү орнотулган эмес."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> иштетилсинби?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> чыгуу шарттарын Тынчымды алба режимине кошо алат."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Колдонмолор жүктөлүүдө…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Бөгөттөө"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Баарын бөгөттөө"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Бул колдонмодо эскертмелер эч качан көрсөтүлбөсүн"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Маанилүүлүгү"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Эскертмелер тизменин башында көрсөтүлүп, түзмөк артыкчылыктуу үзгүлтүктөр гана режимине коюлганда да келе берсин"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Астейдил"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Түзмөк кулпуланганда, астейдил мамилени талап кылган бардык мазмундар бул колдонмонун эскертмелеринен жашырылсын"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Артыкчылыктуу катары мамиле кылуу"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Тынчымды алба режими Артыкчылыктууларга гана коюлганда бул колдонмонун эскертмелери угулушуна уруксат берүү"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Көз жүгүртүүгө уруксат берүү"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Бул колдонмо белгилүү бир эскертмелерди учурдагы экранга көз ирмемге чыгаруу менен, аларды баса белгилөөсүнө уруксат бериңиз"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Сыпайы мазмунду жашыруу"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Түзмөк кулпуланган учурда, бул колдонмонун эскертмелериндеги купуя маалыматты ачыкка чыгара турган мазмунду жашыруу"</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="zen_mode_default_option" msgid="6940069025071935243">"Бул өчүрүлгөнгө чейин"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Артыкчылыктуу үзгүлтүктөр"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Аракетсиз убакыт"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Күндөр"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Эч нерсе жок"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Үзгүлтүктөргө уруксат берилген"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Артыкчылык гана"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Эч нерсе жок"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматташтыруу"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Автоматтык түрдө күйүү"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Эреженин аталышы"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Эреже кошуу"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Эрежени жок кылуу"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<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="3201273040477861538">"Эреженин иш тартибин түзүү"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Эреже табылган жок."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Эч качан"</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_from" msgid="1033337300289871697">"Төмөнкүдөн келген чалуулар/билдирүүлөр"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Баары"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Байланыштар гана"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Жылдызчаланган байланштр гана"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Окуялар жана эстеткичтер"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Ойготкучтар ар дайым артыкчылыктуу үзгүлтүккө учураткычтар"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Ойготкучтар"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Эстеткичтер"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Окуялар"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Тандалган чалуучулар"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Кайталанма чалуучулар"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Эгер бир эле киши <xliff:g id="MINUTES">%d</xliff:g> мүнөт ичинде экинчи жолу чалса, уруксат берилсин"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Автоматтык түрдө күйүү"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Эч качан"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> кийинки күнү"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> же ага чейин бир айгай"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"Үзгүлтүктөр"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Чалуулар же эскертмелер келгенде"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Качан үзгүлтүккө учуратса болот?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Канча убакытка?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Ар дайым үзгүлтүккө учурасын"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"өчүк,баары,ар нерсе"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Артыкчылыктуу үзгүлтүктөргө гана уруксат берилсин"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Ойготкучтарга гана уруксат"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Үзгүлтүккө учурабасын"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Белгисиз"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> мүнөт</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> мүнөт</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Артыкчылыктуу эскертмелер гана режимине белгисиз убакытка өзгөртүү"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> чейин <xliff:g id="DURATION">%1$d</xliff:g> мүнөткө артыкчылыктуу эскертмелер гана режимине өзгөртүү</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> чейин бир мүнөткө артыкчылыктуу эскертмелер гана режимине өзгөртүү</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g> чейин бир саатка артыкчылыктуу эскертмелер гана режимине өзгөртүү</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Ойготкучтар гана режимине белгисиз убакытка өзгөртүү"</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>
+      <item quantity="one"><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"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> чейин <xliff:g id="DURATION">%1$d</xliff:g> саатка ойготкучтар гана режимине өзгөртүү</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> чейин бир саатка ойготкучтар гана режимине өзгөртүү</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Үзгүлтүккө учурабасын режимине белгисиз убакытка өзгөртүү"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g> чейин бир мүнөткө үзгүлтүккө учурабасын режимине өзгөртүү</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> чейин <xliff:g id="DURATION">%1$d</xliff:g> саатка үзгүлтүккө учурабасын режимине өзгөртүү</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> чейин бир саатка үзгүлтүккө учурабасын режимине өзгөртүү</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ар дайым үзгүлтүккө учуратуу режимине өзгөртүү"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"түбөлүк"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Колдонмо эскертмелери"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Эскертме жөндөөлөрү"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Бул түзмөк жөнүндө пикир жөнөтүү"</string>
@@ -3416,4 +3500,63 @@
     <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="2184141780491382435">"Демейки боюнча жүргүзүү"</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="app_launch_domain_links_title" msgid="458956710410857777">"Домен шилтемелери"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Домен URL\'дерин ачуу"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Колдонмо Домен URL\'дерин түздөн-түз ачышына уруксат берүү"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Колдоого алынган домен URL\'дери"</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="410824961149037234">"ички эстутум"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"сырткы эстутум"</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="notifications_enabled" msgid="6983396130566021385">"Күйүк"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Бөгөттөө"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Астейдил"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Артыкчылыктуу"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Артыкчылыктуу жана астейдил"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> уруксат берилди</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> уруксат берилди</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> ичинен <xliff:g id="COUNT_2">%d</xliff:g> уруксат берилди</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ичинен <xliff:g id="COUNT_0">%d</xliff:g> уруксат берилди</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Айрым демейкилер коюлду"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Демейкилер коюлган жок"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Бардык колдонмолор"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Иштетилген"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Жеке"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Жумуш"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Бөгөттөлдү"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Артыкчылыктуу"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Астейдил"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домен URL\'дери менен"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Администратор тарабынан өчүрүлгөн"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Өркүндөтүлгөн"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Белгисиз колдонмо"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Профиль тандоо"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Колдонмо уруксаттары"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> ичинен <xliff:g id="COUNT_0">%d</xliff:g> колдонмого кошумча уруксат бар"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> ичинен <xliff:g id="COUNT_0">%d</xliff:g> колдонмого уруксат бар"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Домен URL\'дери"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Эч бир домен URL ачылбасын"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\"<xliff:g id="DOMAIN">%s</xliff:g>\" ачуу"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\"<xliff:g id="DOMAIN">%s</xliff:g>\" жана тиешелүү URL\'дерди ачуу"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> колдонмо өз домен URL\'дерин ача алат</item>
+      <item quantity="one">Бир колдонмо өз домен URL\'дерин ача алат</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Таанылган жок"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Демейки колдонмолор"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Серепчи колдонмосу"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Демейки серепчи жок"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Демейки)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Колдонмо кампасы"</string>
 </resources>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 5f524af..79529e2 100755
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -45,9 +45,4 @@
     <!-- Dashboard tile image margin start / end -->
     <dimen name="dashboard_tile_image_margin_start">12dp</dimen>
 
-    <dimen name="setup_wizard_card_title_padding_end">32dp</dimen>
-    <dimen name="setup_wizard_card_title_padding_start">56dp</dimen>
-    <dimen name="setup_wizard_card_title_padding_top">24dp</dimen>
-    <dimen name="setup_wizard_card_title_padding_bottom">0dp</dimen>
-
 </resources>
diff --git a/res/values-land/themes.xml b/res/values-land/themes.xml
new file mode 100644
index 0000000..8f407c6
--- /dev/null
+++ b/res/values-land/themes.xml
@@ -0,0 +1,22 @@
+<?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
+  -->
+<resources>
+    <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo-rLA/arrays.xml
index 0209d96..21e1780 100644
--- a/res/values-lo-rLA/arrays.xml
+++ b/res/values-lo-rLA/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ປຸ່ມ Push"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"ປິດ/ເປີດ ​ໄມ​ໂຄຣ​ໂຟນ"</item>
     <item msgid="1148142988678569310">"​ໂປ​ຣ​ເຈັກ​ມີ​ເດຍ"</item>
     <item msgid="9130014005474445273">"​​ເປີດ​ນຳ​ໃຊ້ VPN"</item>
+    <item msgid="1165192162975045562">"ຂຽນ​ວອ​ລ​ເປ​ເປີ"</item>
+    <item msgid="7129487923652967258">"​ໂຄງ​ຮ່າງຊ່ວຍ"</item>
+    <item msgid="1069023208100114540">"ຮູບ​ຖ່າຍ​ໜ້າ​ຈໍ​ຊ່ວຍ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ຕຳແໜ່ງ"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"ປິດ/ເປີດ ​ໄມ​ໂຄຣ​ໂຟນ"</item>
     <item msgid="5906017727368097853">"​ໂປຣ​ເຈັກ​ມີ​ເດຍ"</item>
     <item msgid="2486614710846178542">"​​ເປີດ​ນຳ​ໃຊ້ VPN"</item>
+    <item msgid="5586547561693629602">"ຂຽນ​ວອ​ລ​ເປ​ເປີ"</item>
+    <item msgid="32794179825485062">"​ໂຄງ​ຮ່າງຊ່ວຍ"</item>
+    <item msgid="7872852746938272552">"ຮູບ​ຖ່າຍ​ໜ້າ​ຈໍ​ຊ່ວຍ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ສັ້ນ"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"ຕໍ່າ"</item>
     <item msgid="4212263919458209842">"ຈຳເປັນ"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ປິດ"</item>
-    <item msgid="5656544177755411222">"​ມີ​ການ​ລົບ​ກວນ​ຈຳ​ກັດ"</item>
-    <item msgid="8735337502532332056">"ບໍ່​ມີ​ການ​ລົບ​ກວນ"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ປົກ​ກະ​ຕິ"</item>
     <item msgid="866544120205026771">"ປານກາງ"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"ບົວ"</item>
     <item msgid="6131821495505931173">"ແດງ"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"ແຫຼ່ງ​ທີ່​ມາ​ຂອງ​ສຽງ"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 8c5cc46..8057164 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"ອະນຸຍາດ"</string>
     <string name="deny" msgid="6947806159746484865">"ປະ​ຕິ​ເສດ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ບໍ່ຮູ້ຈັກ"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"ຕອນນີ້ທ່ານຍັງເຫຼືອອີກ <xliff:g id="STEP_COUNT">%1$d</xliff:g> ຂັ້ນຕອນເພື່ອການເປັນນັກພັດທະນາຊອບແວ."</item>
-    <item quantity="other" msgid="6722953419953594148">"ຕອນນີ້ທ່ານຍັງເຫຼືອອີກ <xliff:g id="STEP_COUNT">%1$d</xliff:g> ຂັ້ນຕອນເພື່ອການເປັນນັກພັດທະນາຊອບແວ."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">ປະຈຸບັນທ່ານຍັງຢູ່ຫ່າງ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ຂັ້ນຕອນຈາກການເປັນຜູ້ພັດທະນາ.</item>
+      <item quantity="one">ປະຈຸບັນທ່ານຍັງຢູ່ຫ່າງ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ຂັ້ນຕອນຈາກການເປັນຜູ້ພັດທະນາ.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ຕອນນີ້ທ່ານເປັນນັກພັດທະນາແລ້ວ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ບໍ່ຈຳເປັນ, ທ່ານເປັນນັກພັດທະນາຢູ່ແລ້ວ."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ລະບົບໄຮ້ສາຍ &amp; ເຄືອຂ່າຍ"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"ປິດການນຳໃຊ້ SMS ຜ່ານ IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"ຈຳເປັນຕ້ອງເປີດນຳໃຊ້ການລົງທະບຽນ IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"ຈຳເປັນຕ້ອງປິດການລົງທະບຽນ IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"ເປີດ​ທຸງ​ທີ່ VoLTE ຈັ​ດ​ໃຫ້"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"ປິດ​ທຸງ​ທີ່ VoLTE ຈັ​ດ​ໃຫ້"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"ເປີດການ dump ໜ່ວຍຄວາມຈຳຂອງ LTE"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"ປິດການ dump ໜ່ວຍຄວາມຈຳຂອງ LTE"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"ເບິ່ງປຶ້ມທີ່ຢູ່ໃນ SIM card"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"ເຊື່ອມ​ຕໍ່ແລ້ວ"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ເຊື່ອມຕໍ່ແລ້ວ (ບໍ່ມີໂທລະສັບ)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ເຊື່ອມຕໍ່ແລ້ວ (ບໍ່ມີສື່)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"ເຊື່ອມຕໍ່ (ບໍ່ມີການເຂົ້າເຖິງຂໍ້ຄວາມ)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ເຊື່ອມຕໍ່ແລ້ວ (ບໍ່ມີໂທລະສັບ ຫຼືສື່)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"ກຳລັງຢຸດການເຊື່ອມຕໍ່..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"ກຳລັງເຊື່ອມຕໍ່..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"ກຳລັງຈັບຄູ່..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"ອຸປະກອນ Bluetooth ທີ່ບໍ່ມີຊື່"</string>
     <string name="progress_scanning" msgid="192587958424295789">"ກຳລັງຊອກຫາ..."</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ບໍ່ມີອຸປະກອນ Bluetooth ຢູ່ໃນບໍລິເວນໃກ້ຄຽງ."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ສະແດງໄຟລ໌ທີ່ໄດ້ຮັບ"</string>
     <string name="device_picker" msgid="4978696506172252813">"ເລືອກ​ອຸ​ປະ​ກອນ Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"ຄຳຂໍອະນຸຍາດເພື່ອໃຊ້ Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"ມີແອັບຯຕ້ອງການເປີດນຳໃຊ້ Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"ມີ​ແອັບຯ​ຕ້ອງ​ການ​ເປີດ​ນຳ​ໃຊ້ Bluetooth ສຳ​ລັບ​ອຸ​ປະ​ກອນ​ນີ້."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"ມີແອັບຯຕ້ອງການໃຫ້ແທັບເລັດຂອງທ່ານ ສາມາດຊອກເຫັນໄດ້ຈາກອຸປະກອນ Bluetooth ອື່ນເປັນເວລາ <xliff:g id="TIMEOUT">%1$d</xliff:g> ວິນາທີ."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"ມີແອັບຯຕ້ອງການເຮັດໃຫ້ໂທລະສັບຂອງທ່ານ ສາມາດຊອກເຫັນໄດ້ໂດຍອຸປະກອນ Bluetooth ອື່ນເປັນເວລາ <xliff:g id="TIMEOUT">%1$d</xliff:g> ວິນາທີ."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"ມີແອັບຯຕ້ອງການເຮັດໃຫ້ແທັບເລັດຂອງທ່ານ ສາມາດຖືກຊອກເຫັນໄດ້ໂດຍອຸປະກອນ Bluetooth ອື່ນ. ທ່ານສາມາດປ່ຽນການເຮັດວຽກນີ້ໄດ້ໃນພາຍຫຼັງ ໂດຍໄປທີ່ການຕັ້ງຄ່າ Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD card"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ການຕັ້ງຄ່າ Proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"ຍົກເລີກ"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ຍົກເລີກ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ສືບ​ຕໍ່"</string>
     <string name="okay" msgid="1997666393121016642">"ຕົກລົງ"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ຕົກລົງ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ບໍ່"</string>
-    <string name="forget" msgid="7267115980248732932">"​ລືມ"</string>
+    <string name="forget" msgid="1400428660472591263">"ລືມ"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"ປັບປຸງການຈັບພາບໜ້າ"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"ກວດສອບຄວາມມີຊີວິດ"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"ຕ້ອງກະພິບຕາເມື່ອປົດລັອກ"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ຕັ້ງທີ່ຢູ່ຂອງຂ້ອຍ, ໜ້າຈໍປົດລັອກ, ການລັອກຊິມກາດ, ການລັອກບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ກຳນົດທີ່ຢູ່ຂອງຂ້ອຍ, ການປົດລັອກໜ້າຈໍ, ການລັອກບ່ອນເຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ລະ​ຫັດ​ຜ່ານ"</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="3453670509485083962">"ເພີ່ມ"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ລັອກໜ້າຈໍ"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"ການຕັ້ງ​ລາຍ​ນີ້ວ​ມື"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"ເພື່ອ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ປົດ​ລັອກ​ໜ້າ​ຈໍ​ຂອງ​ທ່ານ ຫຼື​ຢືນຢັນ​ການ​ຊື້, ພວກ​ເຮົາ​ຈຳ​ເປັນ​ຕ້ອງ: \n\n✓ ຕັ້ງ​ວິ​ທີ​ລັອກ​ໜ້າ​ຈໍ​ພື້ນ​ຫຼັງ​ຂອງ​ທ່ານ \n\n✓ ເພີ່ມ​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ຊອກ​ຫາ​ເຊັນ​ເຊີ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ຊອກ​ເຊັນ​ເຊີກວດຈັບ​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ຢູ່​ດ້ານ​ຫຼັງ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"ຈົ່ງ​ເລີ່ມ​ຕົ້ນ!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"ວາງ​ນີ້ວ​ມື​​ລົງ​ເທິງ​ເຊັນ​ເຊີ​ລາຍ​ນີ້ວ​ມື. ​ຍົກ​ມັນ​ຂຶ້ນ​ຫຼັງ​ຈາກ​ທ່ານ​ຮູ້​ສຶກວ່າ​ສັ່ນ​ແລ້ວ."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"ດີ​ຫຼາຍ! ດຽວ​ນີ້​ເຮັດ​ຊ້ຳ​ຄືນ​ອີກ."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"ວາງ​ນີ້ວ​ມື​ດຽວ​ກັນ​ນັ້ນ​ລົງ​ເທິງ​ເຊັນ​ເຊີ​ລາຍ​ນີ້ວ​ມື ແລະ​ຍົກ​ມັນ​ຂຶ້ນ​ຫຼັງ​ຈາກ​ທ່ານ."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ເພີ່ມ​ລາຍ​ນີ້ວ​ມື​ແລ້ວ!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ທຸກ​ຄັ້ງ​ທີ່​ທ່ານ​ເຫັນ​ໄອ​ຄອນ​ນີ້, ທ່ານ​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ສຳ​ລັບ​ການ​ລະ​ບຸ ຫຼື​ເພື່ອ​ໃຫ້​ສິດ​ການ​ຊື້."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"ເພີ່ມ"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ຕໍ່​ໄປ"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"ສຽບສາຍສາກຂອງທ່ານ ແລ້ວລອງໃໝ່ອີກຄັ້ງ."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ບໍ່ໄດ້ຕັ້ງ PIN ຫຼືລະຫັດລັອກໜ້າຈໍ"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ທ່ານຈຳເປັນຕ້ອງຕັ້ງລະຫັດ PIN ຫຼືລະຫັດຜ່ານກ່ອນຈະເລີ່ມຕົ້ນການເຂົ້າລະຫັດໄດ້."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"ທ່ານ​ຕ້ອງ​ແຕ້ມ​ຮູບ​ແບບ​ປົດ​ລັອກ​ເພື່ອ​ຢືນ​ຢັນ​ການ​ເຂົ້າ​ລະ​ຫັດ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"ເຂົ້າລະຫັດ?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"ການດຳເນີນການເຂົ້າລະຫັດ ແມ່ນຂັ້ນຕອນທີ່ບໍ່ສາມາດຍົກເລີກກັບຄືນໄດ້ ແລະຫາກທ່ານຢຸດມັນລະຫວ່າງທາງ ທ່ານຈະສູນເສຍຂໍ້ມູນຂອງທ່ານ. ການເຂົ້າລະຫັດໃຊ້ເວລາຊົ່ວໂມງນຶ່ງ ຫຼືຫຼາຍກວ່ານັ້ນ, ໃນລະຫວ່າງນັ້ນແທັບເລັດຈະຣີສະຕາດເອງຫຼາຍຄັ້ງ."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"ການດຳເນີນການເຂົ້າລະຫັດ ແມ່ນຂັ້ນຕອນທີ່ບໍ່ສາມາດຍົກເລີກກັບຄືນໄດ້ ແລະຫາກທ່ານຢຸດມັນລະຫວ່າງທາງ ທ່ານຈະສູນເສຍຂໍ້ມູນຂອງທ່ານ. ການເຂົ້າລະຫັດໃຊ້ເວລາຊົ່ວໂມງນຶ່ງ ຫຼືຫຼາຍກວ່ານັ້ນ, ໃນລະຫວ່າງນັ້ນໂທລະສັບຈະຣີສະຕາດເອງຫຼາຍຄັ້ງ."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"ການປົດລັອກດ້ວຍໜ້າ"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"ຄວາມປອດໄພຕ່ຳ, ຢູ່ໃນຂັ້ນທົດລອງ"</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_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="current_screen_lock" msgid="4104091715420072219">"ລັອກ​ໜ້າ​ຈໍ​ປະ​ຈຸ​ບັນ"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"ຄຸນ​ສົມ​ບັດ​ການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ເຮັດ​ວຽກ​ອີກ."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ່ເບິ່ງແຍງລະບົບ, ນະໂຍບາຍການເຂົ້າລະຫັດ ຫຼືບ່ອນເກັບຂໍ້ມູນຮັບຮອງ"</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_biometric_weak" msgid="3008473624490350142">"ປົດລັອກດ້ວຍໜ້າ"</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_password" msgid="1203938057264146610">"ລະຫັດຜ່ານ"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"ເມື່ອ​ທ່ານ​ຕັ້ງ​ລັອກ​ໜ້າ​ຈໍ​ແລ້ວ, ທ່ານ​ຍັງ​ສາ​ມາດ​ຕັ້ງ​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ໄດ້​ຢູ່​ໃນ​ການ​ຕັ້ງ​ຄ່າ ແລະ​ຄວາມ​ປອດ​ໄພໄດ້."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ບໍ່ໃຊ້ການລັອກໜ້າຈໍ"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ລຶບຮູບແບບການປົດລັອກ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"ລຶບລະຫັດ PIN ປົດລັອກ"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"ລະຫັດຕ້ອງມີຢ່າງໜ້ອຍ 1 ໂຕອັກສອນ."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"ລະຫັດຜ່ານຕ້ອງມີໂຕເລກຢ່າງໜ້ອຍນຶ່ງໂຕ."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"ລະຫັດຜ່ານຕ້ອງມີສັນຍາລັກຢ່າງໜ້ອຍນຶ່ງໂຕ."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"ລະຫັດຜ່ານຕ້ອງມີໂຕອັກສອນຢ່າງໜ້ອຍ 1 ໂຕ."</item>
-    <item quantity="other" msgid="8186027808415585970">"ລະຫັດຜ່ານຕ້ອງມີໂຕອັກສອນຢ່າງໜ້ອຍ %d ໂຕ."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"ລະຫັດຜ່ານຕ້ອງມີຢ່າງໜ້ອຍ 1 ໂຕພິມນ້ອຍ."</item>
-    <item quantity="other" msgid="2693910942679679225">"ລະຫັດຜ່ານຕ້ອງມີຢ່າງໜ້ອຍ %d ໂຕພິມນ້ອຍ."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"ລະຫັດຜ່ານຕ້ອງມີໂຕພິມໃຫຍ່ຢ່າງໜ້ອຍ 1 ໂຕ."</item>
-    <item quantity="other" msgid="3030801209112209245">"ລະຫັດຜ່ານຕ້ອງມີໂຕພິມໃຫຍ່ຢ່າງໜ້ອຍ %d ໂຕ."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"ລະຫັດຜ່ານຕ້ອງມີໂຕເລກຢ່າງໜ້ອຍ 1 ໂຕ."</item>
-    <item quantity="other" msgid="4703982391407595924">"ລະຫັດຜ່ານຕ້ອງມີໂຕເລກຢ່າງໜ້ອຍ %d ໂຕ."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"ລະຫັດຜ່ານຕ້ອງມີສັນຍາລັກພິເສດຢ່າງໜ້ອຍ 1 ໂຕ."</item>
-    <item quantity="other" msgid="1221290525051187757">"ລະຫັດຜ່ານຕ້ອງມີຢ່າງໜ້ອຍ %d ສັນຍາລັກພິເສດ."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"ລະຫັດຜ່ານຕ້ອງມີໂຕເລກ ຫຼືສັນຍາລັກນຳຢ່າງໜ້ອຍ 1 ໂຕ."</item>
-    <item quantity="other" msgid="3952508584649046404">"ລະຫັດຜ່ານຕ້ອງມີຢ່າງໜ້ອຍ %d ໂຕອັກສອນທີ່ບໍ່ແມ່ນໂຕໜັງສື."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">ລະຫັດຜ່ານຕ້ອງມີຕົວອັກສອນຢ່າງໜ້ອຍ %d ຕົວ.</item>
+      <item quantity="one">ລະຫັດຜ່ານຕ້ອງມີຕົວອັກສອນຢ່າງໜ້ອຍ 1 ຕົວ.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">ລະຫັດຜ່ານຕ້ອງມີຕົວພິມນ້ອຍຢ່າງໜ້ອຍ %d ຕົວ.</item>
+      <item quantity="one">ລະຫັດຜ່ານຕ້ອງມີຕົວພິມນ້ອຍຢ່າງໜ້ອຍ 1 ຕົວ.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">ລະຫັດຜ່ານຕ້ອງມີຕົວພິມໃຫຍ່ຢ່າງໜ້ອຍ %d ຕົວ.</item>
+      <item quantity="one">ລະຫັດຜ່ານຕ້ອງມີຕົວພິມໃຫຍ່ຢ່າງໜ້ອຍ 1 ຕົວ.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">ລະຫັດຜ່ານຕ້ອງມີຕົວເລກຢ່າງໜ້ອຍ %d ຕົວ.</item>
+      <item quantity="one">ລະຫັດຜ່ານຕ້ອງມີຕົວເລກຢ່າງໜ້ອຍ 1 ຕົວ.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">ລະຫັດຜ່ານຕ້ອງມີສັນຍາລັກພິເສດຢ່າງໜ້ອຍ %d ຕົວ.</item>
+      <item quantity="one">ລະຫັດຜ່ານຕ້ອງມີສັນຍາລັກພິເສດຢ່າງໜ້ອຍ 1 ຕົວ.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">ລະຫັດຜ່ານຕ້ອງມີອັກຂະລະທີ່ບໍ່ແມ່ນອັກສອນນໍາຢ່າງໜ້ອຍ %d ຕົວ.</item>
+      <item quantity="one">ລະຫັດຜ່ານຕ້ອງມີອັກຂະລະທີ່ບໍ່ແມ່ນອັກສອນນໍາຢ່າງນ້ອຍ 1 ຕົວ.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"ຜູ່ເບິ່ງແຍງອຸປະກອນ ບໍ່ອະນຸຍາດໃຫ້ໃຊ້ລະຫັດຜ່ານຫຼ້າສຸດ."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ການ​ຮຽງ​ລຳດັບ​ຂຶ້ນ,​ ການ​ຮຽງ​ລຳດັບ​ລົງ ຫຼື​ຈຳນວນ​ຊ້ຳໆ ຂອງ​ໂຕເລກ​ແມ່ນ​ເກືອດ​ຫ້າມ"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ຕົກລົງ"</string>
@@ -480,15 +490,8 @@
     <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;ໃຫ້ກວດສອບວ່າມັນສະແດງ 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">"ຈາກ:&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_accept" msgid="6163520056536604875">"ຈັບຄູ່"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ຈັບຄູ່"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ຍົກເລີກ"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"ການຈັບຄູ່​ຈະ​ອະນຸຍາດ​ໃຫ້ເຂົ້າ​ເຖິງລາຍ​ຊື່ຜູ່ຕິດຕໍ່ ແລະ ປະ​ຫວັດ​ການ​ໂທຂອງ​ທ່ານທຸກໆ​ເທື່ອ​ທີ່​ເຊື່ອມ​ຕໍ່ກັນ."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"ບໍ່ສາມາດຈັບຄູ່ກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ໄດ້."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ບໍ່ສາມາດຈັບຄູ່ກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ໄດ້ ເພາະ PIN ຫຼື passkey ບໍ່ຖືກຕ້ອງ."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ບໍ່ສາມາດຕິດຕໍ່ສື່ສານກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ໄດ້."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ການຈັບຄູ່ຖືກປະຕິເສດໂດຍ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"ບໍ່ສາມາດເຊື່ອມຕໍ່ຫາ <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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"ເພື່ອ​ປັບ​ປຸງ​ຄວາມ​ຖືກ​ຕ້ອງ​ຂອງ​ທີ່​ຕັ້ງ, ແອັບ ແລະການ​ບໍ​ລິ​ການຈະ​ສະ​ແກນ​ຫາ​ອຸ​ປະ​ກອນ Bluetooth, ແມ້​ວ່າ ເມື່ອ Bluetooth ປິດ. ທ່ານ​ສາ​ມາດ​ປ່ຽນ​ແປງ​ອັນ​ນີ້​ຢູ່​ໃນ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ການ​ຕັ້ງ​ຄ່າ​ການ​ສະ​ແກນ<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ເຊື່ອມຕໍ່ກັບ..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"ສຽງ"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ສຽງໂທລະສັບ"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ການໂອນຍ້າຍໄຟລ໌"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ອຸປະກອນປ້ອນຂໍ້ມູນ"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ການເຂົ້າເຖິງອິນເຕີເນັດ"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"ການ​ແບ່ງ​ປັນ​ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"​ໃຊ້​ສຳ​ລັບການ​ແບ່ງ​ປັນ​ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ການແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດ"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"ການ​ເຂົ້າ​ເຖິງ​ຂໍ້​ຄວາມ"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"ເຊື່ອມຕໍ່ກັບສື່ດ້ານສຽງແລ້ວ"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ເຊື່ອມຕໍ່ກັບສຽງໂທລະສັບແລ້ວ"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ເຊື່ອມຕໍ່ກັບເຊີບເວີໂອນຍ້າຍໄຟລ໌ແລ້ວ"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"ເຊື່ອມ​ຕໍ່​ກັບ​ແຜນ​ທີ່ແລ້ວ"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ບໍ່ໄດ້ເຊື່ອມຕໍ່ຫາເຊີບເວີໂອນຍ້າຍໄຟລ໌"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ເຊື່ອມຕໍ່ກັບອຸປະກອນປ້ອນຂໍ້ມູນແລ້ວ"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ໃຊ້ສຳລັບສື່ດ້ານສຽງ"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ໃຊ້ສຳລັບລະບົບສຽງຂອງໂທລະສັບ"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ໃຊ້ເພື່ອໂອນຍ້າຍໄຟລ໌"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ໃຊ້ສຳລັບການປ້ອນຂໍ້ມູນ"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ໃຊ້ເພື່ອເຂົ້າອິນເຕີເນັດ"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ໃຊ້ສຳລັບແຜນທີ່"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"ເຊື່ອມ​ຕໍ່​ຜ່ານ Wi‑Fi ຕົວ​ຊ່ວຍ​ແລ້ວ"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"ດຶງໜ້າຈໍ"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"ກຳລັງປິດ Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"ຜິດພາດ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ໃນໂໝດການໃຊ້ເທິງຍົນ"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ບໍ່ສາມາດກວດຫາເຄືອຂ່າຍໄດ້"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ການແຈ້ງເຕືອນເຄືອຂ່າຍ"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"ແຈ້ງ​ເຕືອນ​ເມື່ອ​ມີ​ເຄືອ​ຂ່າຍ​ສາ​ທາ​ລະ​ນະ​ທີ່​ສາ​ມາດ​ໃຊ້​ໄດ້"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ຫຼີກເວັ້ນເຄືອຂ່າຍທີ່ສັນຍານອ່ອນ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"ບໍ່ໃຊ້ເຄືອຂ່າຍ Wi-Fi ເວັ້ນເສຍແຕ່ມັນຈະມີຄວາມໄວການເຊື່ອມຕໍ່ອິນເຕີເນັດທີ່ດີ."</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ໃຊ້​ສະ​ເພາະ​ເຄືອ​ຂ່າຍ​ທີ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ​ທີ່​ດີ​ເທົ່າ​ນັ້ນ"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"ການສະແກນພ້ອມໃຊ້ຕະຫຼອດເວລາ"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"​ອະ​ນຸ​ຍາດ​ການ​ສະ​ແກນ​ທຸກ​ເທື່ອ"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"ໃຫ້​ບໍລິການ​ສະຖານທີ່​ຂອງ Google ແລະ​ແອັບຯ​ອື່ນໆ​ສະແກນ​ຫາ​ເຄືອ​ຂ່າຍ​ໄດ້, ເຖິງ​ແມ່ນ​ວ່າ Wi-Fi ຈະ​ປິດ​ກໍ​ຕາມ."</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ໃຊ້​ເປີດ Wi‑Fi ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"ໃຫ້​ຕົວ​ຊ່ວຍ Wi‑Fi ເຊື່ອມ​ຕໍ່​ ເພື່ອ​ເປີດ​ເຄືອ​ຂ່າຍ​ທີ່​ໄດ້​ກຳ​ນົດ​ໃຫ້​ເປັນ​ຄຸນ​ນະ​ພາບ​ສູງ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"ເລືອກ​ຕົວ​ຊ່ວຍ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ຕິດຕັ້ງໃບຮັບຮອງ"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ ແລະເພື່ອຈຸດປະສົງອື່ນໆ, Google ແລະແອັບຯອື່ນໆອາດສະແກນເຄືອຂ່າຍທີ່ຢູ່ໃກ້ຄຽງ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ. ຫາກທ່ານບໍ່ຕ້ອງການໃຫ້ສະແກນ, ກະລຸນາໄປທີ່ເມນູ ຂັ້ນສູງ &gt; ການສະແກນພ້ອມໃຊ້ຕະຫຼອດເວລາ."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"ແອັບຯຕ່າງໆອາດສະແກນຫາເຄືອຂ່າຍໃກ້ຄຽງ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ. ຫາກທ່ານບໍ່ຕ້ອງການໃຫ້ສະແກນ, ກະລຸນາໄປທີ່ເມນູ ຂັ້ນສູງ &gt; ການສະແກນພ້ອມໃຊ້ຕະຫຼອດເວລາ."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"ເພື່ອ​ປັບ​ປຸງ​ຄວາມ​ຖືກ​ຕ້ອງ​ຂອງ​ທີ່​ຕັ້ງ, ແອັບ ແລະການ​ບໍ​ລິ​ການຈະ​ສະ​ແກນ​ຫາເຄືອ​ຂ່າຍ Wi‑Fi, ແມ້​ວ່າ​ເມື່ອ 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="5340097010842405981">"ບໍ່ຕ້ອງສະແດງອີກ"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"ເປີດໃຊ້ WiFi ໃນຂະນະໜ້າຈໍປິດ"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"ເປີດ Wi‑Fi ໃນ​ລະ​ຫວ່າງ​ໜ້າ​ຈ​ໍ​ປິດ​ຢູ່"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"ເພີ່ມ​ເຄືອຂ່າຍ​ອື່ນ"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ເພີ່ມເຕີມ"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"ຕັ້ງຄ່າອັດຕະໂນມັດ (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"ເພື່ອ​ເຮັດ​ການ​ຕັ້ງ​ຄ່າ​ໃຫ້​ສຳເລັດ, ແທັບ​ເລັດ​ຂອງ​ທ່ານ​ຈະ​ຕ້ອງ​ເຊື່ອມ​ຕໍ່​ກັບ Wi-Fi. ຫຼັງ​ຈາກ​ການ​ຕັ້ງຄ່າ​ແລ້ວ, ທ່ານ​ຈະ​ສາມາດ​ສະລັບ​ລະຫວ່າງ​ການ​ໃຊ້​ຂໍ້ມູນ​ມື​ຖື ແລະ Wi-Fi ໄດ້."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"​ໂຕ​ເລືອກ​ຂັ້ນ​ສູງ"</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="5940801028985255304">"ກົດປຸ່ມ Wi‑Fi Protected Setup ຢູ່ເຣົາເຕີຂອງທ່ານ. ມັນອາດຂຽນວ່າ \"WPS\" ຫຼືໃຊ້ສັນຍາລັກນີ້:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"ກົດປຸ່ມການ​ຕັ້ງ Wi-Fi ທີ່​ປົກ​ປ້ອງ​ໄວ້ຢູ່ເຣົາເຕີຂອງທ່ານ. ມັນອາດຈະຂຽນວ່າ \"WPS\" ຫຼືໝາຍ​ໄວ້​ດ້ວຍສັນຍາລັກນີ້:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"ໃສ່ pin <xliff:g id="NUMBER">%1$s</xliff:g> ຢູ່ເຣົາເຕີ Wi-Fi ຂອງທ່ານ. ການຕັ້ງຄ່າອາດໃຊ້ເວລາຮອດສອງນາທີຈຶ່ງຈະສຳເລັດ."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS ສຳເລັດແລ້ວ. ກຳລັງເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍ..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"ເຊື່ອມຕໍ່ເຄືອຂ່າຍ Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> ແລ້ວ"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"ກໍານົດຄ່າຄື້ນ AP"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ບໍ່ມີການປ່ຽນແປງ)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ບໍ່ໄດ້ລະບຸ)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"ບັນ​ທຶກແລ້ວ"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"ປິດການນຳໃຊ້"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"ການ​ຕັ້ງ​ຄ່າ IP ລົ້ມ​ເຫຼວ"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"​ການ​ເຊື່ອມ​ຕໍ່ WiFi ລົ້ມ​ເຫຼວ"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ບັນຫາການພິສູດຢືນຢັນ"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"ບໍ່ຢູ່ໃນໄລຍະທີ່ເຊື່ອມຕໍ່ໄດ້"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"​ບໍ່​ພົບ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ​, ຈະ​ບໍ່​ຖືກ​ເຊື່ອມ​ຕໍ່​ໃໝ່​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ."</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_security_none" msgid="7985461072596594400">"ບໍ່ໃຊ້"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"ເຄືອ​ຂ່າຍ​ນີ້​ບໍ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ກັບອິນ​ເຕີ​ເນັດ. ແນວ​ໃດ​ກໍ່​ໃຊ້​ເຄືອ​ຂ່າຍ​ນີ້​ບໍ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ຢ່າ​ຖາມ​ອີກ​ສຳ​ລັບ​ເຄືອ​ຂ່າຍ​ນີ້"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ເຊື່ອມຕໍ່"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ລົ້ມເຫລວໃນການເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ລືມ"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK portable Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"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_mode_title" msgid="2164073796253284289">"ຄວາ​ມ​ມັກ​ການ​ໂທ"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"ໂໝດການໂທ Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"ເລືອກໃຊ້ Wi​-Fi ກ່ອນ"</item>
+    <item msgid="5267397515594230396">"ເລືອກໃຊ້ເຊລລູລາກ່ອນ"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"ເມື່ອ​ການ​ໂທ Wi-Fi ເປີດ, ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ສາ​ມາດ​ໃຫ້​ທິດ​ທາງ​ການ​ໂທ​ຜ່ານ​ເຄືອ​ຂ່າຍ Wi-Fi ຫຼື​ເຄືອ​ຂ່າຍ​ຂອງ​ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ຂອງ​ທ່ານ, ຂຶ້ນ​ກັບ​ຄວາມ​ມັກ​ຂອງ​ທ່ານ ແລະ​ສັນ​ຍານ​ໃດ​ແຮງ​ກ່ວາ. ກ່ອນ​ເປີດ​ຄຸນ​ສ​ົມ​ບັດ​ນີ້, ກວດ​ເບິ່ງ​ກັບ​ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ​ໃນ​ເລື່ອງ​ຄ່າ​ບໍ​ລິ​ການ ແລະ​ລາຍ​ລະ​ອຽດ​ອື່ນໆ."</string>
     <string name="home_settings" msgid="212375129455718176">"ໜ້າຫຼັກ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ການສະແດງຜົນ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ສຽງ"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"ສີສັນ"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"ແຈ້ງ"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"ມືດ"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"ອັດຕະໂນມັດ"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"ອັບ​ເດດ​ແຜ່ນ SIM ທີ່​ມັກ?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> ເປັນ SIM ດຽວ​ເທົ່າ​ນັ້ນ​ຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ. ທ່ານ​ຕ້ອງ​ການ​ໃຊ້ SIM ນີ້​ສຳ​ລັບ​ຂໍ້​ມູນ​ເຊວ​ລູ​ລາ, ການ​ໂທ, ແລະ​ຂໍ້​ຄວາມ SMS ບໍ?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ລະຫັດ PIN ຂອງ SIM ບໍ່ຖືກຕ້ອງທ່ານຕ້ອງຕິດຕໍ່ຫາຜູ່ໃຫ້ບໍລິການຂອງທ່ານ ເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"ລະຫັດ PIN ຂອງ SIM ບໍ່ຖືກຕ້ອງ, ທ່ານສາມາດລອງໄດ້ອີກ <xliff:g id="NUMBER">%d</xliff:g> ເທື່ອກ່ອນທີ່ທ່ານຈະຕ້ອງຕິດຕໍ່ຫາຜູ່ໃຫ້ບໍລິການຂອງທ່ານ ເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ."</item>
-    <item quantity="other" msgid="77103619544346451">"ລະຫັດ PIN ຂອງ SIM ບໍ່ຖືກຕ້ອງ, ທ່ານສາມາດລອງໄດ້ອີກ <xliff:g id="NUMBER">%d</xliff:g> ເທື່ອ."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">ລະຫັດ SIM PIN ບໍ່ຖືກຕ້ອງ, ທ່ານຍັງພະຍາຍາມໄດ້ອີກ <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">"PIN ຂອງ SIM ເຮັດວຽກລົ້ມເຫຼວ!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ສະຖານະແທັບເລັດ"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"ສະ​ຖາ​ນະ​ໂທລະ​ສັບ"</string>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"ແອັບຯ (ຂໍ້ມູນແອັບຯ &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_media_misc_usage" msgid="235452944021647124">"ອື່ນໆ."</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="default" msgid="6915293408836853020">"ຖອດການເຊື່ອມຕໍ່ SD card"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"ຕໍ່​ໃສ່"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ເອົາ​ອອກ"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"ລຶບ &amp; ຟໍ​ແມັດ"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ລຶບ &amp; ຟໍ​ແມັດ​ເປັນ​ບ່ອນ​ຈັດ​ເກັບ​ພາຍ​ໃນ"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"ການເຊື່ອມຕໍ່ USB ຄອມພິວເຕີ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"ການເຊື່ອມຕໍ່ USB ຜ່ານຄອມພິວເຕີ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"ເຊື່ອມຕໍ່ເປັນ"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"ໃຫ້ທ່ານໂອນຍ້າຍໄຟລ໌ສື່ຕ່າງໆ ໃນ Windows ຫຼືໃຊ້ Android File Transfer ໃນ Mac (ເບິ່ງ www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"ກ້ອງຖ່າຍຮູບ (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"ໃຫ້ທ່ານໂອນຍ້າຍຮູບພາບໂດຍໃຊ້ຊອບແວກ້ອງ ແລະໂອນຍ້າຍໄຟລ໌ໃດໆ ກໍໄດ້ໃນຄອມພິວເຕີທີ່ບໍ່ຮອງຮັບ MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ຕິດຕັ້ງເຄື່ອງມືໂອນຍ້າຍໄຟລ໌"</string>
+    <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_external_title" msgid="2723851748972673696">"ໜ່ວຍຈັດເກັບຂໍ້ມູນທີ່ຖອດອອກໄດ້"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ວ່າງ (ທັງ​ໝົດ <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ຖືກ​ເອົາ​ຕໍ່​ໃສ່​ແລ້ວ"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"ບໍ່​ສາ​ມາດ​ຕໍ່​ໃສ່​ໄດ້ <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="4161722509712992231">"ບໍ່​ສາ​ມາດ​ເອົາ <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="8343688274191391889">"ບໍ່​ສາ​ມາດ​ຟໍ​ແມ​ັດ <xliff:g id="NAME">%1$s</xliff:g> ໄດ້"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ປ່ຽນ​ຊື່​ບ່ອນ​ຈັດ​ເກັບຂໍ້​ມູນ"</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="3677827796634199714"><b>"ເມື່ອ​ທ່ານ​ເອົາ <xliff:g id="NAME_0">^1</xliff:g> ນີ້​ອອກ, ແອັບ​ທີ່​ເກັບ​ໄວ້​ຢູ່​ໃນ​ຕົວ​ມັນ​ນັ້ນ​ຈະ​ຢຸດ​ເຮັດ​ວຽກ, ແລະ​ໄຟ​ລ໌​ມີ​ເດຍ​ທີ່​ເກັບ​ໄວ້​ຢູ່​ໃນ​ມັນ​ນັ້ນ​ຈະ​ບໍ່​ມີ​ໃຫ້​ຈົນ​ກ່​ວາ​ທີ່​ຈະ​ໃສ່​ມັນ​ເຂົ້າ​ໃໝ່."</b>" \n\n <xliff:g id="NAME_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_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_next" msgid="2774557300531702572">"ລຶບ &amp; ຟໍ​ແມັດ"</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="1259216693690378749">"ຢ່າຖອດ <xliff:g id="NAME">^1</xliff:g> ອອກ ໃນ​ຂະ​ນະ​ທີ່​ກຳ​ລັງ​ຟໍ​ແມັດ."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ຍ້າຍ​ຂໍ້​ມູນ​ໄປ​ບ່ອນ​ຈັດ​ເກັບ​ໃໝ່"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"ທ່ານ​ສາ​ມາດ​ຍ້າຍ​ຮູບ, ໄຟ​ລ໌, ແລະ​ແອັບ​ຂອງ​ທ່ານ​ໄປ​ໃສ່ <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="5035719146373359329"><b>"ການ​ຍ້າຍ​ໃຊ້​ເວ​ລາ​ປະ​ມານ <xliff:g id="TIME">^1</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="8641916179067596592">"ໃນ​ລະ​ຫວ່າງ​ການ​ຍ້າຍ: \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_move_confirm_title" msgid="292782012677890250">"ຍ້າຍ <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"ການ​ຍ້າຍ <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="4288580957960820740">"ຢ່າ​ເອົາ <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="battery_status_title" msgid="9159414319574976203">"ສະຖານະແບັດເຕີຣີ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ລະດັບແບັດເຕີຣີ"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"ການຕັ້ງຄ່າເຄືອຂ່າຍຖືກຕັ້ງຄືນແລ້ວ"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"ອັນ​ນີ້​ຈະ​ຕັ້ງ​ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ທັງ​ໝົດ​ຄືນ​ໃໝ່, ລວມ​ທັງ:\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="4874737348054213767">"ຕັ້ງຄືນທຸກການຕັ້ງຄ່າເຄືອຂ່າຍບໍ? ທ່ານບໍ່ສາມາດບໍ່​ເຮັດການດຳເນີນການນີ້ໄດ້!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ຕັ້ງຄືນການຕັ້ງຄ່າ"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ຕັ້ງຄືນບໍ?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"​ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ຖືກຕັ້ງ​ຄ່າ​ຄືນ​ໃໝ່​ແລ້ວ."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"​ຣີ​ເຊັດ​ອຸ​ປະ​ກອນ"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ຣີເຊັດຄ່າຈາກໂຮງງານ"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"ລຶບຂໍ້ມູນທຸກຢ່າງໃນແທັບເລັດ"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"ລຶບຂໍ້ມູນທັງໝົດໃນໂທລະສັບ"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຈາກ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງແທັບເລັດທ່ານ, ຮວມເຖິງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນລະບົບ ແລະແອັບພລິເຄຊັນ ແລະການຕັ້ງຄ່າ"</li>\n<li>"ແອັບຯທີ່ດາວໂຫລດມາ"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດໃນ "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ລຶບຂໍ້ມູນທັງໝົດໃນ SD card ເຊັ່ນ: ເພງ ແລະຮູບພາບ"</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="7209547812233487345">"ຕ້ອງ​ການ​ລຶບ​ຂໍ້​ມູນ​ສ່ວນ​ໂຕ ແລະ​ແອັບຯ​ທີ່​ດາວ​ໂຫລດ​ມາ​ທັງໝົດ​ບໍ່? ທ່ານ​ຈະ​ບໍ່​ສາມາດ​ເອົາ​ກັບ​ຄືນ​ມາ​ໄດ້​ອີກ!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"​ລຶບ​ຂໍ້​ມູນ​ສ່ວນ​ໂຕ ແລະ​ແອັບທີ່​ດາວ​ໂຫລດ​ມາ​ທັງໝົດ​ບໍ? ທ່ານ​ຈະ​ບໍ່​ສາມາດບໍ່​ເຮັດ​ການ​ກະ​ທຳ​ນີ້ໄດ້​ອີກ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ລຶບທຸກສິ່ງທຸກຢ່າງ"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ທ່ານຕ້ອງແຕ້ມລະຫັດປົດລັອກຂອງທ່ານ ເພື່ອຢືນຢັນການຣີເຊັດຄ່າຈາກໂຮງງານ."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"ບໍ່ໄດ້ດຳເນີນການຣີເຊັດເທື່ອ ເນື່ອງຈາກບໍລິການ System Clear ບໍ່ສາມາດເຮັດວຽກໄດ້."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ຕ້ອງການຣີເຊັດບໍ່?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ຜູ່​ໃຊ້​ນີ້​ບໍ່​ສາ​ມາດ​ຣີ​ເຊັດ​ຄ່າ​ໂຮງ​ງານ​​ໄດ້"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"ລຶບບ່ອນຈັດເກັບຂໍ້ມູນ USB, ຕ້ອງການລຶບໄຟລ໌ທັງໝົດທີ່ຈັດເກັບໃນນັ້ນບໍ່? ທ່ານຈະບໍ່ສາມາດເອົາກັບຄືນມາໄດ້ອີກ!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"ລຶບຂໍ້ມູນໃນ SD card, ລຶບທຸກໄຟລ໌ທີ່ເກັບໄວ້ໃນນັ້ນບໍ່? ທ່ານຈະບໍ່ສາມາດຍົກເລີກການກະທຳນີ້ໄດ້!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ລຶບທຸກສິ່ງທຸກຢ່າງ"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"ທ່ານຕ້ອງແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານ ເພື່ອຢືນຢັນວ່າທ່ານຕ້ອງການລຶບບ່ອນຈັດເກັບຂໍ້ມູນ USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"ທ່ານຕ້ອງແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານ ເພື່ອຢືນຢັນວ່າທ່ານຕ້ອງການລຶບ SD card."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ຊ່ວຍເຫຼືອ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"ເຄືອ​ຂ່າຍ​ມື​ຖື"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ແພັກເກດມືຖື"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"ແອັບຯ 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ໂຫມດຂໍ້ມູນສະຖານທີ່"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ໃຊ້ GPS, Wi‑Fi ແລະ​ເຄືອ​ຂ່າຍ​ມື​ຖືເພື່ອ​ລະ​ບຸ​ຕຳ​ແໜ່ງ​ທີ່​ຢູ່"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ໃຊ້ເຄືອ​ຂ່າຍ Wi‑Fi ແລະ​ມື​ຖື​ເພື່ອ​ລະ​ບຸ​ຕຳ​ແໜ່ງ​ທີ່​ຢູ່"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ນຳໃຊ້ GPS ເພື່ອລະບຸຂໍ້ມູນສະຖານທີ່ຂອງທ່ານ"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ໃຊ້ GPS ເພື່ອກຳ​ນົດ​ທີ່​ຕັ້ງຂອງທ່ານ"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"ກຳລັງສະແກນ"</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="2070686681074461301">"ປັບ​ປຸງ​ທີ່​ຕັ້ງໂດຍ​ການ​ອະ​ນຸ​ຍາດ​ໃຫ້ແອັບ ແລະການ​ບໍ​ລິ​ການສະ​ແກນ​ຫາ​ເຄືອ​ຂ່າຍ Wi‑Fi ແມ້​ແຕ່​ເມື່ອ Wi‑Fi ປິດ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ການ​ສະ​ແກນ Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"​ປັບ​ປຸງ​ທີ່​ຕັ້ງໂດຍ​ການ​ອະ​ນຸ​ຍາດ​ໃຫ້ການ​ບໍ​ລິ​ການລະ​ບົບ​ສະ​ແກນ​ຫາ​ອຸ​ປະ​ກອນ Bluetooth, ແມ້​ວ່າ ເມື່ອ Bluetooth ປິດ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ທີ່​ຢູ່​ເຄືອ​ຂ່າຍ​ມື​ຖື"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ໃຫ້ແອັບຯຕ່າງໆໃຊ້ບໍລິການສະຖານທີ່ຂອງ Google ເພື່ອປະເມີນສະຖານທີ່ຂອງທ່ານໄດ້ໄວຂຶ້ນ. ຂໍ້ມູນສະຖານທີ່ທີ່ບໍ່ລະບຸໂຕຕົນຈະຖືກເກັບກຳ ແລະສົ່ງໃຫ້ Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ສະຖານທີ່ທີ່ລະບຸໂດຍ Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"ຄວາມ​ປອດ​ໄພໜ້າ​ຈໍ"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ໃຊ້​ຮູບ​ແບບ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ ເພື່ອ​ສືບ​ຕໍ່."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ປ້ອນ PIN ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ ເພື່ອ​ສືບ​ຕໍ່."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ປ້ອນ​ລະ​ຫັດ​ຜ່ານ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ ເພື່ອ​ສືບ​ຕໍ່."</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_need_to_unlock" msgid="757935356911054465">"ຢືນຢັນຮູບແບບທີ່ບັນທຶກ"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"ລອງໃໝ່ອີກຄັ້ງ:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"ການພະຍາຍາມຜິດພາດຫຼາຍຄັ້ງເກີນໄປ!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"ລອງໃໝ່ອີກຄັ້ງໃນ <xliff:g id="NUMBER">%d</xliff:g> ວິນາທີ."</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="manageapplications_settings_title" msgid="7041951105633616745">"ຈັດການແອັບຯ"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ຈັດການແລະລຶບແອັບຯທີ່ຕິດຕັ້ງແລ້ວ"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"ການໃຊ້ພື້ນທີ່ຈັດເກັບຂໍ້ມູນ"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"ເບິ່ງພື້ນທີ່ຈັດເກັບຂໍ້ມູນທີ່ໃຊ້ໂດຍແອັບຯ"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"ບໍລິການທີ່ເຮັດວຽກຢູ່"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ຂໍ້ມູນແທັບເລັດ"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ຂໍ້​ມູນ​ໂທລະ​ສັບ"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"ຂໍ້ມູນແບັດເຕີຣີ"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"ການເປີດດ່ວນ"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"ຕັ້ງທາງລັດແປ້ນພິມເພື່ອເປີດໃຊ້ແອັບຯ"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"ກຳນົດແອັບຯ"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"ບໍ່ມີທາງລັດ"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"ຊອກຫາ + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"ລຶບ"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"ທາງລັດຂອງທ່ານສຳລັບ <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) ຈະຖືກລຶບອອກ."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ຕົກລົງ"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ຍົກເລີກ"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"ແອັບຯ"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"ທາງລັດ"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ເກັບກຳທຸກແພັກເກັດໃນໄຟລ໌ bluetooth HCI"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"ການ​ປົດ​ລັອກ OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ອະ​ນຸ​ຍາດ​ໃຫ້​ປົດ​ລັອກ​ບູດ​ໂຫຼດ​ເດີ"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"​ປ້ອນ​ລະ​ຫັດ​ PIN ຂອງ​ທ່ານ"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"​ປ້ອນ​ລະ​ຫັດ PIN ​ຂອງ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ເພື່ອ​ເປີດ​ນຳ​ໃຊ້​ການ​ປົດ​ລັອກ OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"ອະ​ນຸ​ຍາດ​ການ​ປົກ​ລັອກ OEM ບໍ?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ຄຳ​ເຕືອນ: ຄຸນ​ສົມ​ບັດ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ເຮັດ​ວຽກຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ນີ້ ໃນ​ຂະ​ນະ​ທີ່​ການ​ຕັ້ງ​ຄ່ານີ້​ເປີດ​ຢູ່."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ຂະ​ໜາດ​​ບັບ​ເຟີໂຕ​ລັອກ"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ເລືອກ​ຂະ​ໜາດ​ລັອກ​ຕໍ່​ບັບ​ເຟີ"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"ເປີດ​ນຳ​ໃຊ້​ການກວດ​ສອບ​ຄຸນ​ສົມ​ບັດ​ມຸມມອງ"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ການ​ສ້າງເຄືອຂ່າຍ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ສະແດງການຮັບຮອງຂອງລະບົບໄຮ້ສາຍ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"​ເປີດ​ນຳ​ໃຊ້ການ​ເກັບ​ປະ​ຫວັດ​ Verbose Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ໃຫ້​ບຸລິມະສິດ​ການ​ປ່ຽນ​ຈາກ Wi-Fi ເປັນ​ເຄືອ​​ຂ່າຍ​ໂທ​ລະ​ສັບ"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"ອະ​ນຸ​ຍາດ​ການ​ສະ​ແກນ​ການ​ໂຣມ Wi‑Fi ​ສະ​ເໝີ"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"ໃຊ້​ລູກ​ຄ້າ DHCP ຕຳ​ນານ"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ສະແດງໂຕເລືອກສຳລັບການສະແດງການຮັບຮອງລະບົບໄຮ້ສາຍ"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"ເພີ່ມ​ລະ​ດັບ​ການ​ເກັບ​ປະ​ຫວັດ Wi‑Fi, ສະ​ແດງ​ຕໍ່ SSID RSSI ​ໃນ​ Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ເມື່ອ​ເປີດ​ນຳ​ໃຊ້​ແລ້ວ, ເຄືອ​ຂ່າຍ Wi-Fi ຈະ​ຖືກ​ປ່ຽນ​ໄປ​ໃຊ້​ເຄືອ​ຂ່າຍ​ໂທ​ລະ​ສັບ​ແທນ​ຫາກ​ສັນ​ຍານ Wi-Fi ອ່ອນ"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"​ອະ​ນຸ​ຍາດ/ບໍ່​ອະ​ນຸ​ຍາດການ​ສະ​ແກນ​ການ​ໂຣມ Wi-Fi ອີງ​ຕາມ​ຈຳ​ນວນ​ຂໍ້​ມູນທີ່​ເກີດ​ຂຶ້ນ​ໃນ​ລະ​ດັບ​ສ່ວນ​ຕິດ​ຕໍ່"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"ຂະ​ໜາດ​​ບັບ​ເຟີໂຕ​ລັອກ"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ເລືອກ​ຂະ​ໜາດ​ລັອກ​ຕໍ່​ບັບ​ເຟີ"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"​ເລືອກ​ການ​ຕັ້ງ​ຄ່າ USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"​ເລືອກ​ການ​ຕັ້ງ​ຄ່າ USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"ເປີດ​ນຳ​ໃຊ້​ການກວດ​ສອບ​ຄຸນ​ສົມ​ບັດ​ມຸມມອງ"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ໃຊ້​ລູກ​ຄ້າ DHCP ຈາກ Lollipop ແທນ​ລູກ​ຄ້າ Android DHCP ໃໝ່."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"ອະນຸຍາດໃຫ້ດີບັ໊ກຜ່ານ USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"ການດີບັ໊ກຜ່ານ USB ແມ່ນມີຈຸດປະສົງເພື່ອການພັດທະນາເທົ່ານັ້ນ. ມັນສາມາດໃຊ້ເພື່ອສຳເນົາຂໍ້ມູນລະຫວ່າງຄອມພິວເຕີ ແລະອຸປະກອນຂອງທ່ານ, ຕິດຕັ້ງແອັບຯໂດຍບໍ່ຜ່ານການແຈ້ງເຕືອນ ແລະອ່ານຂໍ້ມູນການບັນທຶກ."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"ຖອດຖອນການເຂົ້າເຖິງການດີບັ໊ກຜ່ານ USB ຈາກຄອມພິວເຕີທຸກເຄື່ອງ ທີ່ທ່ານເຄີຍອະນຸຍາດກ່ອນໜ້ານີ້?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"ແດງມ່ວງ"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ຕ້ອງການ:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"ເພາະ​ວ່າ​ແອັບຯ​ກຳ​ລັງ​ຂັດ​ຂວາງ​ການ​ຂໍ​ອະ​ນຸ​ຍາດ, ການ​ຕັ້ງ​ຄ່າ​ບໍ່​ສາ​ມາດກວດ​ສອບ​ການ​ຕອບ​ຮັບ​ຂອງ​ທ່ານ​ໄດ້."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ຫາກ​ທ່ານ​ເປີດ​ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>, ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ໃຊ້​ການ​ລັອກ​ໜ້າ​ຈໍ​ຂອງ​ທ່ານ​ເພື່ອ​ເພີ່ມ​ການ​ເຂົ້າ​ລະ​ຫັດ​ຂໍ້​ມູນ."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"​ເນື່ອງ​ຈາກ​ທ່ານ​ໄດ້​ເປີດ​ບໍ​ລິ​ການ​ການ​ຊ່ວຍ​ການ​ເຂົ້າ​ເຖິງ, ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ໃຊ້​ການ​ລັອກ​ໜ້າ​ຈໍ​ຂອງ​ທ່ານ​ເພື່ອ​ເພີ່ມ​ການ​ເຂົ້າ​ລະ​ຫັດ​ຂໍ້​ມູນ."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"ເພາະ​ວ່າ​ການ​ເປີດ <xliff:g id="SERVICE">%1$s</xliff:g> ມີ​ຜົນ​ຕໍ່​ການ​ເຂົ້າ​ລະ​ຫັດ, ​ທ່ານ​ຈຶ່ງ​ຈຳ​ຕ້ອງ​ຢືນ​ຢັນ​ຮູບ​ແບບ​ການ​ລັອກ​ຂອງ​ທ່ານ."</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> ແອັບຯໃນໄລຍະເວລາ <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> ໃນ <xliff:g id="TOTALRAM">%2$s</xliff:g> ໄດ້​ນຳ​ໃຊ້​ຕະ​ຫຼອດ <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</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_memory_status" msgid="4251599550196193093">"ໜ່ວຍຄວາມຈຳຂອງອຸປະກອນຕອນນີ້ແມ່ນ <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"ການນຳໃຊ້ RAM ໂດຍສະເລ່ຍ"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ການນຳໃຊ້ RAM ສູງສຸດ"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"ປະ​ມວນ​ຜົນ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"ບໍລິການ"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ໄລຍະເວລາ"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"​ລາຍ​ລະ​ອຽດ​ໜ່ວຍ​ຄວາມ​ຈຳ"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"ເຊື່ອງ​ລະ​ບົບ"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ການຕັ້ງຄ່າເລີ່ມຕົ້ນດ້ານລຸ່ມ ຈະຖືກໃຊ້ແທນທີ່ການຕັ້ງຄ່າຂອງແອັບຯ"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"ການຕັ້ງຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"ລະບົບເລີ່ມຕົ້ນ"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"ຕັ້ງຄ່າລະບົບການສະເຄາະສຽງເພື່ອໃຊ້ກັບຂໍ້ຄວາມທີ່ເວົ້າ"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"ເລືອກລະບົບການສັງເຄາະສຽງເວົ້າເພື່ອໃຊ້ໃນການອ່ານຂໍ້ຄວາມ"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"ອັດຕາການເວົ້າ"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"ຄວາມໄວໃນການເວົ້າຂໍ້ຄວາມ"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ໂທນສຽງ"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"ທ່ານຕ້ອງແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານ ເພື່ອຢືນຢັນການຕິດຕັ້ງຂໍ້ມູນຮັບຮອງ."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ພິມລະຫັດຜ່ານຂອງບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"ລະຫັດຜ່ານປັດຈຸບັນ:"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"ບໍ່ມີບັນຊີໃດໃນປັດຈຸບັນທີ່ຈັດເກັບຂໍ້ມູນສຳຮອງໄວ້"</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="5355557151569037197">"ການ​ບໍ​ລິ​ການ​ສຳຮອງຂໍ້ມູນ​ບໍ່ເປີດໃຊ້."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"ອັນ​ນີ້​ຖືກ​ຕັ້ງ​ໂດຍ​ນະ​ໂຍ​ບາຍ​ຂອງອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ລະຫັດຜ່ານການສຳຮອງຂໍ້ມູນເດັກສະທັອບ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ການ​ສຳຮອງ​ຂໍ້ມູນ​ເຕັມຮູບແບບ​ໃນ​ເດັກສະທັອບ​ຍັງ​ບໍ່​ໄດ້​ຮັບ​ການ​ປ້ອງກັນ​ໃນ​ເວລາ​ນີ້"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ແຕະເພື່ອປ່ຽນ ຫຼືລຶບລະຫັດຂອງການສຳຮອງຂໍ້ມູນເຕັມຮູບແບບໃນເດັກສະທັອບ"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"ຂະໜາດສະລັບອະນິເມຊັນ"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"ໄລຍະເວລາອະນິເມຊັນ"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"ຈຳລອງຈໍສະແດງຜົນທີ່ສອງ"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"ໂໝດ​ຫຼາຍ​ໜ້າ​ຕ່າງ"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"ຫຼາຍ​ກິດ​ຈະ​ກຳ​ຢູ່​ເທິງ​ໜ້າ​ຈໍ​ໃນ​ເວ​ລາ​ດຽວ​ກັນ."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"ເປີດ​ໃຊ້​ງານ​ໂໝດ​ຫຼາຍ​ໜ້າ​ຕ່າງ?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ຄຳ​ເຕືອນ: ​ນີ້​ແມ່ນ​ຄຸນ​ສົມ​ບັດ​ທົດ​ລອງ​ຂັ້ນ​ສູງ​ທີ່​ອະ​ນຸ​ຍາດ​ໃຫ້​ມີ​ຫຼາຍ​ກິດ​ຈະ​ກຳ​ຢູ່​ເທິງ​ໜ້າ​ຈໍ​ໃນ​ເວ​ລາ​ດຽວ​ກັນ​ຜ່ານ​ UI ແອັບ​ປະ​ຈຸ​ບັນ. ບາງ​ແອັບ​ອາດ​ຈະ​ເກີດ​ຂັດ​ຂ້ອງ ແລະ​ບໍ່​ໃຊ້​ງານ​ໄດ້​ຢ່າງ​ຖືກ​ຕ້ອງ ເມື່ອ​ໃຊ້​ກັບ​ຄຸນ​ສົມ​ບັດ​ນີ້."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"ແອັບຯ"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"ບໍ່ຕ້ອງຮັກສາການເຮັດວຽກ"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ລຶບທຸກການເຄື່ອນໄຫວທັນທີທີ່ຜູ່ໃຊ້ອອກຈາກມັນ"</string>
@@ -2195,7 +2251,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="718192651887726259">"ທ່ານ​ສາ​ມາດ​ແບ່ງ​ປັນ​ອຸ​ປະ​ກອນ​ນີ້​ໃຫ້​ຄົນ​ອື່ນ​ໃຊ້​ໄດ້​ໂດຍ​ການ​ສ້າງ​ຜູ່​ໃຊ້​ເພີ່ມ​ເຕີມ. ແຕ່​ລະ​ຜູ່​ໃຊ້​ຈະ​ມີ​ພື້ນ​ທີ່​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ເຂົາ​ເຈົ້າ​ເອງ​ເຊິ່ງ​ພວກ​ເຂົາ​ຈະ​ສາ​ມາດ​ຈັດ​ລະ​ບຽບ​ແອັບຯ, ຮູບ​ພາບ​ພື້ນຫຼັງ ແລະ​ອື່ນໆ​ຂອງ​ເຂົາ​ເຈົ້າ​ໄດ້. ຜູ່​ໃຊ້​ຕ່າງໆ​ຍັງ​ຈະ​ສາ​ມາດ​ປັບ​ແຕ່ງ​ການ​ຕັ້ງ​ຄ່າ​ຂອງ​ອຸ​ປະ​ກອນ​ໄດ້​ ເຊັ່ນ: 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"ອະ​ນຸ​ຍາດ​ໃຫ້​ໂທ​ລະ​ສັບ"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"ອະ​ນ​ຸ​ຍາດ​ໃຫ້​ໂທ​ລະ​ສັບ​ແລະ​ສົ່ງ 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="440218975766968124">"ອະ​ນຸ​ຍາດ​ໃຫ້​ໂທ​ລະ​ສັບ​ບໍ່?"</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_sms_confirm_title" msgid="188164598768941316">"ອະ​ນ​ຸ​ຍາດ​ໃຫ້​ໂທ​ລະ​ສັບ​ແລະ​ສົ່ງ SMS ບໍ່?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"ປະ​ຫວັດ​ການ​ໂທ​ ແລະ​ການ​ສົ່ງ 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="application_restrictions" msgid="8207332020898004394">"ອະນຸຍາດແອັບຯ ແລະເນື້ອຫາ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ແອັບພລິເຄຊັນທີ່ມີຂໍ້ຈຳກັດ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ຂະຫຍາຍການຕັ້ງຄ່າສຳລັບແອັບພລິເຄຊັນ"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"ແອັບຯນີ້ບໍ່ຮອງຮັບການນຳໃຊ້ໃນໂປຣໄຟລ໌ທີ່ຖືກຈຳກັດ"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"​ຂໍ້​ຄວາມ ການ​ສົ່ງ​ຂໍ້​ຄວາມ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ເຄືອ​ຂ່າຍ​ໂທ​ລະ​ສັບ ເຄືອ​ຂ່າຍ ຜູ່​ໃຫ້​ບໍ​ລິ​ການ ໄຮ້​ສາຍ ຂໍ້​ມູນ 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"ການ​ໂທ​ໂທ wifi wi-fi"</string>
     <string name="keywords_home" msgid="3626170808219458848">"​ລອນ​ເຊີ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ໜ້າຈໍ ໜ້າຈໍສຳຜັດ"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"​ຄ່ອຍ​ແສງ​ໜ້າ​ຈໍ ໜ້າ​ຈໍ​ແຕະ ແບັດ​ເຕີ​ຣີ"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"​ຄ່ອຍ​ແສງ​ໜ້າ​ຈໍ ໜ້າ​ຈໍ​ແຕະ ແບັດ​ເຕີ​ຣີ"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"​ພາບ​ພື້ນຫຼັງ ປັບ​ແຕ່ງ​ສ່ວນ​ຕົວ ປັບ​ແຕ່ງ ການ​ສະ​ແດງ​ຜົນ"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ສີ​ສັນ​ມືດ ໂໝດ​ກາງ​ຄືນ ໜ້າ​ຈໍ​ລີ່ ຄວາມ​ແຈ້ງ​ປີ້ນ​ຄືນ"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"ພາບ​ພື້ນ​ຫຼັງ ເຮັດ​ເປັນ​ສ່ວນ​ຕົວ ປັບ​ແຕ່ງ​ເອງ ສະ​ແດງ​ຜົນ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ຂະ​ໜາດ​ໂຕ​ອັກ​ສອນ"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ໂປຣເຈັກ"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"ການຄາສທ໌ໂຄງ​ການ"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"​ພື້ນ​ທີ່​ວ່າງ ດິສ ບ່ອນ​ເກັບ​ຂໍ້​ມູນ ອຸ​ປະ​ກອນ ນຳ​ໃຊ້"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"ການ​ໃຊ້​ ພະ​ລັງ​ງານ ສາກໄຟ"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"​ການ​ສະ​ກົດ​ຄຳ ວັດ​ຈະ​ນາ​ນຸ​ກົມ ການກວດ​ການ​ສະ​ກົດ ການ​ແກ້​ໄຂ​ຄຳ​ຜິດ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"ບັນຊີ"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ການຫ້າມ ຫ້າມ ຖືກຫ້າມ"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"​ແກ້​ໄຂ ຂໍ້​ຄວາມ ແກ້​ໄຂ ສຽງ ສັ່ນ​ເຕືອນ ອັດ​ຕະ​ໂນ​ມັດ ພາ​ສາ ແນະ​ນຳ ການ​ແນະ​ນຳ ຮູບ​ແບບ​ສີ​ສັນ ຄຳ ຫຍາບ​ຄາຍ ປະ​ເພດ ອີ​ໂມ​ຈິ ສາ​ກົນ"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"ຕັ້ງ​ການ​ຕັ້ງ​ຄ່າ​ມາດ​ຕະ​ຖານ​ຄວາມ​ມັກ​ໃໝ່"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"ຄ່າເລີ່ມຕົ້ນຂອງແອັບ​ນໍ້າກ້ອນ​ສຸກ​ເສີນ"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"ດາວ​ໂຫຼດ​ແອັບ ລະ​ບົບ​ແອັບ​ພ​ລິ​ເຄ​ຊັນ"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ຄວາມ​ປອດ​ໄພ​ການ​ອະ​ນຸ​ຍາດ​ແອັບ"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ມາດ​ຕະ​ຖານ​ແອັບ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ສະ​ໄລ້ ລະ​ຫັດ​ຜ່ານ ຮູບ​ແບບ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ຕັ້ງ​ຄ່າ​ແທັກ Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"ຂຽນ"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"ການລົບກວນ"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"​ເມື່ອ​ມີ​ການ​ໂທ ຫຼື​ການ​ແຈ້ງ​ເຕືອນ​ເຂົ້າ​ມາ"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"ອະນຸຍາດໃຫ້ລົບກວນໄດ້ຕະຫຼອດ"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ອະນຸຍາດ​ສະເພາະ​ການ​ລົບກວນ​ທີ່​ສຳຄັນ"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ບໍ່​ອະນຸຍາດ​ໃຫ້​ມີ​ການ​ລົບກວນ​ເລີຍ"</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_option_important_interruptions" msgid="3903928008177972500">"ບຸ​ລິ​ມະ​ສິດເທົ່າ​ນັ້ນ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ບໍ່​ມີ​ການ​ລົບກວນ"</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="ringtone_title" msgid="5379026328015343686">"ຣິງໂທນໂທລະສັບ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"​ຣິງ​ໂທນ​ແຈ້ງ​ເຕືອນ​ເລີ່ມ​ຕົ້ນ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ສັ່ນ​ເຕືອນ​ເມື່ອ​ມີ​ການ​ໂທ​ເຂົ້າ"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ສັ່ນເຕືອນ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"ການ​ເຂົ້າ​ເຖິງ​ການ​ແຈ້ງ​ເຕືອນ"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ແອັບຯບໍ່ສາມາດອ່ານການແຈ້ງເຕືອນໄດ້"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d ແອັບຯສາມາດອ່ານການແຈ້ງເຕືອນໄດ້"</item>
-    <item quantity="other" msgid="980049191810249052">"%d ແອັບຯສາມາດອ່ານການແຈ້ງເຕືອນໄດ້"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d ແອັບສາມາດອ່ານການແຈ້ງເຕືອນໄດ້</item>
+      <item quantity="one">%d  ແອັບສາມາດອ່ານການແຈ້ງເຕືອນໄດ້</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"ບໍ່ໄດ້ຕິດຕັ້ງໂຕຟັງການແຈ້ງເຕືອນ."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"ເປີດໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ຈະສາມາດອ່ານທຸກການແຈ້ງເຕືອນທີ່ມາຈາກລະບົບ ຫຼືແອັບຯໃດໆກໍຕາມທີ່ມີຕິດຕັ້ງຢູ່ ເຊິ່ງອາດຮວມເຖິງຂໍ້ມູນສ່ວນໂຕ ເຊັ່ນ: ລາຍຊື່ຜູ່ຕິດຕໍ່ ແລະຂໍ້ຄວາມທີ່ສົ່ງຫາທ່ານ. ມັນຍັງສາມາດປິດການແຈ້ງເຕືອນເຫຼົ່ານີ້ ຫຼືແຕະປຸ່ມເຮັດວຽກທີ່ຢູ່ພາຍໃນນັ້ນໄດ້ນຳ."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"ຜູ້​ໃຫ້​ບໍລິການ​ເງື່ອນ​ໄຂ"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ບໍ່​ມີ​ແອັບຯ​ລະ​ບຸ​ເງື່ອນ​ໄຂ"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d ແອັບຯ​ລະ​ບຸ​ເງື່ອນ​ໄຂ"</item>
-    <item quantity="other" msgid="358057362115673258">"%d ແອັບຯ​ລະ​ບຸ​ເງື່ອນ​ໄຂ"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"ບໍ່​ມີ​ຜູ່​ໃຫ້​ບໍລິການ​ເງື່ອນ​ໄຂ​ທີ່​ຕິດ​ຕັ້ງ​ໄວ້."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"ເປີດ​ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ຈະ​ສາມາດ​ເພີ່ມ​ເງື່ອນ​ໄຂ​ການ​ອອກ​ຈາກ​ໂໝດ​ຫ້າມ​ລົບ​ກວນ​ໄດ້."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"​ກຳ​ລັງ​ໂຫລດ​ແອັບຯ..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"ບລັອກ"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"ບ​ລັອກ​ທັງ​ໝົດ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ບໍ່​ຕ້ອງ​ສະ​ແດງ​ການ​ແຈ້ງ​ເຕືອນ​ຈາກ​ແອັບຯ​ນີ້"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"ລະດັບຄວາມສຳຄັນ"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"​ສະ​ແດງ​ການ​ແຈ້ງ​ເຕືອນ​ຢູ່​ເທິງ​ສຸດ​ຂອງ​ລາຍ​ຊື່​ແລະໃຫ້​ຮັບ​ມາ​ເລື້ອຍໆ​ເມື່ອ​ອຸ​ປະ​ກອນ​ຖືກ​ຕັ້ງ​ເປັນ​ການ​ລົບ​ກວ​ນ​ທີ່​ສຳ​ຄັ​ນເທົ່າ​ນັ້ນ"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"​ລະ​ອຽດ​​ອ່ອນ"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"ເມື່ອ​ອຸ​ປະ​ກອນ​ຖືກ​ລັອກ, ໃຫ້​ເຊື່ອງ​ເນື້ອ​ຫາ​ໃດໆ​ທີ່​ມີ​ຄວາມ​​ລະ​ອຽດ​ອ່ອນ​ຈາກ​ການ​ແຈ້ງ​ເຕືອນ​ຂອງ​ແອັບຯ​ນີ້"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"ປະ​ຕິ​ບັດ​ເປັນ​ບຸ​ລິ​ມະ​ສິດ"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"ປ່ອຍ​ໃຫ້​ການ​ແຈ້ງ​ເຕືອນ​ຂອງ​ແອັບ​ນີ້​ໃຫ້​ໄດ້​ຍິນ ເມື່ອ​ຫ້າມ​ລົບ​ກວນ​ຖືກ​ຕັ້ງ​ເປັນ​ບຸ​ລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"ອະ​ນຸ​ຍາດ​ການ​ລັກ​ເບິ່ງ"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ປ່ອຍ​ໃຫ້​ແອັບ​ນີ້​ເນັ້ນ​ໜັກ​ການ​ແຈ້ງ​ເຕືອນ​ສະ​ເພາະ​ໂດຍ​ການ​ເລື່ອນ​ພວກ​ມັນ​ໄວໆ​ໄປ​ໃສ່​ມຸມມອງ​ຢູ່​ໜ້າ​ຈໍ​ປະ​ຈຸ​ບັນ"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"ເຊື່ອງ​ເນື້ອ​ໃນ​ລະ​ອຽດ​ອ່ອນ"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"ເມື່ອ​ອຸ​ປະ​ກອນ​ຖືກ​ລັອກ, ເຊື່ອງ​ເນື້ອ​ໃນ​ຢູ່​ໃນການ​ແຈ້ງ​ເຕືອນ​ຂອງ​ແອັບ​ນີ້ ທີ່​ອາດ​ຈະ​ເປີດ​ເຜີຍ​ຂໍ້​ມູນ​ສ່ວນ​ຕົວ"</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="zen_mode_default_option" msgid="6940069025071935243">"ຈົນກວ່າ​ທ່ານ​ຈະ​ປິດ​"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"ການ​ລົບກວນ​ສຳຄັນ"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"​ເວ​ລາ​ປິດ​ເຮັດ​ວຽກ"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ມື້"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ບໍ່ມີ"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"ອະ​ນຸ​ຍາດ​ໃຫ້​ລົບ​ກວນ​ໄດ້"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"​ສະ​ເພາະ​ທີ່​ສຳ​ຄັນ​ເທົ່າ​ນັ້ນ"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ບໍ່ມີ"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"ລະບົບ​ອັດຕະໂນມັດ"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ເປີດ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"ຊື່​ເງື່ອນ​ໄຂ"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"ຕື່ມເງື່ອນໄຂ"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ລຶບ​ເງື່ອນ​ໄຂ"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"ລຶບ​ເງື່ອນ​ໄຂ \"<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="3201273040477861538">"ກົດ​ການ​ກຳ​ນົດ​ເວ​ລາ"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"ບໍ່​ພົບ​ເງື່ອນ​ໄຂ."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ບໍ່​ໃຊ້"</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_from" msgid="1033337300289871697">"ໂທ​ລະ​ສັບ/ຂໍ້​ຄວາມ​ ຈາກ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ທຸກຄົນ"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"ສະເພາະ​ໃນ​ລາຍຊື່​ຜູ່​ຕິດຕໍ່"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"ສະ​ເພາະ​ຜູ່​ທີ່​ຕິດ​ດາວ"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"​ນັດ​ໝາຍ ແລະ ການ​ແຈ້ງ​ເຕືອນ"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"​ໂມງ​ປຸກ​ແມ່ນ​ຖື​ເປັນ​ການ​ລົບ​ກວນ​ທີ່​ສຳ​ຄັນ"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"ໂມງປຸກ"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"ການແຈ້ງເຕືອນ"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ກິດຈະກຳ"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ຜູ້​ໂທ​ທີ່​ເລືອກ​ໄວ້"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ຊ້ຳ​ຄືນ​ຜູ້​ໂທ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ຖ້າ​ຄົນ​ດຽວ​ກັນ​ໂທ​ເປັນ​ຄັ້ງ​ທີ​ສອງ​ພາຍ​ໃນ​ໄລ​ຍະ​ເວ​ລາ <xliff:g id="MINUTES">%d</xliff:g> ວິ​ນາ​ທີ, ອະ​ນຸ​ຍາດ​ໃຫ້​ມັນ​ໄດ້"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ເປີດ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ບໍ່ໃຊ້"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ວັນ​ຕໍ່​ໄປ"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ຫຼື​ການ​ເຕືອນ​ໃດ​ໜຶ່ງ​ກ່ອນນີ້"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"ການລົບກວນ"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"​ເມື່ອ​ມີ​ການ​ໂທ ຫຼື​ການ​ແຈ້ງ​ເຕືອນ​ເຂົ້າ​ມາ"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"ທ່ານ​ຢາກ​ຈະ​ໃຫ້​ຖືກ​ຂັດ​ຈັງ​ຫວະ​ເມື່ອ​ໃດ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ດົນ​ປານ​ໃດ?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"ອະນຸຍາດໃຫ້ລົບກວນໄດ້ຕະຫຼອດ"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ປິດ,ທັງ​ໝົດ,ທຸກ​ຢ່າງ"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"ອະນຸຍາດ​ສະເພາະ​ການ​ລົບກວນ​ທີ່​ສຳຄັນ"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"ອະ​ນຸ​ຍາດ​ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນ"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"ບໍ່​ອະນຸຍາດ​ໃຫ້​ມີ​ການ​ລົບກວນ​ເລີຍ"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"ຢ່າງ​ບໍ່​ມີ​ກຳນົດ"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ນາ​ທີ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ນາ​ທີ</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"ປ່ຽນ​ເປັນ​ການ​ແຈ້ງ​ເຕືອນ​ບຸ​ລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ​ໂດຍ​ບໍ່​ມີ​ກຳ​ນົດ"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"ປ່ຽນ​ເປັນ​ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນ​ຢ່າງ​ບໍ່​ມີ​ກຳ​ນົດ"</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>
+      <item quantity="one">ປ່ຽນ​ເປັນ​ໂມງ​ປຸກ​ເປັນ​ເວ​ລາໜຶ່ງ​ນາ​ທີ​​ເທົ່າ​ນັ້ນ​ຈົນ​ຮອດ <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">ປ່ຽນ​ເປັນ​ໂມງ​ປຸກ​ເປັນ​ເວ​ລາ <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"ປ່ຽນ​ເປັນ​ຫ້າມ​ຂັດ​ຈັງ​ຫວະ​ໂດຍ​ບໍ່​ມີ​ກຳ​ນົດ"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ປ່ຽນ​ເປັນ​ຂັດ​ຈັງ​ຫວະ​ທຸກ​ຄັ້ງ"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ຕະຫຼອດໄປ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ແຈ້ງ​ເຕືອນ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ສົ່ງ​ຄຳ​ຕິ​ຊົມ​ກ່ຽວ​ກັບ​ອຸ​ປະ​ກອນ​ນີ້"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"ເລີ່ມໃຊ້ຕາມຄ່າເລີ່ມຕົ້ນ"</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="app_launch_domain_links_title" msgid="458956710410857777">"ລິ້ງ​ໂດ​ເມນ"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"ເປີດ URL ໂດ​ເມນ"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"ອະ​ນຸ​ຍາດ​ໃຫ້​ແອັບ​ເປີດ URL ໂດ​ເມນ​ໂດຍ​ກົງ"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL ໂດ​ເມນ​ຮອງ​ຮັບ​ແລ້ວ"</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="410824961149037234">"ຄວາມ​ຈຳ​ທາງ​ໃນ"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"ຄວາມ​ຈຳ​ທາງນອກ"</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="storage_used" msgid="7128074132917008743">"ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ໃຊ້​ແລ້ວ"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"ເປີດ"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"ບລັອກ"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"​ລະ​ອຽດ​​ອ່ອນ"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"ບູ​ລິ​ມະ​ສິດ"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"ບູ​ລິ​ມະ​ສິດ &amp; ລະ​ອຽດ​ອ່ອນ"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ການ​ອະ​ນຸ​ຍາດ​ໃຫ້​ໄປ​ແລ້ວ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ການ​ອະ​ນຸ​ຍາດ​ໃຫ້​ໄປ​ແລ້ວ</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> ໃນ <xliff:g id="COUNT_3">%d</xliff:g> ການ​ອະ​ນຸ​ຍາດ​ແມ່ນ​ໄດ້​ໃຫ້​ແລ້ວ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ການ​ອະ​ນຸ​ຍາດ​ແມ່ນ​ໄດ້​ໃຫ້​ແລ້ວ</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"ຕັ້ງ​ບາງ​ຄ່າ​ເລີ່ມ​ຕົ້ນ​ແລ້ວ"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"ບໍ່ໄດ້ຕັ້ງຄ່າເລີ່ມຕົ້ນເທື່ອ"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"ແອັບຯທັງໝົດ"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"ເປີດຳໃຊ້ງານ​ແລ້ວ"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"​ສ່ວນ​ໂຕ"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"ວຽກ"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ບລັອກ​ແລ້ວ"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ບູ​ລິ​ມະ​ສິດ"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"​ລະ​ອຽດ​​ອ່ອນ"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ກັບ URL ໂດ​ເມນ"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"ຖືກ​ປິດ​ການ​ນຳ​ໃຊ້​ໂດຍ​ຄວບ​ຄຸມ​ລະ​ບົບ"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"​ຂັ້ນ​ສູງ"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"ແອັບທີ່ບໍ່ຮູ້ຈັກ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ເລືອກ​ໂປ​ຣ​ໄຟ​ລ໌"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"ການ​ອະ​ນຸ​ຍາດ​ແອັບ"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ແອັບ​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ການ​ເຂົ້າ​ຫາ​ເພີ່ມ​ເຕີມ"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ແອັບ​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ແລ້ວ"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL ໂດ​ເມນ"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"ຢ່າ​ເປີດ URL ໂດ​ເມນ​ໃດ"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"ເປີດ \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"ເປີດ \'<xliff:g id="DOMAIN">%s</xliff:g>\' ແລະ URL ທີ່​ກ່ຽວ​ຂ້ອງ"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ແອັບ​ສາ​ມາດ​ເປີດ URL ໂດ​ເມນ​ຂອງ​ມັນ​ໄດ້</item>
+      <item quantity="one">ໜຶ່ງ​ແອັບ​ສາ​ມາດ​ເປີດ URL ໂດ​ເມນ​ຂອງ​ມັນ​ໄດ້</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"ບໍ່​ຮັບຮູ້"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"​ແອັບ​ມາດ​ຕະ​ຖານ"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ແອັບ​ບ​ຣາວ​ເຊີ"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ບໍ່​ມີ​ບ​ຣາວ​ເຊີ​ມາດ​ຕະ​ຖານ"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ຄ່າເລີ່ມຕົ້ນ)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ບ່ອນ​ຈັດ​ເກັບ​ແອັບ"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 7614636..3a62787 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Mygtuko paspaudimas"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"nutildyti / įjungti mikrofono garsą"</item>
     <item msgid="1148142988678569310">"projektuoti mediją"</item>
     <item msgid="9130014005474445273">"suaktyvinti VPN"</item>
+    <item msgid="1165192162975045562">"Rašymo ekrano fonas"</item>
+    <item msgid="7129487923652967258">"pagalbinė struktūra"</item>
+    <item msgid="1069023208100114540">"pagalbinė ekrano kopija"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Vietovė"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Nutildyti / įjungti mikrofono garsą"</item>
     <item msgid="5906017727368097853">"Projektuoti mediją"</item>
     <item msgid="2486614710846178542">"Suaktyvinti VPN"</item>
+    <item msgid="5586547561693629602">"Rašymo ekrano fonas"</item>
+    <item msgid="32794179825485062">"Pagalbinė struktūra"</item>
+    <item msgid="7872852746938272552">"Pagalbinė ekrano kopija"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Trumpas"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"prasta"</item>
     <item msgid="4212263919458209842">"kritinė"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Išjungta"</item>
-    <item msgid="5656544177755411222">"Ribotos pertraukos"</item>
-    <item msgid="8735337502532332056">"Nėra pertraukų"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Įprasta"</item>
     <item msgid="866544120205026771">"Vidutinė"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rožinė"</item>
     <item msgid="6131821495505931173">"Raudona"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (medijos perdavimo protokolas)"</item>
+    <item msgid="8856820259201251036">"PTP (nuotraukų perdavimo protokolas)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB eternetas)"</item>
+    <item msgid="2686051673589572111">"Garso šaltinis"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0467d92..f214e5e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -22,10 +22,12 @@
     <string name="allow" msgid="3349662621170855910">"Leisti"</string>
     <string name="deny" msgid="6947806159746484865">"Atmesti"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nežinomas"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Liko atlikti <xliff:g id="STEP_COUNT">%1$d</xliff:g> veiksm. ir būsite kūrėjas."</item>
-    <item quantity="other" msgid="6722953419953594148">"Liko atlikti <xliff:g id="STEP_COUNT">%1$d</xliff:g> veiksm. ir būsite kūrėjas."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Liko atlikti <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> veiksmą ir būsite kūrėjas.</item>
+      <item quantity="few">Liko atlikti <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> veiksmus ir būsite kūrėjas.</item>
+      <item quantity="many">Liko atlikti <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> veiksmo ir būsite kūrėjas.</item>
+      <item quantity="other">Liko atlikti <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> veiksmų ir būsite kūrėjas.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Dabar esate kūrėjas!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nereikia, jūs jau esate kūrėjas."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Belaidis ryšys ir tinklai"</string>
@@ -40,6 +42,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Išjungti SMS per IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Būtina įjungti IMS registraciją"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Būtina išjungti IMS registraciją"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Įjungti „VoLTE“ aprūpinimo žymą"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Išjungti „VoLTE“ aprūpinimo žymą"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Įjungti ilgalaikės raidos laisvosios prieigos atminties išklotinę"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Išjungti ilgalaikės raidos laisvosios prieigos atminties išklotinę"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Žiūrėti SIM kortelės adresų knygą"</string>
@@ -135,16 +139,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transliavimas"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Neleisti profilio?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Neleis:&lt;br&gt;&lt;b&gt;„<xliff:g id="PROFILE_NAME">%1$s</xliff:g>“&lt;/b&gt;&lt;br&gt;&lt;br&gt;iš:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Prisijungta"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Prijungta (be telefono)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Prijungta (be laikmenos)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Prisijungta (be prieigos prie pranešimų)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Prijungta (be telefono ar laikmenos)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Atsijungęs (-usi)"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Atjungiama..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Prisijungiama..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Susiejama..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"„Bluetooth“ įrenginys be pavadinimo"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Ieškoma"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nerasta netol. esanč. „Bluetooth“ įreng."</string>
@@ -154,7 +149,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rodyti gautus failus"</string>
     <string name="device_picker" msgid="4978696506172252813">"Pasirinkti „Bluetooth“ įrenginį"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"„Bluetooth“ leidimo užklausa"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Programa nori įjungti „Bluetooth“."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Programa nori įjungti „Bluetooth“ šiame įrenginyje."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Programa nori padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Programa nori padaryti telefoną <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Programa nori padaryti planšetinį kompiuterį matomą kitų „Bluetooth“ įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
@@ -275,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD kortelė"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Tarpinio serverio nustatymai"</string>
     <string name="cancel" msgid="6859253417269739139">"Atšaukti"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ATŠAUKTI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"TĘSTI"</string>
     <string name="okay" msgid="1997666393121016642">"Gerai"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"TAIP"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NE"</string>
-    <string name="forget" msgid="7267115980248732932">"PAMIRŠTI"</string>
+    <string name="forget" msgid="1400428660472591263">"Pamiršti"</string>
+    <string name="save" msgid="879993180139353333">"Išsaugoti"</string>
+    <string name="done" msgid="6942539184162713160">"Atlikta"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nustatymai"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nustatymai"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Spartusis nustatymų klavišas"</string>
@@ -325,9 +318,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rūšiuoti pagal laiko zoną"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Laikas"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Patobulinti veido atitikimą"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Tikrinimas, ar matomas veidas"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Atrakinant reikalauti mirksėti"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Automatiškai užrakinti"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po miego režimo"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po miego būsenos, išskyrus atvejus, kai „<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>“ laiko jį atrakintą"</string>
@@ -348,6 +338,32 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, įgaliojimų saugyklos užraktą"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nustatyti mano vietą, ekrano atrakinimą, įgaliojimų saugyklos užraktą"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Slaptažodžiai"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Kontr. kodo jutiklis"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Kontrolin. kodų tvark."</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Kontrolinių kodų naud."</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Pridėti"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ekrano užraktas"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one">Užregistruotas <xliff:g id="COUNT_1">%1$d</xliff:g> kontrolinis kodas</item>
+      <item quantity="few">Užregistruoti <xliff:g id="COUNT_1">%1$d</xliff:g> kontroliniai kodai</item>
+      <item quantity="many">Užregistruota <xliff:g id="COUNT_1">%1$d</xliff:g> kontrolinio kodo</item>
+      <item quantity="other">Užregistruota <xliff:g id="COUNT_1">%1$d</xliff:g> kontrolinių kodų</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Kontr. kodo sąranka"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Kad galėtume naudoti kontrolinį kodą ekranui atrakinti ar pirkimo operacijoms patvirtinti, turime: \n\n✓ nustatyti atsarginį ekrano užrakto metodą; \n\n✓ pridėti kontrolinį kodą."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Raskite jutiklį"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Raskite kontrolinio kodo jutiklį telefono užpakalinėje dalyje."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Pavadinimas"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Gerai"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ištrinti"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Pradėkime!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Pirštu palieskite kontrolinio kodo jutiklį. Patraukite pirštą pajutę vibraciją."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Puiku! Pakartokite."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Tuo pačiu pirštu palieskite kontrolinio kodo jutiklį ir patraukite pirštą pajutę vibraciją."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Kontr. kodas pridėtas!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kai rodoma ši piktograma, galite naudoti kontrolinį kodą tapatybei nustatyti ar pirkimo operacijai autorizuoti."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Pridėti"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Kitas"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifruotė"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifruoti planšetinį kompiuterį"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifruoti telefoną"</string>
@@ -360,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Įjunkite kroviklį į lizdą ir bandykite dar kartą."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nėra ekrano užrakto PIN kodo ar slaptažodžio"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Prieš pradėdami šifravimo procesą turite nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Turite nupiešti atrakinimo piešinį, kad patvirtintumėte įrenginio šifravimą."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Užšifruoti?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Šifravimo operacijos anuliuoti negalima ir, jei ją pertrauksite, prarasite duomenis. Šifravimas trunka valandą ar ilgiau; jam vykstant planšetinis kompiuteris kelis kartus bus paleidžiamas iš naujo."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Šifravimo operacijos anuliuoti negalima ir, jei ją pertrauksite, prarasite duomenis. Šifravimas trunka valandą ar ilgiau; jam vykstant telefonas kelis kartus bus paleidžiamas iš naujo."</string>
@@ -391,22 +406,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Perbraukti"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Nesaugoma"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Atrakinimas pgl. veidą"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Žemas saugos lygis, bandomasis"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Modelis"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Vidutinis saugos lygis"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Vidutinis–aukštas saugos lygis"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Slaptažodis"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Aukštas saugos lygis"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Esamas ekrano užraktas"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Įrenginio apsaugos funkcijos nebeveiks."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Neleido: administr., šifrav. polit. ar įgalioj. atmint."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nėra"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Perbraukti"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Atrakinimas pagal veidą"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Šablonas"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kodas"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Slaptažodis"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Kai nustatysite ekrano užraktą, taip pat galėsite nustatyti kontrolinį kodą skiltyje „Nustatymai &gt; Sauga“."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Išjungti ekrano užraktą"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Pašalinti atrakinimo modelį"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Pašalinti atrakinimo PIN kodą"</string>
@@ -427,30 +441,42 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Slaptažodyje turi būti bent viena raidė."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Slaptažodyje turi būti bent vienas skaitmuo."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Slaptažodį turi sudaryti bent vienas simbolis."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Slaptažodyje turi būti bent 1 raidė."</item>
-    <item quantity="other" msgid="8186027808415585970">"Slaptažodyje turi būti bent %d raidės (-ių)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Slaptažodyje turi būti bent 1 mažoji raidė."</item>
-    <item quantity="other" msgid="2693910942679679225">"Slaptažodyje turi būti bent %d mažosios (-ųjų) raidės (-ių)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Slaptažodyje turi būti bent 1 didžioji raidė."</item>
-    <item quantity="other" msgid="3030801209112209245">"Slaptažodyje turi būti bent %d didžiosios (-iųjų) raidės (-ių)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Slaptažodyje turi būti bent 1 skaičius."</item>
-    <item quantity="other" msgid="4703982391407595924">"Slaptažodyje turi būti bent %d skaičiai (-ių)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Slaptažodyje turi būti bent 1 specialus simbolis."</item>
-    <item quantity="other" msgid="1221290525051187757">"Slaptažodyje turi būti bent %d specialūs (-ių) simboliai (-ių)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Slaptažodyje turi būti bent 1 neraidinis simbolis."</item>
-    <item quantity="other" msgid="3952508584649046404">"Slaptažodyje turi būti bent %d neraidiniai (-ių) simboliai (-ių)."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Slaptažodyje turi būti bent %d raidė.</item>
+      <item quantity="few">Slaptažodyje turi būti bent %d raidės.</item>
+      <item quantity="many">Slaptažodyje turi būti bent %d raidės.</item>
+      <item quantity="other">Slaptažodyje turi būti bent %d raidžių.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Slaptažodyje turi būti bent %d mažoji raidė.</item>
+      <item quantity="few">Slaptažodyje turi būti bent %d mažosios raidės.</item>
+      <item quantity="many">Slaptažodyje turi būti bent %d mažosios raidės.</item>
+      <item quantity="other">Slaptažodyje turi būti bent %d mažųjų raidžių.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Slaptažodyje turi būti bent %d didžioji raidė.</item>
+      <item quantity="few">Slaptažodyje turi būti bent %d didžiosios raidės.</item>
+      <item quantity="many">Slaptažodyje turi būti bent %d didžiosios raidės.</item>
+      <item quantity="other">Slaptažodyje turi būti bent %d didžiųjų raidžių.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Slaptažodyje turi būti bent %d skaičius.</item>
+      <item quantity="few">Slaptažodyje turi būti bent %d skaičiai.</item>
+      <item quantity="many">Slaptažodyje turi būti bent %d skaičiaus.</item>
+      <item quantity="other">Slaptažodyje turi būti bent %d skaičių.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Slaptažodyje turi būti bent %d specialusis simbolis.</item>
+      <item quantity="few">Slaptažodyje turi būti bent %d specialieji simboliai.</item>
+      <item quantity="many">Slaptažodyje turi būti bent %d specialiojo simbolio.</item>
+      <item quantity="other">Slaptažodyje turi būti bent %d specialiųjų simbolių.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Slaptažodyje turi būti bent %d neraidinis simbolis.</item>
+      <item quantity="few">Slaptažodyje turi būti bent %d neraidiniai simboliai.</item>
+      <item quantity="many">Slaptažodyje turi būti bent %d neraidinio simbolio.</item>
+      <item quantity="other">Slaptažodyje turi būti bent %d neraidinių simbolių.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Įrenginio administratorius neleidžia naudoti pastarojo slaptažodžio."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Didėjanti, mažėjanti ar pasikartojanti skaitmenų seka draudžiama"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Gerai"</string>
@@ -480,15 +506,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Jei norite suporuoti su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Įsitikinkite, kad jame rodomas šis prieigos raktas:&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">"Iš:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Poruoti su šiuo įrenginiu?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Susieti su: <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> Įveskite: <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>, tada paspauskite „Grįžti“ arba „Enter“."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Susieti"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SUSIETI"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Atšaukti"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Susiejus suteikiama prieiga prie kontaktų ir skambučių istorijos, esant prisijungus."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nepavyko susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nepavyko susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ dėl netinkamo PIN kodo ar prieigos rakto."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nepavyksta užmegzti ryšio su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Susiejimą atmetė <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Nepavyko prisijungti prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Nuskaityti ieškant įrenginių"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Atnaujinti"</string>
@@ -515,16 +534,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Išplėst. nust."</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Išplėst. „Bluetooth“ nust."</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kai „Bluetooth“ įj., įreng. gali užm. ryšį su kitais netoliese esančiais „Bluetooth“ įreng."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Kad būtų galima patobulinti vietovės informacijos tikslumą, programos ir paslaugos nuskaitys „Bluetooth“ įrenginius, net kai „Bluetooth“ bus išjungtas. Tai galite pakeisti <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nuskaitymo nustatymuose<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Prijungti prie..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Laikmenos garsas"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefono garsas"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Failo perkėlimas"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Įvesties įrenginys"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Prieiga prie interneto"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktų bendrinimas"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Naudoti kontaktams bendrinti"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneto ryšio bendrinimas"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Prieiga prie pranešimų"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo medijos garso."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo laisvų rankų įrangos garso."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo įvesties įrenginio."</string>
@@ -537,28 +548,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Naudoti"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Pervadinti"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Leisti gaunamų failų perdavimą"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Prijungta prie medijos garso įrašo"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Prijungta prie telefono garso"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Prijungta prie failų perkėlimo serverio"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Prisijungta prie žemėlapio"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neprijungta prie failų perkėlimo serverio"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Prisijungta prie įvesties įrenginio."</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Pr. prie įr., kad gaut. pr. prie int."</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Bendr. vt. int. ryš. su įr."</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Naudoti medijos garsui"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Naudoti telefono garso įrašui"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Naudoti failų perkėlimui"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Naudoti įvedant"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Naudoti interneto prieigai"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Naudoti žemėlapyje"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Doko nustatymai"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Naudoti doką garsui"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaip kalbėtojo telefonas"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muzikai ir medijai"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Atsiminti nustatymus"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"„Wi‑Fi“ pagelbiklis"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Prisijungta naudojant „Wi‑Fi“ pagelbiklį"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Perduoti ekraną"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Perdavimas"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Įgalinti belaidį rodymą"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nerasta netoliese esančių įrenginių."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Jungiama"</string>
@@ -570,6 +568,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Pamiršti"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Atlikta"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Pavadinimas"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Leisti keistis duomenimis, kai planšetinis kompiuteris aptinka kitą įrenginį"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Leisti keistis duomenimis, kai telefonas paliečia kitą įrenginį"</string>
@@ -593,21 +593,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"„Wi-Fi“ išjungiama…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Klaida"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Veikia lėktuvo režimu"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nepavyksta nuskaityti tinklų"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Tinklo įspėjimas"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Pranešti, kai pasiekiamas viešasis tinklas"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vengti prasto ryšio"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"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="wifi_scan_always_available" msgid="3470564139944368030">"Nuskaitymas visada pasiekiamas"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Visada leisti nuskaityti"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Leisti „Google“ vietovių paslaugai ir kitoms programoms nuskaityti tinklus, net kai „Wi-Fi“ išjungtas"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automatiškai naudoti atvirą „Wi‑Fi“"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Leisti „Wi‑Fi“ pagelbikliui automatiškai prisijungti prie atvirų aukštos kokybės tinklų."</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Pasirinkti pagelbiklį"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Įdiegti sertifikatus"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Kad patobulintumėte vietovių tikslumą ir kitais tikslais, leiskite „Google“ vietovių paslaugai ir kitoms programoms ieškoti netoliese esančių „Wi-Fi“ tinklų, net jei „Wi-Fi“ išjungtas. Jei nenorite, kad būtų ieškoma, eikite į skiltį „Išplėstiniai“ &gt; „Visada galima ieškoti“."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programos gali ieškoti netoliese esančių tinklų, net kai „Wi-Fi“ yra išjungtas. Jei nenorite, kad būtų ieškoma, eikite į skiltį „Išplėstiniai“ &gt; „Visada galima ieškoti“."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Kad būtų galima patobulinti vietovės informacijos tikslumą, programos ir paslaugos nuskaitys „Wi‑Fi“ tinklus, net kai „Wi‑Fi“ bus išjungtas. Tai galite pakeisti <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nuskaitymo nustatymuose<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Daugiau neberodyti"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Išlaikyti „Wi-Fi“ įjungtą, kai veikia miego režimas"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"„Wi‑Fi“ įj. esant miego būsen."</string>
@@ -635,11 +630,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Pridėti kitą tinklą"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Daugiau"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatinė sąranka (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Kad užbaigtumėte sąranką, planšetiniam kompiuteriui turi būti suteikta prieiga prie „Wi-Fi“. Baigę sąranką galėsite perjungti iš korinio ryšio duomenų į „Wi-Fi“ ir atvirkščiai."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Išplėstinės parinktys"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Apsaugota „Wi-Fi“ sąranka"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Pradedama WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Maršruto parinktuve paspauskite apsaugotos „Wi-Fi“ sąrankos mygtuką. Jis gali būti pavadintas WPS arba nurodytas šiuo simboliu:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Maršruto parinktuve paspauskite apsaugotos „Wi-Fi“ sąrankos mygtuką. Jis gali būti pavadintas WPS arba pažymėtas šiuo simboliu:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Įveskite „Wi-Fi“ maršruto parinktuvo PIN kodą <xliff:g id="NUMBER">%1$s</xliff:g>. Sąranka gali užtrukti iki dviejų minučių."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS pavyko. Prisijungiama prie tinklo…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Prisijungta prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
@@ -665,20 +659,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anoniminė tapatybė"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Slaptažodis"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Rodyti slaptažodį"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfigūruoti prieigos taško juostą"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GHz dažnio juosta"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz dažnio juosta"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP nustatymai"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nepakeista)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nenurodyta)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Išsaugotas"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Neleidžiama"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP konfigūracijos triktis"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"„Wi-Fi“ ryšio triktis"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentifikavimo problema"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ne diapazone"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Neaptikta jokia prieiga prie interneto, nebus automatiškai iš naujo prisijungta."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Galima WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (galima WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Įveskite tinklo slaptažodį"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Nėra"</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>
@@ -686,6 +675,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Prisijungti, kad būtų prijungta?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ reikia, kad pr. prie int. prieš pr. prie tinkl."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"PRIJUNGTI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Šiame tinkle nėra interneto ryšio. Vis tiek naudoti šį tinklą?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Daugiau neklausti šiame tinkle"</string>
     <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>
@@ -751,6 +742,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"„AndroidAP“ WPA2 PSK neš. „Wi‑Fi“ vieš. int. pr. t."</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> kilnojamasis „Wi-Fi“ 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_mode_title" msgid="2164073796253284289">"Skambinimo nuostata"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"„Wi-Fi“ skambinimo režimas"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Pageidautinas „Wi-Fi“ ryšys"</item>
+    <item msgid="5267397515594230396">"Pageidautinas mobilusis ryšys"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Pagrindinis"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
@@ -814,6 +817,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano šviesumą"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prisitaikantis šviesumas"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizuoti šviesumo lygį pagal esamą šviesą"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Šviesus"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Tamsus"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatinis"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Užmigti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranas išjungiamas"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
@@ -865,10 +873,12 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Atnauj. pageid. SIM kortelę?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> yra vienintelė SIM kortelė įrenginyje. Ar norite naudoti šią SIM kortelę mobiliesiems duomenims, skambučiams bei SMS pranešimams siųsti ir gauti?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Netinkamas SIM kortelės PIN kodas. Reikės susisiekti su operatoriumi, kad atrakintų įrenginį."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Netinkamas SIM kortelės PIN kodas. Jums liko <xliff:g id="NUMBER">%d</xliff:g> band. Paskui reikės susisiekti su operatoriumi, kad jis atrakintų įrenginį."</item>
-    <item quantity="other" msgid="77103619544346451">"Netinkamas SIM kortelės PIN kodas, liko <xliff:g id="NUMBER">%d</xliff:g> band."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Netinkamas SIM kortelės PIN kodas. Liko <xliff:g id="NUMBER_1">%d</xliff:g> bandymas.</item>
+      <item quantity="few">Netinkamas SIM kortelės PIN kodas. Liko <xliff:g id="NUMBER_1">%d</xliff:g> bandymai.</item>
+      <item quantity="many">Netinkamas SIM kortelės PIN kodas. Liko <xliff:g id="NUMBER_1">%d</xliff:g> bandymo.</item>
+      <item quantity="other">Netinkamas SIM kortelės PIN kodas. Liko <xliff:g id="NUMBER_1">%d</xliff:g> bandymų.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Nepavyko atlikti SIM kortelės PIN kodo operacijos."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planšetinio kompiuterio būsena"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefono būsena"</string>
@@ -917,12 +927,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Pasiekiama (tik skaitoma)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Visa vieta"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Skaičiuojama..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Programos (programų duomenys ir medijos turinys)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Programos ir jų duomenys"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medija"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Atsisiuntimai"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Paveikslėliai, vaizdo įrašai"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Garso įr. (muzika, skamb. tonai, tinklal. ir kt.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Įvairūs"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Kiti failai"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Talpykloje saugomi duomenys"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Atjung. bendrin. atmint."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Išimti SD kortelę"</string>
@@ -955,6 +965,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Vykdomas išėmimas"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Mažėja laisvos saugyklos vietos"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Kai kurios sistemos funkcijos, pvz., sinchronizavimas, gali neveikti tinkamai. Pabandykite atlaisvinti vietos ištrynę ar atsegę elementus, pvz., programas ar medijos turinį."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Pervardyti"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Įdėti"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Pašalinti"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Ištrinti ir formatuoti"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Ištr. ir form. kaip vid. atm."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB kompiuterio jungtis"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB kompiuterio jungtis"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Prisijungti kaip"</string>
@@ -962,8 +977,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Leidžia perduoti failus „Windows“ ar „Mac“ naudojant „Android File Transfer“ (žr. šiuo adresu: www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparatas (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Galite perduoti nuotraukas naudodami fotoaparato programinę įrangą ir perduoti bet kokius failus MTP nepalaikančiuose kompiuteriuose"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Įdiegti failų perdavimo įrankius"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Programos, kuriose įgalintos MIDI funkcijos, gali veikti per USB su kompiuteryje įdiegta MIDI programine įranga."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Kiti naudotojai"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Įrenginio atmintis"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Keičiama atmintis"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> nemokamai (iš viso <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> įdėta"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Nepavyko įdėti <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> saugiai pašalinta"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Nepavyko saugiai pašalinti <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> suformatuotas"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Nepavyko suformatuoti <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Pervardyti atmintį"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Suformatavę šią <xliff:g id="NAME_0">^1</xliff:g> galite naudoti ją kituose įrenginiuose. \n\nVisi duomenys šioje <xliff:g id="NAME_1">^1</xliff:g> bus ištrinti. Pirmiausia apsvarstykite galimybę sukurti atsarginę kopiją. \n\n"<b>"Kurkite atsargines nuotraukų ir kitos medijos kopijas"</b>" \nPerkelkite medijos failus į alternatyvią atmintį šiame įrenginyje arba perkelkite juos į kompiuterį USB kabeliu. \n\n"<b>"Kurkite atsargines programų kopijas"</b>" \nVisos šioje <xliff:g id="NAME_6">^1</xliff:g> saugomos programos bus pašalintos, o jų duomenys bus ištrinti. Jei norite pasilikti šias programas, perkelkite jas į alternatyvią atmintį šiame įrenginyje."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kai pašalinsite šią <xliff:g id="NAME_0">^1</xliff:g>, joje saugomos programos nebeveiks, o joje saugomi medijos failai nebus pasiekiami, ko ją vėl įdėsite."</b>" \n\nŠi <xliff:g id="NAME_1">^1</xliff:g> suformatuota veikti tik šiame įrenginyje. Ji neveiks kituose įrenginiuose."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nustatykite <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Naudoti kaip perkeliamą atmintį"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Norint perkelti nuotraukas ir kitą mediją iš vieno įrenginio į kitą."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Naudoti kaip vidinę atmintį"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Norint bet ką saugoti tik šiame įrenginyje, įskaitant programas ir nuotraukas. Suformatavus neveiks kituose įrenginiuose."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatuoti kaip vidinę atminį"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Norint <xliff:g id="NAME_0">^1</xliff:g> saugiai naudoti, reikia ją formatuoti. \n\nSuformatavus š <xliff:g id="NAME_1">^1</xliff:g> veiks šiame įrenginyje. \n\n"<b>"Formatuojant ištrinami visi duomenys, kurie šiuo metu saugomi <xliff:g id="NAME_2">^1</xliff:g>."</b>" Kad neprarastumėte duomenų, apsvarstykite galimybę sukurti jų atsarginę kopiją."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ištrinti ir formatuoti"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatuojama <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Nepašalinkite <xliff:g id="NAME">^1</xliff:g>, kol formatuojama."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Perkelti duom. į naują atmintį"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Galite perkelti nuotraukas, failus ir programų duomenis į šią naują <xliff:g id="NAME">^1</xliff:g>. \n\nPerkėlimas truks apie <xliff:g id="TIME">^2</xliff:g>, o perkėlus vidinėje atmintyje bus <xliff:g id="SIZE">^3</xliff:g> laisvos vietos. Vykdant kai kurios programos neveiks."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Perkelti dabar"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Perkelti vėliau"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Perkelti duomenis dabar"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Perkėlimas trunka apie <xliff:g id="TIME">^1</xliff:g>. Perkėlus vidinėje atmintyje bus <xliff:g id="SIZE">^2</xliff:g> laisvos vietos."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Perkelti"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Perkeliami duomenys…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Perkeliant: \n• Neperkelkite <xliff:g id="NAME">^1</xliff:g>. \n• Kai kurios programos tinkamai neveiks. \n• Įkraukite įrenginį."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> paruošta"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> nustatyta naudoti su nuotraukomis ir kita medija."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Nauja <xliff:g id="NAME">^1</xliff:g> veikia. \n\nKad perkeltumėte nuotraukas, failus ir programų duomenis į šį įrenginį, eikite į skiltį „Nustatymai“ &gt; „Atmintis“."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Perkelti programą <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Programos <xliff:g id="APP">^1</xliff:g> ir jos duomenų perkėlimas į <xliff:g id="NAME_0">^2</xliff:g> truks neilgai. Negalėsite naudoti programos, kol perkėlimas bus baigtas. \n\nKol perkeliama, nepašalinkite <xliff:g id="NAME_1">^2</xliff:g>."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Perkeliama programa <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Nepašalinkite <xliff:g id="NAME">^1</xliff:g>, kol perkeliama. \n\nPrograma <xliff:g id="APP">^2</xliff:g> šiame įrenginyje nebus pasiekiama, kol perkėlimas bus baigtas."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Atšaukti perkėlimą"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akumuliatoriaus būsena"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akumuliatoriaus lygis"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1062,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Atkuriami numatytieji APN nustatymai."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Nustatyti iš naujo į numatytuosius nustatymus"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Numatytųjų APN nustatymų nustatymas iš naujo baigtas."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Tinklo nustatymų nustatymas iš naujo"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Bus ištrinti visi tinklo nustatymai, įskaitant:\n\n"<li>"„Wi‑Fi“"</li>\n<li>"korinio ryšio duomenis"</li>\n<li>"„Bluetooth“"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Nustatyti iš naujo"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Iš naujo nustatyti visus tinklo nustatymus? Šio veiksmo negalėsite anuliuoti!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Nustatyti iš naujo"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Nustatyti iš naujo?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Tinklo nustatymai nustatyti iš naujo"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Nustatyti įrenginį iš naujo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Gamyklos duomenų nustatymas iš naujo"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Ištrinami visi planšetinio kompiuterio duomenys"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Ištrina visus telefono duomenis"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"Taip bus ištrinti visi duomenys iš telefono "<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_accounts" product="default" msgid="6412857499147999073">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
@@ -1024,9 +1084,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ištrinti visus SD kortelės duomenis, pvz., muzikos failus ar nuotraukas"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Iš naujo nustatyti planšetinį kompiuterį"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Iš naujo nustatyti telefoną"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Ištrinti visą asmeninę informaciją ir atsisiųstas programas? Šio veiksmo negalėsite atšaukti!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Ištrinti visą asmeninę informaciją ir atsisiųstas programas? Šio veiksmo negalėsite anuliuoti!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ištrinti viską"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Kad patvirtintumėte gamyklinių duomenų nustatymą iš naujo, turite nubrėžti atrakinimo šabloną."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nebuvo nustatyta iš naujo, nes paslauga „Sistemos išvalymas“ nepasiekiama."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Nustatyti iš naujo?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Šis naudotojas negali atkurti gamyklinių nustatymų"</string>
@@ -1043,8 +1102,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ištrinti USB atmintinę ištrinant visus joje saugomus failus? Šio veiksmo negalėsite atšaukti!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ištrinti SD kortelę ištrinant visus joje saugomus failus? Šio veiksmo negalėsite atšaukti!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ištrinti viską"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Kad patvirtintumėte, jog norite ištrinti USB atmintinę, turite nubrėžti atrakinimo šabloną."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Kad patvirtintumėte, jog norite ištrinti SD kortelę, turite nubrėžti atrakinimo šabloną."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Skambinimo nustatymai"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nustatyti balso paštą, skambučio peradresavimą, skambučio laukimą, skambintojo ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB susiejimas"</string>
@@ -1076,7 +1133,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pagalba"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Koriniai tinklai"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiliojo ryšio planas"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Numatytoji SMS programa"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS programa"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Pakeisti SMS programą?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Naudoti „<xliff:g id="NEW_APP">%1$s</xliff:g>“ kaip SMS programą vietoj „<xliff:g id="CURRENT_APP">%2$s</xliff:g>“?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Naudoti „<xliff:g id="NEW_APP">%s</xliff:g>“ kaip SMS programą?"</string>
@@ -1104,7 +1161,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Vietovės režimas"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Naudoti GPS, „Wi‑Fi“ ir korinį tinklą vietovei nustatyti"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Naudoti „Wi‑Fi“ ir korinį tinklą vietovei nustatyti"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Vietovę nustatyti naudojant GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Nustatyti vietovę naudojant GPS"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Nuskaitymas"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Nuskaitymas"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"„Wi‑Fi“ nuskaitymas"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Patobulinkite vietovės informaciją leisdami programoms ir paslaugoms nuskaityti „Wi‑Fi“ tinklus, net kai „Wi‑Fi“ bus išjungtas"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"„Bluetooth“ nuskaitymas"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Patobulinkite vietovės informacijos tikslumą leisdami sistemos paslaugoms nuskaityti „Bluetooth“ įrenginius, net kai „Bluetooth“ bus išjungtas"</string>
     <string name="location_network_based" msgid="6010456018401296590">"„Wi‑Fi“ ir kor. tinkl. vietov."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Leisti programoms naud. „Google“ viet. pasl., kad viet. būtų nustatoma greičiau. Anonim. viet. duom. bus renk. ir siunč. „Google“."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Vietą nustatė „Wi-Fi“"</string>
@@ -1150,11 +1213,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Slaptažodis nustatytas"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN kodas nustatytas"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Modelis nustatytas"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Ekrano sauga"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Jei norite tęsti, naudokite įrenginio šabloną."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Jei norite tęsti, įveskite įrenginio PIN kodą."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Jei norite tęsti, įveskite įrenginio 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 šablonas"</string>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Įrenginio sauga"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Keisti atrakinimo modelį"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Pakeisti atrakinimo PIN kodą"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Patvirtinti išsaugotą modelį"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Bandykite dar kartą:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nustatyti atrakinimo modelį"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Jei norite gauti pagalbos, paspauskite „Meniu“."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Baigę atleiskite pirštą"</string>
@@ -1176,8 +1243,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nustatyti atrakinimo modelį"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Keisti atrakinimo modelį"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kaip nustatyti atrakinimo modelį"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Per daug neteisingų bandymų!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Bandyti dar kartą po <xliff:g id="NUMBER">%d</xliff:g> sek."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Per daug klaidingų bandymų. Bandykite dar kartą po <xliff:g id="NUMBER">%d</xliff:g> sek."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Programa jūsų telefone neįdiegta."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Valdyti programas"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Tvarkykite ir pašalinkite įdiegtas programas"</string>
@@ -1228,6 +1294,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Rūšiuoti pagal dydį"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Rodyti vykdomas paslaugas"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Rodyti padėtus procesus"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Avarinė programa"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Iš naujo nustat. nuostat."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Iš naujo nust. nuostat.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Bus iš naujo nustatytos visos toliau nurodytų objektų nuostatos:\n\n "<li>"Išjungtos programos"</li>\n" "<li>"Išjungtų programų pranešimai"</li>\n" "<li>"Numatytosios veiksmų programos"</li>\n" "<li>"Programų foninių duomenų apribojimai"</li>\n" "<li>"Visi leidimų apribojimai"</li>\n\n" Neprarasite jokių programų duomenų."</string>
@@ -1299,6 +1366,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Programos operacijos"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Vykdoma"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Niekada nenaudota)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Nėra numatytųjų programų."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Atmintinės naudojimas"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Žiūrėti programų naudojamą atmintinę"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Vykdomos paslaugos"</string>
@@ -1396,17 +1464,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Planšetinio kompiuterio informacija"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefono informacija"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Akumuliatoriaus informacija"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Greitasis paleidimas"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Nustatyti sparčiuosius klavišus, skirtus programoms paleisti"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Priskirti programą"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Nėra sparčiojo klavišo"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Ieškoti + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Išvalyti"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Bus išvalytas spartusis <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) klavišas."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Gerai"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Atšaukti"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Programos"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Spartieji klavišai"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Teksto įvestis"</string>
     <string name="input_method" msgid="5434026103176856164">"Įvesties metodas"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Esama klaviatūra"</string>
@@ -1441,23 +1498,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Užfiksuoti visus faile esančius „Bluetooth“ HCI paketus"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OĮG atrakinimas"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Leisti atrakinti oper. sistemos paleidimo progr."</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Įveskite PIN kodą"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Įveskite įrenginio PIN kodą, kad įgalintumėte OĮG operatoriaus pasirinkimo ribojimo panaikinimą"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Leisti OĮG atrakinimą?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ĮSPĖJIMAS: kol šis nustatymas bus įjungtas, šiame įrenginyje neveiks įrenginio apsaugos funkcijos."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Registruotuvo biuferio dydžiai"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pasir. registr. dydž. žurn. bufer."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Leisti imituoti vietas"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Leisti imituoti vietas"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Įgalinti peržiūros atributų tikrinimą"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Tinklai"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Belaidžio rodymo sertifikavimas"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Įgal. „Wi‑Fi“ daugiaž. įraš. į žurnalą"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agres. „Wi‑Fi“ duom. perd. į mob. tinklą"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Visada leisti „Wi-Fi“ tarptiklinio ryšio nuskaitymą"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Naudoti seną DHCP kliento programą"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Rodyti belaidžio rodymo sertifikavimo parinktis"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Padidinti „Wi‑Fi“ įrašymo į žurnalą lygį, rodyti SSID RSSI „Wi-Fi“ rinkiklyje"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Jei įgalinta ši parinktis, „Wi‑Fi“ agresyviau perduos duomenų ryšį į mobiliojo ryšio tinklą, kai „Wi‑Fi“ signalas bus silpnas"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Leisti / neleisti „Wi‑Fi“ tarptinklinio ryšio nuskaitymo, atsižvelgiant į sąsajos duomenų srauto kiekį"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Registruotuvo biuferio dydžiai"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pasir. registr. dydž. žurn. bufer."</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Pasirinkite USB konfigūraciją"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Pasirinkite USB konfigūraciją"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Leisti imituoti vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Leisti imituoti vietas"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Įgalinti peržiūros atributų tikrinimą"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"DHCP kliento programos iš „Lollipop“ versijos naudojimas vietoje naujos „Android“ DHCP kliento programos."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Leisti USB perkrovimą?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB derinimas skirtas naudoti tik kūrimo tikslais. Jis gali būti naudojamas norint kopijuoti duomenis iš kompiuterio į įrenginį ir atvirkščiai, įdiegti programas įrenginyje be pranešimo ir skaityti žurnalo duomenis."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Panaikinti visų kompiuterių, kuriems anksčiau suteikėte prieigos teisę, prieigą prie USB derinimo?"</string>
@@ -1561,6 +1626,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Purpurinė"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ reikia:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Kadangi programa užstoja leidimo užklausą, nustatymuose negalima patvirtinti jūsų atsakymo."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jei įjungsite „<xliff:g id="SERVICE">%1$s</xliff:g>“, įrenginyje nebus naudojamas ekrano užraktas siekiant patobulinti duomenų šifruotę."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Kadangi įjungėte pritaikymo neįgaliesiems paslaugą, įrenginyje nebus naudojamas ekrano užraktas siekiant patobulinti duomenų šifruotę."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Įjungus „<xliff:g id="SERVICE">%1$s</xliff:g>“ paveikiama duomenų šifruotė, todėl reikia patvirtinti atrakinimo piešinį."</string>
@@ -1702,14 +1768,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Procesų statistika"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Entuziastų pateikta statistika apie vykstančius procesus"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Naudojama atmintis"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Tipo <xliff:g id="TYPE">%1$s</xliff:g> programos per <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Panaudota <xliff:g id="USEDRAM">%1$s</xliff:g> iš <xliff:g id="TOTALRAM">%2$s</xliff:g> per <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Fonas"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Priekinis planas"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Išsaugota talpykloje"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Įrenginio atmintis šiuo metu yra <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Vidutinis laisvosios prieigos atminties naudojimas"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimalus laisvosios prieigos atminties naudojimas"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"„Android“ OS"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Savasis"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Branduolys"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Talpyklos"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM naudojimas"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM naudojimas (fonas)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Rodymo laikas"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Procesai"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Paslaugos"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trukmė"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Išsami atminties informacija"</string>
@@ -1726,6 +1798,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 val."</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 d."</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Rodyti sistemos procesus"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Slėpti sistemą"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Naudoti USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikos tipas"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Fonas"</string>
@@ -1748,7 +1821,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Toliau pateikti numatytieji nustatymai atšaukia programos nustatymus"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Numatytieji nustatymai"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Numatytasis variklis"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Nustato kalbos sintezės variklį, kuris bus naudojamas sakomam tekstui"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Nustatykite kalbos sintezės variklį, kuris bus naudojant sakant tekstą"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Kalbėjimo greitis"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Greitis, kuriuo sakomas tekstas"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Garso aukštis"</string>
@@ -1822,7 +1895,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Atsarginė kopija saugoma įrenginio vidinėje atmintyje"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Saugoma tik programinėje įrangoje"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kredencialai nepasiekiami šiam naudotojui"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kad patvirtintumėte kredencialų diegimą, turite nubrėžti atrakinimo piešinį."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1919,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Kurti atsarginę duomenų kopiją"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"„Google“ serveriuose kurti atsargines programos duomenų, „Wi-Fi“ slaptažodžių ir kitų nustatymų kopijas"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Atsarg. kopijos paskyra"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Šiuo metu jokioje paskyroje nesaugomi atsarginės kopijos duomenys"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Įtraukti programos duomenis"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatinis atkūrimas"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Iš naujo įdiegdami programą atkurkite nustatymus ir duomenis, kurių atsarginės kopijos buvo sukurtos"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Atsarginio kopijavimo paslauga neaktyvi."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tai nustatyta vadovaujantis įrenginio politika."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Viet. atsrg. kop. slapt."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Šiuo metu visos vietinės atsarginės kopijos neapsaugotos"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Jei norite pakeisti ar pašalinti visų vietinių atsarginių kopijų slaptažodį, palieskite"</string>
@@ -2024,6 +2094,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Animuoto perėjimo mast."</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator. trukmės skalė"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Imituoti antrin. ekranus"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Kelių langų režimas"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Keli veiksmai ekrane vienu metu."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Įgalinti kelių langų režimą?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ĮSPĖJIMAS: tai yra eksperimentinė funkcija, kuri suteikia galimybę vienu metu ekrane atlikti kelis veiksmus naudojant naujausių programų NS. Kai kurios programos gali užstrigti arba netinkamai veikti, kai jos naudojamos su šia funkcija."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Programos"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nesaugoti veiklos"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Sunaikinti visą veiklą, kai naud. iš jos išeina"</string>
@@ -2195,7 +2269,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Naudotojas"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ribotas profilis"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Pridėti naują naudotoją?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Galite bendrinti šį įrenginį su kitais žmonėmis sukūrę papildomų naudotojų. Kiekvienam naudotojui suteikiama atskira erdvė, kurią jie gali tinkinti naudodami savo programas, ekrano foną ir kt. Be to, naudotojai gali koreguoti įrenginio nustatymus, pvz., „Wi‑Fi“, kurie taikomi visiems.\n\nKai pridedate naują naudotoją, šis asmuo turi nustatyti savo erdvę.\n\nBet kuris naudotojas gali atnaujinti visų kitų naudotojų programas."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Galite bendrinti šį įrenginį su kitais žmonėmis sukūrę papildomų naudotojų. Kiekvienam naudotojui suteikiama atskira erdvė, kurią jie gali tinkinti naudodami savo programas, ekrano foną ir kt. Be to, naudotojai gali koreguoti įrenginio nustatymus, pvz., „Wi‑Fi“, kurie taikomi visiems.\n\nKai pridedate naują naudotoją, šis asmuo turi nustatyti savo erdvę.\n\nBet kuris naudotojas gali atnaujinti visų kitų naudotojų programas."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kai pridedate naują naudotoją, šis asmuo turi nustatyti savo erdvę.\n\nBet kuris naudotojas gali atnaujinti visų kitų naudotojų programas."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nustatyti naudotoją dabar?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Įsitikinkite, kad asmuo gali paimti įrenginį ir nustatyti savo vietą"</string>
@@ -2226,13 +2300,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Pašalinti svečią?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Bus ištrintos visos šios sesijos programos ir duomenys."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Pašalinti"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Leisti telefonų skambučius"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Leisti telefonų skambučius ir SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Įjungti telefono skambučius"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Įjungti telefono skambučius ir SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Pašalinti naudotoją"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Leisti telefonų skambučius?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Įjungti telefono skambučius?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Skambučių istorija bus bendrinama su šiuo naudotoju."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Leisti telefonų skambučius ir SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Skambučių ir SMS istorija bus bendrinama su šiuo naudotoju."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Įjungti telefono skambučius ir SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Skambučių ir SMS istorija bus bendrinama su šiuo naudotoju."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Leisti programas ir turinį"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programos su apribojimais"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Išplėsti programos nustatymus"</string>
@@ -2283,8 +2357,8 @@
     <string name="user_rename" msgid="8523499513614655279">"PERVARDYTI"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Nustatykite programos apribojimus"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontroliuoja „<xliff:g id="APP">%1$s</xliff:g>“"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ši programa nepalaikoma apribotuose profiliuose"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ši programa gali pasiekti jūsų paskyras"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Ši programa gali pasiekti jūsų paskyras. Valdo „<xliff:g id="APP">%1$s</xliff:g>“"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"„Wi‑Fi“ ir mobilusis ryšys"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Leisti keisti „Wi‑Fi“ ir mobiliojo ryšio nustatymus"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2423,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"„Wi-Fi“ tinklo ryšys"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"teksto pranešimas siųsti žinutę pranešimai susirašinėjimas žinutėmis"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilusis mobiliojo ryšio operatorius belaidis ryšys duomenys 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"„Wi-Fi“ skambutis skambinama"</string>
     <string name="keywords_home" msgid="3626170808219458848">"paleidimo priemonė"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekranas jutiklinis ekranas"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"pritemdytas ekranas jutiklinis ekranas akumuliatorius"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"pritemdytas ekranas jutiklinis ekranas akumuliatorius"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fonas suasmeninti tinkinti pateikti"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tamsu tema naktis režimas blankus ekranas invertuoti šviesumas"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"fonas suasmeninti tinkinti pateiktis"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksto dydis"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projektas"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projekto perdavimas"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"vieta diskas standusis diskas įrenginys naudojimas"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"maitinimas naudojimas įkrovimas"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"rašyba žodynas rašybos tikrinimas automatinis pataisymas"</string>
@@ -2367,11 +2443,16 @@
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"garsiakalbis pyptelėjimas"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"negalima netrukdyti pertraukti nutraukimas nutrūkęs ryšys"</string>
     <string name="keywords_app" msgid="6334757056536837791">"Laisvosios prieigos atmintis"</string>
-    <string name="keywords_location" msgid="782326973714313480">"netoliese vietovė istorija ataskaitų teikimas"</string>
+    <string name="keywords_location" msgid="782326973714313480">"netolimų vietovių istorijos ataskaitų teikimas"</string>
     <string name="keywords_location_mode" msgid="8584992704568356084">"tikslumas"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"paskyra"</string>
     <string name="keywords_users" msgid="4673901601478559100">"apribojimas riboti apribota"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teksto pataisymas pataisyti garsas vibruoti automatinis kalba gestas pasiūlyti pasiūlymas tema įžeidžiantis žodis tipas jaustukai tarptautinis"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"nustatyti iš naujo nuostatos numatytosios"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"numatytoji kritiniu atveju naudotina programa"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"programos atsisiųsti programos sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"programų leidimų sauga"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"programos numatytosios"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slysti slaptažodis šablonas PIN kodas"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nustatyti „Wi-Fi“ ALR žymą"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
@@ -2386,11 +2467,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Signalo garsumas"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Skambučio garsumas"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Pranešimo garsumas"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Pertrauktys"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Kai gaunami skambučiai ir pranešimai"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Visada pertraukti"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Leisti tik prioritetines pertrauktis"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nepertraukti"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Leidžiama tik pagal prioritetą"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatinės taisyklės"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Tik prioritetiniai"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tik įspėjimai"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Jokių pertraukčių"</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="ringtone_title" msgid="5379026328015343686">"Telefono skambėjimo tonas"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Numatytasis pranešimo skambėjimo tonas"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Taip pat vibruoti, kai skamb."</string>
@@ -2416,62 +2498,133 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibravimas"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Galimybė pasiekti pranešimus"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programos negali skaityti pranešimų"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d programa gali skaityti pranešimus"</item>
-    <item quantity="other" msgid="980049191810249052">"%d program. gali skaityti pranešimus"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d programa gali skaityti pranešimus</item>
+      <item quantity="few">%d programos gali skaityti pranešimus</item>
+      <item quantity="many">%d programos gali skaityti pranešimus</item>
+      <item quantity="other">%d programų gali skaityti pranešimus</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Neįdiegta pranešimų skaitymo priemonių."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Įgalinti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"„<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>“ galės skaityti visus sistemos ar įdiegtų programų skelbiamus pranešimus, kuriuose gali būti asmeninės informacijos, pavyzdžiui, kontaktų vardų ir jums atsiųstų pranešimų teksto. Ji taip pat galės atsisakyti šių pranešimų arba jose paliečiamų mygtukų veiksmų."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Sąlygų teikėjai"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nėra sąlygas pateikiančių programų"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d progr. pateikia sąlygas"</item>
-    <item quantity="other" msgid="358057362115673258">"%d progr. pateikia sąlygas"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nėra įdiegta jokių sąlygų teikėjų."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Įgalinti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"„<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>“ galės pridėti išėjimo sąlygas prie režimo „Netrukdyti“."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blokuoti"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuoti viską"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Niekada nerodyti iš šios programos gautų pranešimų"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritetas"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Rodyti pranešimus sąrašo viršuje ir priimti juos net tada, kai įrenginyje nustatyta pertraukti darbą tik tais atvejais, kuriems suteikiamas prioritetas"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Delikatus"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Kai įrenginys užrakintas, slėpti visą neskelbtiną turinį nuo šios programos pranešimų"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Laikyti prioritetiniais"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Leisti pateikti programos pranešimus, kai funkcija „Netrukdyti“ nustatyta į „Tik prioritetiniai įvykiai“"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Leisti sparčiai peržiūrėti"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Leisti programai akcentuoti konkrečius pranešimus, trumpai nuslenkant juos į rodinį dabartiniame ekrane"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Slėpti neskelbtiną turinį"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Kai įrenginys užrakintas, slėpti turinį šios programos pranešimuose, kuriuose gali būti atskleidžiama privati informacija"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Užblokuotas"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritetas"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Delikatus"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Atlikta"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Kol išjungsite"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritetinės pertrauktys"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Prastova"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dienos"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nėra"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Leidžiamos pertrauktys"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Tik prioritetinės"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nėra"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatika"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatiškai įjungti"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Taisyklės pavadinimas"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Pridėti taisyklę"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ištrinti taisyklę"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Ištrinti taisyklę „<xliff:g id="RULE">%1$s</xliff:g>“?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Ištrinti"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Taisyklės tipas"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Nežinoma"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigūruoti taisyklę"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Tvarkaraščio taisyklė"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Taisyklė nerasta."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dienos"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nėra"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Kasdien"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Niekada"</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">"Skambučiai"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Pranešimai"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Skambučiai / pranešimai nuo"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Bet ko"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Tik kontaktų"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Tik žvaigžd. pažymėtų kontaktų"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Įvykiai ir priminimai"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Įspėjimai visada yra prioritetinės pertrauktys"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Signalai"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Priminimai"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Įvykiai"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Pasirinkti skambintojai"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Pakartotinai skambinantys naudotojai"</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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Savaitgalių naktimis"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Pradžios laikas"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Pabaigos laikas"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> kitą dieną"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> arba bet kuris įspėjimas prieš tai"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> kitą dieną arba bet kuris įspėjimas prieš tai"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> kitą dieną"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Pertrauktys"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Kai gaunami skambučiai ir pranešimai"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kada jus pertraukti?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Kiek laiko?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Visada pertraukti"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"išjungta,visi,viskas"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Leisti tik prioritetines pertrauktis"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Leisti tik signalus"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Nepertraukti"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Neribotam laikui"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minutė</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minutės</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> minutės</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minučių</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> valanda</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> valandos</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> valandos</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> valandų</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Pakeisti tik į prioritetinius pranešimus neribotam laikui"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> minutei iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> minutėms iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> minutės iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> minučių iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> valandai (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> valandoms (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> valandos (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pakeisti tik į prioritetinius pranešimus <xliff:g id="DURATION">%1$d</xliff:g> valandų (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Pakeisti tik į signalus neribotam laikui"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> minutei (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> minutėms (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> minutės (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> minučių (iki <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">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> valandai iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> valandoms iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> valandos iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Pakeisti tik į signalus <xliff:g id="DURATION">%1$d</xliff:g> valandų iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Pakeisti į nepertraukimo nustatymą neribotam laikui"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> minutei (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> minutėms (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> minutės (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> minučių (iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> valandai iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> valandoms iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> valandos iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Pakeisti į netrukdymo nustatymą <xliff:g id="DURATION">%1$d</xliff:g> valandų iki <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Pakeisti į pertraukimo nustatymą visam laikui"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"visada"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programų pranešimai"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Įspėjimų nustatymai"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Siųsti atsiliepimą apie šį įrenginį"</string>
@@ -2512,4 +2665,69 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI informacija"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI susijusi informacija"</string>
     <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g> lizdas)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Paleisti pagal numatytuosius nustatymus"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"Naudojama: <xliff:g id="SIZE">%1$s</xliff:g> (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Domeno nuorodos"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Atidaryti domeno URL nuorodas"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Leisti programai tiesiogiai atidaryti domeno URL nuorodas"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Palaikomos domeno URL nuorodos"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Kiti numatytieji nustatymai"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"Naudojama: <xliff:g id="SIZE">%1$s</xliff:g> (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"vidinė atmintis"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"išorinė atmintis"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Vidinė atmintis"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Išorinė atmintinė"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Programos duomenų naudojimas"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"Panaudota <xliff:g id="SIZE">%1$s</xliff:g> nuo <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Naudojama atmintinė"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Įjungta"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Užblokuota"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Neskelbtini"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritetiniai"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritetiniai ir neskelbtini"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one">Suteiktas <xliff:g id="COUNT_1">%d</xliff:g> leidimas</item>
+      <item quantity="few">Suteikti <xliff:g id="COUNT_1">%d</xliff:g> leidimai</item>
+      <item quantity="many">Suteikta <xliff:g id="COUNT_1">%d</xliff:g> leidimo</item>
+      <item quantity="other">Suteikta <xliff:g id="COUNT_1">%d</xliff:g> leidimų</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Suteiktas <xliff:g id="COUNT_2">%d</xliff:g> leidimas iš <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="few">Suteikti <xliff:g id="COUNT_2">%d</xliff:g> leidimai iš <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many">Suteikta <xliff:g id="COUNT_2">%d</xliff:g> leidimo iš <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Suteikta <xliff:g id="COUNT_2">%d</xliff:g> leidimų iš <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Nustatyti kai kurie numatytieji nustatymai"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Nenustatyta jokių numatytųjų nustatymų"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Visos programos"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Įgalintos"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Asmeninės"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Darbas"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Užblokuoti"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritetiniai"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Neskelbtini"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Su domeno URL"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Išjungė administratorius"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Išplėstiniai"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Nežinoma programa"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profilio pasirinkimas"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Programos leidimai"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Leidžiama papildoma programų prieiga: <xliff:g id="COUNT_0">%d</xliff:g> iš <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Leidžiama programų: <xliff:g id="COUNT_0">%d</xliff:g> iš <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domeno URL"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Neatidaryti jokių domeno URL"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Atidaryti <xliff:g id="DOMAIN">%s</xliff:g>"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Atidaryti <xliff:g id="DOMAIN">%s</xliff:g> ir susijusius URL"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one">Šio domeno URL nuorodas galima atidaryti naudojant <xliff:g id="COUNT">%d</xliff:g> programą</item>
+      <item quantity="few">Šio domeno URL nuorodas galima atidaryti naudojant <xliff:g id="COUNT">%d</xliff:g> programas</item>
+      <item quantity="many">Šio domeno URL nuorodas galima atidaryti naudojant <xliff:g id="COUNT">%d</xliff:g> programos</item>
+      <item quantity="other">Šio domeno URL nuorodas galima atidaryti naudojant <xliff:g id="COUNT">%d</xliff:g> programų</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Neatpažintas"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Numatytosios programos"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Naršyklės programa"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nėra numatytosios naršyklės"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Numatytoji)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Programų atmintis"</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 5f75f6a..a125675 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"Parole"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Spiedpoga"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"izslēgt/ieslēgt mikrofonu"</item>
     <item msgid="1148142988678569310">"projicēt saturu"</item>
     <item msgid="9130014005474445273">"aktivizēt VPN"</item>
+    <item msgid="1165192162975045562">"izveidot fona tapeti"</item>
+    <item msgid="7129487923652967258">"palīdzīga struktūra"</item>
+    <item msgid="1069023208100114540">"palīdzīgs ekrānuzņēmums"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Atrašanās vieta"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Izslēgt/ieslēgt mikrofonu"</item>
     <item msgid="5906017727368097853">"Projicēt saturu"</item>
     <item msgid="2486614710846178542">"Aktivizēt VPN"</item>
+    <item msgid="5586547561693629602">"Izveidot fona tapeti"</item>
+    <item msgid="32794179825485062">"Palīdzīga struktūra"</item>
+    <item msgid="7872852746938272552">"Palīdzīgs ekrānuzņēmums"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Īss"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"zems"</item>
     <item msgid="4212263919458209842">"kritisks"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Izslēgts"</item>
-    <item msgid="5656544177755411222">"Ierobežoti pārtraukumi"</item>
-    <item msgid="8735337502532332056">"Nav pārtraukumu"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normāls"</item>
     <item msgid="866544120205026771">"Vidējs"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rozā"</item>
     <item msgid="6131821495505931173">"Sarkana"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (satura pārsūtīšanas protokols)"</item>
+    <item msgid="8856820259201251036">"PTP (attēlu pārsūtīšanas protokols)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB tīkls Ethernet)"</item>
+    <item msgid="2686051673589572111">"Audio avots"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index dfef156..2cc2a6c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -22,10 +22,11 @@
     <string name="allow" msgid="3349662621170855910">"Atļaut"</string>
     <string name="deny" msgid="6947806159746484865">"Aizliegt"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nezināms"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Lai jūs kļūtu par izstrādātāju, atlikusi <xliff:g id="STEP_COUNT">%1$d</xliff:g> darbība."</item>
-    <item quantity="other" msgid="6722953419953594148">"Lai jūs kļūtu par izstrādātāju, atlikušas <xliff:g id="STEP_COUNT">%1$d</xliff:g> darbības."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="zero">Lai jūs kļūtu par izstrādātāju, atlikušas <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> darbības.</item>
+      <item quantity="one">Lai jūs kļūtu par izstrādātāju, atlikusi <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> darbība.</item>
+      <item quantity="other">Lai jūs kļūtu par izstrādātāju, atlikušas <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> darbības.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Tagad jūs esat izstrādātājs!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nav nepieciešams, ja jau esat izstrādātājs."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Bezvadu pakalpojums un tīkli"</string>
@@ -40,6 +41,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Izslēgt īsziņas prioritāti pār IM ziņojumu"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Ieslēgt obligāto IMS reģistrāciju"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Izslēgt obligāto IMS reģistrāciju"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Ieslēgt VoLTE nodrošināto karodziņu"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Izslēgt VoLTE nodrošināto karodziņu"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Ieslēgt lte ram izmeti"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Izslēgt lte ram izmeti"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Skatīt SIM adrešu grāmatu"</string>
@@ -135,16 +138,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Apraidīšana"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vai atspējot profilu?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Tiks atspējots:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;No:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Izveidots savienojums"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Savienojums ir izveidots (nav tālruņa)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Sav. ir izveidots (nav multivides)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Savienots (nav piekļuves ziņojumam)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Sav. ir izveidots (nav tel. vai multiv.)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Atvienots"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Notiek atvienošana..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Notiek savienojuma izveide…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Notiek pāra izveide..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Nenosaukta Bluetooth ierīce"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Notiek meklēšana"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Tuvumā nav atrastas Bluetooth ierīces."</string>
@@ -154,7 +148,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rādīt saņemtos failus"</string>
     <string name="device_picker" msgid="4978696506172252813">"Izvēlēties Bluetooth ierīci"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth atļaujas pieprasījums"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu. Vai atļaut?"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Lietotne vēlas IESLĒGT Bluetooth šajā ierīcē."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt planšetdatoru redzamu citām Bluetooth ierīcēm."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Tālrunī instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt tālruni redzamu citām Bluetooth ierīcēm."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Planšetdatorā instalētā lietotnē tiek mēģināts padarīt planšetdatoru redzamu citām Bluetooth ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
@@ -275,12 +269,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD karte"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Starpniekservera iestatījumi"</string>
     <string name="cancel" msgid="6859253417269739139">"Atcelt"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ATCELT"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"TURPINĀT"</string>
     <string name="okay" msgid="1997666393121016642">"LABI"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JĀ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NĒ"</string>
-    <string name="forget" msgid="7267115980248732932">"AIZMIRST"</string>
+    <string name="forget" msgid="1400428660472591263">"Aizmirst"</string>
+    <string name="save" msgid="879993180139353333">"Saglabāt"</string>
+    <string name="done" msgid="6942539184162713160">"Gatavs"</string>
     <string name="settings_label" msgid="1626402585530130914">"Iestatījumi"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Iestatījumi"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Saīsne Iestatījumi"</string>
@@ -325,9 +317,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Kārtot pēc laika joslas"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datums"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Laiks"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Uzlabot sejas atbilstību"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Dzīvīguma pārbaude"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Pieprasīt mirkšķināšanu, lai atbloķētu."</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Automātiski bloķēt"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pēc miega režīma"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pēc miega režīma ieslēgšanās, ja vien bloķēšanu neliedz <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,6 +337,31 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Manas atrašanās vietas, ekrāna atbloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Paroles"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Pirkstu nospiedumi"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Nospiedumu pārvaldība"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Nospieduma lietošana"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Pievienot"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ekrāna bloķēšana"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="zero">Reģistrēti <xliff:g id="COUNT_1">%1$d</xliff:g> pirkstu nospiedumi</item>
+      <item quantity="one">Reģistrēts <xliff:g id="COUNT_1">%1$d</xliff:g> pirksta nospiedums</item>
+      <item quantity="other">Reģistrēti <xliff:g id="COUNT_1">%1$d</xliff:g> pirkstu nospiedumi</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Nospieduma iestatīšana"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Lai izmantotu savu pirksta nospiedumu ekrāna atbloķēšanai vai pirkumu apstiprināšanai, jums ir: \n\n✓ jāiestata fona ekrāna bloķēšanas metode;\n\n✓ jāpievieno pirksta nospiedums."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensora atrašana"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Atrodiet pirkstu nospiedumu sensoru tālruņa aizmugurē."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nosaukums"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Labi"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Dzēst"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Sāciet!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Novietojiet pirkstu uz pirkstu nospiedumu sensora. Kad jūtat vibrāciju, paceliet pirkstu."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Lieliski, atkārtojiet!"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Novietojiet to pašu pirkstu uz pirkstu nospiedumu sensora. Kad jūtat vibrāciju, paceliet pirkstu."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Nospiedums pievienots!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kad tiek rādīta šī ikona, varat izmantot pirksta nospiedumu identifikācijai vai pirkuma autorizēšanai."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Pievienot"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Tālāk"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrējums"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrēt planšetdatoru"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Tālruņa šifrēšana"</string>
@@ -360,7 +374,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pievienojiet lādētāju un mēģiniet vēlreiz."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nav ekrāna bloķēšanas PIN vai paroles"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Lai varētu sākt šifrēšanu, ir jāiestata bloķēšanas ekrāna PIN vai parole."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Lai apstiprinātu ierīces šifrēšanu, norādiet grafisko atslēgu."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vai veikt šifrēšanu?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Šifrēšanas darbība ir neatgriezeniska; pārtraucot šifrēšanu, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, un tās laikā planšetdators vairākas reizes tiks restartēts."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Šifrēšanas darbība ir neatgriezeniska; pārtraucot šifrēšanu, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, un tās laikā tālrunis vairākas reizes tiks restartēts."</string>
@@ -391,22 +404,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Vilkšana"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Aizsardzība nav iespējota"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Autorizācija pēc sejas"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Zems drošības līmenis, eksperimentāls"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Kombinācija"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Vidējs drošības līmenis"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Vidējs līdz augsts drošības līmenis"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parole"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Augsts drošības līmenis"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Pašreizējais ekrāna bloķēšanas iestatījums"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Ierīces aizsardzības funkcijas vairs nedarbosies."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Atspēj. admin., šifr. polit. vai akred. datu krāt."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nav"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vilkt"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Autorizācija pēc sejas"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Shēma"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parole"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Kad būsiet iestatījis ekrāna bloķēšanu, varēsiet pievienot arī savu pirkstu nospiedumu sadaļā Iestatījumi &gt; Drošība."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Izslēgt ekrāna bloķēšanu"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Noņemt atbloķēšanas kombināciju"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Noņemt atbloķēšanas PIN"</string>
@@ -427,30 +439,36 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Parolē ir jābūt vismaz vienam burtam."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Parolē ir jābūt vismaz vienam ciparam."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Parolē ir jābūt vismaz vienam simbolam."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Parolē ir jābūt vismaz 1 burtam."</item>
-    <item quantity="other" msgid="8186027808415585970">"Parolē ir jābūt vismaz %d burtiem."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Parolē ir jābūt vismaz 1 mazajam burtam."</item>
-    <item quantity="other" msgid="2693910942679679225">"Parolē ir jābūt vismaz %d mazajiem burtiem."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Parolē ir jābūt vismaz 1 lielajam burtam."</item>
-    <item quantity="other" msgid="3030801209112209245">"Parolē ir jābūt vismaz %d lielajiem burtiem."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Parolē ir jābūt vismaz 1 ciparam."</item>
-    <item quantity="other" msgid="4703982391407595924">"Parolē ir jābūt vismaz %d cipariem."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Parolē ir jābūt vismaz 1 īpašajam simbolam."</item>
-    <item quantity="other" msgid="1221290525051187757">"Parolē ir jābūt vismaz %d īpašajiem simboliem."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Parolē ir jābūt vismaz 1 rakstzīmei, kas nav burts."</item>
-    <item quantity="other" msgid="3952508584649046404">"Parolē ir jābūt vismaz %d rakstzīmēm, kas nav burti."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="zero">Parolē ir jābūt vismaz %d burtiem.</item>
+      <item quantity="one">Parolē ir jābūt vismaz %d burtam.</item>
+      <item quantity="other">Parolē ir jābūt vismaz %d burtiem.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="zero">Parolē ir jābūt vismaz %d mazajiem burtiem.</item>
+      <item quantity="one">Parolē ir jābūt vismaz %d mazajam burtam.</item>
+      <item quantity="other">Parolē ir jābūt vismaz %d mazajiem burtiem..</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="zero">Parolē ir jābūt vismaz %d lielajiem burtiem.</item>
+      <item quantity="one">Parolē ir jābūt vismaz %d lielajam burtam.</item>
+      <item quantity="other">Parolē ir jābūt vismaz %d lielajiem burtiem.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="zero">Parolē ir jābūt vismaz %d cipariem.</item>
+      <item quantity="one">Parolē ir jābūt vismaz %d ciparam.</item>
+      <item quantity="other">Parolē ir jābūt vismaz %d cipariem.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="zero">Parolē ir jābūt vismaz %d speciālajiem simboliem.</item>
+      <item quantity="one">Parolē ir jābūt vismaz %d speciālajam simbolam.</item>
+      <item quantity="other">Parolē ir jābūt vismaz %d speciālajiem simboliem.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="zero">Parolē ir jābūt vismaz %d rakstzīmēm, kas nav burti.</item>
+      <item quantity="one">Parolē ir jābūt vismaz %d rakstzīmei, kas nav burti.</item>
+      <item quantity="other">Parolē ir jābūt vismaz %d rakstzīmēm, kas nav burti.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Ierīces administrators neļauj izmantot nesen izveidotu paroli."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Augoša, dilstoša vai atkārtota ciparu secība nav atļauta."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Labi"</string>
@@ -480,15 +498,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Lai savienotu pārī ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pārliecinieties, ka tiek rādīta šī ieejas atslēga:&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">"No:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vai savienot pārī ar šo ierīci?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Lai izveidotu savienojumu pārī ar ierīci <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>, ierakstiet tajā atslēgu <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> un pēc tam nospiediet ievadīšanas taustiņu."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Izveidot pāri"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SAVIENOT PĀRĪ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Atcelt"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Veicot savienošanu pārī, šī ierīce savienojuma laikā varēs piekļūt jūsu kontaktpersonām un zvanu vēsturei."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nevarēja savienot pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nevarēja savienot pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, jo tika ievadīts nepareizs PIN kods vai nepareiza ieejas atslēga."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nevar sazināties ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> noraidīja pāra izveidi."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Nevarēja izveidot savienojumu ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Skenēt ierīces"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Atsvaidzināt"</string>
@@ -515,16 +526,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Papildu iestatījumi"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth papildu iestatījumi"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kad Bluetooth ir ieslēgts, ierīce var sazināties ar citām Bluetooth ierīcēm tuvumā."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Lai uzlabotu atrašanās vietas noteikšanas precizitāti, lietotnēs un pakalpojumos tiks meklētas Bluetooth ierīces, pat ja Bluetooth savienojums ir izslēgts. Varat to mainīt <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>meklēšanas iestatījumos<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Savienot ar..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Multivides audio"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Tālruņa audio"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Failu pārsūtīšana"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Ievades ierīce"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Interneta piekļuve"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktpersonas informācijas kopīgošana"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Izmantot kontaktpersonas informācijas kopīgošanai"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneta savienojuma koplietošana"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Piekļuve ziņojumam"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no datu nesēja audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no brīvroku audio."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no ievades ierīces."</string>
@@ -537,28 +540,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Izmantot:"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Pārdēvēt"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Atļaut ien. failu pārsūtīšanu"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Savienots ar multivides audio"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Savienots ar tālruņa audio"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Savienots ar failu pārsūtīšanas serveri"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Izveidots savienojums ar karti"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nav savienots ar failu pārsūtīšanas serveri"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Izveidots savienojums ar ievades ierīci"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Savien. ar ier., lai nodr. int. piekļ."</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Tiek kopliet. lok. intern. savien. ar ierīci"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Izmantot multivides skaņai"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Izmantot tālruņa skaņai"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Izmantot faila pārsūtīšanai"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Izmantot ievadei"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Izmantot, lai piekļūtu internetam"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Lietot kartei"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Doka iestatījumi"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Audio pakalpojumam izmantot doku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kā mikrofons ar skaļruni"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Mūzikai un multividei"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Iegaumēt iestatījumus"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Izveidots savienojums ar Wi‑Fi palīgu"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Apraides ekrāns"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Apraide"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Bezvadu attēlošanas iespējošana"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tuvumā nav atrasta neviena ierīce."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Notiek savienojuma izveide."</string>
@@ -570,6 +560,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Aizmirst"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Gatavs"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nosaukums"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Atļaut datu apmaiņu, kad planšetdators saskaras ar citu ierīci"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Atļaut datu apmaiņu, kad tālrunis saskaras ar citu ierīci"</string>
@@ -593,21 +585,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Notiek Wi-Fi izslēgšana..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Kļūda"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Lidmašīnas režīmā"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nevar skenēt tīklus"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Tīkla paziņojums"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Paziņot, kad ir pieejams publisks tīkls"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Nelietot vājus savienojumus"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Nelietot Wi-Fi tīklu, ja vien tam nav labs interneta savienojums"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Izmantot tikai tīklus ar labu interneta savienojumu"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Meklēšana vienmēr pieejama"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Vienmēr atļaut meklēšanu"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Atļaut Google atrašanās vietas pakalpojumam un citām lietotnēm meklēt tīklus, pat ja Wi-Fi savienojums ir izslēgts"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automātiski izmantot atvērtu Wi‑Fi tīklu"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Ļaut Wi‑Fi palīgam automātiski pieslēgties atvērtiem augstas kvalitātes Wi-Fi tīkliem"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Palīga atlase"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikātu instalēšana"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Atrašanās vietas noteikšanas precizitātes uzlabošanai un citiem nolūkiem Google un citas lietotnes var meklēt tuvumā esošos tīklus pat tad, kad Wi-Fi ir izslēgts. Ja to nevēlaties, atveriet Papildu &gt; Meklēšana vienmēr pieejama."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Lietotnes var meklēt tuvumā esošos tīklus pat tad, kad Wi-Fi ir izslēgts. Ja to nevēlaties, atveriet Papildu &gt; Meklēšana vienmēr pieejama."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Lai uzlabotu atrašanās vietas noteikšanas precizitāti, lietotnēs un pakalpojumos tiks meklēti Wi-Fi tīkli, pat ja Wi-Fi savienojums ir izslēgts. Varat to mainīt <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>meklēšanas iestatījumos<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Vairs nerādīt"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Aktivizēt Wi-Fi arī miega režīmā"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi ieslēgts miega režīmā"</string>
@@ -635,11 +622,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Pievienot citu tīklu"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Vairāk"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. iestatīšana (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Lai pabeigtu iestatīšanu, planšetdatoram ir nepieciešams Wi-Fi savienojums. Pēc iestatīšanas varat pārslēgties starp mobilajiem datiem un Wi-Fi tīklu."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Papildu opcijas"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi aizsargātā iestatīšana"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Notiek WPS sākšana..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Nospiediet maršrutētāja pogu “Wi-Fi aizsargātā iestatīšana”. Uz tās var būt rakstīts “WPS”, vai var būt redzams šāds simbols:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Nospiediet maršrutētāja pogu “Wi-Fi aizsargātā iestatīšana”. Uz tās var būt rakstīts “WPS” vai var būt redzams šāds simbols:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Ievadiet uz Wi-Fi maršrutētāja norādīto PIN kodu: <xliff:g id="NUMBER">%1$s</xliff:g>. Iestatīšana var ilgt divas minūtes."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS bija veiksmīga. Notiek savienojuma izveide ar tīklu..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Ir izveidots savienojums ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +651,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonīmi identifikācijas dati"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Parole"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Rādīt paroli"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfigurēt piekļuves punkta joslu"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GHz josla"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz josla"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP iestatījumi"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(bez izmaiņām)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nav norādīts)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Saglabāts"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Atspējots"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP konfigurācijas kļūme"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi savienojuma kļūme"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentificēšanas problēma"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Nav diapazona ietvaros"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Nevar noteikt interneta savienojumu. Savienojums netiks izveidots vēlreiz automātiski."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ir pieejams"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ir pieejams)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ievadiet tīkla paroli"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Nav"</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>
@@ -686,6 +667,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vai pierakstīties, lai izveidotu savienojumu?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> pieprasa pierakstīties tiešsaistē pirms savienošanas ar tīklu."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"IZVEIDOT SAVIENOJUMU"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Šim tīklam nav interneta piekļuves. Vai tomēr izmantot šo tīklu?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Vairs nejautāt par šo tīklu"</string>
     <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>
@@ -751,6 +734,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK portatīvais Wi-Fi tīklājs"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> pārnēsājams Wi-Fi 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_mode_title" msgid="2164073796253284289">"Zvanu preference"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi zvanu režīms"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Vēlams Wi-Fi tīkls"</item>
+    <item msgid="5267397515594230396">"Vēlams mobilais tīkls"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2."</item>
+    <item msgid="1171822231056612021">"1."</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Sākums"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Skaņa"</string>
@@ -814,6 +809,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Noregulēt ekrāna spilgtumu"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptīvs spilgtums"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizēt spilgtuma līmeni atbilstoši pieejamajam apgaismojumam"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Motīvs"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Viegli"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Tumšs"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automātiski"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Miega režīms"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekrāns tiek izslēgts"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
@@ -865,10 +865,11 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Vai atjaunināt izvēlēto SIM?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> ir vienīgā SIM karte jūsu ierīcē. Vai vēlaties izmantot šo SIM karti mobilajiem datiem, zvaniem un īsziņām?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Nepareizs SIM kartes PIN kods. Lai atbloķētu ierīci, sazinieties ar mobilo sakaru operatoru."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Nepareizs SIM kartes PIN kods. Varat mēģināt vēl <xliff:g id="NUMBER">%d</xliff:g> reizi. Kļūdas gadījumā būs jāsazinās ar mobilo sakaru operatoru, lai tas atbloķētu jūsu ierīci."</item>
-    <item quantity="other" msgid="77103619544346451">"Nepareizs SIM kartes PIN kods. Varat mēģināt vēl <xliff:g id="NUMBER">%d</xliff:g> reizi(-es)."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="zero">Nepareizs SIM kartes PIN kods. Varat mēģināt vēl <xliff:g id="NUMBER_1">%d</xliff:g> reizes.</item>
+      <item quantity="one">Nepareizs SIM kartes PIN kods. Varat mēģināt vēl <xliff:g id="NUMBER_1">%d</xliff:g> reizi.</item>
+      <item quantity="other">Nepareizs SIM kartes PIN kods. Varat mēģināt vēl <xliff:g id="NUMBER_1">%d</xliff:g> reizes.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM kartes PIN koda ievadīšana neizdevās."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planšetdatora statuss"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Tālruņa statuss"</string>
@@ -917,12 +918,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Pieejams (tikai lasāms)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Kopējā vieta"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Notiek aprēķināšana..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Lietotnes (lietotņu dati un multivides saturs)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Lietotnes un lietotņu dati"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multivide"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Lejupielādes"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Attēli, videoklipi"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (mūzika, zvana signāli, aplādes utt.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Dažādi"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Citi faili"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Kešatmiņā ievietotie dati"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Atvienot kopīgoto krātuvi"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Atvienot SD karti"</string>
@@ -955,6 +956,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Notiek atvienošana"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Paliek maz brīvas vietas"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Dažas sistēmas funkcijas, piemēram, sinhronizēšana, var nedarboties pareizi. Mēģiniet atbrīvot vietu, dzēšot vai noņemot piespraustos vienumus, piemēram, lietotnes vai multivides saturu."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Pārdēvēt"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Pievienot"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Noņemt"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Dzēst un formatēt"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Dzēst un formatēt kā iekšējo atmiņu"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB savienojums ar datoru"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB savienojums ar datoru"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Izveidot savienojumu kā"</string>
@@ -962,8 +968,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Ļauj pārsūtīt multivides failus operētājsistēmā Windows vai, izmantojot lietojumprogrammu Android File Transfer, Mac datorā (skatiet www.android.com/filetransfer)."</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Ļauj pārsūtīt fotoattēlus, izmantojot kameras programmatūru, un pārsūtīt no datoriem jebkurus failus, kas neatbalsta MTP."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalēt failu pārsūtīšanas rīkus"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Ļauj lietojumprogrammām, kurās ir iespējoti MIDI signāli, darboties kopā ar jūsu datora MIDI programmatūru, izmantojot USB savienojumu."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Citi lietotāji"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Ierīces atmiņa"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Noņemamas atmiņas ierīces"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> bez maksas (kopā: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ir pievienota"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Nevarēja pievienot: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> tika droši noņemta"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Nevarēja droši noņemt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ir formatēta"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Nevarēja formatēt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Pārdēvējiet atmiņu"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Pēc formatēšanas varat izmantot šo <xliff:g id="NAME_0">^1</xliff:g> citās ierīcēs. \n\nVisi šajā <xliff:g id="NAME_1">^1</xliff:g> saglabātie dati tiks dzēsti. Ieteicams vispirms dublēt datus. \n\n"<b>"Dublējiet fotoattēlus un citu saturu"</b>" \nPārvietojiet satura failus uz šīs ierīces alternatīvo krātuvi vai pārsūtiet tos uz datoru, izmantojot USB kabeli. \n\n"<b>"Dublējiet lietotnes"</b>" \nVisas šajā <xliff:g id="NAME_6">^1</xliff:g> glabātās lietotnes tiks atinstalētas, un to dati tiks dzēsti. Lai saglabātu šīs lietotnes, pārvietojiet tās uz šīs ierīces alternatīvo krātuvi."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kad izņemsiet šo <xliff:g id="NAME_0">^1</xliff:g>, tajā glabātās lietotnes vairs nedarbosies un tajā glabātie faili nebūs pieejami, līdz tā tiks ievietota atpakaļ."</b>" \n\nŠī <xliff:g id="NAME_1">^1</xliff:g> ir formatēta tā, lai darbotos tikai šajā ierīcē, un tā nedarbosies citās ierīcēs."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Iestatiet <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Izmantot kā pārnēsājamu krātuvi"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Izvēloties šo opciju, varēsiet pārvietot fotoattēlus un citus datus uz citām ierīcēm."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Izmantot kā iekšējo atmiņu"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Izvēloties šo opciju, varēsiet glabāt failus (tostarp lietotnes un fotoattēlus) tikai šajā ierīcē. Tādā gadījumā krātuve ir jāformatē, lai tā darbotos tikai konkrētā ierīcē."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatēt kā iekšējo atmiņu"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Lai padarītu <xliff:g id="NAME_0">^1</xliff:g> drošu, tā ir jāformatē. \n\nPēc formatēšanas šī <xliff:g id="NAME_1">^1</xliff:g> darbosies tikai šajā ierīcē. \n\n"<b>"Formatējot <xliff:g id="NAME_2">^1</xliff:g>, tiks dzēsti visi tajā pašlaik glabātie dati."</b>" Lai nezaudētu datus, dublējiet tos."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Dzēst un formatēt"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Notiek <xliff:g id="NAME">^1</xliff:g> formatēšana…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Neizņemiet <xliff:g id="NAME">^1</xliff:g> formatēšanas laikā."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Pārvietojiet uz jauno krātuvi"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Varat pārvietot fotoattēlus, failus un lietotņu datus uz jauno <xliff:g id="NAME">^1</xliff:g>. \n\nFailu pārvietošanai nepieciešamais laiks ir aptuveni <xliff:g id="TIME">^2</xliff:g>, un tādējādi iekšējā atmiņā tiks atbrīvota <xliff:g id="SIZE">^3</xliff:g> liela vieta. Kamēr noritēs pārvietošana, dažas lietotnes nedarbosies."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Pārvietot tūlīt"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Pārvietot vēlāk"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Pārvietojiet datus tūlīt"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Failu pārvietošanai nepieciešamais laiks ir aptuveni <xliff:g id="TIME">^1</xliff:g>. Iekšējā atmiņā tiks atbrīvota <xliff:g id="SIZE">^2</xliff:g> liela vieta."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Pārvietot failus"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Notiek datu pārvietošana…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Failu pārvietošanas laikā: \n• neizņemiet <xliff:g id="NAME">^1</xliff:g>; \n• dažas lietotnes var nedarboties pareizi; \n• uzturiet ierīces akumulatora enerģijas līmeni."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> ir gatava lietošanai"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Jūsu <xliff:g id="NAME">^1</xliff:g> ir iestatīta, un tajā var glabāt fotoattēlus un citu saturu"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Jaunā <xliff:g id="NAME">^1</xliff:g> darbojas. \n\nLai pārvietotu fotoattēlus un lietotņu datus uz šo ierīci, atveriet izvēlni Iestatījumi &gt; Krātuve."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Pārvietojiet lietotni <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Lietotnes <xliff:g id="APP">^1</xliff:g> un tās datu pārvietošana uz <xliff:g id="NAME_0">^2</xliff:g> aizņems tikai neilgu brīdi. Kamēr pārvietošana nebūs pabeigta, nevarēsiet izmantot lietotni. \n\nNeizņemiet <xliff:g id="NAME_1">^2</xliff:g>, kamēr tiek pārvietoti faili."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Notiek lietotnes <xliff:g id="APP">^1</xliff:g> pārvietošana…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Neizņemiet <xliff:g id="NAME">^1</xliff:g>, kamēr tiek pārvietoti faili. \n\nKamēr failu pārvietošana nebūs pabeigta, lietotne <xliff:g id="APP">^2</xliff:g> šajā ierīcē nebūs pieejama."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Atcelt pārvietošanu"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akumulatora statuss"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akumulatora uzlādes līmenis"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1053,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Notiek APN noklusējuma iestatījumu atjaunošana."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Atiestatīt noklusējuma vērtības"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Noklusējuma APN iestatījumu atiestatīšana ir pabeigta."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Tīkla iestatījumu atiestatīšana"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Tādējādi tiks atiestatīti visi tīklu 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>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Vai atiestatīt visus tīkla iestatījumus? Šo darbību nevarēs atsaukt."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Atiestatīt iestatījumus"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vai atiestatīt?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Tīklu iestatījumi ir atiestatīti."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Atiestatīt ierīci"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Rūpnīcas datu atiestatīšana"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Dzēš visus datus planšetdatorā"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Dzēst visus tālrunī saglabātos datus"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1075,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izdzēst visus SD kartē saglabātos datus, piemēram, mūziku vai fotoattēlus"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Atiestatīt planšetdatoru"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Atiestatīt tālruni"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Vai dzēst visu jūsu personīgo informāciju un visas lejupielādētās lietotnes? Šo darbību nevar atcelt!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Vai dzēst visu jūsu personīgo informāciju un visas lejupielādētās lietotnes? Šo darbību nevarēs atsaukt."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Dzēst visu"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Lai apstiprinātu rūpnīcas datu atiestatīšanu, norādiet grafisko atslēgu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Atiestatīšana netika veikta, jo nav pieejams pakalpojums Sistēmas tīrīšana."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vai atiestatīt?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Šim lietotājam nav pieejama rūpnīcas datu atiestatīšana."</string>
@@ -1043,8 +1093,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vai izdzēst USB atmiņas saturu, dzēšot visus tajā glabātos failus? Šo darbību nevar atcelt."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vai izdzēst SD kartes saturu, tostarp visus tajā saglabātos failus? Šo darbību nevar atcelt!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Dzēst visu"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Lai apstiprinātu USB atmiņas satura dzēšanu, norādiet grafisko atslēgu."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Lai apstiprinātu SD kartes satura dzēšanu, norādiet grafisko atslēgu."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Zvanu iestatījumi"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Balss pasta, zvanu pāradresācijas, zvana gaidīšanas, zvanītāja ID iestatīšana"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB saistīšana"</string>
@@ -1076,7 +1124,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Palīdzība"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilie tīkli"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilo sakaru pakalpojumu plāns"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Noklusējuma īsziņu lietotne"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Īsziņu lietotne"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vai mainīt īsziņu lietotni?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vai īsziņām izmantot lietotni <xliff:g id="NEW_APP">%1$s</xliff:g>, nevis <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vai izmantot lietotni <xliff:g id="NEW_APP">%s</xliff:g> kā īsziņu lietotni?"</string>
@@ -1104,7 +1152,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Atrašanās vietas režīms"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Izmantojiet GPS, Wi-Fi un mobilos tīklus, lai noteiktu atrašanās vietu."</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Izmantojiet Wi-Fi un mobilos tīklus, lai noteiktu atrašanās vietu."</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Lietot GPS atrašanās vietas noteikšanai"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Lietot GPS atrašanās vietas noteikšanai"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Pārbaudīšana"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Pārbaudīšana"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi meklēšana"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Uzlabot atrašanās vietas noteikšanas precizitāti, ļaujot lietotnēm un pakalpojumiem meklēt Wi-Fi tīklus, pat ja Wi-Fi savienojums ir izslēgts"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth meklēšana"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Uzlabot atrašanās vietas noteikšanas precizitāti, ļaujot sistēmas pakalpojumiem meklēt Bluetooth ierīces, pat ja Bluetooth savienojums ir izslēgts"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi un mobilo tīklu atr. vieta"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ļaut lietotnēm izmantot Google atrašanās vietas pakalpojumu, lai ātrāk noteiktu jūsu atrašanās vietu. Tiks apkopoti un nosūtīti uz Google serveriem anonīmi atrašanās vietas dati."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi noteikta atrašanās vieta"</string>
@@ -1150,11 +1204,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parole ir iestatīta"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN kods ir iestatīts"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Kombinācija ir iestatīta"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Ekrāna drošība"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Lai turpinātu, ievadiet ierīces kombināciju."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Lai turpinātu, ievadiet ierīces PIN kodu."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Lai turpinātu, ievadiet ierīces 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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Ierīces drošība"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Atbloķēšanas kombinācijas maiņa"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Mainīt atbloķēšanas PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Apstiprināt saglabāto kombināciju"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Mēģiniet vēlreiz:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Zīmēt atbloķēšanas kombināciju"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Lai saņemtu palīdzību, nospiediet Izvēlne."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Atlaidiet pirkstu, kad esat pabeidzis."</string>
@@ -1176,8 +1234,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Iestatīt atbloķēšanas kombināciju"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Atbloķēšanas kombinācijas maiņa"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kā zīmēt atbloķēšanas kombināciju"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Pārāk daudz nepareizu mēģinājumu!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Mēģiniet vēlreiz pēc <xliff:g id="NUMBER">%d</xliff:g> sekundēm."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Pārāk daudz neveiksmīgu mēģinājumu. Mēģiniet vēlreiz pēc <xliff:g id="NUMBER">%d</xliff:g> sekundēm."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Lietojumprogramma jūsu tālrunī nav instalēta."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pārvaldīt lietotnes"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pārvaldiet un noņemiet instalētās lietotnes"</string>
@@ -1228,6 +1285,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Kārtot pēc izmēra"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Rādīt aktīvos pakalp."</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Rādīt kešatmiņā iev. pr."</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Ārkārtas izsaukumu lietotne"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Atiest. lietotnes prefer."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vai atiest. liet. pref.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tādējādi tiks atiestatītas visas preferences, kas saistītas ar:\n\n "<li>"atspējotām lietotnēm;"</li>\n" "<li>"atspējotu lietotņu paziņojumiem;"</li>\n" "<li>"darbībām paredzētām noklusējuma lietojumprogrammām;"</li>\n" "<li>"lietotņu fona datu ierobežojumiem;"</li>\n" "<li>"visiem atļauju ierobežojumiem."</li>\n\n" Jūs nezaudēsiet nekādus lietotņu datus."</string>
@@ -1299,6 +1357,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Lietotnes darbības"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Darbojas"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nekad nav izmantots)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Nav noklusējuma lietotņu."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Krātuves lietojums"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Skatīt lietotnēm izmantoto atmiņu"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktīvie pakalpojumi"</string>
@@ -1396,17 +1455,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informācija par planšetdatoru"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informācija par tālruni"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informācija par akumulatoru"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Ātrā uzsākšana"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Iestatīt īsinājumtaustiņus lietotņu palaišanai"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Piešķirt lietotni"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Nav saīsnes"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Meklēt + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Notīrīt"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) paredzētā saīsne tiks notīrīta."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Labi"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Atcelt"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Lietotnes"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Saīsnes"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Teksta ievade"</string>
     <string name="input_method" msgid="5434026103176856164">"Ievades metode"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Pašreizējā tastatūra"</string>
@@ -1441,23 +1489,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tvert visas Bluetooth HCI paketes failā"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM atbloķēšana"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Atļaut palaišanas ielādētāja atbloķēšanu"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Ievadiet savu PIN kodu."</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Lai iespējotu OEM atbloķēšanu, ievadiet ierīces PIN kodu."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vai atļaut OEM atbloķēšanu?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"BRĪDINĀJUMS. Kamēr šis iestatījums būs ieslēgts, ierīces aizsardzības funkcijas nedarbosies."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Reģistrētāja buferu lielumi"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Atlasīt reģistrētāja bufera liel."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Atļaut neīstas vietas"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Atļaut neīstas vietas"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Iespējot skata atribūta pārbaudi"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Tīklošana"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Bezvadu attēlošanas sertifikācija"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Iespējot Wi‑Fi detalizēto reģistrēšanu"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresīva pāreja no Wi‑Fi uz mobilo tīklu"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Vienmēr atļaut Wi‑Fi meklēšanu"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Lietot mantoto DHCP klientu"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Rādīt bezvadu attēlošanas sertifikācijas iespējas"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Palieliniet Wi‑Fi reģistrēšanas līmeni; rādīt katram SSID RSSI Wi‑Fi atlasītājā."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Ja opcija ir iespējota un Wi‑Fi signāls ir vājš, datu savienojuma pāreja no Wi-Fi uz mobilo tīklu tiks veikta agresīvāk."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Atļaujiet/neatļaujiet Wi‑Fi meklēšanu, pamatojoties uz saskarnē saņemto datplūsmas apjomu."</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Reģistrētāja buferu lielumi"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Atlasīt reģistrētāja bufera liel."</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Atlasīt USB konfigurāciju"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Atlasīt USB konfigurāciju"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Atļaut neīstas vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Atļaut neīstas vietas"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Iespējot skata atribūta pārbaudi"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Lietot DHCP klientu no operētājsistēmas Lollipop, nevis jauno Android DHCP klientu."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vai atļaut USB atkļūdošanu?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB atkļūdošana ir paredzēta tikai ar izstrādi saistītām darbībām. Izmantojiet to datu kopēšanai no datora uz ierīci un pretēji, lietotņu instalēšanai ierīcē bez paziņojumiem un žurnāla datu lasīšanai."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Vai atcelt piekļuvi USB atkļūdošanai no visiem datoriem, kuriem iepriekš piešķīrāt piekļuvi?"</string>
@@ -1561,6 +1617,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Fuksīnsarkana"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Vai izmantot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Pakalpojumam <xliff:g id="SERVICE">%1$s</xliff:g> nepieciešams:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Lietotne Iestatījumi nevar verificēt jūsu atbildi, jo cita lietotne aizsedz atļaujas pieprasījumu."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ja ieslēgsiet pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>, ierīce neizmantos ekrāna bloķēšanu datu šifrēšanas uzlabošanai."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Tā kā esat ieslēdzis pieejamības pakalpojumu, ierīce neizmantos ekrāna bloķēšanu datu šifrēšanas uzlabošanai."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Tā kā pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> ieslēgšana ietekmē datu šifrēšanu, jums ir jāapstiprina sava grafiskā atslēga."</string>
@@ -1702,14 +1759,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Procesu statistika"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistika par darbības procesiem"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Atmiņas lietojums"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> lietotnes šādā laika posmā: <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Izmantots <xliff:g id="USEDRAM">%1$s</xliff:g> no <xliff:g id="TOTALRAM">%2$s</xliff:g> šādā periodā: <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Fons"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Priekšplāns"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Saglabāts kešatmiņā"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Ierīces atmiņas līmenis pašreiz ir <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Vidējais RAM lietojums"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimālais RAM lietojums"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Vietējie"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kodols"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Kešatmiņas"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM lietojums"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM lietojums (fonā)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Ilgums"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Procesi"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Pakalpojumi"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Ilgums"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Informācija par atmiņu"</string>
@@ -1726,6 +1789,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 stundas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 diena"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Rādīt sistēmas procesus"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Slēpt sistēmu"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Lietot unikālo kopas lielumu"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikas veids"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Fons"</string>
@@ -1748,7 +1812,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Noklusējuma iestatījumiem tālāk ir augstāka prioritāte nekā lietotnes iestatījumiem"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Noklusējuma iestatījumi"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Noklusējuma programma"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Iestata runas sintēzes programmas lietošanu runātajam tekstam"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Iestatiet runas sintēzes programmu, kas jāizmanto runātajam tekstam."</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Runas ātrums"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Teksta ierunāšanas ātrums"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonis"</string>
@@ -1822,7 +1886,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Krātuve aparatūrā"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Tikai programmatūrā"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Šim lietotājam nav pieejami akreditācijas dati."</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Lai apstiprinātu akreditācijas datu instalēšanu, norādiet atbloķēšanas kombināciju."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1910,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Dublēt manus datus"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Dublēt lietotnes datus, Wi-Fi paroles un citus iestatījumus Google serveros"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Rezerves konts"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Pašlaik nevienā kontā netiek uzglabāti dublēti dati."</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Lietotņu datu iekļaušana"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automātiska atjaunošana"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Atkārtoti instalējot lietotni, atjaunot dublētos iestatījumus un datus"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Dublēšanas pakalpojums nav aktīvs."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Šo iestata ierīces politika."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Datora dublējuma parole"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Darbvirsmas pilnie dublējumi pašlaik nav aizsargāti."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Pieskarieties, lai mainītu vai noņemtu paroli pilniem darbvirsmas dublējumiem."</string>
@@ -2024,6 +2085,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Pārejas animācijas mērogs"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animācijas ilguma mērogs"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulēt sekundāros ekr."</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Vairāku logu režīms"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Ekrānā varat veikt vairākas darbības vienlaikus."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Vai iespējot vairāku logu režīmu?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"BRĪDINĀJUMS. Šī ir eksperimentāla funkcija, kas ļauj vienlaicīgi veikt vairākas darbības ekrānā, izmantojot lietotāja saskarni Nesen izmantotās lietotnes. Izmantojot šo funkciju, dažas lietotnes var avarēt vai nedarboties."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Lietotnes"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nesaglabāt darbības"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Iznīcināt katru darbību, kad lietotājs to pārtrauc"</string>
@@ -2195,7 +2260,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Lietotājs"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ierobežots profils"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Vai pievienot jaunu lietotāju?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Varat koplietot šo ierīci ar citām personām, izveidojot papildu lietotājus. Katram lietotājam ir sava vide, kas ir pielāgojama, izmantojot lietotnes, fona tapetes u.c. Lietotāji var pielāgot ierīces iestatījumus, kas attiecas uz visiem lietotājiem, piemēram, Wi‑Fi.\n\nKad pievienosiet jaunu lietotāju, viņam būs jāizveido sava vide.\n\nIkviens lietotājs var atjaunināt lietotnes citu lietotāju vietā."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Varat koplietot šo ierīci ar citām personām, izveidojot papildu lietotājus. Katram lietotājam ir sava vide, kas ir pielāgojama, izmantojot lietotnes, fona tapetes u.c. Lietotāji var pielāgot ierīces iestatījumus, kas attiecas uz visiem lietotājiem, piemēram, Wi‑Fi.\n\nKad pievienosiet jaunu lietotāju, viņam būs jāizveido sava vide.\n\nIkviens lietotājs var atjaunināt lietotnes citu lietotāju vietā."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kad pievienosiet jaunu lietotāju, viņam būs jāizveido sava vide.\n\nIkviens lietotājs var atjaunināt lietotnes citu lietotāju vietā."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Iestatīt kontu tūlīt?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Pārliecinieties, ka persona var izmantot ierīci un iestatīt savu vidi."</string>
@@ -2226,13 +2291,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Vai noņemt viesi?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Tiks dzēstas visas šīs sesijas lietotnes un dati."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Noņemt"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Atļaut tālruņa zvanus"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Atļaut tālruņa zvanus un īsziņas"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Ieslēgt tālruņa zvanus"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Ieslēgt tālruņa zvanus un īsziņas"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Noņemt lietotāju"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Vai atļaut tālruņa zvanus?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Vai ieslēgt tālruņa zvanus?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Ar šo lietotāju tiks kopīgota zvanu vēsture."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Vai atļaut tālruņa zvanus un īsziņas?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Ar šo lietotāju tiks kopīgota zvanu un īsziņu vēsture."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vai ieslēgt tālruņa zvanus un īsziņas?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Ar šo lietotāju tiks kopīgota zvanu un īsziņu vēsture."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Lietotņu un satura atļaušana"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Lietojumprogrammas ar ierobežojumiem"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Izvērst lietojumprogr. iestat."</string>
@@ -2283,8 +2348,8 @@
     <string name="user_rename" msgid="8523499513614655279">"PĀRDĒVĒT"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Iestatīt lietotnes ierobežojumus"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Pārvalda lietotne <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ierobežotiem profiliem netiek atbalstīta šī lietotne."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Šī lietotne var piekļūt jūsu kontiem."</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Šī lietotne var piekļūt jūsu kontiem. Kontrolē: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi un mobilais tīkls"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Atļaut Wi‑Fi un mobilā tīkla iestatījumu pārveidošanu"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2414,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi tīkls savienojums"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"īsziņa sūtīt īsziņu ziņas ziņojumapmaiņa"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilais operators bezvadu dati 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi zvans zvanīšana"</string>
     <string name="keywords_home" msgid="3626170808219458848">"palaišanas programma"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekrāns skārienekrāns"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"tumšs ekrāns skārienekrāns akumulators"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"tumšs ekrāns skārienekrāns akumulators"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fons personalizēt pielāgot displejs"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tumšs motīvs nakts režīms aptumšot ekrāns mainīt spilgtums"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"fons personalizēt pielāgot displejs"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksta lielums"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projicēt"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"apraidītā satura projicēšana"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"vieta disks cietai disks ierīce lietojums"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"jauda lietojums uzlāde"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"pareizrakstība vārdnīca pareizrakstības pārbaude automātiskā labošana"</string>
@@ -2372,6 +2439,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"konts"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ierobežojums ierobežot ierobežots"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teksts labojums labot skaņa vibrācija automātisks valoda žests ieteikt ieteikums motīvs aizvainojošs vārds rakstīt emocijzīmes starptautisks"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"atiestatīt preferences noklusējums"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"ārkārtas gadījumi noklusējuma lietotne"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"lietotnes lejupielādēt lietojumprogrammas sistēma"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"lietotnes atļaujas drošība"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"lietotnes noklusējums"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"vilkt parole kombinācija pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Iestatīt Wi-Fi NFC atzīmi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rakstīt"</string>
@@ -2386,11 +2458,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Signāla skaļums"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Zvana skaļums"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Paziņojumu skaļums"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Pārtraukumi"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Saņemot zvanus un paziņojumus"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Vienmēr pārtraukt"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Atļaut tikai prioritāros pārtraukumus"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nepārtraukt"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Atļauti tikai prioritārie pārtraukumi"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automātiskas kārtulas"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Tikai prioritārie pārtraukumi"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tikai signāli"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Bez pārtraukumiem"</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="ringtone_title" msgid="5379026328015343686">"Tālruņa zvana signāls"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Paziņojumu noklusējuma zvana signāls"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrācija zvaniem"</string>
@@ -2416,62 +2489,124 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrozvans"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Piekļuve paziņojumiem"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Lietotnēs nevar lasīt paziņojumus."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d lietotnē var lasīt paziņojumus."</item>
-    <item quantity="other" msgid="980049191810249052">"%d lietotnēs var lasīt paziņojumus."</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="zero">%d lietotnēs var lasīt paziņojumus</item>
+      <item quantity="one">%d lietotnē var lasīt paziņojumus</item>
+      <item quantity="other">%d lietotnē var lasīt paziņojumus</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nav instalēts neviens paziņojumu uztvērējs."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vai iespējot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Uztvērējs <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> varēs lasīt visus paziņojumus, ko publicējusi sistēma vai jebkura instalētā lietotne. Šajos paziņojumos var būt ietverta personas informācija, piemēram, kontaktpersonu vārdi un saņemtās īsziņas. Šis uztvērējs arī varēs paslēpt šos paziņojumus un pieskarties paziņojumos esošajām darbību pogām."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Nosacījumu sniedzēji"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nosacījumi nav sniegti nevienā lietotnē"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"Nosacījumi sniegti %d lietotnē"</item>
-    <item quantity="other" msgid="358057362115673258">"Nosacījumi sniegti %d lietotnēs"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nav instalēts neviens nosacījumu sniedzējs."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vai iespējot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> varēs pievienot iziešanas nosacījumus režīmā “Netraucēt”."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Notiek lietotņu ielāde..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Bloķēšana"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Bloķēt visus"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nekad nerādīt paziņojumus no šīs lietotnes"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritāte"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Rādīt paziņojumus saraksta augšdaļā un turpināt rādīt jaunus paziņojumus, kad ierīce ir iestatīta tā, lai tiktu rādīti tikai prioritāri paziņojumi"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensitīva informācija"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Ja ierīce ir bloķēta, paslēpt visu šīs lietotnes paziņojumos ietverto konfidenciālo saturu"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Uzskatīt par prioritāti"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Atļaut skaņas paziņojumus no šīs lietotnes, ja statusam “Netraucēt” ir izvēlēts iestatījums “Tikai prioritārie”"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Atļaut ieskatus"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Atļaut šai lietotnei izcelt noteiktus paziņojumus, īslaicīgi parādot tos pašreizējā ekrāna skatā"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Paslēpt sensitīvu saturu"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Ja ierīce ir bloķēta, paslēpt šīs lietotnes paziņojumos ietverto saturu, kurā varētu būt atklāta privāta informācija"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloķēti"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritāte"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitīvi"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gatavs"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Līdz brīdim, kad ieslēgsiet"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritārie pārtraukumi"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Dīkstāve"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dienas"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nav"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Pārtraukumi atļauti"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Tikai prioritārie"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nav"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizācija"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automātiska ieslēgšana"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Kārtulas nosaukums"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Pievienot kārtulu"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Dzēst kārtulu"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vai dzēst kārtulu “<xliff:g id="RULE">%1$s</xliff:g>”?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Dzēst"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Kārtulas veids"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Nezināma"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigurēt kārtulu"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Grafika kārtula"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Kārtula nav atrasta."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dienas"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nav"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Katru dienu"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nekad"</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">"No <xliff:g id="START">%1$s</xliff:g> līdz <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Zvani"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Ziņojumi"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Zvani/ziņojumi no:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Ikviens"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Tikai kontaktpersonas"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Atzīmētās kontaktpersonas"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Pasākumi un atgādinājumi"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Signālu pārtraukumi vienmēr ir prioritāri"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Signāli"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Atgādinājumi"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Notikumi"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Atlasīti zvanītāji"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Personas, kas vairākkārt zvanījušas"</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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Darbadienu naktīs"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Sākuma laiks"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Beigu laiks"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nākamajā dienā"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> vai tad, ja iepriekš atskan signāls"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nākamajā dienā vai tad, ja iepriekš atskan signāls"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nākamajā dienā"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Pārtraukumi"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Saņemot zvanus un paziņojumus"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kad jūs var pārtraukt?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Cik ilgi?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Vienmēr pārtraukt"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"izslēgts, viss"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Atļaut tikai prioritāros pārtraukumus"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Atļaut tikai signālus"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Nepārtraukt"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Uz nenoteiktu laiku"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> minūšu</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minūte</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minūtes</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> stundu</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> stunda</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> stundas</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Pāriet uz režīmu “Tikai prioritārie paziņojumi” uz nenoteiktu laiku"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="zero">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> minūti (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="zero">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> stundu (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Prioritārie paziņojumi” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Pāriet uz režīmu “Tikai signāli” uz nenoteiktu laiku"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="zero">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> minūti (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <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="zero">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> stundu (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Tikai signāli” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Pāriet uz režīmu “Nepārtraukt” uz nenoteiktu laiku"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="zero">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> minūti (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> minūtes (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="zero">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> stundu (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Pāriet uz “Nepārtraukt” <xliff:g id="DURATION">%1$d</xliff:g> stundas (līdz plkst. <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Pāriet uz “Vienmēr pārtraukt”"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"bezgalīgi"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Lietotņu paziņojumi"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paziņojumu iestatījumi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Sūtīt atsauksmes par šo ierīci"</string>
@@ -2512,4 +2647,66 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI informācija"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Ar IMEI saistīta informācija"</string>
     <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. slots)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Palaist pēc noklusējuma"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"Izmantots: <xliff:g id="SIZE">%1$s</xliff:g> no <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Domēnu saites"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Domēnu vietrāžu URL atvēršana"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Atļaut lietotnei tieši atvērt domēnu vietrāžus URL"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Atbalstīto domēnu vietrāži URL"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Citi noklusējuma iestatījumi"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"Izmantots: <xliff:g id="SIZE">%1$s</xliff:g> no <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"iekšējā atmiņa"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"ārējā atmiņa"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Iekšējā krātuve"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Ārējā krātuve"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Lietotnes datu lietojums"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"Izmantoti <xliff:g id="SIZE">%1$s</xliff:g> kopš: <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Izmantotā krātuve"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Ieslēgti"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloķēti"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensitīvie"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritārie"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritārie un sensitīvie"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="zero">Piešķirtas <xliff:g id="COUNT_1">%d</xliff:g> atļaujas</item>
+      <item quantity="one">Piešķirta <xliff:g id="COUNT_1">%d</xliff:g> atļauja</item>
+      <item quantity="other">Piešķirtas <xliff:g id="COUNT_1">%d</xliff:g> atļaujas</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="zero">Piešķirtās atļaujas: <xliff:g id="COUNT_2">%d</xliff:g> no <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one">Piešķirtās atļaujas: <xliff:g id="COUNT_2">%d</xliff:g> no <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Piešķirtās atļaujas: <xliff:g id="COUNT_2">%d</xliff:g> no <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Iestatīti daži noklusējumi"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Nav iestatīti noklusējumi"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Visas lietotnes"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Iespējotās"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Privātās"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Darba"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Ar bloķētiem paziņojumiem"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Ar prioritāriem paziņojumiem"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Ar sensitīviem paziņojumiem"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Ar domēnu URL"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Atspējojis administrators"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Papildu"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Nezināma lietotne"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profila izvēlēšanās"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Lietotnes atļaujas"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> lietotnēm no <xliff:g id="COUNT_1">%d</xliff:g> ir atļauta papildu piekļuve"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Atļautas <xliff:g id="COUNT_0">%d</xliff:g> lietotnes no <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domēnu URL"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Neatvērt nevienu domēna URL"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Atvērt <xliff:g id="DOMAIN">%s</xliff:g>"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Atvērt <xliff:g id="DOMAIN">%s</xliff:g> un saistītos vietrāžus URL"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="zero">Neviena lietotne nevar atvērt domēnu vietrāžus URL</item>
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> lietotne var atvērt savu domēnu vietrāžus URL</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> lietotnes var atvērt savu domēnu vietrāžus URL</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nav atpazīts"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Noklusējuma lietotnes"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Pārlūka lietotne"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nav noklusējuma pārlūka"</string>
+    <string name="default_app" msgid="6864503001385843060">"(noklusējums)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Lietotņu krātuve"</string>
 </resources>
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk-rMK/arrays.xml
index 6479149..6906abb 100644
--- a/res/values-mk-rMK/arrays.xml
+++ b/res/values-mk-rMK/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Копче „Притисни“"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"вклучи/исклучи звук на микрофон"</item>
     <item msgid="1148142988678569310">"проектирај медиуми"</item>
     <item msgid="9130014005474445273">"активирај ВПН"</item>
+    <item msgid="1165192162975045562">"напиши тапет"</item>
+    <item msgid="7129487923652967258">"помош на структурата"</item>
+    <item msgid="1069023208100114540">"помош на сликата на екранот"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Локација"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Вклучи/исклучи звук на микрофон"</item>
     <item msgid="5906017727368097853">"Проектирај медиуми"</item>
     <item msgid="2486614710846178542">"Активирај ВПН"</item>
+    <item msgid="5586547561693629602">"Напиши тапет"</item>
+    <item msgid="32794179825485062">"Помош на структурата"</item>
+    <item msgid="7872852746938272552">"Помош на сликата на екранот"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"мала"</item>
     <item msgid="4212263919458209842">"критична"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Исклучено"</item>
-    <item msgid="5656544177755411222">"Ограничени прекини"</item>
-    <item msgid="8735337502532332056">"Нула прекини"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Нормално"</item>
     <item msgid="866544120205026771">"Умерено"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Розова"</item>
     <item msgid="6131821495505931173">"Црвена"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"МТП (Протокол за трансфер на медиуми)"</item>
+    <item msgid="8856820259201251036">"ПТП (Протокол за трансфер на слика)"</item>
+    <item msgid="216135047298423770">"РНДИС (УСБ за Етернет)"</item>
+    <item msgid="2686051673589572111">"Аудиоизвор"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 9ef06b4..63617fd 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Дозволи"</string>
     <string name="deny" msgid="6947806159746484865">"Одбиј"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Непозната"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Сега сте на <xliff:g id="STEP_COUNT">%1$d</xliff:g> чекор поблиску да станете програмер."</item>
-    <item quantity="other" msgid="6722953419953594148">"Сега сте на <xliff:g id="STEP_COUNT">%1$d</xliff:g> чекори поблиску да станете програмер."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Сега сте на <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> чекор поблиску да станете програмер.</item>
+      <item quantity="other">Сега сте на <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> чекори поблиску да станете програмер.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Сега сте развивач"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Нема потреба, веќе сте развивач"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Безжичен и мрежи"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Исклучи СМС над ИСП"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Потребно е да се вклучи IMS регистрација"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Потребно е да се вклучи IMS регистрација"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Вклучете го знаменцето за обезбедување на VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Исклучете го знаменцето за обезбедување на VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Вклучи LTE режим на чистење РАМ"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Исклучи LTE чистење на РАМ"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Прикажи именик на СИМ"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"Поврзани"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Поврзани (без телефон)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Поврзани (без медиуми)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Поврзано (без порака за пристап)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Поврзан (без телефон или медиуми)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Исклучено"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Се исклучува..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Се поврзува..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Поврзување..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Неименуван уред со Bluetooth"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Пребарување"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Нема уреди со Bluetooth во близина."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Прикажи добиени датотеки"</string>
     <string name="device_picker" msgid="4978696506172252813">"Изберете уред со Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Барање за дозвола на Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Апликација сака да се вклучи Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Апликација сака да го вклучи Bluetooth за уредов."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Апликација сака таблетот да се направи видлив за други Bluetooth уреди за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Апликација сака телефонот да се направи видлив за други Bluetooth уреди за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Апликација сака да го направи таблетот видлив за други Bluetooth уреди. Може да го промените ова подоцна во подесувањата за Bluetooth."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ОТКАЖИ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ПРОДОЛЖИ"</string>
     <string name="okay" msgid="1997666393121016642">"Во ред"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ДА"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"НЕ"</string>
-    <string name="forget" msgid="7267115980248732932">"ЗАБОРАВИ"</string>
+    <string name="forget" msgid="1400428660472591263">"Заборави"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Подобри совпаѓање на лик"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Проверка за движење"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Треба да трепнете додека се отклучува"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Подеси „Моја локација“, отклучување на екран, заклучување на СИМ картичка, заклучување на меморија со акредитиви"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подеси „Моја локација“, отклучување на екран, заклучување на меморија за акредитиви"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Лозинки"</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="3453670509485083962">"Додај"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"заклучување екран"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"Поставување отпечаток"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"За да го користите отпечатокот од прстот за отклучување на екранот или потврдување на купувањата, треба да се: \n\n✓ Постави резервниот метод за заклучување на екранот \n\n✓ Додаде вашиот отпечаток од прстот"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Најдете го сензорот"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Пронајдете го сензорот за отпечатоци на задната страна на телефонот."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Да почнеме!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Поставете го прстот на сензорот за отпечатоци. Подигнете го откако ќе почувствувате вибрација."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Одлично! Сега повтор."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Поставете го истиот прст на сензорот за отпечатоци и подигнете го откако ќе почувствувате вибрација."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Додај отпечаток!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Секогаш кога ќе ја видите оваа икона, може да го користите вашиот отпечаток за идентификација или да авторизирате купување."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Додај"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Следно"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"Треба да ја употребите шемата за отклучување за да потврдите шифрирање на уредот."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Шифрирај?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Операцијата шифрирање е неповратен процес и ако се прекине, ќе ги изгубите податоците. Шифрирањето трае еден час или подолго и за тоа време таблетот ќе се рестартира неколку пати."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Операцијата шифрирање е неповратен процес и ако се прекине, ќе ги изгубите податоците. Шифрирањето трае еден час или подолго и за тоа време телефонот ќе се рестартира неколку пати."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Отклучи со лик"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Мала безбедност, експериментална"</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>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Лозинка"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Високо ниво на безбедност"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Тековно заклучување на екранот"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Карактеристиките за заштита на уредот повеќе нема да работат."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Оневозм. од админ., шифрир. или мемо. за акредит."</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_biometric_weak" msgid="3008473624490350142">"Отклучи со лик"</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="7579210814842056547">"Откако ќе поставите заклучување на екранот, може да ги поставите и вашите отпечатоци во Поставки и Безбедност."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Исклучи заклучување на екран"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Отстрани шема на отклучување"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Отстрани ПИН за отклучување"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Лозинката мора да содржи најмалку една буква."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Лозинката мора да содржи најмалку една цифра."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Лозинката мора да содржи најмалку еден симбол."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Лозинката мора да содржи најмалку 1 буква."</item>
-    <item quantity="other" msgid="8186027808415585970">"Лозинката мора да содржи најмалку %d букви."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Лозинката мора да содржи најмалку 1 мала буква."</item>
-    <item quantity="other" msgid="2693910942679679225">"Лозинката мора да содржи најмалку %d мали букви."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Лозинката мора да содржи најмалку 1 голема буква."</item>
-    <item quantity="other" msgid="3030801209112209245">"Лозинката мора да содржи најмалку %d големи букви."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Лозинката мора да содржи најмалку 1 број."</item>
-    <item quantity="other" msgid="4703982391407595924">"Лозинката мора да содржи најмалку %d цифри."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Лозинката мора да содржи најмалку 1 специјален симбол."</item>
-    <item quantity="other" msgid="1221290525051187757">"Лозинката мора да содржи најмалку %d специјални симболи."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Лозинката мора да содржи најмалку 1 знак што не е буква."</item>
-    <item quantity="other" msgid="3952508584649046404">"Лозинката мора да содржи најмалку %d знаци што не се букви."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Лозинката мора да содржи најмалку %d буква.</item>
+      <item quantity="other">Лозинката мора да содржи најмалку %d букви.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Лозинката мора да содржи најмалку %d мала буква.</item>
+      <item quantity="other">Лозинката мора да содржи најмалку %d мали букви.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Лозинката мора да содржи најмалку %d голема буква.</item>
+      <item quantity="other">Лозинката мора да содржи најмалку %d големи букви.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Лозинката мора да содржи најмалку %d цифра.</item>
+      <item quantity="other">Лозинката мора да содржи најмалку %d цифри.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Лозинката мора да содржи најмалку %d специјален симбол.</item>
+      <item quantity="other">Лозинката мора да содржи најмалку %d специјални симболи.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Лозинката мора да содржи најмалку %d знак што не е буква.</item>
+      <item quantity="other">Лозинката мора да содржи најмалку %d знаци што не се букви.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Администраторот не дозволува користење на последната лозинка."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Забранета е секвенца на броеви која е по нагорен редослед, по надолен редослед или која се повторува"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Во ред"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"Спари"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"СПАРИ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Откажи"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Кога е поврзано, спарувањето одобрува пристап до контактите и историјата на повиците."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Не можеше да се спари со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Не можеше да се спари со <xliff:g id="DEVICE_NAME">%1$s</xliff:g> поради погрешен ПИН или лозинка."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Не може да комуницира со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Спарувањето е одбиено од <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Не можеше да се поврзе со <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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"За да се подобри точноста на локацијата, апликациите и услугите ќе скенираат уреди со Bluetooth, дури и кога Bluetooth е исклучен. Може да го измените ова во <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>поставки за скенирање<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Поврзи се со..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Аудио на медиуми"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Аудио на телефон"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Пренос на датотека"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Влезен уред"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Пристап на интернет"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Споделување контакти"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Користи за споделување контакти"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Споделување конекција на интернет"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Порака за пристап"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"Поврзан со аудио на медиуми"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Поврзан со аудио на телефон"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Поврзан со сервер за пренос на датотеки"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Поврзано со карта"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Не е поврзан со сервер за пренос на датотеки"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Поврзан со влезен уред"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Користи за аудио на медиуми"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Користи за аудио на телефон"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Користи за пренос на датотеки"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Користи за внес"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Користи за пристап на интернет"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Користи за карта"</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_assistant_title" msgid="2553267316621598101">"Помошник за Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Поврзано преку помошник за Wi-Fismile"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Префрли екран"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Исклучување на Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Грешка"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Во режим на работа во авион"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Не може да скенира за мрежи"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Известување за мрежа"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Извести кога ќе има достапна јавна мрежа"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Избегнувај слаби поврзувања"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не користи Wi-Fi мрежа, освен ако има добро поврзување со интернет"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Користи само мрежи со добро поврзување на интернет"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Скенирањето е секогаш достапно"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Секогаш дозволувај скенирање"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Дозволете услугата за локација на Google и други апликации да скенираат за мрежи, дури и кога Wi-Fi е исклучена"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Автоматски користете отворена Wi‑Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Дозволете помошникот за Wi‑Fi автоматски да се поврзува со отворени мрежи со висок квалитет"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Изберете помошник"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталирај сертификати"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"За да се подобри точноста на локација и за други цели, Google и другите апликации може да скенираат за мрежи во околината, дури и кога Wi-Fi е исклучена. Ако не сакате да се случи ова, одете во Напредно &gt; Скенирање секогаш достапно."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Апликациите може да скенираат за мрежи во околината, дури и кога Wi-Fi е исклучена. Ако не сакате да се случи ова, одете на Напредно &gt; Скенирање секогаш достапно."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"За да се подобри точноста на локацијата, апликациите и услугите ќе скенираат Wi‑Fi мрежи, дури и кога 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="5340097010842405981">"Не прикажувај повторно"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Додајте друга мрежа"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Повеќе"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Автоматско подесување (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"За да се заврши поставувањето, таблетот треба да има пристап до Wi-Fi. По поставувањето, може да се префрлате меѓу мобилни податоци и Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Напредни опции"</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="5940801028985255304">"Притиснете го копчето „Заштитено подесување на Wi-Fi“ на вашиот рутер. Тоа може да се нарекува „WPS“ или да го содржи овој симбол:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Притиснете го копчето „Заштитено поставување на Wi-Fi“ на рутерот. Тоа може да се нарекува „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>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"Конфиг. појас на АП"</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">"Подесувања на ИП"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(непроменети)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(неодредени)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Зачувано"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Оневозможено"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Конфигурирањето ИП не успеа"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Поврзувањето преку Wi-Fi не успеа"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем со автентикација"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Надвор од опсег"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Не е откриен пристап до интернет, нема автоматски повторно да се поврзете."</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_security_none" msgid="7985461072596594400">"Ниедна"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"Мрежата нема пристап до интернет. Сепак користете ја мрежата?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Не прашувај повторно во оваа мрежа"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Поврзи се"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не успеа да се поврзе со мрежата"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Пре. ж.м. за Wi‑Fi на AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> точка на пристап на пренослива Wi‑Fi"</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_mode_title" msgid="2164073796253284289">"Параметар за повикување"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Режим – повикување преку Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Се претпочита Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Се претпочита мобилна"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Кога е вклучено повикувањето преку Wi-Fi, телефонот може да насочува повици преку мрежи на Wi-Fi или мрежата на операторот, зависно од параметрите и кој сигнал е посилен. Пред да ја вклучите функцијата, проверете кај операторот за давачки и други детали."</string>
     <string name="home_settings" msgid="212375129455718176">"Почетна страница"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"Тема"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Светло"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Темно"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Автоматски"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Ажурирајте ја СИМ-картичка?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> е единственaта СИМ-картичка во вашиот уред. Дали сакате да ја користите оваа СИМ-картичка за мобилни податоци, повици и СМС-пораки?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ПИН кодот за СИМ картичката е неточен. Контактирате со вашиот оператор да го отклучи уредот."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Неточен ПИН за СИМ картичката, ви преостанува уште <xliff:g id="NUMBER">%d</xliff:g> обид пред да мора да контактирате со вашиот оператор за да го отклучи вашиот уред."</item>
-    <item quantity="other" msgid="77103619544346451">"Неточен ПИН за СИМ картичката, ви преостануваат <xliff:g id="NUMBER">%d</xliff:g> обиди."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Погрешен ПИН-код за СИМ, имате уште <xliff:g id="NUMBER_1">%d</xliff:g> обид.</item>
+      <item quantity="other">Погрешен ПИН-код за СИМ, имате уште <xliff:g id="NUMBER_1">%d</xliff:g> обиди.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Операцијата ПИН на СИМ картичка не успеа!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Статус на таблет"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Статус на телефон"</string>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"Апликации (податоци за апликација и содржина на медиуми)"</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_dcim_usage" msgid="558887013613822577">"Слики, видеа"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музика, мелодии, поткасти, итн.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Разно"</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="default" msgid="6915293408836853020">"Одмонтирај СД картичка"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"Монтирај"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Извади"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Избриши и форматирај"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Избриши и форматирај како внатрешна меморија"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Врска со компјутер со УСБ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"УСБ врска со компјутер"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Поврзи како"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Ви овозможува да пренесете медиумски датотеки на Windows или со користење пренос на датотеки на Android на Mac (види www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Фотоапарат (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Пренеси на компјутери без МТР"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Инсталирај алатки за пренос на датотеки"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Овозможува апликациите со овозможен MIDI да работат преку УСБ со софтвер MIDI на компјутерот."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Други корисници"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Меморија на уредот"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Пренослива меморија"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> слободно (Вкупно <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> е монтирано"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Не може да се монтира <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="4161722509712992231">"Не може безбедно да се извади <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="8343688274191391889">"Не може да се форматира <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Преименувај меморија"</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Преместете ги медиумските датотеки во алтернативна меморија на уредов или префрлете ги на компјутер користејќи УСБ-кабел. \n\n"<b>"Направете резервна копија од апликациите"</b>" \nСите апликации меморирани на <xliff:g id="NAME_6">^1</xliff:g> ќе се деинсталираат и нивните податоци ќе се избришат. За да ги сочувате апликацииве, преместете ги во алтернативна меморија на уредов."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Кога ќе го извадите меморискиот уред <xliff:g id="NAME_0">^1</xliff:g>, апликациите меморирани таму ќе престанат да работат, а медиумските датотеки нема да бидат достапни додека тој не се внесе повторно."</b>" \n\nМеморискиот уред <xliff:g id="NAME_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_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_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="1259216693690378749">"Не отстранувајте ја <xliff:g id="NAME">^1</xliff:g> додека се форматира."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Премести подат. во нова меморија"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Може да ги преместувате фотографиите, датотеките и податоците за апликацијата на новата <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="5035719146373359329"><b>"Преместувањето трае околу <xliff:g id="TIME">^1</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="8641916179067596592">"За време на преместувањето: \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_move_confirm_title" msgid="292782012677890250">"Премести <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Преместувањето на <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="4288580957960820740">"Не отстранувајте ја <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="battery_status_title" msgid="9159414319574976203">"Статус на батеријата"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво на батерија"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Подесувања на APN"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"Ресетирање мрежни поставки"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Ова ќе ги ресетира сите мрежни поставки, вклучувајќи и:\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="4874737348054213767">"Да се ресетираат сите мрежни поставки? Не може да се врати ова дејство!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Ресетирај поставки"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Ресетирај?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Мрежните поставки се ресетирани"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Ресетирај уред"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ресетирање фабрички податоци"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Ги брише сите податоци на таблетот"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Ги брише сите податоци на телефонот"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ова ќе ги избрише сите податоци од "<b>"внатрешна меморија"</b>"на вашиот таблет, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и подесувања на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ова ќе ги избрише сите податоци од "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Избриши ги сите податоци на СД картичката, како што се музика или фотографии"</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="7209547812233487345">"Избришете ги сите ваши лични податоци и преземени апликации? Не може да се врати ова дејство!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Да се избришат сите ваши лични податоци и преземени апликации? Не може да го вратите ова дејство!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Избриши сè"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Треба да ја употребите шемата за отклучување за да потврдите ресетирање на податоците до фабричките подесувања."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Не се изврши ресетирање зашто услугата за чистење на системот не е достапна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Ресетирај?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Фабричкото ресетирање не е достапно за овој корисник"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Избриши ја УСБ меморијата, избриши ги сите датотеки меморирани таму? Не може да се врати ова дејство!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Избриши ја СД картичката, избриши ги сите датотеки меморирани таму? Не може да се врати ова дејство!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Избриши сè"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Треба да ја употребите шемата за отклучување за да потврдите дека сакате да ја избришете УСБ меморијата."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Треба да ја употребите шемата за отклучување за да потврдите дека сакате да ја избришете СД картичката."</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">"Поврзување со УСБ"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помош"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Мобилни мрежи"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Мобилен план"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Стандардна СМС апликација"</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_no_previous_dialog_text" msgid="602683880284921998">"Користи <xliff:g id="NEW_APP">%s</xliff:g> како СМС апликација?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим на локација"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Користи мрежи на GPS, на Wi‑Fi и на мобилен за да утврдиш локација"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Користи мрежи на Wi‑Fi и на мобилен за да утврдиш локација"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Користи ГПС за да се утврди локацијата"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Користи ГПС за да се утврди локацијата"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Се скенира"</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="2070686681074461301">"Подобрете ја локацијата овозможувајќи им на системските услуги да скенираат Wi‑Fi мрежи, дури и кога Wi‑Fi е исклучен"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Скенирање на Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Подобрете ја локацијата овозможувајќи им на системските услуги да скенираат уреди со Bluetooth, дури и кога Bluetooth е исклучен"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Лок. на мр. на Wi‑Fi и на моб."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"За брза процена, овозможи услуга за локација на Google. Анонимните податоци за локација се собираат и се испраќаат на Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Локацијата е утврдена со Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"Безбедност на екран"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Користете ја шемата на уредот за да продолжите."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Внесете го ПИН-кодот на уредот за да продолжите."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Внесете ја лозинката на уредот за да продолжите."</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_need_to_unlock" msgid="757935356911054465">"Потврди зачувана шема"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Обиди се повторно:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"Премногу неточни обиди!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Обиди се повторно за <xliff:g id="NUMBER">%d</xliff:g> секунди."</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="manageapplications_settings_title" msgid="7041951105633616745">"Управувај со апликации"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управувај и отстрани инсталирани апликации"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Употреба на меморија"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Прикажи меморија искористена од апликации"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Активни услуги"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информации за таблет"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информации за телефонот"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Информации за батерија"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Брзо стартување"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Постави кратенки на тастатурата за стартување апликации"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Додели апликација"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Нема кратенка"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Пребарај + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Исчисти"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Кратенката за <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) ќе се избрише."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Во ред"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Откажи"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Апликации"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Кратенки"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сними ги сите Bluetooth HCI пакети во датотека"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Отклучување со OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Дозволи да се отклучи подигнувачот"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Внесете го ПИН-кодот"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Внесете го ПИН-кодот на уредот за да овозможите отклучување со OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Дозволете отклучување со OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ПРЕДУПРЕДУВАЊЕ: функциите за заштита на уредот нема да работат на овој уред додека е вклучена оваа поставка."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Величини на меѓумеморија на забележувач"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Величина/меѓумеморија на дневник"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Овозможи лажни локации"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Овозможи лажни локации"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Овозможете проверка на атрибутот на приказот"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Вмрежување"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Приказ на сертификација на безжична мрежа"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Овозможи преопширно пријавување Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агресивно предавање од Wi‑Fi на мобилен"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Секогаш дозволувај Wi‑Fi скенирање во роаминг"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Користете наследен клиент на DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Покажи ги опциите за безжичен приказ на сертификат"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Зголеми Wi‑Fi ниво на пријавување, прикажи по SSID RSSI во Wi‑Fi бирач"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Кога е вклучено, Wi-Fi ќе биде поагресивно при предавање на поврзувањето со податоци на мобилната мрежа при слаб сигнал на Wi-Fi."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Дозволи/Забрани Wi‑Fi скенирање во роаминг според количината на постоечкиот податочен сообраќај на интерфејсот."</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Величини на меѓумеморија на забележувач"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Величина/меѓумеморија на дневник"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Изберете конфигурација за УСБ"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Изберете конфигурација за УСБ"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Овозможи лажни локации"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Овозможи лажни локации"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Овозможете проверка на атрибутот на приказот"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Користете го клиентот на DHCP од Lollipop наместо новиот клиент на DHCP на Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Овозможи отстранување грешки на УСБ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Отстранувањето грешки на УСБ е наменето само за целите на развој. Користете го за копирање податоци меѓу вашиот компјутер и вашиот уред, за инсталирање апликации на вашиот уред без известување и за читање евиденција на податоци."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Отповикај пристап кон отстранување грешка од УСБ од сите претходно овластени компјутери?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Магента"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Користи <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> треба да:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Бидејќи апликацијата го прикрива барањето за дозвола, Поставките не може да го потврдат вашиот одговор."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако вклучите <xliff:g id="SERVICE">%1$s</xliff:g>, уредот нема да го користи заклучувањето на екранот за да го подобри шифрирањето на податоците."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Со оглед на тоа што вклучивте услуга на пристапност, уредот нема да го користи заклучувањето на екранот за да го подобри шифрирањето на податоците."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Со оглед на тоа што вклучувањето <xliff:g id="SERVICE">%1$s</xliff:g> влијае врз шифрирањето податоци, треба да ја потврдите шемата."</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> апликации за <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> од <xliff:g id="TOTALRAM">%2$s</xliff:g> искористено за <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</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_memory_status" msgid="4251599550196193093">"Меморијата на уредот во моментов е <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Просечна употреба на РАМ меморија"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Максимално искористување на РАМ меморија"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Оперативен систем Android"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"Процеси"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Услуги"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Времетраење"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Детали за меморија"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"Сокриј систем"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Стандардните подесувања подолу ги заменуваат подесувањата за апликации"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Стандардни подесувања"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Стандарден софтвер"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Поставува софтвер за синтеза на говор што треба да се користи за говорен текст"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Поставете алатката за синтеза на говор да се користи за говорен текст"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Брзина на говор"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Брзина со која се кажува текстот"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Интензитет"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"Треба да ја употребите шемата за отклучување за да потврдите инсталација на акредитивот."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Внеси ја лозинката за меморирање акредитиви."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Моментална лозинка:"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"Во моментов нема сметка каде што се складираат резервни копии на податоци"</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="5355557151569037197">"Услугата Резервна копија не е активна."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ова е поставено од правилата на уредот."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Резервна лозинка за работна површина"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Целосни резервни копии на работната површина кои во моментов не се заштитени"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Допрете за да се промени или отстрани лозинката за целосна резервна копија на работната површина"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Опсег на преодна анимац."</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Скала за времетраење на аниматор"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Симул. секундарен екран"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Режим на повеќе прозорци"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Повеќе активности на екранот во исто време."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Да се овозможи режимот на повеќе прозорци?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ПРЕДУПРЕДУВАЊЕ: ова е многу експериментална функција што дозволува повеќе активности на екранот во исто време преку УИ на Неодамнешни апликации. Некои апликации може да паѓаат или да не работат правилно кога се користат со оваа функција."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Апликации"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не чувај активности"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Уништи ја секоја активност штом корисникот ќе го остави"</string>
@@ -2195,7 +2251,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="718192651887726259">"Со создавање дополнителни корисници може да го споделите уредот со други. Секој корисник ќе си има сопствен простор кој може да го прилагодува со сопствени апликации, тапети и така натаму. Корисниците може и да прилагодуваат поставки на уредот што се однесуваат на сите, како 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"Дозволи телефонски повици"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Дозволи телефонски повици и СМС"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Вклучи телефонски повици"</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="440218975766968124">"Да се дозволат телефонски повици?"</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_sms_confirm_title" msgid="188164598768941316">"Да се дозволат телефонски повици и СМС?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Со овој корисник ќе се сподели историјата на повици и СМС."</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="application_restrictions" msgid="8207332020898004394">"Дозволи апликации и содржина"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликации со ограничувања"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подесувања за апликација"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"Оваа апликација не е поддржана во ограничени профили"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi мрежно поврзување"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текстуална порака испраќање текстуални пораки пораки испраќање пораки"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"мобилна мрежа мобилен оператор безжичен податоци 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi повикај повикување"</string>
     <string name="keywords_home" msgid="3626170808219458848">"стартер"</string>
     <string name="keywords_display" msgid="6709007669501628320">"екран екран на допир"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затемни екран екран на допир батерија"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затемни екран екран на допир батерија"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"заднина персонализирај приспособи екран"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"темна тема ноќен режим затемнет екран преврти осветленост"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"заднина персонализирај приспособи екран"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"големина на текст"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"проектирај"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"емитување проект"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"простор диск тврд диск уред употреба"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"напојување употреба трошок"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"правопис речник проверка на правопис автоматска поправка"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"сметка"</string>
     <string name="keywords_users" msgid="4673901601478559100">"рестрикција ограничи ограничено"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст поправка поправи звук вибрирај автоматски јазик движење предложи предлог тема навредлив збор впиши емотикона меѓународно"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"ресетирање претпочитања стандардни"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"стандардна апликација за итни случаи"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"апликации преземање систем"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"апликации дозволи безбедност"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"апликациите се стандардни"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"лизгај лозинка шема ПИН"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Поставете Wi-Fi ознака за НФЦ"</string>
     <string name="write_tag" msgid="8571858602896222537">"Пишувај"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Прекини"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Кога ќе пристигнат повици и известувања"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Секогаш прекинувај"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Дозволи само приоритетни прекини"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не прекинувај"</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_option_important_interruptions" msgid="3903928008177972500">"Само приоритетно"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Само аларми"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Без прекини"</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="ringtone_title" msgid="5379026328015343686">"Мелодија на телефон"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Станд. мелодија за известување"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрации и за повици"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибрации"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Пристап кон известување"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Апликациите не можат да читаат известувања"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d апликација може да чита известувања"</item>
-    <item quantity="other" msgid="980049191810249052">"%d апликации може да читаат известувања"</item>
-  </plurals>
+    <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="2767405417723149879">"Нема инсталирано слушатели на известувања."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Овозможи <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ќе може да ги чита сите известувања испратени од системот или која било инсталирана апликација, што може да вклучува лични информации како што се имиња на контакти и текстуални пораки испратени до вас. Ќе може и да ги отфрли овие известувања или да ги допира копчињата за дејство во тие рамки."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Даватели на состојба"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Нема апликации даватели на состојба"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"Апликацијата %d дава состојби"</item>
-    <item quantity="other" msgid="358057362115673258">"Апликациите %d даваат состојби"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Нема инсталирано даватели на состојба."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Овозможи <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ќе може да додава излезни состојби за режимот Не вознемирувај."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Вчитување апликации…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Блокирај"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај ги сите"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Никогаш не прикажувај известувања од оваа апликација"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Приоритет"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Прикажувај известувања најгоре на списокот и собирај ги кога уредот е поставен на само приоритетни прекини"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Чувствителна"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Кога уредот е заклучен, сокриј ги чувствителните содржини од известувањата на апликацијата"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Сметај како приоритет"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Дозволете да се слушнат известувањата на апликацијата кога како Приоритет е вклучено само „Не вознемирувај“"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Дозволете ѕиркање"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Дозволете апликацијата да истакне одредени известувања со тоа што со лизгање кратко ќе ги прикаже на тековниот екран"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Сокриј чувствителна содржина"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Кога уредот е заклучен, сокриј ја содржината во известувањата на апликацијата кои може да откријат приватни информации"</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="zen_mode_default_option" msgid="6940069025071935243">"Додека не го исклучите"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Приоритетни прекини"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Пауза"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Денови"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ништо"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Прекините се дозволени"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Само приоритетно"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Нема"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматизација"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Вклучи автоматски"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Име на правило"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Додај правило"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Избриши правило"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Избриши правило за „<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="3201273040477861538">"Правило за распоред"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Правилото не е пронајдено"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никогаш"</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_from" msgid="1033337300289871697">"Повици/пораки од"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Кој било"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Само контакти"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Само означени контакти"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Настани и потсетници"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Алармите се секогаш приоритетни прекини"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Аларми"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Потсетници"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Настани"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Избрани повикувачи"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Редовни повикувачи"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Доколку истото лице повикува по втор пат во период од <xliff:g id="MINUTES">%d</xliff:g> минути, дозволете"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Вклучи автоматски"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Никогаш"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следниот ден"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> или кој било аларм пред тоа"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"Прекини"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Кога ќе пристигнат повици и известувања"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Кога сакате да ве прекинат?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"За колку време?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Секогаш прекинувај"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"исклучено,сите,сè"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Дозволете само приоритетни прекини"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Дозволете само аларми"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Не прекинувај"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Неодредено време"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <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="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Промени на приоритетни известувања само на неодредено време"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Промена на аларми само на неодредено време"</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>
+    </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>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Промени да не се прекине на неодредено време"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Промени секогаш да се прекине"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"засекогаш"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Известувања за апли."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Поставки на известувања"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Испрати информации за уредот"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"Стартувај стандардно"</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="app_launch_domain_links_title" msgid="458956710410857777">"Врски за домени"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Отвори УРЛ-домени"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Дозволете апликацијата директно да отвора УРЛ-домени"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Поддржани УРЛ-домени"</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="410824961149037234">"внатрешна меморија"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"надворешна меморија"</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="storage_used" msgid="7128074132917008743">"Искористена меморија"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Вклучено"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Блокирај"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Чувствително"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Приоритет"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Приоритет и чувствително"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <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="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Доделена е <xliff:g id="COUNT_2">%d</xliff:g> од <xliff:g id="COUNT_3">%d</xliff:g> дозвола</item>
+      <item quantity="other">Доделена е <xliff:g id="COUNT_2">%d</xliff:g> од <xliff:g id="COUNT_3">%d</xliff:g> дозволи</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Поставени се некои стандардни вредности"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Нема поставено стандардни вредности"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Сите апликации"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Овозможени"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Лични"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Службени"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блокирани"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Приоритетни"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Чувствителни"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Со УРЛ-домени"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Оневозможено од администраторот"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Напредни"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Изберете профил"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Дозволи за апликацијата"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Дозволен е дополнителен пристап на <xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g> апликации"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Дозволени се <xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g> апликации"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"УРЛ-домени"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Не отворај ниеден УРЛ-домен"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Отвори „<xliff:g id="DOMAIN">%s</xliff:g>“"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Отвори „<xliff:g id="DOMAIN">%s</xliff:g>“ и поврзани УРЛ-адреси"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <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="fingerprint_not_recognized" msgid="1739529686957438119">"Не е препознаено"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Стандардни апликации"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Апликација на прелистувачот"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Нема стандарден прелистувач"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Стандардно)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Складирање апликации"</string>
 </resources>
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml-rIN/arrays.xml
index f99d2d3..25e375b 100644
--- a/res/values-ml-rIN/arrays.xml
+++ b/res/values-ml-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"പുഷ് ബട്ടൺ"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"മൈക്രോഫോൺ മ്യൂട്ടുചെയ്യുക/അൺമ്യൂട്ടുചെയ്യുക"</item>
     <item msgid="1148142988678569310">"പ്രോജക്‌റ്റ് മീഡിയ"</item>
     <item msgid="9130014005474445273">"VPN സജീവമാക്കുക"</item>
+    <item msgid="1165192162975045562">"വാൾപേപ്പർ എഴുതുക"</item>
+    <item msgid="7129487923652967258">"അസിസ്റ്റ് ഘടന"</item>
+    <item msgid="1069023208100114540">"അസിസ്റ്റ് സ്‌ക്രീൻഷോട്ട്"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ലൊക്കേഷൻ"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"മൈക്രോഫോൺ മ്യൂട്ടുചെയ്യുക/അൺമ്യൂട്ടുചെയ്യുക"</item>
     <item msgid="5906017727368097853">"പ്രോജക്‌റ്റ് മീഡിയ"</item>
     <item msgid="2486614710846178542">"VPN സജീവമാക്കുക"</item>
+    <item msgid="5586547561693629602">"വാൾപേപ്പർ എഴുതുക"</item>
+    <item msgid="32794179825485062">"അസിസ്റ്റ് ഘടന"</item>
+    <item msgid="7872852746938272552">"അസിസ്റ്റ് സ്‌ക്രീൻഷോട്ട്"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ഹ്രസ്വമായത്"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"കുറവ്"</item>
     <item msgid="4212263919458209842">"കഴിയാറായി"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ഓഫ്"</item>
-    <item msgid="5656544177755411222">"പരിമിത തടസ്സങ്ങൾ"</item>
-    <item msgid="8735337502532332056">"തടസ്സങ്ങളൊന്നുമില്ല"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"സാധാരണം"</item>
     <item msgid="866544120205026771">"ഇടത്തരം"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"പിങ്ക്"</item>
     <item msgid="6131821495505931173">"ചുവപ്പ്"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (മീഡിയ ട്രാൻസ്‌ഫർ പ്രോട്ടോകോൾ)"</item>
+    <item msgid="8856820259201251036">"PTP (പിക്‌ചർ ട്രാൻസ്‌ഫർ പ്രോട്ടോകോൾ)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB ഇതർനെറ്റ്)"</item>
+    <item msgid="2686051673589572111">"ഓഡിയോ ഉറവിടം"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index a24c5e7..a0acd8a 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"അനുവദിക്കുക"</string>
     <string name="deny" msgid="6947806159746484865">"നിരസിക്കുക"</string>
     <string name="device_info_default" msgid="7847265875578739287">"അജ്ഞാതം"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"ഒരു ഡവലപ്പറായിത്തീരുന്നതിന് നിങ്ങൾ <xliff:g id="STEP_COUNT">%1$d</xliff:g> ചുവട് മാത്രം അകലെയാണ്."</item>
-    <item quantity="other" msgid="6722953419953594148">"ഒരു ഡവലപ്പറായിത്തീരുന്നതിന് നിങ്ങൾ <xliff:g id="STEP_COUNT">%1$d</xliff:g> ചുവടുകൾ മാത്രം അകലെയാണ്."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">ഒരു ഡവലപ്പറാകുന്നതിൽ നിന്നും നിങ്ങൾ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ചുവട് മാത്രം അകലെയാണ്.</item>
+      <item quantity="one">ഒരു ഡവലപ്പറാകുന്നതിൽ നിന്നും നിങ്ങൾ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ചുവട് മാത്രം അകലെയാണ്.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"നിങ്ങൾ ഇപ്പോൾ ഒരു ഡവലപ്പറാണ്!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ആവശ്യമില്ല, നിങ്ങൾ ഇതിനകം ഒരു ഡവലപ്പറാണ്."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"വയർലെസും നെറ്റ്‌വർക്കുകളും"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS മുഖേനയുള്ള SMS ഓഫുചെയ്യുക"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"ആവശ്യമായ IMS രജിസ്‌ട്രേഷൻ ഓണാക്കുക"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"ആവശ്യമായ IMS രജിസ്‌ട്രേഷൻ ഓഫാക്കുക"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE പ്രൊവിഷൻ ചെയ്‌ത ഫ്ലാഗ് ഓണാക്കുക"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE പ്രൊവിഷൻ ചെയ്‌ത ഫ്ലാഗ്‌ ഓഫാക്കുക"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte റാം ഡമ്പ് ഓണാക്കുക"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte റാം ഡമ്പ് ഓഫാക്കുക"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"സിം വിലാസ പുസ്‌‌തകം കാണുക"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"കണക്റ്റുചെയ്‌തു"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"കണ‌ക്റ്റുചെയ്‌തു (ഫോൺ ഇല്ല)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"കണക്‌റ്റുചെയ്‌തു (മീഡിയ ഇല്ല)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"കണക്റ്റുചെയ്‌തു (സന്ദേശ ആക്‌സസ്സില്ല)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"കണ‌ക്റ്റുചെ‌യ്തു (ഫോണോ മീഡിയയോ അല്ല)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"വിച്ഛേദിച്ചു"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"വിച്‌ഛേദിക്കുന്നു..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"കണക്‌റ്റുചെയ്യുന്നു..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"ജോടിയാക്കുന്നു…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"പേരുനൽകാത്ത ബ്ലൂടൂത്ത് ഉപകരണം"</string>
     <string name="progress_scanning" msgid="192587958424295789">"തിരയുന്നു"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"സമീപത്ത് ബ്ലൂടൂത്ത് ഉപകരണങ്ങളൊന്നും കണ്ടെത്തിയില്ല."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ലഭിച്ച ഫയലുകൾ ദൃശ്യമാക്കുക"</string>
     <string name="device_picker" msgid="4978696506172252813">"ബ്ലൂടൂത്ത് ഉപകരണം തിരഞ്ഞെടുക്കുക"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"ബ്ലൂടൂത്ത് അനുമതി അഭ്യർത്ഥന"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"ഒരു അപ്ലിക്കേഷൻ ബ്ലൂടൂത്ത് ഓണാക്കാൻ താൽപ്പര്യപ്പെടുന്നു."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"ഈ ഉപകരണത്തിനായി ഒരു അപ്ലിക്കേഷന് ബ്ലൂടൂത്ത് ഓണാക്കേണ്ടതുണ്ട്."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"ഒരു അപ്ലിക്കേഷൻ <xliff:g id="TIMEOUT">%1$d</xliff:g> സെക്കൻഡ് നേരത്തേക്ക് നിങ്ങളുടെ ടാബ്‌ലെറ്റ് മറ്റ് ബ്ലൂടൂത്ത് ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കാൻ താൽപ്പര്യപ്പെടുന്നു."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"ഒരു അപ്ലിക്കേഷൻ <xliff:g id="TIMEOUT">%1$d</xliff:g> സെക്കൻഡ് നേരത്തേക്ക് നിങ്ങളുടെ ഫോൺ മറ്റ് ബ്ലൂടൂത്ത് ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കാൻ താൽപ്പര്യപ്പെടുന്നു."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് മറ്റ് ബ്ലൂടൂത്ത് ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കാൻ ഒരു അപ്ലിക്കേഷൻ താൽപ്പര്യപ്പെടുന്നു. നിങ്ങൾക്ക് ഇത് പിന്നീട് ബ്ലൂടൂത്ത് ക്രമീകരണങ്ങളിൽ മാറ്റാം."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"റദ്ദാക്കുക"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"തുടരുക"</string>
     <string name="okay" msgid="1997666393121016642">"ശരി"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ശരി"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"അല്ല"</string>
-    <string name="forget" msgid="7267115980248732932">"മറക്കുക"</string>
+    <string name="forget" msgid="1400428660472591263">"മറക്കുക"</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>
@@ -303,7 +294,7 @@
     <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="sum_carrier_select" msgid="3616956422251879163">"ഒരു നെ‌റ്റ്‌വർക്ക് ഓപ്പറേറ്ററെ തിരഞ്ഞെടുക്കുക"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"മുഖം പൊരുത്തപ്പെടുത്തൽ മെച്ചപ്പെടുത്തുക"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"തൽസമയ പരിശോധന"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"അൺലോക്കുചെയ്യുമ്പോൾ കണ്ണുചിമ്മേണ്ടതുണ്ട്"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, സിം കാർഡ് ലോക്ക്, ക്രഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, ക്രെഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"പാ‌സ്‌വേഡുകൾ"</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="3453670509485083962">"ചേർക്കുക"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"സ്‌ക്രീൻ ലോക്ക്"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"വിരലടയാള സജ്ജീകരണം"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"നിങ്ങളുടെ സ്‌ക്രീൻ അൺലോക്കുചെയ്യാനോ വാങ്ങലുകൾ സ്ഥിരീകരിക്കാനോ വിരലടയാളം ഉപയോഗിക്കുക, ഞങ്ങൾക്ക്: \n\n✓ ബാക്കപ്പ് സ്‌ക്രീൻ ലോക്ക് രീതി സജ്ജമാക്കി \n\n✓ വിരലടയാളം ചേർക്കേണ്ടതുണ്ട്"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"സെൻസർ കണ്ടെത്തുക"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"നിങ്ങളുടെ ഫോണിന്റെ പിൻഭാഗത്ത് ഫിംഗർപ്രിന്റ് സെൻസർ കണ്ടെത്തുക."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"ആരംഭിക്കാം!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"ഫിംഗർപ്രിന്റ് സെൻസറിൽ വിരൽ വയ്‌ക്കുക. വൈബ്രേഷൻ അനുഭവപ്പെട്ടുകഴിഞ്ഞാൽ വിരൽ മാറ്റുക."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"കൊള്ളാം! ഇപ്പോൾ ആവർത്തിക്കുക."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"ഫിംഗർപ്രിന്റ് സെൻസറിൽ സമാന വിരൽ തന്നെ വയ്‌ക്കുകയും വൈബ്രേഷൻ അനുഭവപ്പെട്ടുകഴിഞ്ഞാൽ മാറ്റുകയും ചെയ്യുക."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"വിരലടയാളം ചേർത്തു!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"നിങ്ങൾ ഈ ഐക്കൺ കാണുമ്പോഴെല്ലാം, തിരിച്ചറിയാനോ ഒരു വാങ്ങലിന് അംഗീകാരം നൽകാനോ വിരലടയാളം ഉപയോഗിക്കാനാകും."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"ചേർക്കുക"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"അടുത്തത്"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"നിങ്ങളുടെ ഉപകരണം എൻക്രിപ്‌റ്റുചെയ്യുന്നത് സ്ഥിരീകരിക്കുന്നതിന് അൺലോക്ക് ചെയ്യൽ പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"എൻക്രിപ്റ്റുചെയ്യണോ?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"എൻക്രിപ്‌ഷൻ പ്രവർത്തനം റദ്ദാക്കാനാകില്ല, നിങ്ങൾ അത് തടസ്സപ്പെടുത്തുകയാണെങ്കിൽ ഡാറ്റ നഷ്‌ടപ്പെടും. എൻക്രിപ്ഷന് ഒരു മണിക്കൂറോ അതിലധികമോ സമയമെടുക്കാം, ആ സമയം ടാബ്‌ലെറ്റ് നിരവധി തവണം പുനരാരംഭിക്കും."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"എൻക്രിപ്‌ഷൻ പ്രവർത്തനം റദ്ദാക്കാനാകില്ല, നിങ്ങൾ അത് തടസ്സപ്പെടുത്തിയാൽ ഡാറ്റ നഷ്‌ടപ്പെടും. എൻക്രിപ്ഷന് ഒരു മണിക്കൂറോ അതിലധികമോ സമയമെടുക്കാം, ആ സമയം ഫോൺ നിരവധി തവണം പുനരാരംഭിക്കും."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"സുരക്ഷ കുറഞ്ഞതും പരീക്ഷണാത്മകവും"</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>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"പാസ്‌വേഡ്"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ഉയർന്ന സുരക്ഷ"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"നിലവിലെ സ്‌ക്രീൻ ലോക്ക്"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"ഉപകരണ സുരക്ഷ ഫീച്ചറുകൾ ഇനി പ്രവർത്തിക്കില്ല."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"അഡ്‌മിനിസ്‌ട്രേറ്ററോ എൻക്രിപ്‌ഷൻ നയം അല്ലെങ്കിൽ ക്രെഡൻഷ്യൽ സംഭരണം ഉപയോഗിച്ചോ പ്രവർത്തനരഹിതമാക്കി"</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_biometric_weak" msgid="3008473624490350142">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്"</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="7579210814842056547">"നിങ്ങൾ സ്‌ക്രീൻ ലോക്ക് സജ്ജമാക്കിക്കഴിഞ്ഞാൽ, ക്രമീകരണം &gt; സുരക്ഷ എന്നതിൽ നിങ്ങളുടെ വിരലടയാളം സജ്ജമാക്കാനുമാകും."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"സ്‌ക്രീൻ ലോക്ക് ഓഫാക്കുക"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"അൺലോക്ക് പാറ്റേൺ നീക്കംചെയ്യുക"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"അൺലോക്ക് പിൻ നീക്കംചെയ്യുക"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"പാസ്‌വേഡിൽ ഒരു അക്ഷരമെങ്കിലും ഉണ്ടായിരിക്കണം."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"പാസ്‌വേഡിൽ ഒരു സംഖ്യയെങ്കിലും ഉണ്ടായിരിക്കണം."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"പാസ്‌വേഡിൽ ഒരു ചിഹ്നമെങ്കിലും ഉണ്ടായിരിക്കണം."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"പാസ്‌വേഡിൽ ഒരു അക്ഷരമെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-    <item quantity="other" msgid="8186027808415585970">"പാസ്‌വേഡിൽ %d അക്ഷരങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"പാസ്‌വേഡിൽ ഒരു ചെറിയക്ഷരമെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-    <item quantity="other" msgid="2693910942679679225">"പാസ്‌വേഡിൽ %d ചെറിയക്ഷരങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"പാസ്‌വേഡിൽ ഒരു വലിയക്ഷരമെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-    <item quantity="other" msgid="3030801209112209245">"പാസ്‌വേഡിൽ %d വലിയക്ഷരങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"പാസ്‌വേഡിൽ ഒരു അക്കമെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-    <item quantity="other" msgid="4703982391407595924">"പാസ്‌വേഡിൽ %d സംഖ്യകളെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"പാസ്‌വേഡിൽ ഒരു പ്രത്യേക ചിഹ്നമെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-    <item quantity="other" msgid="1221290525051187757">"പാസ്‌വേഡിൽ %d പ്രത്യേക ചിഹ്നങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"പാസ്‌വേഡിൽ അക്ഷരമല്ലാത്ത ഒരു പ്രതീകമെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-    <item quantity="other" msgid="3952508584649046404">"പാസ്‌വേഡിൽ അക്ഷരമല്ലാത്ത %d പ്രതീകങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">പാസ്‌വേഡിൽ %d അക്ഷരങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+      <item quantity="one">പാസ്‌വേഡിൽ ഒരു അക്ഷരമെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">പാസ്‌വേഡിൽ %d ചെറിയക്ഷരങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+      <item quantity="one">പാസ്‌വേഡിൽ ഒരു ചെറിയക്ഷരമെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">പാസ്‌വേഡിൽ %d വലിയക്ഷരങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+      <item quantity="one">പാസ്‌വേഡിൽ ഒരു വലിയക്ഷരമെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">പാസ്‌വേഡിൽ %d സംഖ്യകളെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+      <item quantity="one">പാസ്‌വേഡിൽ ഒരു സംഖ്യയെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">പാസ്‌വേഡിൽ %d പ്രത്യേക ചിഹ്നങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+      <item quantity="one">പാസ്‌വേഡിൽ ഒരു പ്രത്യേക ചിഹ്നമെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">പാസ്‌വേഡിൽ അക്ഷരമല്ലാത്ത %d പ്രതീകങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+      <item quantity="one">പാസ്‌വേഡിൽ അക്ഷരമല്ലാത്ത ഒരു പ്രതീകമെങ്കിലും ഉണ്ടായിരിക്കണം.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"ഒരു സമീപകാല പാസ്‌വേഡ് ഉപയോഗിക്കാൻ ഉപകരണ അഡ്‌മിനിസ്‌ട്രേറ്റർ അനുവദിക്കുന്നില്ല."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"സംഖ്യകളുടെ ആരോഹണമോ അവരോഹണമോ ആവർത്തിക്കുന്ന അനുക്രമമോ നിരോധിച്ചിരിക്കുന്നു"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ശരി"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"ജോടിയാക്കുക"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ജോടിയാക്കുക"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"റദ്ദാക്കുക"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"കണക്‌റ്റു‌ചെയ്‌തിരിക്കുമ്പോൾ, ജോടിയാക്കുന്നത് നിങ്ങളുടെ കോൺടാക്‌റ്റുകളിലേക്കും കോൾ ചരിത്രത്തിലേക്കും  ആക്‌സസ്സ് അനുവദിക്കുന്നു."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്നതുമായി ജോടിയാക്കാനായില്ല."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ഒരു തെറ്റായ പിൻ അല്ലെങ്കിൽ പാസ്‌കീ കാരണം <xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്നതുമായി ജോടിയാക്കാനായില്ല."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്നതുമായി ആശയവിനിമയം നടത്താനായില്ല."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, ജോടിയാക്കൽ നിരസിച്ചു."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്താൻ, അപ്ലിക്കേഷനുകളും സേവനങ്ങളും Bluetooth ഓഫാണെങ്കിൽപ്പോലും Bluetooth ഉപകരണങ്ങൾ ലഭ്യമാണോയെന്നറിയാൻ സ്‌കാൻ ചെയ്യും. നിങ്ങൾക്ക് <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>സ്‌കാനിംഗ് ക്രമീകരണത്തിൽ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ഇത് മാറ്റാനാകും."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ഇതിൽ കണക്റ്റുചെയ്യുക..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"മീഡിയ ഓഡിയോ"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ഫോൺ ഓഡിയോ"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ഫയൽ കൈമാറൽ"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ഇൻപുട്ട് ഉപകരണം"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ഇന്റർനെറ്റ് ആക്‌സസ്സ്"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"കോൺടാക്‌റ്റ് പങ്കിടൽ"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"കോൺടാക്‌റ്റ് പങ്കിടലിനായി ഉപയോഗിക്കുക"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടൽ"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"ആക്‌സസ്സ് നിയന്ത്രിക്കുക"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"മീഡിയ ഓഡിയോയിലേക്ക് കണ‌ക്റ്റുചെയ്‌തു"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ഫോൺ ഓഡിയോയിൽ കണ‌ക്റ്റുചെ‌യ്‌തു"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ഫയൽ കൈമാറ്റ സെർവറിലേക്ക് കണ‌ക്റ്റുചെ‌യ്‌തു"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"മാപ്പിലേക്ക് കണക്റ്റുചെയ്‌തു"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ഫയൽ കൈമാറ്റ സെർവറിൽ കണ‌ക്റ്റുചെയ്‌തിട്ടില്ല"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ഇൻപുട്ട് ഉപകരണത്തിൽ കണക്റ്റുചെയ്‌തു"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"മീഡിയ ഓഡിയോയ്ക്കായി ഉപയോഗിക്കുക"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ഫോൺ ഓഡിയോയ്ക്കായി ഉപയോഗിക്കുക"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ഫയൽ കൈമാറ്റത്തിനായി ഉപയോഗിക്കുന്നു"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ഇൻപുട്ടിനായി ഉപയോഗിക്കുക"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ഇന്റ‌ർനെറ്റ് ആക്‌‌സസ്സിനായി ഉപയോഗിക്കുന്നു"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"മാപ്പിനായി ഉപയോഗിക്കുക"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi അസിസ്‌റ്റന്റ്"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi അസിസ്റ്റന്റ് മുഖേന കണക്‌റ്റുചെയ്തു"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"കാസ്‌റ്റ് സ്‌ക്രീൻ"</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>
@@ -570,12 +552,14 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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="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_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="6981652347448777459">"ഈ സവിശേഷത ഓണായിരിക്കുമ്പോൾ, ഉപകരണങ്ങൾ വളരെ അടുത്തടുത്തായി പിടിച്ചുകൊണ്ട് മറ്റൊരു NFC പ്രാപ്‌തമായ ഉപകരണത്തിലേക്ക് നിങ്ങൾക്ക് അപ്ലിക്കേഷൻ ഉള്ളടക്കം ബീം ചെയ്യാനാകും. ഉദാഹരണത്തിന്, ബ്രൗസർ പേജുകളും YouTube വീഡിയോകളും ആളുകളുടെ കോൺടാക്റ്റുകളും അതിലധികം കാര്യങ്ങളും നിങ്ങൾക്ക് ബീം ചെയ്യാം.\n\nഉപകരണങ്ങൾ ഒരുമിച്ച് കൊണ്ടുവന്ന് (സാധാരണ ഒന്നിനുശേഷം മറ്റൊന്ന്) നിങ്ങളുടെ സ്‌ക്രീൻ ടച്ച് ചെയ്യുക. എന്തിനായി ബീം ചെയ്യണമെന്നത് അപ്ലിക്കേഷൻ നിർണ്ണയിക്കുന്നു."</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi ഓഫാക്കുന്നു…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"പിശക്"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"വിമാന മോഡിലാണ്"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"നെ‌റ്റ്‌വർക്കുകൾക്കായി സ്കാൻ ചെയ്യാനായില്ല"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"നെറ്റ്‌വർക്ക് അറിയിപ്പ്"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"പൊതുവായ ഒരു നെറ്റ്‌വർക്ക് എപ്പോഴെങ്കിലും ലഭ്യമാണെങ്കിൽ അറിയിക്കുക"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"മോശം കണക്ഷനുകൾ ഒഴിവാക്കുക"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"മികച്ച ഇന്റർനെറ്റ് കണക്ഷൻ ഉണ്ടാകുന്നതുവരെ Wi‑Fi നെറ്റ്‌വർക്ക് ഉപയോഗിക്കരുത്"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"മികച്ച ഇന്റർനെറ്റ് കണക്ഷനുള്ള നെറ്റ്‌വർക്കുകൾ മാത്രം ഉപയോഗിക്കുക"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"സ്‌കാൻ ചെയ്യൽ എല്ലായ്‌പ്പോഴും ലഭ്യമാണ്"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"സ്‌കാനിംഗ് എല്ലായ്‌പ്പോഴും അനുവദിക്കുക"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-Fi ഓഫാണെങ്കിൽപ്പോലും, Google ലൊക്കേഷൻ സേവനത്തെയും മറ്റ് അപ്ലിക്കേഷനുകളെയും നെറ്റ്‌വർക്കുകൾ സ്‌കാൻ ചെയ്യാൻ അനുവദിക്കുക"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ഓപ്പൺ Wi‑Fi സ്വയം ഉപയോഗിക്കുക"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"ഉയർന്ന നിലവാരമുള്ളതെന്ന് നിർണ്ണയിക്കപ്പെടുന്ന ഓപ്പൺ നെറ്റ്‌വർക്കുകൾ സ്വയം കണക്‌റ്റുചെയ്യാൻ ഒരു Wi-Fi അസിസ്റ്റന്റിനെ അനുവദിക്കുക"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"സാഹായിയെ തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്റ്റാളുചെയ്യുക"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്തുന്നതിനും മറ്റ് ആവശ്യകതകൾക്കായും, Wi-Fi ഓഫായിരിക്കുമ്പോൾപ്പോലും Google-ഉം മറ്റ് അപ്ലിക്കേഷനുകളും സമീപത്തുള്ള നെറ്റ്‌വർക്കുകൾ സ്‌കാൻ ചെയ്യാനിടയുണ്ട്. ഇത് സംഭവിക്കാൻ താൽപ്പര്യപ്പെടുന്നില്ലെങ്കിൽ, വിപുലമായത് &gt; സ്‌കാൻ ചെയ്യൽ എല്ലായ്‌പ്പോഴും ലഭ്യമാണ് എന്നതിലേക്ക് പോകുക."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi ഓഫായിരിക്കുമ്പോൾപ്പോലും സമീപമുള്ള നെറ്റ്‌വർക്കുകൾക്കായി അപ്ലിക്കേഷനുകൾ സ്‌കാൻ ചെയ്യാനിടയുണ്ട്. ഇത് സംഭവിക്കാൻ താൽപ്പര്യപ്പെടുന്നില്ലെങ്കിൽ, വിപുലമായത് &gt; സ്‌കാൻ ചെയ്യൽ എല്ലായ്‌പ്പോഴും ലഭ്യമാണ് എന്നതിലേക്ക് പോകുക."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്താൻ, അപ്ലിക്കേഷനുകളും സേവനങ്ങളും Wi‑Fi ഓഫാണെങ്കിൽപ്പോലും 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="5340097010842405981">"വീണ്ടും കാണിക്കരുത്"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"മറ്റൊ‌രു നെറ്റ്‌വർക്ക് ചേർക്കുക"</string>
     <string name="wifi_more" msgid="3195296805089107950">"കൂടുതൽ"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"യാന്ത്രിക സജ്ജീകരണം (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"സജ്ജീകരണം പൂർത്തിയാക്കാൻ, നിങ്ങളുടെ ടാബ്‌ലെറ്റിന് Wi‑Fi യിലേക്ക് ആക്‌സസ്സ് ആവശ്യമാണ്. സജ്ജീകരണത്തിനുശേഷം നിങ്ങൾക്ക് സെല്ലുലാർ ഡാറ്റയ്‌ക്കും Wi‑Fi യ്‌ക്കുമിടയിൽ മാറാനാകും."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"വിപുലമായ ഓപ്ഷനുകൾ"</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="5940801028985255304">"നിങ്ങളുടെ റൂട്ടറിലെ Wi‑Fi പരിരക്ഷിത സജ്ജീകരണ ബട്ടൺ അമർത്തുക. ഇത് \"WPS\" കോൾ ചെയ്യാനോ ഈ ചിഹ്നം ഉൾപ്പെടാനോ ഇടയുണ്ട്:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"നിങ്ങളുടെ റൂട്ടറിലെ 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_complete" msgid="2388138550456729134">"WPS വിജയിച്ചു. നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യുന്നു…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi‑Fi നെറ്റ്‌വർക്കിൽ <xliff:g id="NETWORK_NAME">%s</xliff:g> കണക്റ്റുചെയ്യുന്നു"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"AP ബാൻഡ് കോൺഫിഗർ ചെയ്യുക"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(മാറ്റം വരുത്തിയിട്ടില്ല)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(വ്യക്തമാക്കിയിട്ടില്ല)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"സംരക്ഷിച്ചു"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"പ്രവർത്തനരഹിതമാക്കി"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP കോൺഫിഗറേഷൻ പരാജയം"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi കണക്ഷൻ പരാജയം"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ആധികാരികമാക്കുന്നതിലെ പ്രശ്‌നം"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"പരിധിയിലില്ല"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"ഇന്റർനെറ്റ് ആക്സസ്സൊന്നും കണ്ടെത്താത്തതിനാൽ സ്വയം വീണ്ടും കണക്‌റ്റുചെയ്യില്ല."</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_security_none" msgid="7985461072596594400">"ഒന്നുമില്ല"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"ഈ നെറ്റ്‌വർക്കിൽ ഇന്റർനെറ്റ് ആക്‌സസ്സ് ഇല്ല. ഏതുവിധേനയും ഈ നെറ്റ്‌വർക്ക് ഉപയോഗിക്കണോ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ഈ നെറ്റ്‌വർക്കിനായി വീണ്ടും ആവശ്യപ്പെടരുത്"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"കണക്റ്റുചെയ്യുക"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"മറക്കുക"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK പോർട്ടബിൾ Wi‑Fi ഹോട്ട്‌സ്‌പോട്ട്"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> പോർട്ടബിൾ Wi‑Fi ഹോട്ട്‌സ്പോട്ട്"</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_mode_title" msgid="2164073796253284289">"കോളിംഗ് മുൻഗണന"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi കോളിംഗ് മോഡ്"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi തിരഞ്ഞെടുത്തിരിക്കുന്നു"</item>
+    <item msgid="5267397515594230396">"സെല്ലുലാർ തിരഞ്ഞെടുത്തിരിക്കുന്നു"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi കോളിംഗ് ഓണായിരിക്കുമ്പോൾ, നിങ്ങളുടെ മുൻഗണനയും ഏത് സിഗ്നലാണ് ശക്തമെന്നതും അടിസ്ഥാനമാക്കി ഫോണിന് Wi-Fi നെറ്റ്‌വർക്കോ കാരിയർ നെറ്റ്‌വർക്കോ വഴി കോളുകൾ റൂട്ട് ചെയ്യാനാകും. ഈ ഫീച്ചർ ഓണാക്കുന്നതിനുമുമ്പ്, നിരക്കുകളും മറ്റ് വിശദാംശങ്ങളും അറിയുന്നതിന് നിങ്ങളുടെ കാരിയറെ ബന്ധപ്പെടുക."</string>
     <string name="home_settings" msgid="212375129455718176">"ഹോം"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ദൃശ്യമാക്കുക"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ശബ്‌ദം"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"തീം"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"ഇളം"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"ഇരുണ്ട"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"സ്വയമേവ"</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>
@@ -824,7 +816,7 @@
     <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_off" msgid="2481581696365146473">"ഓഫാണ്"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ഓഫ്"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"ഫോൺ ഡോക്കുചെയ്‌തിരിക്കുമ്പോഴോ കൂടാതെ/അല്ലെങ്കിൽ സുഷുപ്‌തിയിലാകുമ്പോഴോ എന്തുസംഭവിക്കുമെന്നത് നിയന്ത്രിക്കാൻ ഡേഡ്രീം ഓൺ ചെയ്യുക."</string>
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"ഡേഡ്രീമിലാകുന്നത് എപ്പോൾ"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ഇപ്പോൾ ആരംഭിക്കുക"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"തിരഞ്ഞെടുത്ത SIM കാർഡ് അപ്‌ഡേറ്റുചെയ്യണോ?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"നിങ്ങളുടെ ഉപകരണത്തിലെ ഒരേയൊരു SIM ആണ് <xliff:g id="NEW_SIM">%1$s</xliff:g>. സെല്ലുലാർ ഡാറ്റയ്‌ക്കും കോളുകൾക്കും SMS സന്ദേശങ്ങൾക്കും ഈ SIM ഉപയോഗിക്കണോ?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"സിം പിൻ കോഡ് തെറ്റാണ്, നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യാൻ ഇപ്പോൾ നിങ്ങളുടെ കാരിയറുമായി ബന്ധപ്പെടണം."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"തെറ്റായ സിം പിൻ കോഡ്, നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യാൻ നിങ്ങളുടെ സേവനദാതാവുമായി ബന്ധപ്പെടുന്നതിന് മുമ്പായി നിങ്ങൾക്ക് <xliff:g id="NUMBER">%d</xliff:g> ശ്രമം കൂടി ബാക്കിയുണ്ട്."</item>
-    <item quantity="other" msgid="77103619544346451">"തെറ്റായ സിം പിൻ കോഡ്, നിങ്ങൾക്ക് <xliff:g id="NUMBER">%d</xliff:g> ശ്രമങ്ങൾ കൂടി ബാക്കിയുണ്ട്."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM PIN കോഡ് തെറ്റാണ്, നിങ്ങൾക്ക് <xliff:g id="NUMBER_1">%d</xliff:g> ശ്രമങ്ങൾ കൂടി ശേഷിക്കുന്നു.</item>
+      <item quantity="one">SIM PIN കോഡ് തെറ്റാണ്, നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യാൻ കാരിയറെ ബന്ധപ്പെടേണ്ടതിന് മുമ്പായി <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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"അപ്ലിക്കേഷനുകൾ (അപ്ലിക്കേഷൻ ഡാറ്റയും മീഡിയ ഉള്ളടക്കവും)"</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_dcim_usage" msgid="558887013613822577">"ചിത്രങ്ങളും വീഡിയോകളും"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"ഓഡിയോ (സംഗീതം, റിംഗ്ടോണുകൾ, പോഡ്കാസ്‌റ്റുകൾ തുടങ്ങിയവ)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"പലവക"</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="default" msgid="6915293408836853020">"SD കാർഡ് അൺമൗണ്ടുചെയ്യുക"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"മൗണ്ടുചെയ്യുക"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"നിരസിക്കുക"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"മായ്‌ക്കുക, ഫോർമാറ്റുചെയ്യുക"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ആന്തരിക സംഭരണമായി മായ്‌ക്കുക, ഫോർമാറ്റുചെയ്യുക"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB കമ്പ്യൂട്ടർ കണക്ഷൻ"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB കമ്പ്യൂട്ടർ കണക്ഷൻ"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"ഇതായി കണ‌ക്റ്റുചെയ്യുക"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"ക്യാമറ സോ‌ഫ്‌റ്റ്‌വെയർ ഉപയോഗിച്ച് ഫോട്ടോകൾ കൈമാറ്റം ചെയ്യാനും MTP-യെ പിന്തുണയ്ക്കാത്ത കമ്പ്യൂട്ടറുകളിലെ എല്ലാ ഫയലുകളും കൈമാറ്റം ചെയ്യാനും നിങ്ങളെ അനുവദിക്കുന്നു"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ഫയൽ കൈമാറ്റ ഉപകരണങ്ങൾ ഇൻസ്‌റ്റാളുചെയ്യുക"</string>
+    <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_external_title" msgid="2723851748972673696">"നീക്കംചെയ്യാനാവുന്ന സംഭരണം"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> സൗജന്യം (മൊത്തം <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> മൗണ്ടുചെയ്‌തു"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> ഫോർമാറ്റുചെയ്യാനായില്ല"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"സംഭരണത്തിന്റെ പേരുമാറ്റുക"</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="3677827796634199714"><b>"നിങ്ങൾ ഈ <xliff:g id="NAME_0">^1</xliff:g> ഒഴിവാക്കുമ്പോൾ, അതിൽ സംഭരിച്ചിരിക്കുന്ന അപ്ലിക്കേഷനുകളുടെ പ്രവർത്തനം നിലയ്‌ക്കുകയും അതിൽ സംഭരിച്ചിരിക്കുന്ന മീഡിയ ഫയലുകൾ അത് തിരികെ ചേർക്കുന്നതുവരെ ലഭ്യമാകുകയുമില്ല ."</b>" \n\nഈ <xliff:g id="NAME_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_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_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="1259216693690378749">"അത് ഫോർമാറ്റുചെയ്യുമ്പോൾ <xliff:g id="NAME">^1</xliff:g> നീക്കംചെയ്യരുത്."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"പുതിയ സംഭരണത്തിലേക്ക് വിവരം നീക്കുക"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"നിങ്ങൾക്ക് ഈ പുതിയ <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="5035719146373359329"><b>"നീക്കാൻ ഏകദേശം <xliff:g id="TIME">^1</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="8641916179067596592">"നീക്കുന്ന സമയത്ത്: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> നീക്കുക"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="NAME_0">^2</xliff:g> എന്നതിലേക്ക് <xliff:g id="APP">^1</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="4288580957960820740">"നീക്കുന്നതിനിടെ <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="battery_status_title" msgid="9159414319574976203">"ബാറ്ററി നില"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ബാറ്ററി നില"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-കൾ"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"നെറ്റ്‌വർക്ക് ക്രമീകരണം റീസെറ്റുചെയ്യുക"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"ഇത് ഇവയുൾപ്പെടെ എല്ലാ നെറ്റ്‌വർക്ക് ക്രമീകരണവും റീസെറ്റുചെയ്യും:\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="4874737348054213767">"എല്ലാ നെറ്റ്‌വർക്കിംഗ് ക്രമീകരണവും റീസെറ്റുചെയ്യണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാവില്ല!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ക്രമീകരണം റീസെറ്റുചെയ്യുക"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"റീസെറ്റുചെയ്യണോ?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"നെറ്റ്‌വർക്ക് ക്രമീകരണം റീസെറ്റുചെയ്‌തു"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"ഉപകരണം പുനഃസജ്ജീകരിക്കുക"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ഫാക്‌ടറി ഡാറ്റ പുനഃസജ്ജീകരണം"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"ടാബ്‌ലെറ്റിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുന്നു"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"ഫോണിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുന്നു"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ഇത് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ "<b>"ആന്തരിക സംഭരണത്തിൽ"</b>" നിന്നും ഇവയുൾപ്പെടെ എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സി‌സ്റ്റത്തിന്റെയും അപ്ലിക്കേഷന്റെയും ഡാറ്റയും ക്രമീകരണങ്ങളും"</li>\n<li>"ഡൗൺലോഡുചെ‌യ്‌ത അപ്ലിക്കേഷനുകൾ"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ഇത് നിങ്ങളുടെ ഫോണിലെ "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"സംഗീതമോ ഫോട്ടോകളോ പോലുള്ള, SD കാർഡിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ടാബ്‌ലെറ്റ് പുനഃസജ്ജമാക്കുക"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ഫോൺ പുനഃസജ്ജമാക്കുക"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"നിങ്ങളുടെ എല്ലാ വ്യക്തിഗത വിവരവും ഡൗൺലോഡ് ചെയ്‌ത അപ്ലിക്കേഷനുകളും മായ്ക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"നിങ്ങളുടെ എല്ലാ വ്യക്തിഗത വിവരവും ഡൗൺലോഡ് ചെയ്‌ത അപ്ലിക്കേഷനുകളും മായ്‌ക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"എല്ലാം മായ്ക്കുക"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ഒരു ഫാക്‌ടറി ഡാറ്റ പുനഃസജ്ജീകരണം സ്ഥിരീകരിക്കാൻ നിങ്ങൾ ഒരു അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"സി‌സ്റ്റം മായ്ക്കുക സേവനം ലഭ്യമല്ലാത്തതിനാൽ പുനഃസജ്ജീകരണമൊന്നും നടത്തിയില്ല."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"പുനഃസജ്ജമാക്കണോ?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ഈ ഉപയോക്താവിനായി ഫാക്‌ടറി പുനഃസജ്ജമാക്കൽ ലഭ്യമല്ല"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB സംഭരണത്തിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ ഫയലുകളും ഇല്ലാതാക്കി അത് മായ്‌ക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD കാർഡിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ ഫയലുകളും ഇല്ലാതാക്കി അത് മായ്‌ക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"എല്ലാം മായ്ക്കുക"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB സംഭരണം നിങ്ങൾക്ക് മായ്‌ക്കണമെന്ന് സ്ഥിരീകരിക്കാൻ നിങ്ങളുടെ അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD കാർഡ് മായ്‌ക്കണമെന്നത് സ്ഥിരീകരിക്കാൻ നിങ്ങൾ ഒരു അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"സഹായം"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"സെല്ലുലാർ നെറ്റ്‌വർക്കുകൾ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"മൊബൈൽ പ്ലാൻ"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"സ്ഥിര 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ലൊക്കേഷൻ മോഡ്"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS, Wi‑Fi, സെല്ലുലാർ നെറ്റ്‌വർക്കുകൾ ഉപയോഗിക്കുക"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ Wi‑Fi, സെല്ലുലാർ നെറ്റ്‌വർക്കുകൾ ഉപയോഗിക്കുക"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"നിങ്ങളുടെ ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS ഉപയോഗിക്കുക"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS ഉപയോഗിക്കുക"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"സ്കാൻ ചെയ്യുന്നു"</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="2070686681074461301">"Wi‑Fi ഓഫാണെങ്കിൽപ്പോലും Wi‑Fi ഉപകരണങ്ങൾ ലഭ്യമാണോയെന്ന് സ്‌കാൻ ചെയ്യാൻ അപ്ലിക്കേഷനുകളെയും സേവനങ്ങളെയും അനുവദിച്ചുകൊണ്ട് ലൊക്കേഷൻ മെച്ചപ്പെടുത്തുക"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth സ്‌കാനിംഗ്"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Bluetooth ഓഫാണെങ്കിൽപ്പോലും Bluetooth ഉപകരണങ്ങൾ ലഭ്യമാണോയെന്നറിയുന്നതിന് സ്‌കാൻ ചെയ്യാൻ നിങ്ങൾക്ക് സിസ്റ്റം സേവനങ്ങളെ അനുവദിച്ചുകൊണ്ട് ലൊക്കേഷൻ മെച്ചപ്പെടുത്തുക"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi, സെല്ലുലാർ നെറ്റ്‌വർക്ക് ലൊക്കേഷൻ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"നിങ്ങളുടെ ലൊക്കേഷൻ വേഗത്തിൽ നിർണ്ണയിക്കാൻ Google-ന്റെ ലൊക്കേഷൻ സേവനം ഉപയോഗിക്കാൻ അപ്ലിക്കേഷനുകളെ അനുവദിക്കുക. അജ്ഞാത ലൊക്കേഷൻ ഡാറ്റ ശേഖരിച്ച് Google-ന് അയയ്‌ക്കും."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi നിർണ്ണയിച്ച ലൊക്കേഷൻ"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"സ്‌ക്രീൻ സുരക്ഷ"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"തുടരാൻ നിങ്ങളുടെ ഉപകരണ പാറ്റേൺ ഉപയോഗിക്കുക."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"തുടരാൻ ഉപകരണ പിൻ നൽകുക."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"തുടരാൻ നിങ്ങളുടെ ഉപകരണത്തിന്റെ പാസ്‌വേഡ് നൽകുക."</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_need_to_unlock" msgid="757935356911054465">"സംരക്ഷിച്ച പാറ്റേൺ സ്ഥിരീകരിക്കുക"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"വീണ്ടും ശ്രമിക്കുക:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"വളരെയധികം തെറ്റായ ശ്രമങ്ങൾ!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> സെക്കൻഡിനുള്ളിൽ വീണ്ടും ശ്രമിക്കുക."</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="manageapplications_settings_title" msgid="7041951105633616745">"അപ്ലിക്കേഷനുകൾ നിയന്ത്രിക്കുക"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ഇൻസ്റ്റാൾ ചെയ്‌ത അപ്ലിക്കേഷനുകൾ നിയന്ത്രിക്കുക, നീക്കംചെയ്യുക"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"സംഭരണ ഉപയോഗം"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"അപ്ലിക്കേഷൻ ഉപയോഗിച്ച സംഭരണം കാണുക"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"പ്രവർത്തിക്കുന്ന സേവനങ്ങൾ"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ടാബ്‌ലെറ്റ് വിവരം"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ഫോൺ വിവരം"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"ബാറ്ററി വിവരം"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"ദ്രുത്ര സമാരംഭം"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"അപ്ലിക്കേഷനുകൾ സമാരംഭിക്കുന്നതിന് കീബോർഡ് കുറുക്കുവഴികൾ സജ്ജമാക്കുക"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"അപ്ലിക്കേഷനിൽ നൽകുക"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"കുറുക്കുവഴിയൊന്നുമില്ല"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"തിരയൽ+ <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"മായ്‌ക്കുക"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) എന്നതിനായുള്ള നിങ്ങളുടെ കുറുക്കുവഴികൾ മായ്‌ക്കും."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ശരി"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"റദ്ദാക്കുക"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"അപ്ലിക്കേഷനുകൾ"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"കുറുക്കുവഴികൾ"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ഒരു ഫയലിൽ എല്ലാ ബ്ലൂടൂത്ത് HCI പാക്കറ്റുകളും ക്യാപ്‌ചർ ചെയ്യുക"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM അൺലോക്കുചെയ്യൽ"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"അൺലോക്കാകാൻ ബൂട്ട്‌ലോഡറിനെ അനുവദിക്കുക"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"നിങ്ങളുടെ PIN നൽകുക"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM അൺലോക്ക് പ്രവർത്തനക്ഷമമാക്കുന്നതിന് നിങ്ങളുടെ ഉപകരണത്തിന്റെ PIN നൽകുക"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM അൺലോക്കുചെയ്യൽ അനുവദിക്കണോ?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"മുന്നറിയിപ്പ്: ഈ ക്രമീകരണം ഓണായിരിക്കുമ്പോൾ, ഉപകരണ സുരക്ഷാ ഫീച്ചറുകൾ ഈ ഉപകരണത്തിൽ പ്രവർത്തിക്കില്ല."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ലോഗർ ബഫർ വലുപ്പം"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ഓരോ ലോഗ് ബഫറിനും ലോഗർ വലുപ്പം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"വ്യാജ ലൊക്കേഷനുകൾ അനുവദിക്കുക"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"വ്യാജ ലൊക്കേഷനുകൾ അനുവദിക്കുക"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"ആട്രിബ്യൂട്ട് പരിശോധന കാണുന്നത് പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"നെറ്റ്‍വര്‍ക്കിംഗ്"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"വയർലെസ് ഡിസ്‌പ്ലേ സർട്ടിഫിക്കേഷൻ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi വെർബോസ് ലോഗിംഗ് പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"സെല്ലുലാർ ഹാൻഡ്ഓവറിലേക്ക് വൈഫൈ അഗ്രസ്സീവാക്കുക"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"എല്ലായ്‌പ്പോഴും വൈഫൈ റോം സ്‌‌കാനുകൾ അനുവദിക്കുക"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"പഴയ DHCP ക്ലയന്റ് ഉപയോഗിക്കുക"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"വയർലെസ് ഡിസ്‌പ്ലേ സർട്ടിഫിക്കേഷനായി ഓപ്‌ഷനുകൾ ദൃശ്യമാക്കുക"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi പിക്കറിൽ ഓരോ SSID RSSI പ്രകാരം കാണിക്കാൻ Wi‑Fi ലോഗിംഗ് നില വർദ്ധിപ്പിക്കുക"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"പ്രവർത്തനക്ഷമമായിരിക്കുമ്പോൾ, വൈഫൈ സിഗ്‌നൽ കുറവായിരിക്കുന്ന സമയത്ത് സെല്ലുലാറിലേക്ക് ഡാറ്റ കണക്ഷൻ മുഖേന കൈമാറുന്നതിൽ വൈഫൈ കൂടുതൽ പ്രവർത്തനക്ഷമമാകും"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"ഇന്റർഫേസിലെ ഡാറ്റ ട്രാഫിക്ക് സാന്നിദ്ധ്യത്തിന്റെ കണക്ക് അടിസ്ഥാനമാക്കി Wi‑Fi റോം സ്‌കാനുകൾ അനുവദിക്കുക/അനുവദിക്കാതിരിക്കുക"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"ലോഗർ ബഫർ വലുപ്പം"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ഓരോ ലോഗ് ബഫറിനും ലോഗർ വലുപ്പം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB കോൺഫിഗറേഷൻ തിരഞ്ഞെടുക്കുക"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB കോൺഫിഗറേഷൻ തിരഞ്ഞെടുക്കുക"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"വ്യാജ ലൊക്കേഷനുകൾ അനുവദിക്കുക"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"വ്യാജ ലൊക്കേഷനുകൾ അനുവദിക്കുക"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"ആട്രിബ്യൂട്ട് പരിശോധന കാണുന്നത് പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"പുതിയ Android DHCP ക്ലയന്റിനുപകരം Lollipop-ൽ നിന്ന് DHCP ക്ലയന്റ് ഉപയോഗിക്കുക."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB ഡീബഗ്ഗുചെയ്യാൻ അനുവദിക്കണോ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB ഡീബഗ്ഗിംഗ് വികസന ആവശ്യകതകൾക്ക് മാത്രമുള്ളതാണ്. നിങ്ങളുടെ കമ്പ്യൂട്ടറിനും ഉപകരണത്തിനുമിടയിൽ ഡാറ്റ പകർത്തുന്നതിനും അറിയിപ്പില്ലാതെ തന്നെ നിങ്ങളുടെ ഉപകരണത്തിൽ അപ്ലിക്കേഷനുകൾ ഇൻസ്‌റ്റാളുചെയ്യുന്നതിനും ലോഗ് ഡാറ്റ റീഡുചെയ്യുന്നതിനും ഇത് ഉപയോഗിക്കുക."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"നിങ്ങൾ മുമ്പ് അംഗീകരിച്ച എല്ലാ കമ്പ്യൂട്ടറുകളിൽ നിന്നും USB ഡീബഗ്ഗുചെയ്യുന്നതിനുള്ള ആക്‌സസ്സ് പിൻവലിക്കണോ?"</string>
@@ -1503,7 +1550,7 @@
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"ഈ സവിശേഷത ഓണാക്കുമ്പോൾ, സ്‌ക്രീനിൽ മൂന്നുതവണ ടാപ്പുചെയ്യുന്നതിലൂടെ സൂം ഇൻ ചെയ്യാനും സൂം ഔട്ട് ചെയ്യാനുമാകും.\n\nസൂം ഇൻ ചെയ്യുമ്പോൾ, നിങ്ങൾക്ക് ഇവ ചെയ്യാം:\n"<ul><li>"പാൻ: സ്‌ക്രീനിന് കുറുകെ രണ്ടോ അതിലധികമോ വിരലുകൾ ഇഴയ്‌ക്കുക."</li>\n<li>"സൂം നില ക്രമീകരിക്കുക: രണ്ടോ അതിലധികമോ വിരലുകൾ ഒരുമിച്ചോ അകലത്തിലോ പിടിച്ച് പിഞ്ചുചെയ്യുക."</li></ul>\n\n"മൂന്നുതവണ ടാപ്പുചെയ്‌ത് പിടിക്കുന്നതിലൂടെ നിങ്ങളുടെ വിരലിനടിയിലുള്ളത് താൽക്കാലികമായി മാഗ്‌നിഫൈ ചെയ്യാനുമാകും. മാഗ്‌നിഫൈ ചെയ്‌ത ഈ നിലയിൽ, സ്‌ക്രീനിന്റെ വ്യത്യസ്‌ത ഭാഗങ്ങൾ പര്യവേക്ഷണം ചെയ്യുന്നതിന് നിങ്ങളുടെ വിരൽ ഇഴയ്‌ക്കാനുമാകും. മുമ്പത്തെ നിലയിലേക്ക് തിരിച്ചുപോകാൻ നിങ്ങളുടെ വിരൽ മാറ്റുക.\n\nശ്രദ്ധിക്കുക: കീബോർഡിലും നാവിഗേഷൻ ബാറിലും ഒഴികെ എല്ലായിടത്തും മാഗ്‌നിഫൈ ചെയ്യുന്നതിനായി മൂന്നുതവണ ടാപ്പുചെയ്യുന്നത് പ്രവർത്തിക്കും."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"പ്രവേശനക്ഷമതാ കുറുക്കുവഴി"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"ഓണാണ്"</string>
-    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ഓഫാണ്"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ഓഫ്"</string>
     <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"ഈ സവിശേഷത ഓണാക്കുമ്പോൾ, നിങ്ങൾക്ക് രണ്ട് ഘട്ടങ്ങളായി വേഗത്തിൽ പ്രവേശനക്ഷമതാ സവിശേഷതകൾ പ്രവർത്തനക്ഷമമാക്കാം:\n\nഘട്ടം 1: ഒരു ശബ്‌ദം കേൾക്കുന്നതുവരെ അല്ലെങ്കിൽ ഒരു വൈബ്രേഷൻ അനുഭവപ്പെടുന്നതുവരെ പവർബട്ടൺ അമർത്തിപ്പിടിക്കുക.\n\nഘട്ടം 2: ഓഡിയോ സ്ഥിരീകരണം കേൾക്കുന്നതുവരെ രണ്ട് വിരലുകൾ സ്‌പർശിച്ച് പിടിക്കുക.\n\nഉപകരണത്തിന് ഒന്നിലധികം ഉപയോക്താക്കളുണ്ടെങ്കിൽ, ലോക്ക്‌സ്‌ക്രീനിൽ ഈ കുറുക്കുവഴി ഉപയോഗിക്കുന്നത് ഉപകരണം അൺലോക്കുചെയ്യുന്നതുവരെ താൽക്കാലികമായി പ്രവേശനക്ഷമത പ്രവർത്തനക്ഷമമാക്കുന്നതിനിടയാക്കുന്നു."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"വളരെ വലിയ വാചകം"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"ഉയർന്ന ദൃശ്യ തീവ്രതയുള്ള ടെക്‌സ്റ്റ്"</string>
@@ -1527,7 +1574,7 @@
     <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"ട്രിട്ടാനോമലി (നീല-മഞ്ഞ)"</string>
     <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_off" msgid="4172584906487070211">"ഓഫ്"</string>
     <string name="accessibility_feature_or_input_method_not_allowed" msgid="5950315477009501647">"നിങ്ങളുടെ ഓർഗനൈസേഷൻ അനുവദിക്കുന്നില്ല"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"പ്രിവ്യൂ ചെയ്യുക"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"സാധാരണ ഓപ്ഷനുകൾ"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"മജന്ത"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ഉപയോഗിക്കണോ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> എന്നതിന് ഇവ ആവശ്യമാണ്:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"അനുമതി അഭ്യർത്ഥനയെ ഒരു അപ്ലിക്കേഷൻ മറയ്‌ക്കുന്നതിനാൽ, ക്രമീകരണത്തിന് നിങ്ങളുടെ പ്രതികരണം പരിശോധിച്ചുറപ്പിക്കാനാകില്ല."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കിയെങ്കിൽ, ഡാറ്റ എൻക്രിപ്‌ഷൻ മെച്ചപ്പെടുത്താനായി ഉപകരണം നിങ്ങളുടെ സ്‌ക്രീൻ ലോക്ക് ഉപയോഗിക്കില്ല."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"നിങ്ങൾ പ്രവേശനക്ഷമത സേവനം ഓണാക്കിയതിനാൽ, ഡാറ്റ എൻക്രിപ്‌ഷൻ മെച്ചപ്പെടുത്താനായി ഉപകരണം നിങ്ങളുടെ സ്‌ക്രീൻ ലോക്ക് ഉപയോഗിക്കില്ല."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കുന്നത് ഡാറ്റ എൻക്രിപ്‌ഷനെ ബാധിക്കുന്നതിനാൽ, നിങ്ങളുടെ പാറ്റേൺ സ്ഥിരീകരിക്കേണ്ടതുണ്ട്."</string>
@@ -1582,7 +1630,7 @@
     <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_off" msgid="7294876968403966040">"ഓഫാണ്"</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_search" msgid="7025589328240514553">"തിരയൽ"</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> അപ്ലിക്കേഷനുകളുടെ പ്രോസസ്സ് പൂർത്തിയായ സമയം <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="TIMEDURATION">%3$s</xliff:g>-ന് <xliff:g id="USEDRAM">%1$s</xliff:g> / <xliff:g id="TOTALRAM">%2$s</xliff:g> ഉപയോഗിച്ചു"</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_memory_status" msgid="4251599550196193093">"ഉപകരണ മെമ്മറി നിലവിൽ <xliff:g id="MEMSTATE">%1$s</xliff:g> ആണ്"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"ശരാശരി RAM ഉപയോഗം"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"പരമാവധി RAM ഉപയോഗം"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"പ്രോസസുകൾ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"സേവനങ്ങള്‍"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ദൈർഘ്യം"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"മെമ്മറി വിശദാംശങ്ങൾ"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 മണിക്കൂർ"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"ഒരു ദിവസം"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"സിസ്റ്റം ദൃശ്യമാക്കുക"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"സിസ്റ്റം മറയ്‌ക്കുക"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ചുവടെയുള്ള സ്ഥിര ക്രമീകരണങ്ങൾ അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളെ അസാധുവാക്കുന്നു"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"സ്ഥിര ക്രമീകരണങ്ങൾ"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"സ്ഥിര എഞ്ചിൻ"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"സംഭാഷണ വാചകത്തിന് ഉപയോഗിച്ച സംഭാഷണ സിന്തസിസ് എഞ്ചിൻ സജ്ജീകരിക്കുക"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"സംഭാഷണ ടെക്‌സ്‌റ്റിന് ഉപയോഗിക്കാൻ സംഭാഷണ സിന്തസിസ് എഞ്ചിൻ സജ്ജീകരിക്കുക"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"വായന നിരക്ക്"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"വാചകം പറയുന്ന വേഗത"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"പിച്ച്"</string>
@@ -1795,7 +1850,7 @@
     <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_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>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"ക്രെഡൻഷ്യൽ ഇൻസ്റ്റാളുചെയ്യൽ സ്ഥിരീകരിക്കുന്നതിന് നിങ്ങളുടെ അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ക്രെഡൻഷ്യൽ സംഭരണത്തിനുള്ള പാ‌സ്‌വേഡ് ടൈപ്പുചെയ്യുക."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"നിലവിലെ പാസ്‍വേഡ്:"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"നിലവിൽ അക്കൗണ്ടുകളൊന്നും ബാക്കപ്പ് ചെയ്ത ഡാറ്റ സംഭരിക്കുന്നില്ല"</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="5355557151569037197">"ബാക്കപ്പ് സേവനം നിർജ്ജീവമാണ്."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"ഇത് നിങ്ങളുടെ ഉപകരണ നയം സജ്ജീകരിച്ചതാണ്."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ഡെ‌സ്‌ക്ടോപ്പ് ബാക്കപ്പ് പാസ്‌വേഡ്"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ഡെസ്‌ക്‌ടോപ്പ് പൂർണ്ണ ബാക്കപ്പുകൾ നിലവിൽ പരിരക്ഷിച്ചിട്ടില്ല"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ഡെസ്‌ക്‌ടോപ്പ് പൂർണ്ണ ബാക്കപ്പുകൾക്കായി പാസ്‌വേഡുകൾ മാറ്റാനോ നീക്കംചെയ്യാനോ സ്‌പർശിക്കുക"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"സംക്രമണ ആനിമേഷൻ സ്‌കെയിൽ"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"ആനിമേറ്റർ ദൈർഘ്യ സ്‌കെയിൽ"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"ദ്വിതീയ ഡിസ്‌പ്ലേകൾ അനുകരിക്കുക"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"മൾട്ടി വിൻഡോ മോഡ്"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"ഒരേ സമയം സ്‌ക്രീനിൽ ഒന്നിലധികം പ്രവർത്തികൾ."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"മൾട്ടി വിൻഡോ മോഡ് പ്രവർത്തനക്ഷമമാക്കണോ?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"മുന്നറിയിപ്പ്: പുതിയ അപ്ലിക്കേഷൻ UI വഴി ഒരേ സമയം സ്‌ക്രീനിൽ ഒന്നിലധികം പ്രവർത്തികൾ അനുവദിക്കുന്ന ഒരു ഉയർന്ന പരീക്ഷണാത്‌മക ഫീച്ചറാണിത്. ഈ ഫീച്ചറിൽ ഉപയോഗിക്കുമ്പോൾ ചില അപ്ലിക്കേഷനുകൾ ക്രാഷാകുകയോ ശരിയായി പ്രവർത്തിക്കാതെയോ ഇരിക്കാം."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"അപ്ലിക്കേഷനുകൾ"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"പ്രവർത്തനങ്ങൾ സൂക്ഷിക്കരുത്"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ഉപയോക്താവ് ഉപേക്ഷിക്കുന്നതിനനുസരിച്ച് എല്ലാ പ്രവർത്തനങ്ങളും നശിപ്പിക്കുക"</string>
@@ -2195,7 +2251,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="718192651887726259">"കൂടുതൽ ഉപയോക്താക്കളെ സൃഷ്‌ടിച്ചുകൊണ്ട് ഈ ഉപകരണം മറ്റ് ആളുകളുമായി നിങ്ങൾക്ക് പങ്കിടാനാവും. സ്വന്തം അപ്ലിക്കേഷനുകളും വാൾപേപ്പറും അതിൽ കൂടുതൽ കാര്യങ്ങളും ഉപയോഗിച്ചുകൊണ്ട് ഇഷ്‌ടാനുസൃതമാക്കുന്നതിന് ഓരോ ഉപയോക്താക്കൾക്കും അവരുടേതായ ഒരു ഇടം ലഭിക്കുന്നു. 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"ഫോൺ കോളുകൾ അനുവദിക്കുക"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"ഫോൺ കോളുകൾ, SMS എന്നിവ അനുവദിക്കുക"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"ഫോൺ കോളുകൾ ഓണാക്കുക"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"ഫോൺ കോളുകൾ, SMS എന്നിവ ഓണാക്കുക"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"ഉപയോക്താവിനെ നീക്കംചെയ്യുക"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"ഫോൺ കോളുകൾ അനുവദിക്കണോ?"</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_sms_confirm_title" msgid="188164598768941316">"ഫോൺ കോളുകൾ, SMS എന്നിവ അനുവദിക്കണോ?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"ഈ ഉപയോക്താവുമായി കോൾ, SMS എന്നിവയുടെ ചരിത്രം പങ്കിടും."</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="application_restrictions" msgid="8207332020898004394">"അപ്ലിക്കേഷനുകളും ഉള്ളടക്കവും അനുവദിക്കുക"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"നിയന്ത്രണങ്ങളുള്ള അപ്ലിക്കേഷനുകൾ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"അപ്ലിക്കേഷനുകൾക്കായുള്ള ക്രമീകരണങ്ങൾ വിപുലീകരിക്കുക"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"നിയന്ത്രിത പ്രൊഫൈലുകളിൽ ഈ അപ്ലിക്കേഷനെ പിന്തുണയ്‌ക്കില്ല"</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>
@@ -2337,7 +2393,7 @@
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM കാർഡുകൾ മാറ്റി."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"സജ്ജീകരിക്കാൻ സ്‌പർശിക്കുക"</string>
-    <string name="sim_pref_divider" msgid="6778907671867621874">"ഇതിനുള്ള പ്രസ്താവിത SIM"</string>
+    <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>
     <string name="dashboard_title" msgid="5453710313046681820">"ക്രമീകരണങ്ങൾ"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"വൈഫൈ വൈഫൈ നെറ്റ്‌വർക്ക് കണക്ഷൻ"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ടെക്‌സ്‌റ്റ് സന്ദേശം ടെക്സ്റ്റുചെയ്യൽ സന്ദേശങ്ങൾ സന്ദേശമയയ്‌ക്കൽ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"സെല്ലുലാർ സെൽ കാരിയർ വയർലെസ്സ് ഡാറ്റ 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi കോൾ വിളിക്കുന്നു"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ലോഞ്ചർ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"സ്ക്രീൻ ടച്ച്സ്ക്രീൻ"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"മങ്ങിയ സ്‌ക്രീൻ ടച്ച്‌സ്‌ക്രീൻ ബാറ്ററി"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"മങ്ങിയ സ്‌ക്രീൻ ടച്ച്‌സ്‌ക്രീൻ ബാറ്ററി"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"പശ്‌ചാത്തലം വ്യക്തിഗതമാക്കുക ഇഷ്‌ടാനുസൃതമാക്കുക ഡിസ്‌പ്ലേ"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ഇരുണ്ട തീം രാത്രി മോഡ് മങ്ങിയ സ്‌ക്രീൻ വിപരീത ക്രമ തെളിച്ചം"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"പശ്ചാത്തലം വ്യക്തിഗതമാക്കൽ ഡിസ്‌പ്ലേ ഇഷ്‌ടാനുസൃതമാക്കൽ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ടെക്‌സ്‌റ്റ് വലുപ്പം"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"പ്രോജക്റ്റ്"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"പ്രോജക്റ്റ് കാസ്റ്റ്"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ഇടം ഡിസ്‌ക് ഹാർഡ് ഡ്രൈവ് ഉപകരണം ഉപയോഗം"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"പവർ ഉപയോഗ നിരക്ക്"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"അക്ഷരവിന്യാസം നിഘണ്ടു അക്ഷര‌പ്പിശക് പരിശോധന സ്വയം തിരുത്തൽ"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"അക്കൗണ്ട്"</string>
     <string name="keywords_users" msgid="4673901601478559100">"നിയന്ത്രണം നിയന്ത്രിക്കുക നിയന്ത്രിച്ചു"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ടെക്‌സ്‌റ്റ് തിരുത്തൽ തിരുത്തുക ശബ്‌ദം വൈബ്രേറ്റുചെയ്യുക സ്വയമേവയുള്ള ഭഷ സവിശേഷത നിർദ്ദേശിക്കുക നിർദ്ദേശം തീം കുറ്റകരമായ പദം ടൈപ്പുചെയ്യൽ ഇമോജി അന്തർദ്ദേശീയം"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"മുൻഗണനകളെ സ്ഥിരമെന്ന് റീസെറ്റുചെയ്യുക"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"അടിയന്തര ഐസ് അപ്ലിക്കേഷൻ സ്ഥിര ക്രമീകരണം"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"ആപ്സ് ഡൗൺലോഡ് അപ്ലിക്കേഷൻ സിസ്റ്റം"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"അപ്ലിക്കേഷൻ അനുമതി സുരക്ഷ"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"സ്ഥിര അപ്ലിക്കേഷനുകൾ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"പാസ്‌വേഡ് പാറ്റേൺ പിൻ സ്ലൈഡുചെയ്യുക"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ടാഗ് സജ്ജമാക്കുക"</string>
     <string name="write_tag" msgid="8571858602896222537">"റൈറ്റുചെയ്യുക"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"തടസ്സങ്ങൾ"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"കോളുകളും അറിയിപ്പുകളും വരുമ്പോൾ"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"എല്ലായ്‌പ്പോഴും തടസ്സം"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"മുൻഗണനാതടസ്സങ്ങൾ മാത്രമനുവദിക്കൂ"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"തടസ്സപ്പെടുത്തരുത്"</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_option_important_interruptions" msgid="3903928008177972500">"മുൻഗണന മാത്രം"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"അലാറങ്ങൾ മാത്രം"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"തടസ്സങ്ങളൊന്നുമില്ല"</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="ringtone_title" msgid="5379026328015343686">"ഫോൺ റിംഗ്ടോൺ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"സ്ഥിര അറിയിപ്പ് റിംഗ്‌ടോൺ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"കോളുകൾക്കായും വൈബ്രേറ്റ് ചെയ്യും"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"വൈബ്രേറ്റുചെയ്യുക"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"അറിയിപ്പ് ആക്‌സസ്സ്"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"അപ്ലിക്കേഷനുകൾക്ക് അറിയിപ്പുകൾ വായിക്കാനായില്ല"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d അപ്ലിക്കേഷന് അറിയിപ്പുകൾ റീഡുചെയ്യാനാകും"</item>
-    <item quantity="other" msgid="980049191810249052">"%d അപ്ലിക്കേഷനുകൾക്ക് അറിയിപ്പുകൾ റീഡുചെയ്യാനാകും"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d അപ്ലിക്കേഷനുകൾക്ക് അറിയിപ്പുകൾ വായിക്കാനാകും</item>
+      <item quantity="one">%d അപ്ലിക്കേഷന് അറിയിപ്പുകൾ വായിക്കാനാകും</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"അറിയിപ്പ് ലിസണറുകളൊന്നും ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> പ്രവർത്തനക്ഷമമാക്കണോ?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"സിസ്റ്റമോ ഇൻസ്റ്റാളുചെയ്‌ത ഏതെങ്കിലും അപ്ലിക്കേഷനോ പോസ്റ്റുചെയ്‌ത എല്ലാ അറിയിപ്പുകളും <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> എന്നതിന് വായിക്കാനാകും, അതിൽ കോൺടാക്റ്റ് പേരുകളോ നിങ്ങൾക്ക് അയച്ച സന്ദേശങ്ങളുടെ വാചകമോ പോലുള്ള വ്യക്തിഗത വിവരങ്ങൾ ഉൾപ്പെടാനിടയുണ്ട്. ഇതിന് അവയ്‌ക്കുള്ളിലെ ഈ അറിയിപ്പുകൾ നിരസിക്കാനോ പ്രവർത്തന ബട്ടണുകളിൽ സ്‌പർശിക്കാനോ കൂടി കഴിയും"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"കണ്ടീഷൻ ദാതാക്കൾ"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"അപ്ലിക്കേഷനുകളൊന്നും കണ്ടീഷനുകൾ നൽകുന്നില്ല."</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d അപ്ലിക്കേഷൻ കണ്ടീഷനുകൾ അനുവദിക്കുന്നു"</item>
-    <item quantity="other" msgid="358057362115673258">"%d അപ്ലിക്കേഷനുകൾ നൽകുന്ന കണ്ടീഷനുകൾ"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"കണ്ടീഷൻ ദാതാക്കളെയൊന്നും ഇൻസ്‌റ്റാളുചെയ്തിട്ടില്ല."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> പ്രവർത്തനക്ഷമമാക്കണോ?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> എന്നതിന്, ശല്യം ചെയ്യരുത് മോഡിലേക്കുള്ള എക്‌സിറ്റ് കണ്ടീഷനുകൾ ചേർക്കാനാകും."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"തടയുക"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"എല്ലാം തടയുക"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ഈ അപ്ലിക്കേഷനിൽ നിന്ന് അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"മുന്‍‌ഗണന"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"ലിസ്റ്റിനുമുകളിൽ അറിയിപ്പുകൾ കാണിക്കുകയും മുൻഗണന തടസ്സങ്ങളിലേയ്‌ക്ക് സജ്ജീകരിച്ചിരിക്കുമ്പോൾ മാത്രം അവ നേടുന്നത് തുടരുകയും ചെയ്യുക"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"തന്ത്രപ്രധാനം"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"ഉപകരണം ലോക്ക് ചെയ്തിരിക്കുമ്പോൾ, ഈ അപ്ലിക്കേഷന്റെ അറിയിപ്പുകളിൽ നിന്നുള്ള എല്ലാ തന്ത്രപ്രധാന ഉള്ളടക്കവും മറയ്ക്കുക"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"മുൻഗണയായി കണക്കാക്കുക"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"\'മുൻഗണന മാത്രം\' എന്നതിൽ \'ശല്യപ്പെടുത്തരുത്\' എന്നത് സജ്ജമാക്കുമ്പോൾ, ഈ അപ്ലിക്കേഷന്റെ അറിയിപ്പുകൾ കേൾക്കുന്നതാക്കുക"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"പീക്കിംഗ് അനുവദിക്കുക"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"നിലവിലെ സ്‌ക്രീനിൽ ചില അറിയിപ്പുകളെ കാഴ്‌ച എന്നതിലേക്ക് നീക്കിക്കൊണ്ട് അവയ്‌ക്ക് പ്രാധാന്യം നൽകാൻ ഈ അപ്ലിക്കേഷനെ അനുവദിക്കുക"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"തന്ത്രപ്രധാനപരമായ ഉള്ളടക്കം മറയ്‌ക്കുക"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"ഉപകരണം ലോക്കുചെയ്‌തിരിക്കുമ്പോൾ, സ്വകാര്യ വിവരം വെളിപ്പെടുത്തിയേക്കാവുന്ന ഈ അപ്ലിക്കേഷന്റെ അറിയിപ്പുകളിലെ ഉള്ളടക്കം മറയ്‌ക്കുക"</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="zen_mode_default_option" msgid="6940069025071935243">"നിങ്ങൾ ഇത് ഓ‌ഫാക്കും വരെ"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"മുൻഗണനാ തടസ്സങ്ങൾ"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"പ്രവർത്തനരഹിതമായ സമയം"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ദിവസം"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ഒന്നുമില്ല"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"തടസ്സങ്ങൾ അനുവദിച്ചിരിക്കുന്നു"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"മുൻഗണന മാത്രം"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ഒന്നുമില്ല"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"യാന്ത്രികമാക്കൽ"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ഓട്ടോമാറ്റിക്കായി ഓണാക്കുക"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"നയത്തിന്റെ പേര്"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"നയം ചേർക്കുക"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"നയം ഇല്ലാതാക്കുക"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<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="3201273040477861538">"ഷെഡ്യൂൾ നയം"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"നയം കണ്ടെത്തിയില്ല."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ഒരിക്കലുമില്ല"</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_from" msgid="1033337300289871697">"ഇതിൽ നിന്നുള്ള കോളുകൾ/സന്ദേശങ്ങൾ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ആര്‍ക്കും"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"കോൺടാക്‌റ്റുകൾ മാത്രം"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"നക്ഷത്രമിട്ട കോൺടാക്‌റ്റുകൾ മാത്രം"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"ഇവന്റുകളും ഓർമ്മപ്പെടുത്തലുകളും"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"അലാറങ്ങളെ എപ്പോഴും മുൻഗണന തടസ്സങ്ങളായി പരിഗണിക്കുന്നു"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"അലാറങ്ങൾ"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"ഓർമ്മപ്പെടുത്തലുകൾ"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ഇവന്റുകൾ"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"തിരഞ്ഞെടുത്ത കോളർമാർ"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ആവർത്തിച്ച് വിളിക്കുന്നവർ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g> മിനിറ്റ് സമയത്തിനുള്ളിൽ ഒരേ വ്യക്തി തന്നെ രണ്ടാമതും വിളിക്കുകയാണെങ്കിൽ, അത് അനുവദിക്കുക"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ഓട്ടോമാറ്റിക്കായി ഓണാക്കുക"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ഒരിക്കലുമില്ല"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"അടുത്ത ദിവസം <xliff:g id="FORMATTED_TIME">%s</xliff:g>-ന്"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ന് അല്ലെങ്കിൽ അതിനുമുമ്പുള്ള എതെങ്കിലും അലാറം"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"അടുത്ത ദിവസം <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_interruptions_voice_title" msgid="855256211259132964">"തടസ്സങ്ങൾ"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"കോളുകളും അറിയിപ്പുകളും വരുമ്പോൾ"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"എപ്പോഴാണ് \'തടസ്സപ്പെടുത്തുക\' മോഡിലേക്ക് മാറാൻ നിങ്ങൾ താൽപ്പര്യപ്പെടുന്നത്?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"എത്ര സമയത്തേക്ക്?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"എല്ലായ്‌പ്പോഴും തടസ്സം"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ഓഫ്,എല്ലാം,എല്ലാകാര്യവും"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"മുൻഗണനാതടസ്സങ്ങൾ മാത്രമനുവദിക്കൂ"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"അലാറങ്ങൾ മാത്രം അനുവദിക്കുക"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"തടസ്സപ്പെടുത്തരുത്"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"അവ്യക്തം"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> മിനിറ്റ്</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> മിനിറ്റ്</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"അനിശ്ചിതമായി \'മുൻഗണന അറിയിപ്പുകൾ മാത്രം\'എന്നതിലേക്ക് മാറ്റുക"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> വരെ <xliff:g id="DURATION">%1$d</xliff:g> മിനിറ്റത്തേക്ക് \'മുൻഗണന അറിയിപ്പുകൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> വരെ ഒരു മിനിറ്റത്തേക്ക് \'മുൻഗണന അറിയിപ്പുകൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g> വരെ ഒരു മണിക്കൂർ നേരത്തേക്ക് \'മുൻഗണന അറിയിപ്പുകൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"അനിശ്ചിതമായി \'അലാറങ്ങൾ മാത്രം\'എന്നതിലേക്ക് മാറ്റുക"</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>
+      <item quantity="one"><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"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> വരെ <xliff:g id="DURATION">%1$d</xliff:g> മണിക്കൂർ നേരത്തേക്ക് \'അലാറങ്ങൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> വരെ ഒരു മണിക്കൂർ നേരത്തേക്ക് \'അലാറങ്ങൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"അനിശ്ചിതമായി \'തടസ്സപ്പെടുത്തരുത്\' എന്നതിലേക്ക് മാറ്റുക"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g>വരെ ഒരു മിനിറ്റത്തേക്ക് \'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് മാറ്റുക</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> വരെ <xliff:g id="DURATION">%1$d</xliff:g> മണിക്കൂർ നേരത്തേക്ക് \'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് മാറ്റുക</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> വരെ ഒരു മണിക്കൂർ നേരത്തേക്ക് \'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് മാറ്റുക</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"\'എല്ലായ്‌പ്പോഴും തടസ്സപ്പെടുത്തുക\' എന്നതിലേക്ക് മാറ്റുക"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ശാശ്വതമായി"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"അപ്ലിക്കേഷൻ അറിയിപ്പുകൾ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ഈ ഉപകരണത്തെക്കുറിച്ചുള്ള ഫീഡ്‌ബാക്ക് അയയ്‌ക്കുക"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"സ്ഥിരമായി സമാരംഭിക്കുക"</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="app_launch_domain_links_title" msgid="458956710410857777">"ഡൊമെയ്‌ൻ ലിങ്കുകൾ"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"ഡൊമെയ്‌ൻ URL-കൾ തുറക്കുക"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"ഡൊമെയ്‌ൻ URL-കൾ നേരിട്ട് തുറക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുക"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"പിന്തുണയ്‌ക്കുന്ന ഡൊമെയ്‌ൻ URL-കൾ"</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="410824961149037234">"ആന്തരിക മെമ്മറി"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"ബാഹ്യ മെമ്മറി"</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="notifications_enabled" msgid="6983396130566021385">"ഓണാണ്"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"തടയുക"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"തന്ത്രപ്രധാനം"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"മു‌ൻഗണന"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"മുൻഗണനയും തന്ത്രപ്രധാനവും"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> അനുമതികൾ നൽകി</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> അനുമതി നൽകി</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> / <xliff:g id="COUNT_3">%d</xliff:g> അനുമതികൾ നൽകി</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> അനുമതി നൽകി</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"സ്ഥിരമായ ചിലവ സജ്ജീകരിച്ചു"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"സ്ഥിരമായൊന്നും സജ്ജീകരിച്ചിട്ടില്ല"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"എല്ലാ അപ്ലിക്കേഷനുകളും"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"പ്രവർത്തനക്ഷമമാക്കി"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"വ്യക്തിഗതം"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"ഔദ്യോഗികം"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"തടഞ്ഞു"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"മു‌ൻഗണന"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"തന്ത്രപ്രധാനം"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ഡൊമെയ്‌ൻ URL-കൾ ഉള്ളത്"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"അഡ്‌മിനിസ്ട്രേറ്റർ പ്രവർത്തനരഹിതമാക്കി"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"വിപുലമായത്"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"അജ്ഞാത അപ്ലിക്കേഷൻ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"അപ്ലിക്കേഷൻ അനുമതികൾ"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> അപ്ലിക്കേഷനുകൾക്ക് കൂടുതൽ ആക്‌സസ്സ് അനുവദിച്ചിരിക്കുന്നു"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> അപ്ലിക്കേഷനുകൾ അനുവദനീയം"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"ഡൊമെയ്ൻ URL-കൾ"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"ഒരു ഡൊമെയ്‌ൻ URL-ഉം തുറക്കരുത്"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' തുറക്കുക"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' എന്നതും അനുബന്ധ URL-കളും തുറക്കുക"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> അപ്ലിക്കേഷനുകൾക്ക് അതിന്റെ ഡൊമെയ്ൻ URL-കൾ തുറക്കാനാകും</item>
+      <item quantity="one">ഒരു അപ്ലിക്കേഷന് അതിന്റെ ഡൊമെയ്‌ൻ URL-കൾ തുറക്കാനാകും</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"തിരിച്ചറിഞ്ഞില്ല"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"സ്ഥിര അപ്ലിക്കേഷനുകൾ"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ബ്രൗസർ അപ്ലിക്കേഷൻ"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"സ്ഥിര ബ്രൗസറൊന്നുമില്ല"</string>
+    <string name="default_app" msgid="6864503001385843060">"(സ്ഥിരമായത്)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"അപ്ലിക്കേഷൻ സംഭരണം"</string>
 </resources>
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn-rMN/arrays.xml
index 3e7b377..700a960 100644
--- a/res/values-mn-rMN/arrays.xml
+++ b/res/values-mn-rMN/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"СИМ"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Товчлуур"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"Микрофон хаах/нээх"</item>
     <item msgid="1148142988678569310">"төслийн медиа"</item>
     <item msgid="9130014005474445273">"VPN идэвхжүүлэх"</item>
+    <item msgid="1165192162975045562">"ханын зураг бичих"</item>
+    <item msgid="7129487923652967258">"бүтэц өөрчлөх"</item>
+    <item msgid="1069023208100114540">"дэлгэцийн агшинг өөрчлөх"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Байршил"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Микрофон хаах/нээх"</item>
     <item msgid="5906017727368097853">"Төслийн медиа"</item>
     <item msgid="2486614710846178542">"VPN идэвхжүүлэх"</item>
+    <item msgid="5586547561693629602">"Ханын зураг бичих"</item>
+    <item msgid="32794179825485062">"Бүтэц өөрчлөх"</item>
+    <item msgid="7872852746938272552">"Дэлгэцийн агшинг өөрчлөх"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Богино"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"бага"</item>
     <item msgid="4212263919458209842">"эгзэгтэй"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Идэвхгүй"</item>
-    <item msgid="5656544177755411222">"Хязгаарлагдмал тасалдалтай"</item>
-    <item msgid="8735337502532332056">"Тасалдал байхгүй"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Хэвийн"</item>
     <item msgid="866544120205026771">"Дундаж"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Ягаан"</item>
     <item msgid="6131821495505931173">"Улаан"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Медиа дамжуулах протокол)"</item>
+    <item msgid="8856820259201251036">"PTP (Зураг дамжуулах протокол)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Аудио эх сурвалж"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 3e861b2..b6d4837 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Зөвшөөрөх"</string>
     <string name="deny" msgid="6947806159746484865">"Татгалзах"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Тодорхойгүй"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Танд одоо хөгжүүлэгч болоход <xliff:g id="STEP_COUNT">%1$d</xliff:g> алхам дутуу байна."</item>
-    <item quantity="other" msgid="6722953419953594148">"Танд одоо хөгжүүлэгч болоход <xliff:g id="STEP_COUNT">%1$d</xliff:g> алхам дутуу байна."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Танд одоо хөгжүүлэгч болоход <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> алхам дутуу байна.</item>
+      <item quantity="one">Танд одоо хөгжүүлэгч болоход <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> алхам дутуу байна.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Та одоо хөгжүүлэгч боллоо!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Шаардлагагүй, та аль хэдийн хөгжүүлэгч болсон."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Утасгүй &amp; сүлжээ"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"SMS-г IMS дээр асаах"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS бүртгэлийг асаах шаардлагатай"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS бүртгэлийг унтраах шаардлагатай"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE хэлбэрт байгаа тугийг идэвхтэй болгох"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE хэлбэрт байгаа тугийг идэвхгүй болгох"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Санах ой чөлөөлөхийг идэвхжүүлэх"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Санах ой чөлөөлөхийг идэвхгүйжүүлэх"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM хаягийн лавлахыг харах"</string>
@@ -135,16 +137,7 @@
     <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="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;-н &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;-г идэвхгүйжүүлэх болно"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Холбогдсон"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Холбогдсон (утас байхгүй)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Холбогдсон (медиа байхгүй)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Холбогдсон (зурвас хандалт байхгүй)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Холбогдсон (утас буюу медиа байхгүй)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Салгагдсан"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Салгаж байна…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Холбогдож байна..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Хослуулж байна…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Нэргүй блютүүт төхөөрөмж"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Хайж байна..."</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Ойролцоо блютүүт төхөөрөмж олдсонгүй."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Хүлээн авсан файлуудыг харуулах"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth төхөөрөмж сонгох"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Блютүүт зөвшөөрөл шаардлагатай"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Апп блютүүтийг асаахыг хүсч байна."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Апп энэ төхөөрөмж дээр Блютүүтийг асаахыг хүсэж байна."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Апп таны таблетыг бусад блютүүт төхөөрөмжүүдэд <xliff:g id="TIMEOUT">%1$d</xliff:g> секундын турш харагдуулахыг хүсч байна."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Апп таны утсыг бусад блютүүт төхөөрөмжүүдэд <xliff:g id="TIMEOUT">%1$d</xliff:g> секундын турш харагдуулахыг хүсч байна."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Апп таны утсыг бусад блютүүт төхөөрөмжүүдэд харагдуулахыг хүсэж байна. Та үүнийг блютүүт тохиргооноос дараа нь өөрчилж болно."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ЦУЦЛАХ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ҮРГЭЛЖЛҮҮЛЭХ"</string>
     <string name="okay" msgid="1997666393121016642">"ТИЙМ"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ТИЙМ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ҮГҮЙ"</string>
-    <string name="forget" msgid="7267115980248732932">"МАРТАХ"</string>
+    <string name="forget" msgid="1400428660472591263">"Мартах"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Царайгаар таниулахыг сайжруулах"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Амьд эсэхийг шалгах"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Нээх үед нүдний анивчилтыг шаардана"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Миний Байршил, дэлгэц тайлах, SIM картны түгжээ, жуухны сангийн түгжээг тохируулах"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Миний Байршил, дэлгэц тайлах, жуухын сангийн түгжээ зэргийг тохируулах"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Нууц үг"</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="3453670509485083962">"Нэмэх"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"дэлгэцний түгжээ"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"Хурууны хээний тохиргоо"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Хурууны хээгээр дэлгэцийн түгжээ тайлах эсвэл худалдан авалт баталгаажуулахад та дараах үйлдлийг хийх хэрэгтэй. Үүнд: \n\n✓ Дэлгэц түгжих нөөц аргаа тодорхойлох \n\n✓ Хурууны хээгээ нэмэх"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Мэдрэгч хай"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Утасныхаа ард хурууны хээ мэдрэгчийг байршуул"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Эхэлцгээе!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Хурууны хээ мэдрэгч дээр хурууны хээ нь орсон хурууг уншуулна уу. Чичиргээг мэдэрсний дараа хурууг авна уу."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Маш сайн байна! Үйлдлийг дахин давтана уу."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Хурууны хээ мэдрэгч дээр хурууны хээ нь орсон хурууг уншуулна уу мөн чичиргээг мэдэрсний дараа хурууг авна уу."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Хурууны хээг нэмж оруулсан болно!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Энэ тэмдэг гарч ирсэн тохиолдолд та өөрийн хурууны хээг оруулах эсвэл худалдан авалт хийх зөвшөөрөл олгох боломжтой болох юм."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Нэмэх"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Дараах"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Цэнэглэгчээ залгаад дахин оролдоно уу."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Дэлгэцийн түгжээний PIN буюу нууц үг байхгүй"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Та шифрлэлтийг эхлүүлэхийн өмнө дэлгэцийн түгжээний PIN буюу нууц үгийг тохируулах шаардлагатай."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Та төхөөрөмжийн шифрлэлтийг баталгаажуулахын тулд түгжээ тайлах хээг зурах шаардлагатай."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Шифрлэх үү?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Шифрлэлтийн үйлдлийг буцаах боломжгүй бөгөөд та тасалдуулбал өгөгдлөө алдах болно. Шифрлэлтэд нэг цаг хүртэл хугацаа орж болох бөгөөд таблет хэд хэдэн удаа дахин асах болно."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Шифрлэлтийн үйлдлийг буцаах боломжгүй бөгөөд та тасалдуулбал өгөгдлөө алдах болно. Шифрлэлтэд нэг цаг болон түүнээс удаан хугацаа орж болох бөгөөд утас хэд хэдэн удаа дахин асах болно."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Царайгаар Тайлах"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Аюулгүй байдал багатай, туршилтын"</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_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="current_screen_lock" msgid="4104091715420072219">"Одоо байгаа дэлгэцийн түгжээ"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Төхөөрөмжийн хамгаалалтын функцүүд цаашид ажиллахгүй."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Администратор, шифрлэлтийн бодлого, эсхүл жуухын сангаас идэвхгүйжүүлсэн"</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_biometric_weak" msgid="3008473624490350142">"Царайгаар Тайлах"</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_password" msgid="1203938057264146610">"Нууц үг"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Та дэлгэцийн цоожоо тохируулсны дараа Тохиргоо &amp; gt; Аюулгүй байдал цэсэнд ороод хурууны хээгээ мөн тохируулж болно."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Дэлгэцийн түгжээг унтраах"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Тайлах хээг арилгах"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Тайлан PIN-г арилгана уу"</string>
@@ -427,30 +437,20 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Нууц үгэнд дор хаяж нэг үсэг орсон байх ёстой."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Нууц үгэнд дор хаяж нэг цифр орсон байх ёстой."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Нууц үгэнд дор хаяж нэг тэмдэгт орсон байх ёстой."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Нууц үгэнд дор хаяж 1 үсэг орсон байх ёстой"</item>
-    <item quantity="other" msgid="8186027808415585970">"Нууц үгэнд дор хаяж %d үсэг орсон байх ёстой"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Нууц үгэнд дор хаяж 1 жижиг үсэг орсон байх ёстой."</item>
-    <item quantity="other" msgid="2693910942679679225">"Нууц үгэнд дор хаяж %d жижиг үсэг орсон байх ёстой."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Нууц үгэнд дор хаяж 1 том үсэг орсон байх ёстой."</item>
-    <item quantity="other" msgid="3030801209112209245">"Нууц үгэнд дор хаяж %d том үсэг орсон байх ёстой."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Нууц үгэнд дор хаяж 1 цифр орсон байх ёстой"</item>
-    <item quantity="other" msgid="4703982391407595924">"Нууц үгэнд дор хаяж %d цифр орсон байх ёстой"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Нууц үгэнд дор хаяж 1 тусгай тэмдэгт орсон байх ёстой."</item>
-    <item quantity="other" msgid="1221290525051187757">"Нууц үгэнд дор хаяж %d тусгай тэмдэгт орсон байх ёстой."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Нууц үгэнд дор хаяж 1 үсэг биш тэмдэгт орсон байх ёстой."</item>
-    <item quantity="other" msgid="3952508584649046404">"Нууц үгэнд дор хаяж %d үсэг биш тэмдэгт орсон байх ёстой."</item>
-  </plurals>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_password_requires_letters (5677371623980347934) -->
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Password must contain at least %d lowercase letters.</item>
+      <item quantity="one">Нууц үгэнд хамгийн багадаа 1 жижиг үсэг оросон байх шаардлагатай.</item>
+    </plurals>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_password_requires_uppercase (2483949715040341677) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_password_requires_numeric (9156410893744210033) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_password_requires_symbols (5384442837439742233) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_password_requires_nonletter (4175064976268466293) -->
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Төхөөрөмжийн администратор саяхны нууц үгийг ашиглахыг зөвшөөрөхгүй."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Цифрийн өссөн, уруудсан, давтагдсан дарааллыг хориглоно"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Тийм"</string>
@@ -480,15 +480,8 @@
     <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_accept" msgid="6163520056536604875">"Хослуулах"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ХОСЛУУЛАХ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Цуцлах"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Хослуулснаар холбогдсон үед таны харилцагчид болон дуудлагын түүхэд хандах боломжтой."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тай хослуулж чадсангүй."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Буруу PIN эсхүл дамжих түлхүүрээс шалтгаалан <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тай хослуулж чадсангүй."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тай холбоо барих боломжгүй."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Хослуулахаас <xliff:g id="DEVICE_NAME">%1$s</xliff:g> татгалзсан."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +508,8 @@
     <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="3719383048635344071">"Байршлын нарийвчлалыг сайжруулахын тулд апп-ууд болон үйлчилгээнүүд нь Bluetooth асаалтгүй байсан ч Bluetooth төхөөрөмжүүдийг скан хийх болно. Та үүнийг <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>скан хийх тохиргоон дотор өөрчилж болно<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Холбох…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Медиа аудио"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Утасны аудио"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Файл дамжуулалт"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Оруулах төхөөрөмж"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Интернэт хандалт"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Харилцагч хуваалцах"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Харилцагч хуваалцахад ашиглах"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Интернэт холболтыг хуваалцах"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Зурвас хандалт"</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>
@@ -537,28 +522,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"Медиа аудиод холбогдсон"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Утасны аудид холбогдсон"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Файл дамжуулах серверт холбогдсон"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Газрын зурагтай холбогдсон"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Файл дамжуулах серверт холбогдоогүй"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Оруулах төхөөрөмжтэй холбогдсон"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Медиа аудиод ашиглах"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Утасны аудиод ашиглах"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Файл дамжуулахад ашиглах"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Оруулахад ашиглах"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Интернет хандалтанд ашиглах"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Газрын зурагт ашиглах"</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_assistant_title" msgid="2553267316621598101">"Wi-Fi Туслагч"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi-Fi туслагчаар дамжуулан холбогдлоо"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Дамжуулах дэлгэц"</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>
@@ -570,6 +542,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +567,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi-г унтрааж байна…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Алдаа"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Нислэгийн горим"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Сүлжээнүүдийг скан хийх боломжгүй"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Сүлжээний мэдэгдэл"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Нийтийн сүлжээ ашиглах боломжтой үед мэдэгдэх"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Муу холболтуудаас зайлсхийх"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Wi-Fi сүлжээний Интернэт холболт сайн биш бол бүү ашиглаарай"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Зөвхөн сайн интернэт холболттой сүлжээг ашиглах"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Скан хийхийг байнга идэвхжүүлэх"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Скан хийхийг байнга зөвшөөрөх"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google-н байршлын үйлчилгээ болон бусад апп-уудад Wi‑Fi унтраатай үед ч сүлжээ скан хийхийг зөвшөөрөх"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Нээлттэй Wi-Fi сүлжээг автоматаар ашигла"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fi туслагчийг сүлжээ сайтай Wi-Fi сүлжээнүүдэд автоматаар холбогдохыг зөвшөөр."</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Туслагчийг сонгоно уу"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификат суулгах"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Байршлын нарийвчлалыг сайжруулах болон бусад зорилгоор Google болон өөр апп-ууд Wi-Fi хаалттай байгаа хэдий ч ойролцоох сүлжээнүүдийг скан хийж болно. Та үүнийг хүсэхгүй байгаа бол Дэлгэрэнгүй &gt; Сканийг байнга боломжтой байлгах гэсэн рүү очно уу."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Апп-ууд Wi-Fi хаалттай байгаа хэдий ч ойролцоох сүлжээнүүдийг скан хийж болно. Та үүнийг хүсэхгүй байгаа бол Дэлгэрэнгүй &gt; Сканийг байнга боломжтой байлгах гэсэн рүү очно уу."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Байршлын нарийвчлалыг сайжруулахын тулд апп-ууд болон үйлчилгээнүүд нь Wi-Fi асаалтгүй байсан ч 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="5340097010842405981">"Дахиж үл харуулах"</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>
@@ -635,11 +604,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Өөр сүлжээ нэмэх"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Бусад"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Автомат тохируулга (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Тохируулгыг дуусгахын тулд таны таблет Wi-Fi-д холбогдох шаардлагатай. Тохируулга хийсний дараа та мобайл дата болон Wi-Fi хооронд сэлгэж болно."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Дэлгэрэнгүй сонголтууд"</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="5940801028985255304">"Өөрийн чиглүүлэгч дээрх Wi‑Fi Хамгаалагдсан Тохируулга товчийг дарна уу. Үүнийг \"WPS\" гэж нэрлэх буюу дараах симболыг агуулж болно:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Рутер дээрх Wi‑Fi Protected Setup товчийг дар. Энэ нь 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">"Wi‑Fi сүлжээнд <xliff:g id="NETWORK_NAME">%s</xliff:g> холбогдсон"</string>
@@ -665,20 +633,15 @@
     <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="219415018348922629">"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 тохиргоо"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(өөрчлөгдөөгүй)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(тодорхойлоогүй)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Хадгалагдсан"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Идэвхгүйжүүлсэн"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP тохируулга амжилтгүй"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi холболт амжилтгүй"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Гэрчлэлийн асуудал"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Хүрээнд байхгүй"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Интернэт холболт илэрсэнгүй, автоматаар дахин холболт хийгдэхгүй"</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_security_none" msgid="7985461072596594400">"Байхгүй"</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>
@@ -686,6 +649,8 @@
     <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="1509171132175355674">"Энэ сүлжээ нь интернэтэд холбогдоогүй байна. Энэ сүлжээг цааш үргэлжлүүлэн ашиглах уу?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Энэ сүлжээнд дахин бүү асуу"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Холбогдох"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Сүлжээнд холбогдож чадсангүй"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Мартах"</string>
@@ -751,6 +716,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK зөөврийн Wi‑Fi хотспот"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> зөөврийн Wi-Fi сүлжээний цэг"</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_mode_title" msgid="2164073796253284289">"Үндсэн сонголтыг дуудаж байна"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi дуудах горим"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi илүү эрхэмлэдэг"</item>
+    <item msgid="5267397515594230396">"Үүрэн сүлжээг илүү эрхэмлэдэг"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi дуудлага асаалттай байгаа үед таны сонголт болон аль дохио илүү хүчтэй байгаагаас шалтгаалан Wi-Fi сүлжээ болон таны операторын сүлжээгээр дамжуулан таны утас дуудлагуудыг хянаж дамжуулна. Энэ горимыг асаахаасаа өмнө өөрийнхөө операторын төлбөр болон бусад дэлгэрэнгүй мэдээллүүдийг шалгаж үзээрэй."</string>
     <string name="home_settings" msgid="212375129455718176">"Нүүр"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дэлгэц"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дуу"</string>
@@ -814,6 +791,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"Загвар"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Гэрэл"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Бараан"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Автоматаар"</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>
@@ -865,10 +847,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Өөрийн сонгосон SIM картаа шинэчлэх үү?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> нь таны төхөөрөмжинд байгаа цорын ганц SIM болно. Та энэ  SIM-ийг гар утасны мэдээлэл, дуудлага, мессеж зэрэгт ашиглахыг хүсч байна уу?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"СИМ ПИН код буруу, та төхөөрөмжийн түгжээх тайлахын тулд өөрийн оператор компанитай холбоо барина уу."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"СИМ ПИН код буруу байна, танд мобайл оператор компанитай холбогдохгүйгээр төхөөрөмжийн түгжээг тайлахад <xliff:g id="NUMBER">%d</xliff:g> оролдлого хийх боломж үлдсэн байна."</item>
-    <item quantity="other" msgid="77103619544346451">"СИМ ПИН код буруу байна, танд <xliff:g id="NUMBER">%d</xliff:g> оролдлого хийх боломж үлдлээ."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">СИМ-ны ПИН код буруу байна. Та <xliff:g id="NUMBER_1">%d</xliff:g> удаа оролдлого хийх боломжтой байна.</item>
+      <item quantity="one">СИМ-ны ПИН код буруу байна. Танд мобайл оператортойгоо холбогдохгүйгээр төхөөрөмжийн түгжээг тайлахад <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>
@@ -917,12 +899,12 @@
     <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="2348501997988663688">"Апп (апп өгөгдөл &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_media_misc_usage" msgid="235452944021647124">"Янз бүрийн."</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="default" msgid="6915293408836853020">"SD картыг салгах"</string>
@@ -955,6 +937,11 @@
     <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_mount" msgid="1014683672493425425">"Залгах"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Салгах"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Устгах &amp; хэлбэршүүлэх"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Устгах &amp; дотоод санах ой хэлбэрээр хэлбэршүүлэх"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB компьютерийн холболт"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB компьютерийн холболт"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Холбогдох"</string>
@@ -962,8 +949,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows дээр медиа файлуудыг дамжуулах буюу Андройд Файл Дамжуулагчийг Mac дээр ашиглах боломж олгоно (www.android.com/filetransfer харна уу)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Танд камерын програм ашиглан зураг дамжуулах, компьютер дээрээс MTP-г дэмждэггүй ямар ч файлыг дамжуулах боломж олгоно"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Файл дамжуулах хэрэгслийг суулгах"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI-г идэвхжүүлсэн програмуудыг өөрийн компьютер дээрх MIDI програм хангамжийг USB дээр ажиллуулах."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Бусад хэрэглэгчид"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Төхөөрөмжийн санах ой"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Хөдөлгөөнт санах ой"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> хоосон (нийт <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> залгасан байна"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>-ыг хэлбэршүүлэх боломжгүй байна"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Санах ойн нэрийг өөрчлөх"</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="3677827796634199714"><b>" <xliff:g id="NAME_0">^1</xliff:g>-ыг салгах үед суулгагдсан апп-ууд ажиллахаа зогсоож, хадгалагдсан файлуудыг дахин оруулахаас нааш нээх боломжгүй болно. "</b>\n\n"Энэхүү <xliff:g id="NAME_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_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_next" msgid="2774557300531702572">"Устгах &amp; хэлбэршүүлэх"</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="1259216693690378749">"Хэлбэршүүлэлт хийх явцад <xliff:g id="NAME">^1</xliff:g>-ыг бүү устга."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Шинэ санах ойд өгөгдлийг зөөх"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Шинэ <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="5035719146373359329"><b>"Зөөвөрлөхөд <xliff:g id="TIME">^1</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="8641916179067596592">"Зөөвөрлөх үед: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>-ыг зөөх"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"Зөөвөрлөх явцад <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="battery_status_title" msgid="9159414319574976203">"Зайны статус"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Зайны түвшин"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,10 +1034,15 @@
     <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_network_title" msgid="4557113742173895074">"Сүлжээний тохиргоог дахин тохируулах"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Энэ сүлжээний бүх тохиргоог дахин тохируулна. Үүнд:\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="4874737348054213767">"Бүх сүлжээний тохиргоог дахин тохируулах уу? Энэ үйлдлийг буцаах боломжгүй!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Дахин тохируулах"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Дахин тохируулах уу?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Сүлжээний тохиргоог дахин тохируулсан байна"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Төхөөрөмжийг дахин тохируулах"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Үйлдвэрээс гарсан төлөвт"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Таблет дээрх бүх өгөгдлийг арилгана"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Утсан дээрх бүх өгөгдлийг арилгана"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Энэ таны таблетын "<b>"дотоод сангаас"</b>"таны \n\n"<li>"Google акаунт"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан апп-уудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Энэ таны утасны "<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>
@@ -1024,9 +1056,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD карт дээрх хөгжим, зураг гэх мэт бүх өгөгдлүүдийг арчих"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Таблетыг дахин шинэчлэх"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Утсыг дахин шинэчлэх"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Таны бүх хувийн мэдээлэл болон татсан апп-уудыг устгах уу? Та энэ үйлдлийг дараа буцаах боломжгүй!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Бүх хувийн мэдээллээ устгаад, апп-ыг татаж авмаар байна уу? Энэ үйлдлийг буцаах боломжгүй!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Бүгдийг устгах"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Утасны дахин шинэчлэлтийг баталгаажуулахын тулд та өөрийн тайлах загвараа зурах шаардлагатай."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Системийг Цэвэрлэх үйлчилгээг ашиглах боломжгүй байгаа учраас дахин шинэчлэх үйлдлийг гүйцэтгээгүй."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Дахин шинэчлэх үү?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Энэ хэрэглэгчийн хувьд үйлдвэрээс гарсан төлөв рүү шинэчлэх боломжгүй"</string>
@@ -1043,8 +1074,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB санг арилгаж хадгалагдсан бүх файлыг устгах уу? Та энэ үйлдлийг буцаах боломжгүй!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD картыг арилгаж хадгалагдсан бүх файлыг устгах уу? Та энэ үйлдлийг буцаах боломжгүй!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Бүгдийг устгах"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Та USB санг арилгахыг хүсэж байгаагаа баталгаажуулахын тулд өөрийн тайлах загварыг зурах шаардлагатай."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Та SD картыг арилгахыг хүсэж байгаагаа баталгаажуулахын тулд өөрийн тайлах загварыг зурах шаардлагатай."</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>
@@ -1076,7 +1105,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Тусламж"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Үүрэн сүлжээ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Мобайл төлбөрийн багц"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Үндсэн 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">"<xliff:g id="NEW_APP">%s</xliff:g>-г таны SMS апп-р ашиглах уу?"</string>
@@ -1104,7 +1133,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Байршлын горим"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Байршил тодорхойлоход GPS, Wi‑Fi, болон үүрэн сүлжээ ашиглах"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Байршил тодорхойлоход Wi‑Fi болон үүрэн сүлжээ ашиглах"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Өөрийн байршлыг тодорхойлохын тулд GPS ашиглах"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Байршлыг тогтоохын тулд GPS ашиглах"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Скан хийж байна"</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="2070686681074461301">"Апп-ууд болон үйлчилгээнүүдэд Wi-Fi асаалтгүй байсан ч Wi-Fi сүлжээнүүдийг скан хийх боломжийг олгох замаар байршлыг сайжруул"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth скан"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Системийн үйлчилгээнүүдэд Bluetooth асаалтгүй байсан ч Bluetooth төхөөрөмжүүдийг скан хийх боломжийг олгох замаар байршлыг сайжруул"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; үүрэн сүлжээний байршил"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Апп-уудад Google-н байршлын үйлчилгээ ашиглан таны байршлыг хурдан олохыг зөвшөөрөх. Нэргүй байршлын мэдээлэл цуглуулагдаж Google рүү илгээгдэх болно."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi-р тодорхойлогдсон байршил"</string>
@@ -1150,11 +1185,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"Дэлгэцийн хамгаалалт"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Үргэлжлүүлэхийн тулд төхөөрөмжийн зурган түгжээг оруулна уу."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Үргэлжлүүлэхийн тулдтөхөөрөмжийнхөө ПИН кодыг оруулна уу."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Үргэлжлүүлэхийн тулд төхөөрөмжийн нууц үгээ оруулна уу."</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_need_to_unlock" msgid="757935356911054465">"Хадгалагдсан загварыг баталгаажуулна уу"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Дахин оролдно уу:"</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>
@@ -1176,8 +1215,7 @@
     <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_header" msgid="819903817323783498">"Хэт олон буруу оролдлого"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> секундын дараа дахин оролдоно уу."</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="manageapplications_settings_title" msgid="7041951105633616745">"Апп удирдах"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Суулгасан апп-уудыг удирдах болон устгах"</string>
@@ -1228,6 +1266,7 @@
     <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>
@@ -1299,6 +1338,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Хадгалах сангийн ашиглалт"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Апп-уудад ашиглагдаж буй санг харах"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Ажиллаж байгаа үйлчилгээнүүд"</string>
@@ -1396,17 +1436,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Таблетын мэдээлэл"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Утасны мэдээлэл"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Зайны мэдээлэл"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Шуурхай эхлүүлэх"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Апп эхлүүлэх гарын товчилборуудыг тохируулаарай"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Апп оноох"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Товчилбор байхгүй"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Хайлт + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Цэвэрлэх"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Таны <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) товчилбор устах болно."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Тийм"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Цуцлах"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Апп"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Товчилбор"</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>
@@ -1441,23 +1470,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Файл доторх бүх блютүүт HCI пакетуудыг унших"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM түгжээ тайлагч"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Bootloader-н түгжээг тайлахыг зөвшөөрөх"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Пин кодоо оруул"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM түгжээ тайлагчийг идэвхжүүлэхийн тулд төхөөрөмжийнхөө пин кодыг оруулна уу."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM түгжээ тайлагчийг зөвшөөрөх үү?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"АНХААР: Энэ тохиргоо асаалттай байгаа үед тухайн төхөөрөмжийн хамгаалалтын функцүүд ажиллахгүй."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Логгерын буферын хэмжээ"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Лог буфер бүрт ногдох логгерын хэмжээг сонгоно уу"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Хуурамч байршлыг зөвшөөрөх"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Хуурамч байршлыг зөвшөөрөх"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Харах тохируулгын шалгалтыг идэвхжүүлэх"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Сүлжээ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Утасгүй дэлгэцийн сертификат"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi Verbose лог-г идэвхжүүлэх"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Үүрэн шилжүүлэг рүү идэвхтэй Wi‑Fi"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi Роум сканыг байнга зөвшөөрөх"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Хуучин DHCP харилцагчийг хэрэглэх"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Утасгүй дэлгэцийн сертификатын сонголтыг харуулах"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi лог-н түвшинг нэмэгдүүлэх, Wi‑Fi Сонгогч дээрх SSID-д ногдох RSSI-г харуулах"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Идэвхжүүлсэн үед Wi‑Fi дохио сул бол дата холболтыг Үүрэн рүү шилжүүлэхдээ илүү идэвхтэй байх болно"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Интерфэйс дээрх дата трафикын хэмжээнээс хамааран Wi‑Fi Роум Скан-г зөвшөөрөх/үл зөвшөөрөх"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Логгерын буферын хэмжээ"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Лог буфер бүрт ногдох логгерын хэмжээг сонгоно уу"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB Тохируулга сонгох"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB Тохируулга сонгох"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Хуурамч байршлыг зөвшөөрөх"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Хуурамч байршлыг зөвшөөрөх"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Харах тохируулгын шалгалтыг идэвхжүүлэх"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Шинэ Андройд DHCP харилцагчийн оронд Lollipop-ийн DHCP харилцагчийг хэрэглэ."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB дебаг хийхийг зөвшөөрөх үү?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB дебаг нь зөвхөн хөгжүүлэлтийн зорилготой. Үүнийг өөрийн компьютер болон төхөөрөмжийн хооронд өгөгдөл хуулах, өөрийн төхөөрөмж дээр мэдэгдэлгүйгээр аппликешн суулгах, лог датаг унших зэрэгт ашиглаж болно."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Таны өмнө нь зөвшөөрөл өгсөн бүх компьютерээс USB дебаг хандалтыг нь хураах уу?"</string>
@@ -1561,6 +1598,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Улаан"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>-г ашиглах уу?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> шаардлага:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Апп нь зөвшөөрөл авах хүсэлтийг танихгүй байгаа тул Тохиргооноос таны хариултыг баталгаажуулж чадахгүй байна."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Хэрэв та <xliff:g id="SERVICE">%1$s</xliff:g>-г асаавал таны төхөөрөмж дата шифрлэлтийг сайжруулах дэлгэцийн түгжээг ашиглахгүй."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Та хандалтын үйлчилгээг асаасан учир таны төхөөрөмж таны дэлгэцийн түгжээг дата шифрлэлтэнд ашиглахгүй."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>-г асаах нь дата шифрлэлтэд нөлөөлөх учир та хээгээ баталгаажуулах шаардлагатай."</string>
@@ -1702,14 +1740,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> апп-ууд <xliff:g id="TIME">%2$s</xliff:g> хугацаанд"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> нь <xliff:g id="TOTALRAM">%2$s</xliff:g>-с <xliff:g id="TIMEDURATION">%3$s</xliff:g> ашиглагдсан байна"</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_memory_status" msgid="4251599550196193093">"Төхөөрөмжийн санах ой одоо <xliff:g id="MEMSTATE">%1$s</xliff:g> байна"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Дундаж RAM ашиглалт"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Хамгийн их RAM ашиглалт"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Үндсэн"</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">"Кэшүүд"</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="processes_subtitle" msgid="6827502409379462438">"Процесс"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Үйлчилгээнүүд"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Үргэлжлэх хугацаа"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Санах ойн мэдээлэл"</string>
@@ -1726,6 +1770,7 @@
     <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_hide_system" msgid="4106826741703745733">"Системийг нуух"</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>
@@ -1748,7 +1793,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Доорх үндсэн тохиргоогоор апп тохиргоог дарах"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Үндсэн тохиргоо"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Үндсэн үүсгүүр"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Ярианы үүсгүүрийг текст уншихад ашиглахаар тохируулна"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Яриа үүсгэх системийг текст уншихад ашиглахаар тохируулах"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Ярианы түвшин"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Текстийг унших хурд"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Авиа тон"</string>
@@ -1822,7 +1867,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"Та жуухын суулгалтыг баталгаажуулахын тулд өөрийн тайлах хээг зурах шаардлагатай."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Жуухын санд зориулсан нууц үгийг бичих."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Одоогийн нууц үг:"</string>
@@ -1847,12 +1891,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"Нөөцлөгдсөн өгөгдлийг хадгалж байгаа акаунт байхгүй байна"</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="5355557151569037197">"Нөөцлөлт үйлчилгээ идэвхгүй байна."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Үүнийг таны төхөөрөмжийн бодлогын дагуу суулгасан байна."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Десктоп нөөшлөлтийн нууц үг"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Десктоп бүрэн нөөцлөлт одоогоор хамгаалалтгүй байна"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Десктоп дээрх бүрэн нөөшлөлтийн нууц үгийг өөрчлөх буюу арилгахын тулд хүрнэ үү"</string>
@@ -2024,6 +2066,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Шилжилтийн дүрс амилуулалтын далайц"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Дүрс амилуулалт үргэлжлэх далайц"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Хоёрдох дэлгэцийн симуляци хийх"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Олон цонхонд ажиллах горим"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Дэлгэцэн дээр нэгэн зэрэг хийгдэж буй олон үйл ажиллагаанууд."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Олон цонхонд ажиллах горимыг идэвхжүүлэх үү?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"АНХААРУУЛГА: Энэ бол Recent apps UI-аар дамжуулан дэлгэцэн дээр нэгэн зэрэг олон үйл ажиллагаа хийхийг зөвшөөрдөг туршилтын горим юм. Энэ горимыг ашиглаж байх үед зарим апп-ууд эвдрэх эсвэл зөв ажиллахгүй байж болох юм."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Апп"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Үйлдлүүдийг хадгалахгүй"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Үйлдэл бүрийг хэрэглэгч орхимогц нь устгах"</string>
@@ -2195,7 +2241,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="718192651887726259">"Та хэрэглэгч нэмэх замаар энэ төхөөрөмжийг бусадтай хуваалцаж болно. Хэрэглэгч бүрт өөрийн апп, дэвсгэр зураг гэх мэтийг тохируулж болох хувийн профайлтай байна. Хэрэглэгчид нь бусдад бүгдэд нь нөлөөлөх 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>
@@ -2226,13 +2272,13 @@
     <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="8310589470979488255">"Утасны дуудлагыг зөвшөөрөх"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Утасны дуудлага болон 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="440218975766968124">"Утасны дуудлагыг зөвшөөрөх үү?"</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_sms_confirm_title" msgid="188164598768941316">"Утасны дуудлага болон SMS зөвшөөрөх үү?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Дуудлага болон 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="application_restrictions" msgid="8207332020898004394">"Апп болон контентыг зөвшөөрөх"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Хязгаарлалттай аппликешнүүд"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Аппликешний тохиргоог дэлгэх"</string>
@@ -2283,8 +2329,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"Энэ апп нь хязгаарлагдсан профайлуудад дэмжигдэггүй"</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>
@@ -2349,13 +2395,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi сүлжээний холболт"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"Зурвас зурвас бичих зурвасаар харилцах"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"үүрэн холбоо үүрэн зөөгч утасгүй өгөгдөл 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi дуудлага дуудаж байна"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ажиллуулагч"</string>
     <string name="keywords_display" msgid="6709007669501628320">"дэлгэц мэдрэгчтэй"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"бүдэг дэлгэц мэдрэгчтэй дэлгэц тэжээл"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"бүдэг дэлгэц мэдрэгчтэй дэлгэц тэжээл"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"Дэвсгэр тохируулах дэлгэц тохируулах"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"бараан дэлгэцийн горим бүдэг дэлгэц гэрэлний тохиргоо"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"дэлгэцийн арын хэсгийн тохиргоо дэлгэцийн тохиргоо"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"текстийн хэмжээ"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"төсөл"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"Төсөл харуулах"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"орон зай диск хатуу диск төхөөрөмж хэрэглээ"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"эрчим хүчний хэрэглээ цэнэглэлт"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"үсэглэх толь үг үсгийн алдаа шалгах автоматиар засах"</string>
@@ -2372,6 +2420,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"акаунт"</string>
     <string name="keywords_users" msgid="4673901601478559100">"хязгаарлалт хязгаарлах хязгаарлагдсан"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"Текст залруулах дууг залруулах чичиргээ авто хэл дохио зөвлөх дэвсгэр доромжилсон үг бичих дүрс олон улс"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"Эрхэмлэх тохиргоог анхны хэлбэрт оруулах"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"Онцгой нөхцөлд ашиглах апп"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"апп, апп татах, систем"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"апп-уудын зөвшөөрлийн аюулгүй байдал"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"үндсэн апликейшнүүд"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"слайд нууц үг хээ пин"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Tагь тохируулах"</string>
     <string name="write_tag" msgid="8571858602896222537">"Бичих"</string>
@@ -2386,11 +2439,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Тасалдал"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Дуудлага болон мэдэгдэл ирэх үед"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Тасалдлыг байнга зөвшөөрөх"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Зөвхөн нэн тэргүүний тасалдлыг зөвшөөрөх"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Тасалдалгүй байх"</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_option_important_interruptions" msgid="3903928008177972500">"Зөвхөн чухал зүйлс"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Зөвхөн сэрүүлэг"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Аливаа саад байхгүй байх"</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="ringtone_title" msgid="5379026328015343686">"Утасны хонхны ая"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Мэдэгдлийн үндсэн хонхны ая"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Дуудлагад бас чичрэх"</string>
@@ -2416,62 +2470,113 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Чичиргээ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Мэдэгдлийн хандалт"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Апп-ууд мэдэгдлийг уншиж чадахгүй"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d апп мэдэгдлийг уншиж чадна"</item>
-    <item quantity="other" msgid="980049191810249052">"%d апп-ууд мэдэгдлийг уншиж чадна"</item>
-  </plurals>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for manage_notification_access_summary_nonzero (7930130030691218387) -->
     <string name="no_notification_listeners" msgid="2767405417723149879">"Мэдэгдэл сонсогч суулгагдаагүй."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g>-г идэвхжүүлэх үү?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> нь систем буюу аливаа суулгасан апп-н гаргасан бүх мэдэгдлүүдийг унших боломжтой байна, үүнд харилцагчийн нэрс, танд ирсэн зурвасууд гэх мэт хувийн мэдээллүүд орж болно. Энэ мөн тэдгээр мэдэгдлүүдийг болиулах буюу тэдгээрийн доторх үйлдлийн товчнуудад хүрэх боломжтой."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Нөхцөл нийлүүлэгч"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Нөхцөл нийлүүлэх апп байхгүй"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d апп нөхцөлүүдийг нийлүүлнэ"</item>
-    <item quantity="other" msgid="358057362115673258">"%d апп нөхцөлүүдийг нийлүүлнэ"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Нөхцөл нийлүүлэгч суулгаагүй байна."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g>-г идэвхжүүлэх үү?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> нь \"Бүү саад бол\" горимоос гарах нөхцөлүүдийг нэмэх боломж олгоно."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Апп-уудыг ачаалж байна..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Хориглох"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Бүгдийг блокло"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Энэ апп-н мэдэгдлийг хэзээ ч харуулахгүй"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Чухал"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Мэдэгдлийг жагсаалтын эхэнд харуулж, төхөөрөмж зөвхөн чухал тасалдлыг харуулахаар тохируулсан үед харуулж байх"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Нууц"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Төхөөрөмж түгжээтэй үед энэ апп-н мэдэгдлээс нууц контентыг харуулахгүй"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Нэн тэргүүнд тавих"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Do not disturb горимыг зөвхөн Эхэнд тавихад тохируулсан үед ч энэхүү апп-нй мэдэгдлийг сонсго"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Гүйлгэн харахыг зөвшөөрөх"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Энэ апп-д зарим мэдэгдлийг мэдэгдэхийг зөвшөөрөхийн тулд одоогийн дэлгэцэнд оруул"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Эмзэг мэдээллийг нуух"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Төхөөрөмж цоожтой үед энэ апп-ны мэдэгдэл дэх нууц мэдээлэл ил гаргаж магадгүй агуулгыг нуух"</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="zen_mode_default_option" msgid="6940069025071935243">"Таныг унтраах хүртэл"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Нэн тэргүүний тасалдал"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Сул зогсолт"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Өдөр"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Хоосон"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Зөвшөөрөгдсөн саатал"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Зөвхөн чухлыг нь"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Байхгүй"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматжуулалт"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Автоматаар асаах"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Горимын нэр"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Горим нэмэх"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Горимыг устгах"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<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="3201273040477861538">"Цагийн хуваарийн дүрэм"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Горим олдсонгүй."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Хэзээ ч үгүй"</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_from" msgid="1033337300289871697">"Авсан дуудлага/зурвасууд"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Дурын хүн"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Зөвхөн харилцагчдаас"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Зөвхөн одтой харилцагчдаас"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Үйл явдал болон сануулагч"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Сэрүүлэг нь ямагт чухал тасалдал байна"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Сэрүүлэг"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Сануулагч"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Үйл явдал"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Сонгосон дуудлага хийгч"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Давтан дуудлага хийгч"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Хэрэв нэг хүн <xliff:g id="MINUTES">%d</xliff:g> минутын дотор хоёр дахь удаагаа дуудлага хийвэл үүнийг хүлээн авна."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Автоматаар асаах"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Хэзээ ч үгүй"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> дараагийн өдөр"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> эсвэл өмнөх сэрүүлэг"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"Тасалдал"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Дуудлага болон мэдэгдэл ирэх үед"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Танд хэзээ саад болж болох вэ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Хэр удаан?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Тасалдлыг байнга зөвшөөрөх"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"унтраах,бүх,бүх зүйл"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Зөвхөн нэн тэргүүний тасалдлыг зөвшөөрөх"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Зөвхөн анхааруулгыг зөвшөөрөх"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Бүү саад бол"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Тодорхойгүй"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минутууд</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> минут</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Тодорхой бус хугацаагаар \"чухал мэдэгдэл харуулах\" горимд шилжих"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">\"Чухал мэдэгдлийг харуулах\" горимд  <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл <xliff:g id="DURATION">%1$d</xliff:g> минутын турш шилжихl</item>
+      <item quantity="one">\"Чухал мэдэгдлийг харуулах\" горимд <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> хүртэл нэг минутын турш шилжих</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">\"Чухал мэдэгдлийг харуулах\" горимд (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл) <xliff:g id="DURATION">%1$d</xliff:g> цагийн турш шилжих </item>
+      <item quantity="one">\"Чухал мэдэгдлийг харуулах\" горимд <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> хүртэл нэг цагийн турш шилжих</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Тодорхой бус хугацаатай анхааруулганд шилжих"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">\"Анхааруул\" горимд (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл) зөвхөн <xliff:g id="DURATION">%1$d</xliff:g> минутын турш шилжих</item>
+      <item quantity="one">\"Анхааруул\" горимд <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">\"Анхааруул\" горимд <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл зөвхөн <xliff:g id="DURATION">%1$d</xliff:g> цагийн турш шилжих</item>
+      <item quantity="one">\"Анхааруул\" горимд <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> хүртэл зөвхөн нэг цагийн турш шилжих</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Тодорхой бус хугацаагаар \"бүү саад бол\" горимд шилжих"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">\"Бүү саад бол\" горимд (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл) <xliff:g id="DURATION">%1$d</xliff:g> минутын турш шилжих</item>
+      <item quantity="one">\"Бүү саад бол\" горимд <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> хүртэл нэг минутын турш шилжих</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">\"Бүү саад бол\" горимд <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> хүртэл <xliff:g id="DURATION">%1$d</xliff:g> цагийн турш шилжих</item>
+      <item quantity="one">\"Бүү саад бол\" горимд <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> хүртэл нэг цагийн турш шилжих</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Үргэлж саад бол горимд шилжих"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"үүрд"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Aпп мэдэгдлүүд"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Энэ төхөөрөмжийн талаар санал илгээх"</string>
@@ -2512,4 +2617,63 @@
     <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="2184141780491382435">"Үндсэн тохиргоогоор ажиллуулах"</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="app_launch_domain_links_title" msgid="458956710410857777">"Домэйн холбоосууд"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Домэйн хаягуудыг нээх"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Апп-д Домэйн хаягуудыг шууд нээхийг зөвшөөрөх"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Дэмжигдсэн домэйн хаягууд"</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="410824961149037234">"дотоод санах ой"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"гадаад санах ой"</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="notifications_enabled" msgid="6983396130566021385">"Идэвхтэй"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Хориглох"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Нууц"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Чухал"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Тэргүүлэх чиглэл &amp; Нууц"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> зөвшөөрөл олгогдсон </item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> зөвшөөрөл олгогдсон </item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g>-аас <xliff:g id="COUNT_2">%d</xliff:g> зөвшөөрөл олгогдсон</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>-аас <xliff:g id="COUNT_0">%d</xliff:g> зөвшөөрөл олгогдсон байна</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Зарим үндсэн тохиргоонуудыг суулгасан"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Ямар ч үндсэн тохиргоог суулгаагүй байна"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Бүх апп-ууд"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Идэвхжүүлсэн"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Хувийн"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Ажил"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блоклосон байна"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Чухал"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Нууц"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домэйн хаягуудын хамт"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Админ идэвхгүй болгосон"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Боловсронгуй"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Үл мэдэгдэх апп"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Профайлаа сонгоно уу"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Апп зөвшөөрөл"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>-аас<xliff:g id="COUNT_1">%d</xliff:g> апп-уудад нэмэлтээр нэвтрэхийг зөвшөөрсөн"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>-аас <xliff:g id="COUNT_1">%d</xliff:g> апп зөвшөөрөгдсөн"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Домэйн хаягууд"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Ямар ч домэйн хаягийг битгий нээ"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\'-ыг нээх"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' болон холбоотой хаягуудыг нээх"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> апп-ууд нь өөрийн домайн URL-уудыг нээж чадна</item>
+      <item quantity="one">Нэг апп нь өөрийн домайн URL-уудыг нээж чадна</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Танигдахгүй байна"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Үндсэн Апликейшн"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Хөтөч апп"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Үндсэн веб хөтөч байхгүй"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Үндсэн)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Апп-ны санах ой"</string>
 </resources>
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr-rIN/arrays.xml
index 69eb913..92b10c5 100644
--- a/res/values-mr-rIN/arrays.xml
+++ b/res/values-mr-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"सिम"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"पुश बटण"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"मायक्रोफोन निःशब्द/सशब्द करा"</item>
     <item msgid="1148142988678569310">"प्रोजेक्‍ट मीडिया"</item>
     <item msgid="9130014005474445273">"VPN सक्रिय करा"</item>
+    <item msgid="1165192162975045562">"लिहिण्याचा वॉलपेपर"</item>
+    <item msgid="7129487923652967258">"सहाय्य रचना"</item>
+    <item msgid="1069023208100114540">"सहाय्य स्क्रीनशॉट"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"स्थान"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"मायक्रोफोन निःशब्द/सशब्द करा"</item>
     <item msgid="5906017727368097853">"प्रोजेक्‍ट मीडिया"</item>
     <item msgid="2486614710846178542">"VPN सक्रिय करा"</item>
+    <item msgid="5586547561693629602">"लिहिण्याचा वॉलपेपर"</item>
+    <item msgid="32794179825485062">"सहाय्य रचना"</item>
+    <item msgid="7872852746938272552">"सहाय्य स्क्रीनशॉट"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"लहान"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"निम्न"</item>
     <item msgid="4212263919458209842">"गंभीर"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"बंद"</item>
-    <item msgid="5656544177755411222">"मर्यादित व्यत्यय"</item>
-    <item msgid="8735337502532332056">"शून्य व्यत्यय"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"सामान्य"</item>
     <item msgid="866544120205026771">"मध्यम"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"गुलाबी"</item>
     <item msgid="6131821495505931173">"लाल"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (मीडिया स्‍थानांतरण प्रोटोकॉल)"</item>
+    <item msgid="8856820259201251036">"PTP (चित्र स्‍थानांतरण प्रोटोकॉल)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB इथरनेट)"</item>
+    <item msgid="2686051673589572111">"ऑडिओ स्त्रोत"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 8a21532..18ca0a9 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"अनुमती द्या"</string>
     <string name="deny" msgid="6947806159746484865">"नकार द्या"</string>
     <string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"आपण आता एक विकासक बनण्यापासून <xliff:g id="STEP_COUNT">%1$d</xliff:g> चरण दूर आहात."</item>
-    <item quantity="other" msgid="6722953419953594148">"आपण आता एक विकासक बनण्यापासून <xliff:g id="STEP_COUNT">%1$d</xliff:g> चरण दूर आहात."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">आपण आता विकासक बनण्यापासून <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण दूर आहात.</item>
+      <item quantity="other">आपण आता विकासक बनण्यापासून <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरणे दूर आहात.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"आता आपण एक विकासक आहात!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"आवश्यकता नाही, आपण आधीपासून एक विकासक आहात."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"वायरलेस आणि नेटवर्क"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS वरील SMS बंद करा"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS नोंदणी आवश्यक आहे चालू करा"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"आवश्यक IMS नोंदणी बंद करा"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE तरतूद केलेले ध्वजांकन चालू करा"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE तरतूद केलेले ध्वजांकन बंद करा"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram डंप चालू करा"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram डंप बंद करा"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"सिम अॅड्रेस बुक पहा"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"कनेक्ट केले"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"कनेक्ट केले (फोन नाही)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"कनेक्ट केले (मीडिया नाही)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"कनेक्ट केलेले आहे (कोणत्याही संदेशामध्ये प्रवेश नाही)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"कनेक्ट केले (फोन किंवा मीडिया नाही)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"डिस्कनेक्ट केले"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"डिस्कनेक्ट करत आहे..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"कनेक्ट करीत आहे..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"जोडत आहे…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"अनामित ब डिव्हाइस"</string>
     <string name="progress_scanning" msgid="192587958424295789">"शोधत आहे"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"जवळपास ब डिव्हाइसेस आढळली नाहीत."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त झालेल्या फायली दर्शवा"</string>
     <string name="device_picker" msgid="4978696506172252813">"ब डिव्हाइस निवडा"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"ब परवानगी विनंती"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"एका अॅपला ब चालू करण्याची आवश्यकता आहे."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"या डिव्हाइसकरिता अॅप ब चालू करू इच्छित आहे."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"एका अॅपला आपला टॅब्लेट इतर ब डिव्हाइसेससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता दृश्यमान बनविण्याची आवश्यकता आहे."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"एका अॅपला आपला फोन इतर ब डिव्हाइसेससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता दृश्यमान बनविण्याची आवश्यकता आहे."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"एका अॅपला इतर ब डिव्हाइसेससाठी आपला टॅब्लेट दृश्यमान बनविण्याची आवश्यकता आहे. आपण नंतर ब सेटिंग्जमध्ये हे बदलू शकता."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"रद्द करा"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"सुरु ठेवा"</string>
     <string name="okay" msgid="1997666393121016642">"ठीक आहे"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"होय"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"नाही"</string>
-    <string name="forget" msgid="7267115980248732932">"विसरा"</string>
+    <string name="forget" msgid="1400428660472591263">"विसरा"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"चेहरा जुळविणे सुधारा"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"थेटपणा चेक करा"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"अनलॉक करताना डोळ्याची उघडझाप करणे आवश्यक आहे"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"माझे स्थान, स्क्रीन लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"संकेतशब्द"</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="3453670509485083962">"जोडा"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"स्क्रीन लॉक"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"फिंगरप्रिंट सेटअप करा"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"आपली स्क्रीन अनलॉक करण्‍यासाठी किंवा खरेदीचे पुष्‍टीकरण करण्‍यासाठी, आपले फिंगरप्रिंट वापरण्‍याकरिता आम्हाला हे करण्‍याची आवश्‍यकता असेल:\n\n✓ आपली बॅकअप स्क्रीनलॉक पद्धत सेट करा \n\n✓ आपले फिंगरप्रिंट जोडा"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"सेन्सर शोधा"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"आपल्‍या फोनच्या पाठीमागे फिंगरप्रिंट सेन्सर शोधा."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"आपण प्रारंभ करूया!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"फिंगरप्रिंट सेन्सरवर आपले बोट ठेवा. आपल्याला कंपन जाणवल्यानंतर उचला."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"छान! आता पुनरावृत्ती करा."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"फिंगरप्रिंट सेन्सरवर तेच बोट ठेवा आणि आपल्याला कंपन जाणवल्यानंतर उचला."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"फिंगरप्रिंट जोडले!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जेव्हाही आपण हे चिन्ह पाहता, तेव्हा आपण ओळखीसाठी किंवा खरेदी अधिकृत करण्यासाठी आपले फिंगरप्रिंट वापरू शकता."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"जोडा"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"पुढील"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"आपल्‍या डिव्‍हाइसच्या कूटबद्धीकरणाचे पुष्‍टीकरण करण्‍यासाठी आपल्‍याला आपला अनलॉक नमुना रेखाटण्‍याची आवश्‍यकता आहे."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"कूटबद्ध करायचे?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"कूटबद्धीकरण कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. कूटबद्धीकरणास एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान टॅब्लेट कित्येक वेळा रीस्टार्ट होईल."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"कूटबद्धीकरण कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. कूटबद्धीकरणास एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान फोन कित्येक वेळा रीस्टार्ट होईल."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"चेहरा अनलॉक"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"कमी सुरक्षितता, प्रायोगिक"</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>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"संकेतशब्द"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षितता"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"वर्तमान स्क्रीन लॉक"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"डिव्हाइस संरक्षण वैशिष्ट्ये यापुढे कार्य करणार नाहीत."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"प्रशासकाद्वारे, कूटबद्धीकरण धोरण किंवा क्रडेन्शियल संचयनाद्वारे अक्षम केले"</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_biometric_weak" msgid="3008473624490350142">"चेहरा अनलॉक"</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="7579210814842056547">"एकदा आपण स्क्रीन लॉक सेट केल्यानंतर, आपण सेटिंग्ज &gt; सुरक्षितता मध्ये आपले फिंगरप्रिंट देखील सेट करू शकता."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"स्क्रीन लॉक बंद करा"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"नमुना अनलॉक करा काढा"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"अनलॉक पिन काढा"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"संकेतशब्दामध्ये कमीतकमी एक अक्षर असावे."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"संकेतशब्दामध्ये कमीतकमी एक अंक असावा."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"संकेतशब्दामध्ये कमीतकमी एक चिन्ह असावे."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"संकेतशब्दामध्ये कमीतकमी 1 अक्षर असावे."</item>
-    <item quantity="other" msgid="8186027808415585970">"संकेतशब्दामध्ये कमीतकमी %d अक्षर असावीत."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"संकेतशब्दामध्ये कमीतकमी 1 लोअरकेस अक्षर असावे."</item>
-    <item quantity="other" msgid="2693910942679679225">"संकेतशब्दामध्ये कमीतकमी %d लोअरकेस अक्षरे असावीत."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"संकेतशब्दामध्ये कमीतकमी 1 अप्परकेस अक्षर असावे."</item>
-    <item quantity="other" msgid="3030801209112209245">"संकेतशब्दामध्ये कमीतकमी %d अप्परकेस अक्षरे असावीत."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"संकेतशब्दामध्ये कमीतकमी 1 संख्यात्मक अंक असावा."</item>
-    <item quantity="other" msgid="4703982391407595924">"संकेतशब्दामध्ये कमीतकमी %d संख्यात्मक अंक असावेत."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"संकेतशब्दामध्ये कमीतकमी 1 विशिष्ट चिन्ह असावे."</item>
-    <item quantity="other" msgid="1221290525051187757">"संकेतशब्दामध्ये कमीतकमी %d विशिष्ट चिन्ह असावीत."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"संकेतशब्दामध्ये कमीतकमी 1 अक्षर नसलेला वर्ण असावा."</item>
-    <item quantity="other" msgid="3952508584649046404">"संकेतशब्दामध्ये कमीतकमी %d अक्षर नसलेले वर्ण असावेत."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">संकेतशब्दामध्ये कमीत कमी %d अक्षर असणे आवश्यक आहे.</item>
+      <item quantity="other">संकेतशब्दामध्ये कमीत कमी %d अक्षरे असणे आवश्यक आहे.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">संकेतशब्दामध्ये कमीत कमी %d लोअरकेस अक्षर असणे आवश्यक आहे.</item>
+      <item quantity="other">संकेतशब्दामध्ये कमीत कमी %d लोअरकेस अक्षरे असणे आवश्यक आहे.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">संकेतशब्दामध्ये कमीत कमी %d अप्परकेस अक्षर असणे आवश्यक आहे.</item>
+      <item quantity="other">संकेतशब्दामध्ये कमीत कमी %d अप्परकेस अक्षरे असणे आवश्यक आहे.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">संकेतशब्दामध्ये कमीत कमी %d संख्यात्मक अंक असणे आवश्यक आहे.</item>
+      <item quantity="other">संकेतशब्दामध्ये कमीत कमी %d संख्यात्मक अंक असणे आवश्यक आहे.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">संकेतशब्दामध्ये कमीत कमी %d विशिष्ट चिन्ह असणे आवश्यक आहे.</item>
+      <item quantity="other">संकेतशब्दामध्ये कमीत कमी %d विशिष्ट चिन्हे असणे आवश्यक आहे.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">संकेतशब्दामध्ये कमीत कमी %d अक्षर-नसलेला वर्ण असणे आवश्यक आहे.</item>
+      <item quantity="other">संकेतशब्दामध्ये कमीत कमी %d अक्षर-नसलेले वर्ण असणे आवश्यक आहे.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"डिव्हाइस प्रशासक अलीकडील संकेतशब्द वापरण्याची अनुमती देत नाही."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"चढत्या, उतरत्या किंवा अंकांचा पुनरावृत्ती क्रम निषिद्ध आहे"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ठीक"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"जोडा"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"जोडा"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"रद्द करा"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"कनेक्‍ट केल्यावर जोडणी आपले संपर्क आणि कॉल इतिहास यावरील प्रवेशास मंजूरी देते."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> शी जोडू शकलो नाही."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"अयोग्य पिन किंवा पासकीमुळे <xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह जोडू शकलो नाही."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> शी संप्रेषण करू शकत नाही."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे जोडणी नाकारली."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"स्थान अचूकता सुधारण्यासाठी, ब्लूटुथ बंद असले तरी देखील, अ‍ॅप्स आणि सेवा ब्लूटुथ डिव्हाइसेससाठी स्कॅन करतील. आपण हे <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_specific_profiles_title" msgid="6952214406025825164">"यावर कनेक्ट करा…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"मीडिया ऑडिओ"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"फोन ऑडिओ"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"फाइल स्थानांतरण"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"इनपुट डिव्हाइस"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"इंटरनेट प्रवेश"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"संपर्क सामायिकरण"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"संपर्क सामायिकरणासाठी वापरा"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"इंटरनेट कनेक्शन सामायिकरण"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"संदेशात प्रवेश"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"मीडिया ऑडिओवर कनेक्ट केले"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"फोन ऑडिओ वर कनेक्ट केले"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"फाईल स्थानांतर सर्व्हरवर कनेक्ट केले"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"नकाशाशी कनेक्ट केले"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"फाइल स्थानांतर सर्व्हरशी कनेक्ट केले नाही"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"इनपुट डिव्हाइसवर कनेक्ट केले"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"मीडिया ऑडिओसाठी वापरा"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"फोन ऑडिओसाठी वापरा"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"फाईल स्थानांतरणासाठी वापरा"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"इनपुट साठी वापरा"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"इंटरनेट प्रवेशासाठी वापरा"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"नकाशासाठी वापरा"</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_assistant_title" msgid="2553267316621598101">"वाय-फाय सहाय्यक"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi सहाय्यक द्वारे कनेक्ट केले"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"स्क्रीन कास्‍ट करा"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"वाय-फाय बंद करीत आहे…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"त्रुटी"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"विमान मोड मध्ये"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"नेटवर्कसाठी स्कॅन करू शकत नाही"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"नेटवर्क सूचना"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"जेव्हाही सार्वजनिक नेटवर्क उपलब्ध असते तेव्हा सूचित करा"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"खराब कनेक्शन टाळा"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"वाय-फाय नेटवर्कचे चांगले इंटरनेट कनेक्शन नसल्यास त्याचा वापर करु नका"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"केवळ चांगले इंटरनेट कनेक्शन असलेली नेटवर्क वापरा"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"स्कॅनिंग नेहमी उपलब्ध"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"स्कॅनिंगला नेहमी अनुमती द्या"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google ची स्थान सेवा आणि इतर अॅप्सना नेटवर्कसाठी स्कॅन करु द्या, वाय-फाय बंद असताना देखील"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"खुले वाय‑फाय स्वयंचलितपणे वापरा"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"वाय-वाय सहाय्यकास स्वयंचलितपणे उच्च गुणवत्ता असण्यासाठी निर्धारित केलेल्‍या खुल्या नेटवर्कशी कनेक्‍ट करू द्या"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"सहाय्यक निवडा"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्रे स्थापित करा"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान अचूकता सुधारण्यासाठी आणि इतर हेतूंसाठी Google आणि इतर अॅप्स जवळपासच्या नेटवर्कसाठी स्कॅन करु शकतात, वाय-फाय बंद असताना देखील. हे व्हावे असे आपण इच्छित नसल्यास प्रगत &gt; स्कॅनिंग नेहमी उपलब्ध वर जा."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"अॅप्स जवळपासच्या नेटवर्कसाठी स्कॅन करु शकतात, वाय-फाय बंद असताना देखील. हे व्हावे असे आपण इच्छित नसल्यास प्रगत &gt; स्कॅनिंग नेहमी उपलब्ध वर जा."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"स्थान अचूकता सुधारण्यासाठी, वाय-फाय बंद असले तरी देखील, अ‍ॅप्स आणि सेवा वाय-फाय नेटवर्कसाठी स्कॅन करतील. आपण हे <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="5340097010842405981">"पुन्हा दर्शवू नका"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"निष्क्रिय असताना वाय-फाय चालू ठेवा"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"निष्क्रिय करा दरम्यान वाय-फाय चालू"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"दुसरे नेटवर्क जोडा"</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्वयंचलित सेटअप (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"सेटअप पूर्ण करण्यासाठी, आपल्या टॅब्लेटला वाय-फाय वर प्रवेश करण्याची आवश्यकता आहे. सेटअप नंतर, आपण सेल्युलर डेटा आणि वाय-फाय दरम्यान स्विच करु शकता."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"प्रगत पर्याय"</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="5940801028985255304">"आपल्या राउटरवरील वाय-फाय संरक्षित सेटअप बटण दाबा. त्यास \"WPS\" म्हणून संबोधले जाऊ शकते किंवा हे चिन्ह असू शकते:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"आपल्या राउटरवरील वाय‑फाय संरक्षित सेटअप बटण दाबा. त्यास \"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>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"AP बँड कॉन्‍फिगर करा"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(न बदललेले)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(निर्दिष्ट न केलेले)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"जतन केले"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"अक्षम"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP कॉन्फिगरेशन अयशस्वी"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi कनेक्शन अयशस्वी"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"प्रमाणीकरण समस्या"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"परिक्षेत्रामध्ये नाही"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"कोणताही इंटरनेट प्रवेश आढळला नाही, स्वयंचलितपणे रीकनेक्ट करणार नाही."</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_security_none" msgid="7985461072596594400">"काहीही नाही"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"या नेटवर्कमध्‍ये इंटरनेट प्रवेश नाही. तरीही हे नेटवर्क वापरायचे?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"या नेटर्वकसाठी पुन्हा विचारू नका"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"कनेक्ट करा"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"नेटवर्कशी कनेक्‍ट करण्‍यात अयशस्वी"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"विसरा"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK पोर्टेबल वाय-फाय हॉटस्पॉट"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<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_mode_title" msgid="2164073796253284289">"कॉल करण्याचे प्राधान्य"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"वाय-फाय कॉलिंग मोड"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"वाय-फाय प्राधान्यकृत"</item>
+    <item msgid="5267397515594230396">"सेल्युलर प्राधान्यकृत"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"वाय-फाय कॉलिंग चालू असताना, आपला फोन आपल्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा आपल्या वाहकाच्या नेटवर्कद्वारे कॉल मार्गस्थ करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी आणि इतर तपशीलांच्या संबंधात आपल्या वाहकास विचारा."</string>
     <string name="home_settings" msgid="212375129455718176">"घर"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शित करा"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनी"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"थीम"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"फिकट"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"गडद"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"स्वयंचलित"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"प्राधान्यीकृत सिम कार्ड अद्यतनित करायचे?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"आपल्‍या डिव्‍हाइस मधील <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">
-    <item quantity="one" msgid="4840607930166101114">"सिम पिन कोड चुकीचा आहे, आपण आपले डिव्‍हाइस अनलॉक करण्‍यासाठी आपल्‍या वाहकाशी संपर्क साधण्‍यापूर्वी आपल्‍याकडे उर्वरित <xliff:g id="NUMBER">%d</xliff:g> प्रयत्न आहेत."</item>
-    <item quantity="other" msgid="77103619544346451">"सिम पिन कोड चुकीचा आहे, आपल्‍याकडे उर्वरित <xliff:g id="NUMBER">%d</xliff:g> प्रयत्न आहेत."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">सिम पिन चुकीचा आहे, आपल्याकडे <xliff:g id="NUMBER_1">%d</xliff:g> प्रयत्न उर्वरित आहे.</item>
+      <item quantity="other">सिम पिन चुकीचा आहे, आपल्याकडे <xliff:g id="NUMBER_1">%d</xliff:g> प्रयत्न उर्वरित आहेत.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"सिम पिन ऑपरेशन अयशस्वी!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"टॅब्लेट स्थिती"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"फोन स्थिती"</string>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"अॅप्स (अॅप डेटा आणि मीडिया सामग्री)"</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_dcim_usage" msgid="558887013613822577">"चित्रे, व्हिडिओ"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"ऑडिओ (संगीत, रिंगटोन, पॉडकास्ट इ.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"संकीर्ण"</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="default" msgid="6915293408836853020">"SD कार्ड अनमाउंट करा"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"माउंट करा"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"बाहेर काढा"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"मिटवा आणि स्वरूपित करा"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"मिटवा आणि अंतर्गत संचयन म्हणून स्वरूपित करा"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB संगणक कनेक्शन"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB संगणक कनेक्शन"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"म्हणून कनेक्ट करा"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"आपल्याला कॅमेरा सॉफ्टवेअर वापरून फोटो स्थानांतर आणि MTP वर समर्थित नसलेल्या संगणकावर कोणत्याही फायली स्थानांतर करू देते"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"फाईल-स्थानांतर साधने स्थापित करा"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI सक्षम असलेल्या अनुप्रयोगांना आपल्या संगणकावर MIDI सॉफ्टवेअरसह USB वर कार्य करू द्या."</string>
     <string name="storage_other_users" msgid="808708845102611856">"इतर वापरकर्ते"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"डिव्‍हाइस संचयन"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"काढण्‍यायोग्य संचयन"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> विनामूल्य (एकूण <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> माउंट केले"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> स्वरूपित करणे शक्य झाले नाही"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"संचयन पुनर्नामित करा"</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="3677827796634199714"><b>"आपण <xliff:g id="NAME_0">^1</xliff:g> बाहेर काढता तेव्‍हा, त्यावर संचयित केलेले अ‍ॅप्स कार्य करणे थांबवतील आणि ते पुन्हा घातले जाईपर्यंत त्यावर संचयित केलेल्‍या मीडिया फायली उपलब्ध असणार नाहीत."</b>" \n\n हे <xliff:g id="NAME_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_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_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="1259216693690378749">"फॉर्मेट करताना <xliff:g id="NAME">^1</xliff:g> काढू नका."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"डेटा नवीन संचयनावर हलवा"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"आपण आपले फोटो, फायली अ‍ॅप डेटा या नवीन <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="5035719146373359329"><b>"हलविण्‍यास सुमारे <xliff:g id="TIME">^1</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="8641916179067596592">"हलविण्‍यादरम्यान: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> हलवा"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"हलविण्‍यादरम्यान <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="battery_status_title" msgid="9159414319574976203">"बॅटरी स्थिती"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"बॅटरी पातळी"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"नेटवर्क सेटिंग्ज रीसेट केले"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"हे सर्व नेटवर्क सेटिंग्ज रीसेट करेल, यासह:\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="4874737348054213767">"सर्व नेटवर्क सेटिंग्ज रीसेट करायच्या? आपण ही क्रिया पूर्ववत करू शकत नाही!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिंग्ज रीसेट करा"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"रीसेट करायचे?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"नेटवर्क सेटिंग्ज रीसेट केल्या गेल्या आहेत"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"डिव्हाइस रीसेट करा"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"फॅक्‍टरी डेटा रीसेट"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"टॅब्लेटवरील सर्व डेटा मिटवते"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"फोनवरील सर्व डेटा मिटवते"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"हे आपल्या टॅब्लेटच्या "<b>"अंतर्गत संचयना"</b>" वरील सर्व डेटा मिटवेल,                                                                     यासह:\n\n"<li>"आपले Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"हे आपल्या फोनच्या "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD कार्डवरील सर्व डेटा मिटवा, जसे की संगीत किंवा फोटो"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"टॅब्लेट रीसेट करा"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फोन रीसेट करा"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"आपली सर्व वैयक्तिक माहिती आणि डाउनलोड केलेले अॅप्स मिटवायचे? आपण ही क्रिया उलट करू शकत नाही!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"आपली सर्व वैयक्तिक माहिती आणि डाउनलोड केलेले अॅप्स मिटवायचे? आपण ही क्रिया पूर्ववत करू शकत नाही!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"प्रत्येकगोष्ट मिटवा"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"आपल्याला फॅक्टरी डेटा रीसेटची पुष्टी करण्यासाठी आपला अनलॉक नमुना रेखांकित करण्याची आवश्यकता आहे."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"सिस्टम साफ करा सेवा उपलब्ध नसल्यामुळे कोणतेही रीसेट केले नाही."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करायचे?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"या वापरकर्त्यासाठी फॅक्‍टरी रीसेट उपलब्‍ध नाही"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB संचयन मिटवायचे, तेथे संचयित केलेल्या सर्व फायली हटवून? आपण ही क्रिया उलट करू शकत नाही!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD कार्ड मिटवायचे, तेथे संचयित केलेल्या सर्व फायली हटवून? आपण ही क्रिया उलट करू शकत नाही!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"प्रत्येकगोष्ट मिटवा"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"आपण USB संचयन मिटवू इच्छित असल्याची पुष्टी करण्यासाठी आपल्याला आपला अनलॉक नमूना रेखांकित करण्याची आवश्यकता आहे."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"आपण SD कार्ड मिटवू इच्छिता याची पुष्टी करण्यासाठी आपल्याला आपला अनलॉक नमुना रेखांकित करण्याची आवश्यकता आहे."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"मदत"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"सेल्युलर नेटवर्क"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाईल योजना"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"डीफॉल्ट 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">"आपला SMS अॅप म्हणून <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"स्थान निर्धारित करण्यासाठी GPS, वाय-फाय, आणि सेल्युलर नेटवर्क वापरा"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"स्थान निर्धारित करण्यासाठी वाय-फाय आणि सेल्युलर नेटवर्क वापरा"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"आपले स्थान निर्धारीत करण्यासाठी GPS चा वापर करा"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्थान निर्धारीत करण्यासाठी GPS चा वापर करा"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"स्कॅन करत आहे"</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="2070686681074461301">"अ‍ॅप्स आणि सेवांना वाय-फाय बंद असताना देखील वाय-फाय नेटवर्कसाठी स्कॅन करण्याची अनुमती देऊन स्‍थान सुधारा"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्लूटुथ स्कॅन करणे"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ब्लूटुथ बंद असले तरी देखील, सिस्‍टीम सेवांना ब्लूटुथ डिव्हाइसेससाठी स्कॅन करण्याची अनुमती देऊन स्थान सुधारा"</string>
     <string name="location_network_based" msgid="6010456018401296590">"वाय-फाय आणि सेल्युलर नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी अॅप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाय-फाय द्वारे निर्धारीत केलेले स्थान"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"स्क्रीन सुरक्षा"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"सुरु ठेवण्‍यासाठी आपला डिव्‍हाइस नमुना वापरा."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"सुरु ठेवण्‍यासाठी आपले डिव्‍हाइस पिन प्रविष्‍ट करा."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"सुरु ठेवण्‍यासाठी आपला डिव्‍हाइस संकेतशब्द प्रविष्‍ट करा."</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_need_to_unlock" msgid="757935356911054465">"जतन केलेल्या नमुन्याची पुष्टी करा"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"पुन्हा प्रयत्न करा:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"बरेच अयोग्य प्रयत्न!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> सेकंदांमध्ये पुन्हा प्रयत्न करा."</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="manageapplications_settings_title" msgid="7041951105633616745">"अ‍ॅप्स व्यवस्थापित करा"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"स्थापित अॅप्स व्यवस्थापित करा आणि काढा"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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="runningservices_settings_title" msgid="8097287939865165213">"चालू सेवा"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"टॅब्लेट माहिती"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"फोन माहिती"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"बॅटरी माहिती"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"द्रुत लाँच"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"अॅप्स लाँच करण्यासाठी कीबोर्ड शॉर्टकट सेट करा"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"अॅप सुपूर्त करा"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"शॉर्टकट नाही"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"शोध + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"साफ करा"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) साठी आपला शॉर्टकट साफ केला जाईल."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ठीक"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"रद्द करा"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"अॅप्स"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"शॉर्टकट"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"सर्व ब HCI पॅकेट एका फाईलमध्ये कॅप्चर करा"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM अनलॉक करणे"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"बूटलोडर अनलॉक करण्यासाठी अनुमती द्या"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"आपला PIN प्रविष्ट करा"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM अनलॉक सक्षम करण्यासाठी आपले डिव्हाइस PIN प्रविष्ट करा"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM अनलॉक करण्यास अनुमती द्यायची?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"चेतावणी: ही सेटिंग चालू असताना या डिव्हाइसवर डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"लॉगर बफर आकार"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"प्रति लॉग बफर लॉगर आकार निवडा"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"बनावट स्थानांना अनुमती द्या"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"बनावट स्थानांना अनुमती द्या"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"दृश्‍य विशेषता तपासणी सक्षम करा"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"नेटवर्किंग"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस प्रदर्शन प्रमाणीकरण"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाय-फाय शब्दपाल्हाळ लॉगिंग सक्षम करा"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"सेल्‍युलर सोपविण्‍यावरील आक्रमक वाय-फाय"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"वाय-फाय रोम स्‍कॅनला नेहमी अनुमती द्या"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"परंपरागत DHCP क्लायंटचा वापर करा"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"वायरलेस प्रदर्शन प्रमाणिकरणासाठी पर्याय दर्शवा"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"वाय-फाय लॉगिंग स्‍तर वाढवा, वाय-फाय निवडकामध्‍ये प्रति SSID RSSI दर्शवा"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"सक्षम केले असताना,  वाय-फाय सिग्‍नल निम्‍न असताना, सेल्‍युलरवरील डेटा कनेक्‍शन वरून वाय-फाय हाताळण्‍यात अधिक आक्रमक असेल"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"वाय-फाय रोम स्‍कॅनला इंटरफेसवर उपस्‍थित असलेल्‍या रहदारी डेटाच्या प्रमाणावर आधारित अनुमती द्या/अनुमती देऊ नका"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"लॉगर बफर आकार"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"प्रति लॉग बफर लॉगर आकार निवडा"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB कॉन्‍फिगरेशन निवडा"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB कॉन्‍फिगरेशन निवडा"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"बनावट स्थानांना अनुमती द्या"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"बनावट स्थानांना अनुमती द्या"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"दृश्‍य विशेषता तपासणी सक्षम करा"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"नवीन Android DHCP क्लायंट ऐवजी Lollipop वरून DHCP क्लायंटचा वापर करा."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB डीबग करण्यास अनुमती द्यायची?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB डीबग करण्याचा हेतू फक्त विकासाच्या उद्देशांसाठी आहे. याचा वापर आपला संगणक आणि आपले डिव्हाइस यांच्या दरम्यान डेटा कॉपी करण्यासाठी करा, सूचनेशिवाय आपल्या डिव्हाइसवर अॅप्स स्थापित करा आणि लॉग डेटा वाचा."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"आपण पूर्वी प्राधिकृत केलेल्या सर्व संगणकांवरुन USB डीबग करण्यासाठी प्रवेश पुनर्प्राप्त करायचा?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"किरमिजी तांबडा"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> वापरायची?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"यासाठी <xliff:g id="SERVICE">%1$s</xliff:g> आवश्यक आहे:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"अ‍ॅप परवानगी विनंती अस्पष्‍ट करीत असल्‍याने, सेटिंग्ज आपला प्रतिसाद सत्यापित करू शकत नाहीत."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"आपण <xliff:g id="SERVICE">%1$s</xliff:g> चालू केल्‍यास, आपले डिव्‍हाइस डेटा कूटबद्धीकरण वर्धित करण्‍यासाठी आपला स्क्रीन लॉक वापरणार नाही."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"आपण प्रवेशयोग्यता सेवा चालू केली असल्‍यामुळे, आपले डिव्‍हाइस डेटा कूटबद्धीकरण वर्धित करण्‍यासाठी आपला स्क्रीन लॉक वापरणार नाही."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा कूटबद्धीकरण प्रभावित होते, आपल्याला आपल्या नमुन्याची पुष्टी करण्याची आवश्यकता आहे."</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TIME">%2$s</xliff:g> मध्ये <xliff:g id="TYPE">%1$s</xliff:g> अॅप्स"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<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_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_memory_status" msgid="4251599550196193093">"डिव्हाइस मेमरी सध्या <xliff:g id="MEMSTATE">%1$s</xliff:g> आहे"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"सरासरी RAM वापर"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"कमाल RAM वापरा"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"प्रक्रिया"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"सेवा"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"कालावधी"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"मेमरी तपशील"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"सिस्‍टीम लपवा"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"खालील डीफॉल्ट सेटिंग्ज अॅप सेटिंग्जना आच्छादित करतात"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"डीफॉल्ट सेटिंग्‍ज"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"डीफॉल्ट इंजिन"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"बोललेल्या मजकुरासाठी वापरल्या जाणारे उच्चार संश्लेषण इंजिन सेट करते"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"बोललेल्या मजकूराकरिता वापरण्यासाठी उच्चार सश्लेषण इंजिन सेट करा"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"बोलण्याचा रेट"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"ज्या गतीने मजकूर बोलला जातो ती"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"पिच"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"क्रेडेन्शियल स्थापनेची पुष्टी करण्यासाठी आपल्याला आपला अनलॉक नमूना रेखांकित करण्याची आवश्यकता आहे."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"क्रेडेन्शियल संचयनासाठी संकेतशब्द टाइप करा."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"वर्तमान संकेतशब्द:"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"माझ्या डेटाचा बॅकअप घ्या"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Google सर्व्हरमध्ये अॅप डेटा, वाय-फाय संकेतशब्द आणि इतर सेटिंग्जचा बॅक अप घ्या"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"बॅकअप खाते"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"कोणतेही खाते सध्या बॅक अप घेतलेला डेटा संचयित करत नाहीये"</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="5355557151569037197">"बॅकअप सेवा निष्क्रिय आहे."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"हे आपल्या डिव्हाइस धोरणानुसार सेट केले आहे."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्कटॉप बॅकअप संकेतशब्द"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्कटॉप पूर्ण बॅक अप सध्या संरक्षित नाहीत"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटॉपच्या पूर्ण बॅकअपसाठी असलेला संकेतशब्द बदलण्यासाठी किंवा काढून टाकण्यासाठी स्पर्श करा"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"संक्रमण अॅनिमेशन स्केल"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"अॅनिमेटर कालावधी स्केल"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"दुय्यम प्रदर्शनांची बतावणी करा"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"एकाधिक-विंडो मोड"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"एकाचवेळी स्क्रीनवरील एकाधिक क्रियाकलाप."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"एकाधिक-विंडो मोड सक्षम करायचा?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"चेतावणी: हे उच्च प्रायोगिक वैशिष्‍ट्य आहे जे अलीकडील अ‍ॅप्‍स UI द्वारे स्क्रीन-वरील एकाधिक क्रियाकलापांना एकाचवेळी अनुमती देते. काही अ‍ॅप्‍स या वैशिष्‍ट्यासह वापरले जातात तेव्हा ते क्रॅश होऊ शकतात किंवा योग्यरित्या कार्य करू शकत नाहीत."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"अॅप्स"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"क्रियाकलाप ठेवू नका"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"वापरकर्त्याने प्रत्येक क्रियाकलाप सोडताच तो नष्ट करा"</string>
@@ -2049,7 +2105,7 @@
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"इथरनेट वापर लपवा"</string>
     <string name="data_usage_menu_metered" msgid="6235119991372755026">"नेटवर्क प्रतिबंध"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"अॅप डेटा स्वयं-संकालित करा"</string>
-    <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"सिम कार्डे"</string>
+    <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"सिम कार्ड"</string>
     <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"सेल्युलर नेटवर्क"</string>
     <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"डेटा स्‍वयं-सिंक करा"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"वैयक्तिक डेटा स्‍वयं-सिंक करा"</string>
@@ -2195,7 +2251,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="718192651887726259">"आपण अतिरिक्त वापरकर्ते तयार करून इतर लोकांबरोबर हे डिव्हाइस सामायिक करू शकता. प्रत्येक वापरकर्त्यास त्यांचे स्वतःचे स्थान असते, जे ते त्यांच्या स्वतःच्या अॅप्ससह, वॉलपेपरसह आणि याप्रकारे सानुकूल करू शकतात. वापरकर्ते प्रत्येकावर प्रभाव करणार्‍या वाय-फाय सारख्या डिव्हाइस सेटिंग्ज देखील समायोजित करू शकतात.\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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"फोन कॉल ला अनुमती द्या"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"फोन कॉल आणि SMS ला अनुमती द्या"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"फोन कॉल चालू करा"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"फोन कॉल आणि SMS चालू करा"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"वापरकर्ता काढा"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"फोन कॉल ला अनुमती द्यायची?"</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_sms_confirm_title" msgid="188164598768941316">"फोन कॉ़ल आणि SMS ला अनुमती द्यायची?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"या वापरकर्त्याशी कॉल आणि SMS इतिहास सामायिक केला जाईल."</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="application_restrictions" msgid="8207332020898004394">"अॅप्स आणि सामग्रीला अनुमती द्या"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंध असलेले अनुप्रयोग"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"अनुप्रयोगासाठी सेटिंग्ज विस्तृत करा"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"हा अॅप प्रतिबंधित प्रोफाईलमध्ये समर्थित नाही"</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>
@@ -2302,8 +2358,8 @@
     <string name="user_image_choose_photo" msgid="7940990613897477057">"गॅलरीमधून फोटो निवडा"</string>
     <string name="user_image_photo_selector" msgid="5492565707299454873">"फोटो निवडा"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
-    <string name="sim_setup_wizard_title" msgid="1732682852692274928">"सिम कार्डे"</string>
-    <string name="sim_settings_title" msgid="6822745211458959756">"सिम कार्डे"</string>
+    <string name="sim_setup_wizard_title" msgid="1732682852692274928">"सिम कार्ड"</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">"सिम कार्डे बदलली"</string>
     <string name="sim_cards_changed_message_summary" msgid="5452545583546944683">"क्रियाकलाप सेट करण्यासाठी स्पर्श करा"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"वायफाय वाय-फाय नेटवर्क कनेक्शन"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"मजकूर संदेश मजकूर पाठविणे संदेशन"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"सेल्युलर सेल कॅरियर वायरलेस डेटा 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"वायफाय वाय-फाय कॉल कॉलिंग"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लाँचर"</string>
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रीन स्पर्श स्क्रीन"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"मंद स्क्रीन टचस्क्रीन बॅटरी"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"मंद स्क्रीन टचस्क्रीन बॅटरी"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"पार्श्वभूमी वैयक्तिकृत सानुकूल प्रदर्शन"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"गडद थीम रात्र मोड मंद स्क्रीन उलटे चमक"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"पार्श्वभूमी वैयक्तिकृत सानुकूल प्रदर्शन"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"मजकूर आकार"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"प्रोजेक्ट"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"प्रोजेक्ट कास्‍ट"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"स्थान डिस्क हार्ड ड्राइव्ह डिव्हाइस वापर"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"उर्जा वापर शुल्क"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"शब्दलेखन शब्दकोश शब्दलेखन तपासणी स्वयं-दुरुस्ती"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"खाते"</string>
     <string name="keywords_users" msgid="4673901601478559100">"प्रतिबंध प्रतिबंध करा प्रतिबंधित"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"मजकूर सुधारणा योग्य ध्वनी कंपन स्वयं भाषा जेश्चर सुचवा सूचना थीम आक्षेपार्ह शब्द प्रकार इमोजी आंतरराष्ट्रीय"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"प्राधान्ये डीफॉल्‍ट रीसेट करा"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"आणीबाणी आइस अॅप डीफॉल्ट"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"अॅप्स डाउनलोड अनुप्रयोग सिस्टीम"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"अॅप्स परवानग्या सुरक्षितता"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"अ‍ॅप्‍स डीफॉल्‍ट"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"संकेतशब्द नमुना पिन स्लाइड करा"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाय-फाय NFC टॅग सेट अप"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिहा"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"व्यत्यय"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"कॉल आणि सूचना येतात तेव्‍हा"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"नेहमी व्यत्यय आणा"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"केवळ प्राधान्य दिलेल्या व्‍यत्‍ययांना अनुमती द्या"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"व्यत्यय आणू नका"</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_option_important_interruptions" msgid="3903928008177972500">"केवळ प्राधान्य"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"केवळ अलार्म"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"कोणतेही व्यत्यय नाहीत"</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="ringtone_title" msgid="5379026328015343686">"फोन रिंगटोन"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"डिफॉल्ट सूचना रींगटोन"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल साठी कंपन देखील"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"कंपन करा"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"सूचना प्रवेश"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"अॅप्स सूचनांचे वाचन करु शकत नाहीत"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d अॅप सूचना वाचू शकतो"</item>
-    <item quantity="other" msgid="980049191810249052">"%d अॅप सूचना वाचू शकतात"</item>
-  </plurals>
+    <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="2767405417723149879">"कोणतेही सूचना श्रोते स्थापित केलेले नाहीत."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> सक्षम करायचे?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> सिस्टमद्वारे किंवा कोणत्याही स्थापित अॅपद्वारे पोस्ट केलेल्या सर्व सूचना वाचण्यात सक्षम होईल, हे आपल्याला पाठविलेल्या संपर्क नावे आणि संदेशांच्या मजकुरासारखी वैयक्तिक माहिती समाविष्ट करू शकते. हे या सूचना डिसमिस करण्यात किंवा त्यातील क्रिया बटणांना स्पर्श करण्यात देखील सक्षम होईल."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"शर्त प्रदाते"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"कोणतेही अॅप्स शर्ती प्रदान करतात"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d अॅप शर्ती प्रदान करतो"</item>
-    <item quantity="other" msgid="358057362115673258">"%d अॅप्स शर्ती प्रदान करतात"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"कोणतेही शर्ती प्रदाते स्थापित केलेले नाहीत."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> सक्षम करायचे?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"व्यत्यय आणू नका मोड मध्ये निर्गमन शर्ती जोडण्यास <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> सक्षम असेल."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अॅप्स लोड करीत आहे..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"अवरोधित करा"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"सर्व अवरोधित करा"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"या अॅपकडील सूचना कधीही दर्शवू नका"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"प्राधान्य"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"सूचना सूचीच्या शीर्षस्थानी दर्शवा आणि डिव्हाइस प्राधान्य दिलेल्या व्यत्ययांवर सेट केलेले असताना त्यांना येऊ द्या"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"संवेदनशील"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"डिव्हाइस लॉक केलेले असताना, या अॅपच्या सूचनांमधील कोणतीही संवेदशनशील सामग्री लपवा"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"प्राधान्य म्हणून हाताळा"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"व्यत्यय आणू नका प्राधान्यावर सेट केले असते केवळ तेव्हा या अ‍ॅपच्या सूचना ऐकल्या जाऊ द्या"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"डोकावून पाहण्यास अनुमती द्या"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"या अ‍ॅपला विशिष्‍ट सूचनांना थोडक्यात वर्तमान स्क्रीनवरील दृश्यामध्‍ये स्लाइड करून महत्त्व देऊ द्या"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"संवेदनशील सामग्री लपवा"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"डिव्‍हाइस लॉक केले असते तेव्हा, खाजगी माहिती कदाचित उघड करू शकणारी या अ‍ॅपच्या सूचनांमधील सामग्री लपवा"</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="zen_mode_default_option" msgid="6940069025071935243">"आपण हे बंद करेपर्यंत"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"प्राधान्य दिलेले व्यत्यय"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"कार्य न करण्याचा कालावधी"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"दिवस"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"काहीही नाही"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"व्यत्ययांना अनुमती"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"केवळ प्राधान्य"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"काहीही नाही"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"स्वयंचलन"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"स्वयंचलितपणे चालू करा"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"नियमाचे नाव"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"नियम जोडा"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"नियम हटवा"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<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="3201273040477861538">"अनुसूची नियम"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"नियम आढळला नाही."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"कधीही नाही"</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_from" msgid="1033337300289871697">"कडील कॉल/संदेश"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"कोणीही"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"केवळ संपर्क"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"केवळ तारांकित संपर्क"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"इव्हेंट आणि स्मरणपत्रे"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"अलार्म नेहमी प्राधान्य दिलेले व्‍यत्यय असतात"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"स्मरणपत्रे"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"इव्हेंट"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"निवडलेले कॉलर"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"कॉलरची पुनरावृत्ती करा"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"दुसर्‍या वेळी समान व्‍यक्ती <xliff:g id="MINUTES">%d</xliff:g> मिनिटाच्या कालावधीत कॉल करीत असल्यास, त्यास अनुमती द्या"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वयंचलितपणे चालू करा"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"कधीही नाही"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"पुढील दिवशी <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"किंवा त्यापूर्वीचा कोणताही अलार्म <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"पुढील दिवशी किंवा त्यापूर्वीचा कोणताही अलार्म <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_interruptions_voice_title" msgid="855256211259132964">"व्यत्यय"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"कॉल आणि सूचना येतात तेव्‍हा"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"आपल्‍या कामात कधी व्यत्यय आणले जाऊ शकते?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"किती वेळ?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"नेहमी व्यत्यय आणतात"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"बंद,सर्व,प्रत्येकगोष्‍ट"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"केवळ प्राधान्य दिलेल्या व्‍यत्‍ययांना अनुमती द्या"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"केवळ अलार्मना अनुमती द्या"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"व्यत्यय आणू नका"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"अनिश्‍चितपणे"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <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="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"केवळ अनिश्चितपणे प्राधान्य सूचनांवर बदला"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"अनिश्चितपणे केवळ अलार्म वर बदला"</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>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <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_no_interruptions_indefinite" msgid="5705225870569410806">"अनिश्चितपणे व्यत्यय आणू नका वर बदला"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_always" msgid="6172985102689237703">"नेहमी व्‍यत्यय आणा वर बदला"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"कायमचे"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"अॅप सूचना"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग्ज"</string>
     <string name="device_feedback" msgid="3238056036766293294">"या डिव्हाइस बद्दल अभिप्राय पाठवा"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"डीफॉल्टनुसार लाँच करा"</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="app_launch_domain_links_title" msgid="458956710410857777">"डोमेन दुवे"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"डोमेन URL उघडा"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"अ‍ॅपला डोमेन URL थेट उघडण्‍यासाठी अनुमती द्या"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"समर्थित डोमेन URL"</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="410824961149037234">"अंतर्गत मेमरी"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"बाह्य मेमरी"</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="notifications_enabled" msgid="6983396130566021385">"चालू"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"अवरोधित करा"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"संवेदनशील"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"प्राधान्य"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"प्राधान्य आणि संवेदनशील"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <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="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_3">%d</xliff:g> पैकी <xliff:g id="COUNT_2">%d</xliff:g> परवानग्यांना मंजूरी दिली</item>
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> पैकी <xliff:g id="COUNT_2">%d</xliff:g> परवानग्यांना मंजूरी दिली</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"काही डीफॉल्‍ट सेट केले"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"कोणतेही डीफॉल्ट सेट केले नाही"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"सर्व अ‍ॅप्स"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"सक्षम केले"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"वैयक्तिक"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"अवरोधित केले"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"प्राधान्य"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"संवेदनशील"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URL सह"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"प्रशासकाद्वारे अक्षम केलेले"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"प्रगत"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अॅप"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"प्रोफाईल निवडा"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"अॅप परवानग्या"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> पैकी <xliff:g id="COUNT_0">%d</xliff:g> अॅप्सना अतिरिक्त प्रवेशाची अनुमती आहे"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> पैकी <xliff:g id="COUNT_0">%d</xliff:g> अॅप्सना अनुमती आहे"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"डोमेन URL"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"कोणतीही डोमेन URL उघडू नका"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' उघडा"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' आणि संबंधित URL उघडा"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> अ‍ॅप त्याच्या डोमेन URL उघडू शकतो</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अ‍ॅप्‍स त्यांच्या डोमेन URL उघडू शकतात</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"ओळखले नाही"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"डीफॉल्ट अ‍ॅप्स"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ब्राउझर अ‍ॅप"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"कोणतेही डीफॉल्‍ट ब्राउझर नाही"</string>
+    <string name="default_app" msgid="6864503001385843060">"(डीफॉल्ट)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"अ‍ॅप्स संचयन"</string>
 </resources>
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml
index f4d49d9..910ec7d 100644
--- a/res/values-ms-rMY/arrays.xml
+++ b/res/values-ms-rMY/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Butang tekan"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"redam/nyahredam mikrofon"</item>
     <item msgid="1148142988678569310">"media projek"</item>
     <item msgid="9130014005474445273">"aktifkan VPN"</item>
+    <item msgid="1165192162975045562">"tulis kertas dinding"</item>
+    <item msgid="7129487923652967258">"bantu struktur"</item>
+    <item msgid="1069023208100114540">"bantu tangkapan skrin"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasi"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Redam/nyahredam mikrofon"</item>
     <item msgid="5906017727368097853">"Media projek"</item>
     <item msgid="2486614710846178542">"Aktifkan VPN"</item>
+    <item msgid="5586547561693629602">"Tulis kertas dinding"</item>
+    <item msgid="32794179825485062">"Bantu struktur"</item>
+    <item msgid="7872852746938272552">"Bantu tangkapan skrin"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Pendek"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"rendah"</item>
     <item msgid="4212263919458209842">"kritikal"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Mati"</item>
-    <item msgid="5656544177755411222">"Gangguan terhad"</item>
-    <item msgid="8735337502532332056">"Gangguan sifar"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Biasa"</item>
     <item msgid="866544120205026771">"Sederhana"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Merah jambu"</item>
     <item msgid="6131821495505931173">"Merah"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Protokol Pindahan Media)"</item>
+    <item msgid="8856820259201251036">"PTP (Protokol Pindahan Gambar)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet USB)"</item>
+    <item msgid="2686051673589572111">"Sumber Audio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index bddc7ab..ca3aeba 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Benarkan"</string>
     <string name="deny" msgid="6947806159746484865">"Nafikan"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Anda kini <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah daripada menjadi pemaju."</item>
-    <item quantity="other" msgid="6722953419953594148">"Anda kini <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah daripada menjadi pemaju."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Anda kini <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> langkah daripada menjadi pembangun.</item>
+      <item quantity="one">Anda kini <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> langkah daripada menjadi pembangun.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Anda kini pemaju!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, anda sudah pun menjadi pemaju."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Wayarles &amp; rangkaian"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Matikan SMS pada IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Anda perlu menghidupkan pendaftaran IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Anda perlu mematikan pendaftaran IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Hidupkan bendera yang diperuntukkan VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Matikan bendera yang diperuntukkan VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Turn on lte ram dump"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Turn off lte ram dump"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Lihat buku alamat SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Lumpuhkan profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Hal ini akan melumpuhkan:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Bersambung"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Disambungkan (tiada telefon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Disambungkan (tiada media)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Disambungkan (tiada akses mesej)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Disambungkan (tiada telefon atau media)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Diputuskan sambungan"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Memutuskan sambungan..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Menyambung..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Memasangkan..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Peranti Bluetooth tanpa nama"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Mencari"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Tiada peranti Bluetooth yang berdekatan yang ditemui."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tunjukkan fail yang diterima"</string>
     <string name="device_picker" msgid="4978696506172252813">"Pilih peranti Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan kebenaran Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Satu apl ingin menghidupkan Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Apl mahu HIDUPKAN Bluetooth untuk peranti ini."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Satu apl ingin menjadikan tablet anda kelihatan kepada peranti Bluetooth lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Satu apl ingin menjadikan telefon anda kelihatan kepada peranti Bluetooth lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Satu apl mahu menjadikan tablet anda kelihatan kepada peranti Bluetooth lain. Anda boleh menukar tetapan ini dalam tetapan Bluetooth kemudian."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kad SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Tetapan proksi"</string>
     <string name="cancel" msgid="6859253417269739139">"Batal"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"BATAL"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"TERUSKAN"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"YA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"TIDAK"</string>
-    <string name="forget" msgid="7267115980248732932">"LUPAKAN"</string>
+    <string name="forget" msgid="1400428660472591263">"Lupakan"</string>
+    <string name="save" msgid="879993180139353333">"Simpan"</string>
+    <string name="done" msgid="6942539184162713160">"Selesai"</string>
     <string name="settings_label" msgid="1626402585530130914">"Tetapan"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Tetapan"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Pintasan tetapan"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Diisih mengikut zon waktu"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tarikh"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Masa"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Tingkatkan pemadanan muka"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Pemeriksaan liveness"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Memerlukan mata berkelip semasa membuka kunci"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Kunci secara automatik"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> selepas tidur"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> selepas tidur, kecuali semasa dibiarkan tidak dikunci oleh <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Tetapkan Lokasi Saya, buka kunci skrin, kunci storan bukti kelayakan"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Kata laluan"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Cap jari"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Urus cap jari"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gunakan cap jari untuk"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Tambah"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"kunci skrin"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> cap jari didaftarkan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> cap jari didaftarkan</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Persediaan cap jari"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Untuk menggunakan cap jari anda bagi membuka kunci skrin atau mengesahkan pembelian, kami perlu: \n\n✓ Menyediakan kaedah kunci skrin sandaran \n\n✓ Menambahkan cap jari anda"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Cari penderia"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Cari penderia cap jari di bahagian belakang telefon anda."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nama"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Padam"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Mari mulakan!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Letakkan jari anda pada penderia cap jari. Angkat jari selepas merasa getaran."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Bagus! Sekarang ulang."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Letakkan jari yang sama pada penderia cap jari dan angkat jari anda selepas merasa getaran."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Cap jari ditambahkan!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Apabila anda melihat ikon ini, anda boleh menggunakan cap jari untuk pengenalan atau membenarkan pembelian."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Tambah"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seterusnya"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Penyulitan"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Sulitkan tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Sulitkan telefon"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pasangkan palam pengecas anda dan cuba lagi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Tiada PIN kunci skrin atau kata laluan"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Anda perlu menetapkan PIN atau kata laluan kunci skrin sebelum anda boleh memulakan penyulitan."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan menyulitkan peranti anda."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Sulitkan?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operasi penyegerakan ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih dan dalam masa yang sama tablet akan dimulakan semula beberapa kali."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operasi penyegerakan ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih, dalam masa yang sama fon akan dimulakan semula beberapa kali."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Leret"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Tiada keselamatan"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Buka Kunci Wajah"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Keselamatan yang rendah, percubaan"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Corak"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Keselamatan sederhana"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keselamatan sederhana ke tinggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Kata laluan"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Keselamatan tinggi"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Kunci skrin semasa"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Ciri-ciri perlindungan peranti tidak lagi berfungsi."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dlumpuhkn pentadbir, dsr penyulitan/storan klayakn"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tiada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Leret"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Buka Kunci Wajah"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Corak"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Kata laluan"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Setelah anda menyediakan kunci skrin, anda boleh menyediakan cap jari dalam Tetapan &gt; Keselamatan juga."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Matikan kunci skrin"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Alih keluar corak buka kunci"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Alih keluar PIN buka kunci"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Kata laluan mesti mengandungi sekurang-kurangnya satu huruf."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Kata laluan mesti mengandungi sekurang-kurangnya satu digit."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Kata laluan mesti mengandungi sekurang-kurangnya satu simbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf."</item>
-    <item quantity="other" msgid="8186027808415585970">"Kata laluan mesti mengandungi sekurang-kurangnya %d huruf."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf kecil."</item>
-    <item quantity="other" msgid="2693910942679679225">"Kata laluan mesti mengandungi sekurang-kurangnya %d huruf kecil."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf besar."</item>
-    <item quantity="other" msgid="3030801209112209245">"Kata laluan mesti mengandungi sekurang-kurangnya %d huruf besar."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Kata laluan mesti mengandungi sekurang-kurangnya 1 digit angka."</item>
-    <item quantity="other" msgid="4703982391407595924">"Kata laluan mesti mengandungi sekurang-kurangnya %d digit angka."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Kata laluan mesti mengandungi sekurang-kurangnya 1 simbol khas."</item>
-    <item quantity="other" msgid="1221290525051187757">"Kata laluan mesti mengandungi sekurang-kurangnya %d simbol khas."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Kata laluan mesti mengandungi sekurang-kurangnya 1 aksara bukan huruf."</item>
-    <item quantity="other" msgid="3952508584649046404">"Kata laluan mesti mengandungi sekurang-kurangnya %d aksara bukan huruf."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Kata laluan mesti mengandungi sekurang-kurangnya %d huruf.</item>
+      <item quantity="one">Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Kata laluan mesti mengandungi sekurang-kurangnya %d huruf kecil.</item>
+      <item quantity="one">Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf kecil.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Kata laluan mesti mengandungi sekurang-kurangnya %d huruf besar.</item>
+      <item quantity="one">Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf besar.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Kata laluan mesti mengandungi sekurang-kurangnya %d digit angka.</item>
+      <item quantity="one">Kata laluan mesti mengandungi sekurang-kurangnya 1 digit angka.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Kata laluan mesti mengandungi sekurang-kurangnya %d simbol khas.</item>
+      <item quantity="one">Kata laluan mesti mengandungi sekurang-kurangnya 1 simbol khas.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Kata laluan mesti mengandungi sekurang-kurangnya %d aksara bukan huruf.</item>
+      <item quantity="one">Kata laluan mesti mengandungi sekurang-kurangnya 1 aksara bukan huruf.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Pentadbir peranti tidak membenarkan menggunakan kata laluan yang baharu."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Urutan digit yang menaik, menurun atau berulang adalah dilarang"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Untuk menjadi pasangan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pastikan ia menunjukkan kunci laluan ini:&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">"Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Jadikan pasangan peranti ini?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Untuk berpasangan dengan:<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>Taip padanya:<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>, kemudian tekan Kembali atau Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Jadikan pasangan"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"JADIKAN PASANGAN"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Batal"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Berpasangan memberi anda akses kepada kenalan dan sejarah panggilan apabila disambungkan."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Tidak dapat berpasangan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Tidak dapat berpasangan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kerana PIN atau kunci laluan yang salah."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Tidak boleh berkomunikasi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Pasangan ditolak oleh <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Tidak dapat menyambung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Imbas untuk mengesan peranti"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Muatkan semula"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Lanjutan"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Lanjutan"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Peranti boleh berkomunikasi jika Bluetooth hidup."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Untuk meningkatkan ketepatan lokasi, apl dan perkhidmatan akan mengimbas untuk mengesan peranti Bluetooth, meskipun semasa Bluetooth dimatikan. Anda boleh menukarnya dalam <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tetapan pengimbasan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Sambung ke..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio media"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Pemindahan fail"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Peranti input"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Perkongsian kenalan"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Gunakan untuk perkongsian kenalan"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Perkongsian sambungan Internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Akses Mesej"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari audio bebas tangan."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari peranti input."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Gunakan untuk"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Namakan semula"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Benarkan pindahan fail masuk"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Disambungkan ke audio media"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Disambungkan ke audio telefon"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Bersambung ke pelayan pemindahan fail"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Disambungkan ke peta"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak bersambung kepada pelayan pemindahan fail"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Disambungkan ke peranti input"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Sbg ke pranti utk aks Int"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Kgsi sbgn Int dgn peranti"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gunakan untuk audio media"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gunakan untuk audio telefon"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk pemindahan fail"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gunakan untuk input"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gunakan untuk akses Internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gunakan untuk peta"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Tetapan Dok"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gunakan dok untuk audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai telefon pembesar suara"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk muzik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat tetapan"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Pembantu Wi-Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Disambungkan melalui Pembantu Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Skrin Cast"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Hantar"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Dayakan paparan wayarles"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tiada peranti berdekatan ditemui."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Menyambung"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Lupakan"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Selesai"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nama"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Benarkan pertukaran data apabila tablet menyentuh peranti lain"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Benarkan pertukaran data apabila telefon menyentuh peranti lain"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Mematikan Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Ralat"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Dalam mod Pesawat"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Tidak boleh mengimbas untuk rangkaian"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Pemberitahuan rangkaian"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Maklumkan apabila rangkaian awam tersedia"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Elakkan sambungan lemah"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Jangan gunakan rangkaian Wi-Fi melainkan jika rangkaian itu mempunyai sambungan internet yang baik"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Guna rangkaian dengan sambungan Internet yang stabil sahaja"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Imbasan sentiasa tersedia"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Sentiasa benarkan pengimbasan"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Benarkan perkhidmatan lokasi Google dan apl lain mengimbas rangkaian, walaupun semasa Wi-Fi dimatikan"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Gunakan Wi-Fi terbuka secara automatik"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Biarkan pembantu Wi-Fi menyambung scr automatik ke rangkaian tbuka yg ditentukan sbg bkualiti tinggi"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Pilih pembantu"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Pasang sijil"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, Google dan apl lain mungkin mengimbas rangkaian berhampiran walaupun semasa Wi-Fi dimatikan. Jika anda tidak mahu ini berlaku, pergi ke Terperinci &gt; Pengimbasan sentiasa tersedia."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apl mungkin mengimbas rangkaian berhampiran, walaupun semasa Wi-Fi dimatikan. Jika anda tidak mahu ini berlaku, pergi ke Terperinci &gt; Pengimbasan sentiasa tersedia."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Untuk meningkatkan ketepatan lokasi, apl dan perkhidmatan akan mengimbas untuk mengesan rangkaian Wi-Fi, meskipun semasa Wi-Fi dimatikan. Anda boleh menukarnya dalam <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tetapan pengimbasan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Jangan tunjukkan lagi"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Biarkan Wi-Fi aktif semasa tidur"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi aktif semasa tidur"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Tambah rangkaian lain"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lagi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Persediaan automatik (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Untuk melengkapkan persediaan, tablet anda memerlukan akses ke Wi-Fi. Selepas persediaan, anda boleh beralih antara data selular dan Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Pilihan terperinci"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Persediaan Wi-Fi Berkunci"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulakan WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Tekan butang Persediaan Terlindung Wi-Fi di router anda. Namanya mungkin \"WPS\" atau mengandungi simbol ini:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Tekan butang Persediaan Terlindung Wi-Fi pada penghala anda. Namanya mungkin \"WPS\" atau ditandai dengan simbol ini:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada penghala Wi-Fi anda. Persediaan ini boleh mengambil masa sehingga dua minit untuk selesai."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS berjaya. Menyambung ke rangkaian…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Disambungkan ke rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identiti tanpa nama"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Kata laluan"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Tunjukkan kata laluan"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Jalur Config AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Jalur 2.4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Jalur 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Tetapan IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(tidak berubah)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(tidak ditentukan)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Dinyahdayakan"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Kegagalan Konfigurasi IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Kegagalan Sambungan WiFi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Masalah pengesahan"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam liputan"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Tiada Akses Internet Dikesan, tidak akan menyambung secara automatik."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Masukkan kata laluan rangkaian anda"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Tiada"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Log masuk untuk menyambung?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> mahu anda log masuk sblm menyambung ke rangkaian."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"SAMBUNG"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Rangkaian ini tiada akses Internet. Gunakan rangkaian ini juga?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Jangan minta rangkaian ini lagi"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Tpt lputn Wi-Fi bgrak AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> tempat liputan Wi-Fi mudah alih"</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_mode_title" msgid="2164073796253284289">"Pilihan panggilan"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Mod panggilan Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi diutamakan"</item>
+    <item msgid="5267397515594230396">"Selular diutamakan"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Skrin Utama"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Bunyi"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Laraskan kecerahan skrin"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kecerahan mudah suai"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimumkan tahap kecerahan untuk cahaya yang tersedia"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Cerah"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Gelap"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatik"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrin dimatikan"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Kemas kini kad SIM pilihan?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> adalah satu-satunya SIM dalam peranti anda. Adakah anda ingin menggunakan SIM ini untuk data selular, panggilan dan mesej SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Kod PIN SIM tidak betul, jadi anda harus menghubungi pembawa anda untuk membuka kunci peranti."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Kod PIN SIM tidak betul. Anda mempunyai <xliff:g id="NUMBER">%d</xliff:g> percubaan lagi sebelum anda harus menghubungi pembawa anda untuk membuka kunci peranti."</item>
-    <item quantity="other" msgid="77103619544346451">"Kod PIN SIM tidak betul, anda mempunyai <xliff:g id="NUMBER">%d</xliff:g> percubaan lagi."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Kod PIN SIM salah, anda ada <xliff:g id="NUMBER_1">%d</xliff:g> cubaan lagi.</item>
+      <item quantity="one">Kod PIN SIM tidak betul. Anda ada <xliff:g id="NUMBER_0">%d</xliff:g> cubaan lagi sebelum anda harus menghubungi pembawa anda untuk membuka kunci peranti.</item>
+    </plurals>
     <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 telefon"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Tersedia (baca-sahaja)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Jumlah ruang"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Mengira..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apl (data apl &amp; kandungan media)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apl &amp; data apl"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Muat turun"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Gambar, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzik, nada dering, podcast, dll.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Pelbagai"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Fail lain"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Nyahlekap storan kongsi"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Nyahlekap kad SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Penyahlekapan sedang berlangsung"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Ruang storan semakin berkurangan"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Beberapa fungsi sistem, seperti penyegerakan, mungkin tidak berfungsi dengan betul. Cuba kosongkan ruang dengan memadam atau menyahcemat item seperti apl atau kandungan media."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Namakan semula"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Lekap"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Keluar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Padam &amp; format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Pdm &amp; format sbg strn dlmn"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Sambungan komputer USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Sambungan komputer USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Sambung sebagai"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Membolehkan anda memindahkan fail media pada Windows atau menggunakan Pemindahan Fail Android pada Mac (lihat www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Membolehkan anda memindahkan foto menggunakan perisian kamera dan memindahkan sebarang fail pada komputer yang tidak menyokong MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Pasang alat pemindahan fail"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Benarkan aplikasi didayakan MIDI berfungsi melalui USB dengan perisian MIDI pada komputer anda."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Pengguna lain"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Storan peranti"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Storan boleh tanggal"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> kosong (Jumaat <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> dilekapkan"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Tidak dapat melekapkan <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> dikeluarkan dengan selamat"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Tidak dapat mengeluarkan <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> sudah diformatkan"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Tidak dapat memformat <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Namakan semula storan"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Selepas memformat, anda boleh menggunakan <xliff:g id="NAME_0">^1</xliff:g> ini dalam peranti lain. \n\nSemua data pada <xliff:g id="NAME_1">^1</xliff:g> ini akan dipadamkan. Anda mungkin ingin membuat sandaran dahulu. \n\n"<b>"Sandarkan foto &amp; media lain"</b>" \nAlihkan fail media anda ke storan alternatif pada peranti ini atau pindahkannya ke komputer menggunakan kabel USB. \n\n"<b>"Sandarkan apl"</b>" \nSemua apl yang disimpan pada <xliff:g id="NAME_6">^1</xliff:g> ini akan dinyahpasang dan datanya akan dipadamkan. Untuk menyimpan apl ini, alihkannya ke storan alternatif pada peranti ini."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Apabila anda menanggalkan <xliff:g id="NAME_0">^1</xliff:g> ini, apl yang disimpan padanya akan berhenti berfungsi dan fail media yang disimpan padanya tidak akan tersedia sehingga storan itu dimasukkan semula."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> ini diformatkan untuk berfungsi pada peranti ini sahaja. Storan ini tidak akan berfungsi pada peranti lain."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Sediakan <xliff:g id="NAME">^1</xliff:g> anda"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gunakan sebagai storan mudah bawa"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Untuk mengalihkan foto dan media lain antara peranti."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Gunakan sebagai storan dalaman"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Untuk menyimpan apa-apa pada peranti ini sahaja, termasuk apl dan foto. Perlu diformat, tetapi storan tidak akan dapat berfungsi dengan peranti lain."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format sebagai storan dalaman"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Proses ini memerlukan <xliff:g id="NAME_0">^1</xliff:g> diformatkan supaya menjadi lebih selamat. \n\nSelepas memformatnya, <xliff:g id="NAME_1">^1</xliff:g> ini hanya akan berfungsi pada peranti ini sahaja. \n\n"<b>"Proses memformat akan memadamkan semua data yang disimpan pada <xliff:g id="NAME_2">^1</xliff:g>."</b>" Untuk mengelakkan daripada kehilangan data, sila buat sandaran."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Padam &amp; format"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Memformat <xliff:g id="NAME">^1</xliff:g>..."</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Jangan tanggalkan <xliff:g id="NAME">^1</xliff:g> semasa sedang diformat."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Alihkan data ke storan baharu"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Anda boleh mengalihkan foto, fail dan data apl ke <xliff:g id="NAME">^1</xliff:g> baharu ini. \n\nPeralihan ini mengambil masa kira-kira <xliff:g id="TIME">^2</xliff:g> dan akan mengosongkan <xliff:g id="SIZE">^3</xliff:g> pada storan dalaman. Sesetengah apl tidak akan berfungsi semasa proses ini sedang dijalankan."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Alihkan sekarang"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Alihkan kemudian"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Alihkan data sekarang"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Peralihan itu mengambil masa kira-kira <xliff:g id="TIME">^1</xliff:g>. Sebanyak <xliff:g id="SIZE">^2</xliff:g> storan dalaman akan dikosongkan."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Alih"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Mengalihkan data..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Semasa peralihan: \n• Jangan tanggalkan <xliff:g id="NAME">^1</xliff:g>. \n• Sesetengah apl tidak akan berfungsi dengan betul. \n• Pastikan peranti terus dicas."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> sudah sedia"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> anda sudah disediakan untuk digunakan dengan foto dan media lain."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> baharu anda berfungsi. \n\nUntuk mengalihkan foto, fail dan data apl ke peranti ini, pergi ke Tetapan &gt; Storan."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Alihkan <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Mengalihkan <xliff:g id="APP">^1</xliff:g> dan datanya ke <xliff:g id="NAME_0">^2</xliff:g> akan mengambil sedikit masa sahaja. Anda tidak akan dapat menggunakan apl sehinga peralihan selesai. \n\nJangan tanggalkan <xliff:g id="NAME_1">^2</xliff:g> semasa peralihan."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Mengalihkan <xliff:g id="APP">^1</xliff:g>..."</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Jangan tanggalkan <xliff:g id="NAME">^1</xliff:g> semasa peralihan. \n\nApl <xliff:g id="APP">^2</xliff:g> pada peranti ini tidak akan tersedia sehingga peralihan selesai."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Batalkan peralihan"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status bateri"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Aras bateri"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Memulihkan tetapan lalai APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Tetapkan semula kepada lalai"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penetapan semula tetapan lalai APN selesai."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Tetapan rangkaian sudah ditetapkan semula"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Langkah ini akan menetapkan semula semua tetapan rangkaian, termasuk:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data selular"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Tetapkan semula tetapan"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Tetapkan semula semua tetapan rangkaian? Anda tidak boleh membuat asal tindakan ini!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Tetapkan semula tetapan"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Tetapkan semula?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Tetapan rangkaian telah ditetapkan semula"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Tetapkan semula peranti"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Tetapan semula data kilang"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Memadamkan semua data pada tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Memadamkan semua data pada telefon"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"Ini akan memadamkan semua data dari "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Padamkan semua data pada kad SD, seperti muzik atau foto"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tetapkan semula tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Tetapkan semula telefon"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Padamkan semua maklumat peribadi anda dan aplikasi yang dimuat turun? Anda tidak boleh menterbalikkan tindakan ini!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Padamkan semua maklumat peribadi anda dan aplikasi yang dimuat turun? Anda tidak boleh membuat asal tindakan ini!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Padamkan semua"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan tetapan semula data kilang."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Tiada penetapan semula dijalankan kerana perkhidmatan Padam Bersih Sistem tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Tetapkan semula?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tetapan semula kilang tidak tersedia untuk pengguna ini"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Padamkan storan USB, memadamkan semua fail yang disimpan di sana? Anda tidak boleh menterbalikkan tindakan ini!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Padamkan kad SD, turut memadamkan semua fail yang tersimpan padanya? Anda tidak boleh menterbalikkan tindakan ini!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Padamkan semua"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Anda perlu melukis corak buka kunci anda untuk mengesahkan bahawa anda mahu memadamkan storan USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Anda perlu melukis corak buka kunci anda untuk mengesahkan bahawa anda mahu memadamkan kad SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Tetapan panggilan"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Tetapkan mel suara, pemajuan panggilan, panggilan menunggu, ID pemanggil"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Penambatan USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Rangkaian selular"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Pelan mudah alih"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Apl SMS lalai"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Apl SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Tukar apl SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gunakan <xliff:g id="NEW_APP">%1$s</xliff:g> bukannya <xliff:g id="CURRENT_APP">%2$s</xliff:g> sebagai apl SMS anda?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> sebagai apl SMS anda?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mod lokasi"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gunakan GPS, Wi-Fi dan rangkaian selular untuk menentukan lokasi"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gunakan Wi-Fi dan rangkaian selular untuk menentukan lokasi"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gunakan GPS untuk menentukan lokasi anda"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gunakan GPS untuk menentukan lokasi"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Mengimbas"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Mengimbas"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Pengimbasan Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Tingkatkan lokasi dengan membenarkan apl dan perkhidmatan mengimbas untuk mengesan rangkaian Wi‑Fi meskipun semasa Wi‑Fi dimatikan"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Pengimbasan Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Tingkatkan lokasi dengan membenarkan perkhidmatan sistem mengimbas untuk mengesan peranti Bluetooth, meskipun semasa Bluetooth dimatikan"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasi Wi-Fi &amp; selular"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Biar apl guna perkhidmatan lokasi Google utk anggar lokasi lebih cepat. Data lokasi tanpa nama dikumpul dan dihantar kpd Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokasi ditentukan oleh Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Kata laluan sudah ditetapkan"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN belum ditetapkan"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Corak sudah ditetapkan"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Keselamatan skrin"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Gunakan corak peranti anda untuk meneruskan."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Masukkan PIN peranti anda untuk meneruskan."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Masukkan kata laluan peranti anda untuk meneruskan."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Keselamatan peranti"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Tukar corak buka kunci"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Tukar PIN buka kunci"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Sahkan corak yang disimpan"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Cuba lagi:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Lukis corak buka kunci"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tekan Menu untuk mendapatkan bantuan."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Alihkan jari apabila selesai"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Tetapkan corak buka kunci"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Tukar corak buka kunci"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cara melukis corak buka kunci"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Terlalu banyak percubaan yang salah!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Cuba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> saat."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Terlalu banyak percubaan yang salah. Cuba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> saat."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikasi tidak dipasang pada telefon anda."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Urus aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Urus dan alih keluar aplikasi yang dipasang"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Isih mengikut saiz"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Tnjk prkhdmtn sdg dijlnkn"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Tunjuk proses yg dicache"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Apl kecemasan"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Tetapkan semula pilihan apl"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Tetapkan semula pilihan app?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ini akan menetapkan semula semua pilihan untuk:\n\n "<li>"Apl dilumpuhkan"</li>\n" "<li>"Pemberitahuan apl dilumpuhkan"</li>\n" "<li>"Aplikasi lalai untuk tindakan"</li>\n" "<li>"Sekatan data latar belakang untuk apl"</li>\n" "<li>"Sebarang sekatan kebenaran"</li>\n\n" Anda tidak akan kehilangan apa-apa data apl."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Pengendalian apl"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Dijalankan"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Tidak pernah digunakan)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Tiada Apl lalai."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan storan"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Lihat storan yang digunakan oleh aplikasi"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Perkhidmatan dijalankan"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Maklumat tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Maklumat telefon"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Maklumat bateri"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Lancar cepat"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Tetapkan pintasan papan kekunci untuk melancarkan aplikasi"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Tetapkan aplikasi"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Tiada pintasan"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Cari + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Padam bersih"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Pintasan anda untuk <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) akan dipadam bersih."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Batal"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplikasi"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Pintasan"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Input teks"</string>
     <string name="input_method" msgid="5434026103176856164">"Kaedah input"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Papan Kekunci Semasa"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth dalam fail"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Pembukaan kunci OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Benarkan pemuat but untuk dibuka kunci"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Masukkan PIN anda"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Masukkan PIN peranti anda untuk mendayakan buka kunci OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Benarkan pembukaan kunci OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AMARAN: Ciri perlindungan peranti tidak akan berfungsi pada peranti ini semasa tetapan ini dihidupkan."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Saiz penimbal pengelog"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pilih saiz Pengelog per pnmbal log"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Benarkan lokasi olokan"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Benarkan lokasi olokan"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Dayakan pemeriksaan atribut paparan"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Perangkaian"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Pensijilan paparan wayarles"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Dayakan Pengelogan Berjela-jela Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Penyerahan Wi-Fi ke Selular agresif"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Sentiasa benarkan Imbasan Perayauan Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Gunakan pelanggan DHCP lama"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Tunjukkan pilihan untuk pensijilan paparan wayarles"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Tingkatkan tahap pengelogan Wi-Fi, tunjuk setiap SSID RSSI dalam Pemilih Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Apabila diaktifkan, Wi-Fi akan menjadi lebih agresif dalam menyerahkan sambungan data ke Selular, apabila isyarat Wi-Fi rendah"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Benarkan/Jangan benarkan Imbasan Perayauan Wi-Fi berdasarkan jumlah trafik data yang ada pada antara muka"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Saiz penimbal pengelog"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pilih saiz Pengelog per pnmbal log"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Pilih Konfigurasi USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Pilih Konfigurasi USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Benarkan lokasi olokan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Benarkan lokasi olokan"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Dayakan pemeriksaan atribut paparan"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gunakan pelanggan DHCP daripada Lollipop bukannya pelanggan DHCP Android baharu."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Benarkan penyahpepijatan USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Penyahpepijatan USB adalah dimaksudkan untuk tujuan pembangunan sahaja. Gunakannya untuk menyalin data antara komputer dan peranti anda, memasang aplikasi pada peranti anda tanpa pemberitahuan, dan membaca data log."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Batalkan akses ke penyahpepijatan USB dari semua komputer yang anda berikan kebenaran sebelum ini?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Oleh sebab apl melindungi permintaan kebenaran, Tetapan tidak dapat mengesahkan jawapan anda."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jika anda menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g>, peranti anda tidak akan menggunakan kunci skrin anda untuk meningkatkan penyulitan data."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Oleh sebab anda telah menghidupkan perkhidmatan kebolehaksesan, peranti anda tidak akan menggunakan kunci skrin anda untuk meningkatkan penyulitan data."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Oleh kerana menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g> mempengaruhi penyulitan data, anda perlu mengesahkan corak anda."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistik Proses"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistik skema tentang proses yang sedang berjalan"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Penggunaan memori"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apl mengikut <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> daripada <xliff:g id="TOTALRAM">%2$s</xliff:g> digunakan sepanjang <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Latar Belakang"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Latar Depan"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Dicache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memori peranti kini adalah <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Purata penggunaan RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Penggunaan RAM maksimum"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"OS Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Asli"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Inti"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Cache"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Penggunaan RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Penggunaan RAM (latar belakang)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Masa berjalan"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Proses"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Perkhidmatan"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tempoh"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Butiran memori"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 jam"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 hari"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Tunjukkan sistem"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Sembunyikan sistem"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gunakan Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Jenis statistik"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Latar Belakang"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Tetapan lalai di bawah ini mengatasi tetapan aplikasi"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Tetapan lalai"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Enjin lalai"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Menetapkan enjin sintesis pertuturan untuk digunakan bagi teks pertuturan"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Tetapkan enjin sintesis pertuturan untuk digunakan bagi teks tuturan"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Kadar pertuturan"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kelajuan pertuturan teks"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pic"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Bersandarkan perkakasan"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Perisian sahaja"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Bukti kelayakan tidak tersedia untuk pengguna ini"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan pemasangan bukti kelayakan."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Sandarkan data saya"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sandarkan data apl, kata laluan Wi-Fi dan tetapan lain ke pelayan Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Sandarkan akaun"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Tiada akaun yang sedang menyimpan data sandaran buat masa ini"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Masukkan data apl"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan automatik"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Apabila memasang semula aplikasi, pulihkan tetapan dan data yang disandarkan"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Perkhidmatan sandaran tidak aktif."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ini ditetapkan oleh dasar peranti anda."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kata laluan sandaran komputer meja"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Sandaran penuh meja komputer tidak dilindungi pada masa ini"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh untuk menukar atau mengalih keluar kata laluan untuk sandaran penuh komputer meja"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animasi peralihan"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala tempoh juruanimasi"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulasikan paparan kedua"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Mod berbilang tetingkap"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Berbilang aktiviti pada skrin dalam masa yang sama."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Dayakan mod berbilang tetingkap?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"AMARAN: Ciri ini ialah ciri percubaan tinggi yang membenarkan berbilang aktiviti pada skrin dalam masa yang sama melalui UI Apl baru-baru ini. Sesetengah apl mungkin ranap atau tidak berfungsi dengan betul semasa digunakan dengan ciri ini."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikasi"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Jangan simpan aktiviti"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Musnahkn setiap aktviti slps pengguna mengglkannya"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Pengguna"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil terhad"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Tambah pengguna baharu?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Anda boleh berkongsi peranti ini dengan orang lain dengan membuat pengguna tambahan Setiap pengguna mempunyai ruang mereka sendiri, yang boleh diperibadikan dengan kertas dinding mereka sendiri dan sebagainya Pengguna juga boleh melaraskan tetapan peranti seperti Wi-Fi yang akan memberi kesan kepada semua orang.\n\nApabila anda menambah pengguna baharu, orang itu perlu menyediakan ruang mereka.\n\nMana-mana pengguna boleh mengemas kini apl untuk semua pengguna lain."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Anda boleh berkongsi peranti ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna mempunyai ruang mereka sendiri, yang boleh diperibadikan dengan apl, kertas dinding dan sebagainya. Pengguna turut boleh melaraskan tetapan peranti seperti Wi-Fi yang akan memberi kesan kepada semua orang.\n\nApabila anda menambahkan pengguna baharu, orang itu perlu menyediakan ruang mereka.\n\nMana-mana pengguna boleh mengemas kini apl untuk semua pengguna lain."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Apabila anda menambah pengguna baharu, orang itu perlu menyediakan ruang mereka.\n\nMana-mana pengguna boleh mengemas kini apl untuk semua pengguna lain."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Sediakan pengguna sekarang?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Pastikan orang itu tersedia untuk mengambil peranti dan menyediakan ruangan"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Alih keluar tetamu?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Semua apl dan data dalam sesi ini akan dipadam."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Alih keluar"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Benarkan panggilan telefon"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Benarkan panggilan telefon dan SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Hidupkan panggilan telefon"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Hidupkan panggilan telefon &amp; SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Alih keluar pengguna"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Benarkan panggilan telefon?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Hidupkan panggilan telefon?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Sejarah panggilan akan dikongsi dengan pengguna ini."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Benarkan panggilan telefon dan SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Sejarah panggilan dan SMS akan dikongsi dengan pengguna ini."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Hidupkan panggilan telefon &amp; SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Sejarah panggilan dan SMS akan dikongsi dengan pengguna ini."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Benarkan apl dan kandungan"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan sekatan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Kembangkn tetapan utk aplikasi"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"NAMAKAN SEMULA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Tetapkan sekatan apl"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Dikawal oleh <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Apl ini tidak disokong dalam profil yang disekat"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Apl ini boleh mengakses akaun anda"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Apl ini boleh mengakses akaun anda. Dikawal oleh <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi dan Mudah Alih"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Benarkan pengubahsuaian tetapan Wi-Fi dan Mudah Alih"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sambungan rangkaian"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mesej teks menghantar mesej mesej pemesejan"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"selular sel pembawa data wayarles 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi panggil panggilan"</string>
     <string name="keywords_home" msgid="3626170808219458848">"pelancar"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skrin skrin sentuh"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"skrin malap skrin sentuh bateri"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"skrin malap skrin sentuh bateri"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"latar belakang peribadikan suaikan paparan"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tema gelap mod malam malapkan skrin terbalikkan kecerahan"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"latar belakang peribadikan suaikan paparan"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"saiz teks"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projek"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"tayangkan kandungan yang dihantar"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ruang cakera pemacu keras peranti penggunaan"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"caj penggunaan kuasa"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ejaan kamus penyemak ejaan pembetulan auto"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"akaun"</string>
     <string name="keywords_users" msgid="4673901601478559100">"sekatan sekat terhad"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"pembetulan teks betul bunyi getaran auto bahasa gerak isyarat cadang cadangan tema perkataan mengganggu taip emoji antarabangsa"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"tetapan semula pilihan lalai"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"apl ais kecemasan lalai"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"app muat turun aplikasi sistem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"keselamatan kebenaran apl"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apl lalai"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"luncur kata laluan corak pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sediakan Teg NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Kelantangan penggera"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Kelantangan deringan"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Kelantangan pemberitahuan"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Gangguan"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Apabila panggilan dan pemberitahuan tiba"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Sentiasa ganggu"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Benarkan gangguan keutamaan sahaja"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Jangan ganggu"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Benarkan keutamaan sahaja"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Peraturan automatik"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Keutamaan sahaja"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Penggera sahaja"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Tiada gangguan"</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="ringtone_title" msgid="5379026328015343686">"Nada dering telefon"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Nada dering pemberitahuan lalai"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Juga bergetar untuk panggilan"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Bergetar"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Akses pemberitahuan"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apl tidak boleh membaca pemberitahuan"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d apl boleh membaca pemberitahuan"</item>
-    <item quantity="other" msgid="980049191810249052">"%d apl boleh membaca pemberitahuan"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d apl boleh membaca pemberitahuan</item>
+      <item quantity="one">%d apl boleh membaca pemberitahuan</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Tiada pendengar pemberitahuan dipasang."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Dayakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> akan dapat membaca semua pemberitahuan yang disiarkan oleh sistem atau mana-mana apl yang dipasang, yang mungkin termasuk maklumat peribadi seperti nama kenalan dan teks dalam mesej yang dihantar kepada anda. Pendengar juga akan dapat mengetepikan pemberitahuan ini atau menyentuh butang tindakan dalam pemberitahuan itu."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Pembekal keadaan"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Tiada apl yang menyediakan keadaan"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d apl menyediakan keadaan"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apl menyediakan keadaan"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Tiada pembekal keadaan dipasang."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Dayakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> akan dapat menambahkan keadaan keluar kepada mod Jangan Ganggu."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuatkan apl..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Sekat"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Sekat semua"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Jangan sekali-kali paparkan pemberitahuan dari apl ini"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Keutamaan"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Paparkan pemberitahuan di bahagian atas senarai dan pastikan pemberitahuan tetap dipaparkan apabila peranti ditetapkan kepada gangguan keutamaan sahaja"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensitif"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Apabila peranti dikunci, sembunyikan sebarang kandungan yang sensitif daripada pemberitahuan apl ini"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Anggap sebagai perkara penting"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Benarkan pemberitahuan apl ini kedengaran apabila Jangan ganggu ditetapkan kepada Perkara penting sahaja"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Benarkan mengintai"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Benarkan apl ini menekankan pemberitahuan tertentu dengan meluncurkan pemberitahuan agar kelihatan seketika pada skrin semasa"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Sembunyikan kandungan sensitif"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Apabila peranti dikunci, sembunyikan kandungan dalam pemberitahuan apl ini yang mungkin mendedahkan maklumat peribadi"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Disekat"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Keutamaan"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitif"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Selesai"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Sehingga anda matikan"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Gangguan keutamaan"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Waktu gendala"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dari"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Tiada"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Gangguan yang dibenarkan"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Keutamaan sahaja"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Tiada"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automasi"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Hidupkan secara automatik"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nama peraturan"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Tambahkan peraturan"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Padam peraturan"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Padam peraturan \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Padam"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Jenis peraturan"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Tidak diketahui"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Peraturan konfigurasi"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Peraturan jadual"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Peraturan tidak ditemui."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Hari"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Tiada"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Setiap hari"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Tidak pernah"</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> hingga <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Panggilan"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesej"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Panggilan/mesej daripada"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Sesiapa sahaja"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Kenalan sahaja"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kenalan dibintangkan sahaja"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Acara dan peringatan"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Penggera sentiasa menjadi gangguan keutamaan"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Penggera"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Peringatan"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Pemanggil dipilih"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ulang pemanggil"</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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Malam hari bekerja"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Masa mula"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Masa tamat"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari seterusnya"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> atau sebarang penggera sebelumnya"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari seterusnya atau sebarang penggera sebelumnya"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari seterusnya"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Gangguan"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Apabila panggilan dan pemberitahuan tiba"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Bilakah anda ingin diganggu?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Untuk berapa lama?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Sentiasa ganggu"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"mati,semua,segala-galanya"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Benarkan gangguan utama sahaja"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Benarkan penggera sahaja"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Jangan ganggu"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Selama-lamanya"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minit</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minit</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> jam</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> jam</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Tukar kepada pemberitahuan keutamaan sahaja selama-lamanya"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Tukar kepada pemberitahuan utama hanya untuk <xliff:g id="DURATION">%1$d</xliff:g> minit sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Tukar kepada pemberitahuan utama hanya untuk satu minit sehingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Tukar kepada pemberitahuan utama hanya untuk <xliff:g id="DURATION">%1$d</xliff:g> jam (sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Tukar kepada pemberitahuan utama hanya untuk satu jam sehingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Tukar kepada penggera sahaja selama-lamanya"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Tukar kepada penggera hanya untuk <xliff:g id="DURATION">%1$d</xliff:g> minit (sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Tukar kepada penggera hanya untuk satu minit sehingga <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">Tukar kepada penggera hanya untuk <xliff:g id="DURATION">%1$d</xliff:g> jam sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Tukar kepada penggera hanya untuk satu jam sehingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Tukar kepada jangan ganggu selama-lamanya"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Tukar kepada jangan ganggu selama <xliff:g id="DURATION">%1$d</xliff:g> minit (sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Tukar kepada jangan ganggu selama satu minit sehingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Tukar kepada jangan ganggu selama <xliff:g id="DURATION">%1$d</xliff:g> jam sehingga <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Tukar kepada jangan ganggu selama satu jam sehingga <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Tukar kepada sentiasa ganggu"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"selamanya"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Hntr mklm balas mngenai peranti ini"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Maklumat IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Maklumat 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="2184141780491382435">"Lancarkan secara lalai"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> digunakan dalam <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Pautan domain"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Buka URL Domain"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Benarkan apl untuk terus membuka URL Domain"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL domain yang disokong"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Lalai yang lain"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> digunakan dalam <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"memori dalaman"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"memori luaran"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Storan dalaman"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Storan luaran"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Penggunaan data apl"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> dgunakn sejak <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Storan yang digunakan"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Dihidupkan"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Sekat"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensitif"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Keutamaan"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Keutamaan &amp; Sensitif"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kebenaran diberikan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kebenaran diberikan</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> daripada <xliff:g id="COUNT_3">%d</xliff:g> kebenaran diberikan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> daripada <xliff:g id="COUNT_1">%d</xliff:g> kebenaran diberikan</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Beberapa lalai ditetapkan"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Tiada lalai ditetapkan"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Semua apl"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Didayakan"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Peribadi"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Kerja"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Disekat"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Keutamaan"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitif"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Dengan URL domain"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Dilumpuhkan oleh pentadbir"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Terperinci"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Apl tidak diketahui"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Kebenaran apl"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> daripada <xliff:g id="COUNT_1">%d</xliff:g> apl yang diberikan akses tambahan"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> daripada <xliff:g id="COUNT_1">%d</xliff:g> apl yang dibenarkan"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL Domain"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Jangan buka mana-mana URL domain"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Buka \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Buka \'<xliff:g id="DOMAIN">%s</xliff:g>\' dan URL yang berkaitan"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apl boleh membuka URL domain apl itu</item>
+      <item quantity="one">Satu apl boleh membuka URL domain apl itu</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Tidak dikenali"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Apl Lalai"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Apl penyemak imbas"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Tiada Penyemak Imbas lalai"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Lalai)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Storan apl"</string>
 </resources>
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my-rMM/arrays.xml
index a043eec..83dafc8 100644
--- a/res/values-my-rMM/arrays.xml
+++ b/res/values-my-rMM/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"နှိပ်ရန်ခလုတ်"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"မိုက်ခရိုဖုန်း အသံတိတ်/မတိတ်ရန်"</item>
     <item msgid="1148142988678569310">"ပရိုဂျက် မီဒီယာ"</item>
     <item msgid="9130014005474445273">"VPN ကို စဖွင့်သုံးရန်"</item>
+    <item msgid="1165192162975045562">"နောက်ခံကိုရေးပါ"</item>
+    <item msgid="7129487923652967258">"ဖွဲ့စည်းပုံကိုကူညီရန်"</item>
+    <item msgid="1069023208100114540">"ဖန်သားပြင်ရိုက်ကွက်အားကူညီရန်"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"တည်နေရာ"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"မိုက်ခရိုဖုန်း အသံတိတ်/မတိတ်ရန်"</item>
     <item msgid="5906017727368097853">"ပရိုဂျက် မီဒီယာ"</item>
     <item msgid="2486614710846178542">"VPN ကို စဖွင့်သုံးရန်"</item>
+    <item msgid="5586547561693629602">"နောက်ခံရေးပါ"</item>
+    <item msgid="32794179825485062">"ဖွဲ့စည်းပုံကိုကူညီရန်"</item>
+    <item msgid="7872852746938272552">"ဖန်သားပြင်ရိုက်ကွက်အားကူညီရန်"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"အတို"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"နည်းနေသည်"</item>
     <item msgid="4212263919458209842">"စိုးရိမ်ရသည်"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ပိတ်"</item>
-    <item msgid="5656544177755411222">"ကန့်သတ်ချက်ရှိသော အ​နှောင့်အယှက်များ"</item>
-    <item msgid="8735337502532332056">"အနှောင့်အယှက်မရှိ"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ပုံမှန်"</item>
     <item msgid="866544120205026771">"အတော်အသင့်"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"ပန်းရောင်"</item>
     <item msgid="6131821495505931173">"အနီ"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (မီဒီယာ လွှဲပြောင်းမှု ပရိုတိုကော)"</item>
+    <item msgid="8856820259201251036">"PTP (ပုံ လွှဲပြောင်းမှု ပရိုတိုကော)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB အီသာနက်)"</item>
+    <item msgid="2686051673589572111">"အသံ ရင်းမြစ်"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 7b044a3..6bfdf64 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"ခွင့်ပြုပါ"</string>
     <string name="deny" msgid="6947806159746484865">"ငြင်းပယ်ခြင်း"</string>
     <string name="device_info_default" msgid="7847265875578739287">"အကြောင်းအရာ မသိရှိ"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"သင်သည် အခုဆိုရင် တည်ဆောက်သူတယောက်ဖြစ်ဖို့ <xliff:g id="STEP_COUNT">%1$d</xliff:g> အဆင့် လိုသေးသည်"</item>
-    <item quantity="other" msgid="6722953419953594148">"သင်သည် အခုဆိုရင် တည်ဆောက်သူတယောက်ဖြစ်ဖို့ <xliff:g id="STEP_COUNT">%1$d</xliff:g> အဆင့် လိုသေးသည်"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">သင်သည် ယခု ဆောဖ့်ဝဲရေးသားသူထံမှ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> အဆင့်အကွာအဝေးတွင် ရှိနေပါသည်။</item>
+      <item quantity="one">သင်သည် ယခု ဆောဖ့်ဝဲရေးသားသူထံမှ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> အဆင့် အကွာအဝေးတွင်ရှိနေပါသည်။</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"သင်ဟာ ယခု တည်ဆောက်သူတစ်ယောက် ဖြစ်နေပါပြီ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"မလိုတော့ပါ။ သင်သည် တည်ဆောက်သူတစ်ယောက် ဖြစ်နေပြီ ဖြစ်သည်။"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ကြိုးမဲ့ &amp; ကွန်ရက်များ"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"SMS over IMSကိုပိတ်ခြင်း"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMSစာရင်းသွင်းခြင်းဖွင့်ထားရန် လိုအပ်သည်"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMSစာရင်းသွင်းခြင်း လိုအပ်မှုကို ပိတ်မည်"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE ထောက်ပံ့ထားသည့် flag ဖွင့်ရန်"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Turn off VoLTE provisioned flag"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram dumpအားဖွင့်ရန်"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram dumpအားပိတ်ရန်"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIMကဒ်မှ လိပ်စာစာအုပ်ကို ကြည့်ရန်"</string>
@@ -135,16 +137,7 @@
     <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;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"ချိတ်ဆက်ထားပြီး"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ချိတ်ဆက်ထားပြီး (ဖုန်းမရှိ)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ချိတ်ဆက်ထားပြီး (မီဒီယာမရှိ)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"ချိတ်ဆက်မိသည် (သတင်းရယူမှုမရှိ)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ချိတ်ဆက်ပြီး (ဖုန်း သို့ မီဒီယာမဟုတ်ပါ)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ချိတ်ဆက်မှုပြတ်တောက်သည်"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"အဆက်အသွယ်ဖြတ်တောက်သည်"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"ချိတ်ဆက်နေသည်"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"တွဲချိတ်ပါ"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"အမည်မသိသောဘလူးတုသ်စက်"</string>
     <string name="progress_scanning" msgid="192587958424295789">"ရှာဖွေနေသည်…"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"အနီးအနားတွင် မည်သည့်ဘလူးတုသ်စက်မှမရှိပါ"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ရရှိသောဖိုင်များကို ပြရန်"</string>
     <string name="device_picker" msgid="4978696506172252813">"ဘလူးတုသ် စက်ကိရိယာကို ရွေးပါ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"ဘလူးတုသ်ခွင့်ပြုချက်တောင်းခံသည်"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"အပလီကေးရှင်းတစ်ခုမှ ဘလူးတုသ် ဖွင့်လိုသည်။"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"app တစ်ခုက ဒီကိရိယာ အတွက် ဘလူးတုသ်ကို ဖွင့်ပေး လိုသည်။"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"အပလီကေးရှင်းတစ်ခုမှ သင်၏တက်ဘလက်ကို အခြားဘလူးတုသ်ပစ္စည်းများမှ <xliff:g id="TIMEOUT">%1$d</xliff:g> စက္ကန့် မြင်အောင် လုပ်လိုသည်။"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"အပလီကေးရှင်းတစ်ခုမှ သင်၏ ဖုန်းကို အခြားဘလူးတုသ်ပစ္စည်းများမှ <xliff:g id="TIMEOUT">%1$d</xliff:g> စက္ကန့်ကြာစွာ မြင်အောင် လုပ်လိုသည်။"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"အပလီကေးရှင်းတစ်ခုမှ သင်၏ တက်ဘလက်ကို အခြား ဘလူးတုသ်ပစ္စည်းများမှ မြင်အောင် လုပ်လိုသည်။ သင် နောက်ပိုင်းတွင် ဘလူးတုသ်ဆက်တင်တွင် ပြန်လည် ပြင်ဆင်နိုင်သည်။"</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ထားတော့"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ဆက်လုပ်ရန်"</string>
     <string name="okay" msgid="1997666393121016642">"အိုကေ"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"လုပ်မည်"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"မလုပ်"</string>
-    <string name="forget" msgid="7267115980248732932">"မေ့ပစ်လိုက်"</string>
+    <string name="forget" msgid="1400428660472591263">"မေ့ပစ်ရန်"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"တထပ်တည်းကျသောမျက်နှာ စစ်ဆေးခြင်း တိုးတက်အောင်ပြုလုပ်ရန်"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"လှုပ်ရှားမှု ရှိမရှိ စစ်ဆေးရန်"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"သော့ဖွင့်စဉ် မျက်တောင်ခတ်ရန် လိုအပ်သည်"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"စကားဝှက်များ"</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="3453670509485083962">"ထည့်ရန်"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ဖုန်းမျက်နှာပြင်အား သော့ချရန်"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"လက်ဗွေရာကို တပ်ဆင်ရန်"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"သင့် ဖန်မျက်နှာပြင်အား သော့ဖွင့်ရန် သို့မဟုတ် ဝယ်ယူမှုများ အတည်ပြုရန် စသည်တို့တွင် သင့် လက်ဗွေရာကို သုံးရန်အတွက်၊ ကျွန်ုပ်တို့ အောက်ပါတို့ကို ပြုလုပ်ရန်လိုသည်-  \n\n✓ သင့် အရံသိမ်းဆည်း ဖန်မျက်နှာပြင် သော့ခတ်နည်းအား သတ်မှတ်ပါ  \n\n✓ သင့် လက်ဗွေရာ ထည့်ပါ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"အာရုံခံကိရိယာ ရှာရန်"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"လက်ဗွေရာ အာရုံခံကိရိယာအား သင့်ဖုန်း၏ကျောဘက်တွင် နေရာချပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"စတင်ကြစို့!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"သင့်လက်ချောင်းကို လက်ဗွေဖတ်ကိရိယာပေါ်တွင် ထားပါ။ တုန်ခါမှုကိုခံစားရသည်နှင့် လွတ်လိုက်ပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"ကောင်းပါသည်! အခုပြန်လုပ်ပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"တူညီသည့် လက်ချောင်းကို လက်ဗွေဖတ်ကိရိယာပေါ်တွင် ထားပြီး တုန်ခါမှုကိုခံစားရသည်နှင့် လွတ်လိုက်ပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"လက်ဗွေရာကို ထည့်ပြီးပါပြီ!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ဤကိုယ်စားပြုရုပ်ပုံကို သင်တွေ့တိုင်း၊  သက်သေခံခြင်းအတွက်သို့မဟုတ် ဝယ်ယူခြင်းကို ခွင့်ပြုရန်အတွက် သင့်လက်ဗွေရာကို အသုံးပြုနိုင်ပါသည်။"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"ထည့်ရန်"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"နောက်တစ်ခု"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"သင်သည် သင်၏ ကိရိယာ လျှို့ဝှက်ကုဒ်သွင်းမှကို အတည်ပြုရန် သင်၏ သော့ဖွင့်ရေး ဇယားပုံစံကိ ရွေးဆွဲပေးရန် လိုအပ်သည်။"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"လျှို့ဝှက်အသွင်ပြောင်းမည်လား ?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းလုပ်ငန်းစဉ်သည် နောက်ကြောင်းပြန်လှည့်၍ မရနိုင်သောကြောင့် သင်ကြားဖြတ်နှောင့်ယှက်မိပါက အချက်အလက်များ ဆုံးရှုံးမည်ဖြစ်သည်။ လျှို့ဝှက်အသွင်ပြောင်းခြင်းသည် ၁နာရီ သို့ ၎င်းထက်ပိုကြာနိုင်ပြီး ၎င်းအချိန်အတွင်း တက်ဘလက်သည် ကြိမ်ဖန်များစွာ အစမှ ပြန်စလိမ့်မည်။"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းလုပ်ငန်းစဉ်သည် နောက်ကြောင်းပြန်လှည့်၍ မရနိုင်သောကြောင့် သင်ကြားဖြတ်နှောင့်ယှက်မိပါက အချက်အလက်များ ဆုံးရှုံးမည်ဖြစ်သည်။ လျှို့ဝှက်အသွင်ပြောင်းခြင်းသည် ၁နာရီ သို့ ၎င်းထက်ပိုကြာနိုင်ပြီး ၎င်းအချိန်အတွင်း ဖုန်းသည် ကြိမ်ဖန်များစွာ အစမှ ပြန်စလိမ့်မည်။"</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"မျက်နှာမှတ် သော့ဖွင့်ခြင်း"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"လုံခြုံမှုနည်းသည်၊ စမ်းသတ်မှုသာ"</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>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"လျို့ဝှက် နံပါတ်"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"လုံခြုံရေး မြင့်မည်"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"လက်ရှိမျက်နှာပြင် သော့ချခြင်း"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"စက်ကိရိယာကာကွယ်ရေးအင်္ဂါရပ်များ အလုပ်လုပ်မည် မဟုတ်ပါ။"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"အက်မင်၊ ပေါ်လစီ သို့ ယုံကြည်သောအကောင့်မှ ပိတ်ထားသည်"</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_biometric_weak" msgid="3008473624490350142">"မျက်နှာမှတ် သော့ဖွင့်ခြင်း"</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="7579210814842056547">"ဖုန်းမျက်နှာပြင်လော့ချမှုစလုပ်သည့်အခါ ပြင်ဆင်ရွေးချယ်ရေးနှင့်လုံခြံရေးတွင် သင့်လက်ဗွေဖြင့်လည်းလော့ချနိုင်သည်။"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"မျက်နှာပြင်သော့ပိတ်မည်"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ဖွင့်ရန်ပုံဖော်မှုအား ဖယ်ရှားမည်"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"သော့ဖွင့်ရန်ပင်နံပါတ်အား ဖယ်ရှားမည်"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"စကားဝှက်တွင် အနည်းဆုံး စာလုံး ၁လုံး ပါရမည်။"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"စကားဝှက်တွင် အနည်းဆုံး ဂဏန်း ၁လုံး ပါရမည်။"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"စကားဝှက်တွင် အနည်းဆုံး သင်္ကေတအက္ခရာ ၁လုံး ပါရမည်။"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"စကားဝှက်တွင် အနည်းဆုံး စာလုံး ၁လုံး ပါရမည်။"</item>
-    <item quantity="other" msgid="8186027808415585970">"စကားဝှက်တွင် အနည်းဆုံး စာလုံး %dလုံး ပါရမည်။"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"စကားဝှက်တွင် အင်္ဂလိပ်စာလုံးအသေး အနည်းဆုံး ၁လုံးပါရမည်။"</item>
-    <item quantity="other" msgid="2693910942679679225">"စကားဝှက်တွင် အင်္ဂလိပ်စာလုံးအသေး အနည်းဆုံး %d လုံးပါရမည်။"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"စကားဝှက်တွင် အင်္ဂလိပ်စာလုံးအကြီး အနည်းဆုံး ၁လုံးပါရမည်။"</item>
-    <item quantity="other" msgid="3030801209112209245">"စကားဝှက်တွင် အင်္ဂလိပ်စာလုံးအကြီး အနည်းဆုံး  %d လုံး ပါရမည်။"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"စကားဝှက်တွင် အနည်းဆုံး ဂဏန်း ၁လုံး ပါရမည်။"</item>
-    <item quantity="other" msgid="4703982391407595924">"စကားဝှက်တွင် ဂဏန်း အနည်းဆုံး %d  လုံးပါရမည်။"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"စကားဝှက်တွင် အထူးပြုသင်္ကေတ အနည်းဆုံး ၁ လုံးပါရမည်။"</item>
-    <item quantity="other" msgid="1221290525051187757">"စကားဝှက်တွင် အထူးပြုသင်္ကေတ အနည်းဆုံး %d  လုံးပါရမည်။"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"စကားဝှက်တွင် စာလုံးမဟုတ်သော အက္ခရာ အနည်းဆုံး ၁လုံးပါရမည်။"</item>
-    <item quantity="other" msgid="3952508584649046404">"စကားဝှက်တွင် စာလုံးမဟုတ်သော အက္ခရာ အနည်းဆုံး %d လုံးပါရမည်။"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">စကားဝှက်တွင် အနည်းဆုံး စာလုံး %d ပါရမည်။</item>
+      <item quantity="one">စကားဝှက်တွင် အနည်းဆုံး စာလုံး 1 လုံး ပါရမည်။</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">စကားဝှက်တွင် အင်္ဂလိပ်စာလုံးအသေး အနည်းဆုံး %d လုံးပါရမည်။</item>
+      <item quantity="one">စကားဝှက်တွင် အင်္ဂလိပ်စာလုံးအသေး အနည်းဆုံး 1 လုံးပါရမည်။</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">စကားဝှက်တွင် အင်္ဂလိပ်စာလုံးအကြီး အနည်းဆုံး %d လုံးပါရမည်။</item>
+      <item quantity="one">စကားဝှက်တွင် အင်္ဂလိပ်စာလုံးအကြီး အနည်းဆုံး 1 လုံးပါရမည်။</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">စကားဝှက်တွင် အနည်းဆုံး ဂဏန်း %d လုံး ပါရမည်။</item>
+      <item quantity="one">စကားဝှက်တွင် အနည်းဆုံး ဂဏန်း 1 လုံး ပါရမည်။</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">စကားဝှက်တွင် အထူးပြုသင်္ကေတ အနည်းဆုံး %d လုံးပါရမည်။ </item>
+      <item quantity="one">စကားဝှက်တွင် အထူးပြုသင်္ကေတ အနည်းဆုံး 1 လုံးပါရမည်။ </item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">စကားဝှက်တွင် စာလုံးမဟုတ်သည့်အက္ခရာ အနည်းဆုံး %d လုံးပါရမည်။</item>
+      <item quantity="one">စကားဝှက်တွင် စာလုံးမဟုတ်သည့်အက္ခရာ အနည်းဆုံး 1 လုံးပါရမည်။</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"စက်ပစ္စည်း အက်ဒ်မင်မှ လတ်တလောသုံးသောစကားဝှက်ကို ခွင့်မပြုပါ။"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"၈ဏန်းမျာကို အငယ်မှအကြီးသို့၊ အကြီးမှအငယ်သို့ သို့မဟုတ် ထပ်တလဲလဲ အစီအစဉ်ကို တားမြစ်ထား"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ကောင်းပြီ"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"အတူတွဲပါ"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ချိတ်တွဲရန်"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ထားတော့"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"ချိတ်တွဲမှုက ချိတ်ဆက်ထားလျှင် သင်၏ အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်းကို ရယူခွင့် ပြုသည်။"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ပင်နံပါတ် သို့မဟုတ် ဖြတ်သန်းခွင့်ကီးမမှန်ကန်သောကြောင့်<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ။"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့်ဆက်သွယ်မရပါ"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့်တွဲချိတ်ရန် ပယ်ချခံရသည်"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"တည်နေရာ မှန်ကန်မှု တိုးတက်စေရန်၊ အပ်ဖ်များနှင့် ဝန်ဆောင်မှုများသည် ဘလူးတုသ်ပိတ်ထားလျှင်တောင် ဘလူးတုသ်စက်ပစ္စည်းများကို ရှာဖွေပါလိမ့်မည်။ ၎င်းကိုသင် <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_specific_profiles_title" msgid="6952214406025825164">"ကိုချိတ်ဆက်ရန်"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"မီဒီယာ အသံ"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ဖုန်းအသံ"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ဖိုင်လွဲပြောင်းခြင်း"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ထည့်သွင်းသော စက်"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"အင်တာနက်ချိတ်ဆက်ခြင်း"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"အဆက်အသွယ်ကို မျှဝေရန်"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"အဆက်အသွယ်ကို မျှဝေရန် အတွက် သုံးရန်"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"အင်တာနက်ဆက်သွယ်မှု မျှဝေခြင်း"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"သတင်းရယူမှု"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"မီဒီယာအသံအား ချိတ်ဆက်ရန်"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ဖုန်းအသံအား ချိတ်ဆက်ရန်"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ဖိုင်လွှဲပြောင်းမည့်ဆာဗာနှင့် ချိတ်ဆက်ထားပြီး"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"မြေပုံနှင့် ချိတ်ဆက်ရန်"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ဖိုင်လွှဲပြောင်းမည့်ဆာဗာနှင့် ချိတ်ဆက်မထားပါ"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ထည့်သွင်းထားသောစက်ကို ချိတ်ဆက်မည်"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"မီဒီယာအသံအတွက်အသုံးပြုရန်"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ဖုန်းအသံအားအသုံးပြုရန်"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ဖိုင်လွဲပြောင်းရန်အတွက်အသုံးပြုရန်"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ထည့်သွင်းရန်အသုံးပြုသည်"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"အင်တာနက်ချိတ်ဆက်ရန်အသုံးပြုသည်"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"မြေပုံအတွက်သုံးရန်"</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_assistant_title" msgid="2553267316621598101">"ကြိုးမဲ့ ကူညီပေးသူ"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"ကြိုးမဲ့ကူညီသူမှတဆင့် ချိတ်ဆက်၏"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"အရိပ်ထင်မျက်နှာပြင်"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"ဝိုင်ဖိုင်ပိတ်နေသည် …"</string>
     <string name="wifi_error" msgid="3207971103917128179">"အမှား"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"လေယာဉ်ပျံပေါ်သုံးစနစ်"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ကွန်ယက်များကို စကင်မလုပ်နိုင်ပါ"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ကွန်ယက်မှအကြောင်းကြားချက်"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"အများပြည်သူ ကွန်ရက် ရနိုင်တိုင်းမှာ အကြောင်းကြားပေးရန်"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"အားနည်းသော ချိတ်ဆက်မှုများကို ရှောင်ကြဉ်ရန်"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"ကောင်းမွန်သော အင်တာနက် ချိတ်ဆက်မှု မရှိသော ဝိုင်ဖိုင်ကွန်ရက်အား မသုံးပါနှင့်"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"အင်တာနက် ချိတ်ဆက်မှု ကောင်းသည့် ကွန်ရက်များကိုသာ အသုံးပြုရန်"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"စကင်န်လုပ်ခြင်း အမြဲတန်းရနိုင်ရန်"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"စကင်လုပ်မှုကို အမြဲတမ်း ခွင့်ပြုရန်"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"ကြိုးမဲ့ကို ပိတ်ထားချိန် မှာတောင်၊ Google တည်နေရာ ၀န်ဆောင်မှု နှင့် အခြား appများက ကွန်ရက်များကို ရှာကြည့်ပါစေ"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ပွင့်လင်း ကြိုးမဲ့အင်တာနက် အလိုအလျောက် အသုံးပြုမည်"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"အရည်အသွေးမြင့်သည်ဟု သတ်မှတ်ထားသည့် ပွင့်လင်းကွန်ရက်များသို့  ကြိုးမဲ့ကူပေးသူမှ အလိုအလျောက် ချိတ်ဆက်စေပါ။"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"အကူ ရွေးချယ်ပါ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"အသိအမှတ်ပြုလက်မှတ်များထည့်သွင်းရန်"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"တည်နေရာ တိကျမှုနှင့် အခြားရည်ရွယ်ချက်များ ပိုကောင်းလာစေရန် ဝိုင်ဖိုင်ကို ပိတ်ထားချိန်မှာပင်လျှင် ဂူးဂယ်နှင့် တခြား အပလီကေးရှင်းများသည် အနီးနားမှ ကွန်ရက်များကို ရှာဖွေနိုင်သည်။ ထိုသို့ မဖြစ်စေချင်လျှင် အဆင့်မြင့်သို့ သွားပြီး &gt; ရှာဖွေမှုအမြဲရနိုင်ရန်"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"ဝိုင်ဖိုင်ပိတ်ထားချိန်မှာပင်လျှင် အပလီကေးရှင်းများသည် အနီးနားမှ ကွန်ရက်များကို ရှာဖွေလိမ့်မည်။ ထိုသို့ မဖြစ်စေချင်လျှင် အဆင့်မြင့်သို့ သွားပြီး &gt; ရှာဖွေမှုအမြဲရနိုင်ရန်"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"တည်နေရာ မှန်ကန်မှု တိုးတက်စေရန်၊ အပ်ဖ်များနှင့် ဝန်ဆောင်မှုများသည် ဝိုင်ဖိုင်ပိတ်ထားလျှင်တောင် ဝိုင်ဖိုင်ကွန်ရက်များကို ရှာဖွေပါလိမ့်မည်၊ ၎င်းကိုသင် <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="5340097010842405981">"နောက်ထပ်မပြပါနှင့်"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"စက်နားနေစဉ် ဝိုင်ဖိုင်ဖွင့်ထားပါ"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"စက်နားနေစဉ် ကြိုးမဲ့ ဖွင့်ထားရန်"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"အခြား ကွန်ရက်တစ်ခု သုံးရန်"</string>
     <string name="wifi_more" msgid="3195296805089107950">"နောက်ထပ်"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"အလိုအလျောက် အစီအမံ (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"စဖွင့်သတ်မှတ်မှု ပြီးဆုံးရန် သင်၏ တက်ဘလက်သည် ကြိုးမဲ့ကို အသုံးပြုရန်လိုသည်။ စဖွင့်သတ်မှတ်မှု နောက်မှာ သင်သည် ကြိုးမဲ့ နှင့် မိုဘိုင်း ဒေတာ အကြားမှာ ပြောင်းသုံးနိုင်သည်။"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"အဆင့်မြင့် ရွေးစရာများ"</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="5940801028985255304">"ရောက်တာပေါ်မှ ဝိုင်ဖိုင် ကာကွယ်ရေး အစီအမံခလုတ်ကို နှိပ်လိုက်ပါ။ \"WPS\" ဟုခေါ်ပါသည် (သို့) ဤသင်္ကေတ ပါရှိပါသည်:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"သင့်၏ကွန်ပျူတာသို့အချက်အလက်ပို့သောစက်ပေါ်မှ Wi-Fi ကာကွယ်ရေးစီမံခလုတ်ကို နှိပ်ပါ။ ၄င်းကို WPS ဟုခေါ်ပါသည်။(သို့)ဤသင်္ကေတပါရှိသည်။"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"သင်၏ ၀ိုင်ဖိုင်ရောက်တာတွင် ပင်နံပါတ် <xliff:g id="NUMBER">%1$s</xliff:g> ထည့်ပါ။ ဤအစီအမံများပြီးရန် ၂ မိနစ်ခန့်အထိ ကြာနိုင်သည်။"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS ရရှိထားပြီ။ ကွန်ရက်ကို ဆက်သွယ်နေသည်…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"ဝိုင်ဖိုင်ကွန်ရက် <xliff:g id="NETWORK_NAME">%s</xliff:g> သို့ချိတ်ဆက်မိပြီ"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"Config 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 ဆက်တင်များ"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ပြောင်းလဲခြင်းမရှိ)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(သတ်မှတ်ထားခြင်းမရှိ)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"သိမ်းဆည်းပြီး"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"သုံးမရအောင် ပိတ်ထားသည်"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP ပြုပြင်ခြင်း မအောင်မြင်ပါ"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi ချိတ်ဆက်မှု မအောင်မြင်ပါ"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"စစ်မှန်ကြောင်းအတည်ပြုရန်၌ ပြသနာရှိခြင်း"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"စက်ကွင်းထဲတွင် မဟုတ်ပါ"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"မည်သည့် အင်တာနက်မျှမရှိပါ၊ အလိုအလျောက် ပြန်လည်မချိတ်ဆက်ပါ။"</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_security_none" msgid="7985461072596594400">"တစ်ခုမှမဟုတ်ပါ"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"ဤကွန်ယက်တွင် အင်တာနက်ဝင်ရောက်သုံးခွင့် မရှိပါ။ မည်သို့ပင်ဖြစ်စေ ဤကွန်ယက်အား သုံးမည်လား?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ဤကွန်ယက်အား ထပ်မံမေးမြန်းခြင်း မပြုရန်"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ချိတ်ဆက်ရန်"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ကွန်ရက်ကို ချိတ်ဆက်ရန် မအောင်မြင်ခဲ့ပါ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"မေ့ပစ်ရန်"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"အန်ဒရွိုက်AP WPA2 PSK ခရီးဆောင် ကြိုးမဲ့ ဟော့စပေါ့"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<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">"ဝိုင်ဖိုင် ခေါ်ဆိုမှု"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"ခေါ်ဆိုရန် ရွေးချယ်မှု"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"ဝိုင်ဖိုင်ဖြင့် ခေါ်ဆိုသောမုဒ်"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"ဝိုင်ဖိုင်အား ပိုနှစ်သက်သော"</item>
+    <item msgid="5267397515594230396">"ဆယ်လူလာအား ပိုနှစ်သက်သော"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"၂"</item>
+    <item msgid="1171822231056612021">"၁"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"သင့်ရွေးချယ်မှု သိုမ့ဟုတ်  စစ်ဂနယ် အားရှိမှုပေါ် မူတည်လျှက်၊ ဝိုင်ဖိုင်ခေါ်ဆိုမှု ဖွင့်ထားပါက၊ သင့်ဖုန်းသည် ဝိုင်ဖိုင်ကွန်ယက်များ သို့မဟုတ် သင့် မိုဘိုင်းဝန်ဆောင်မှုဌာန၏ ကွန်ယက်မှတဆင့် ခေါ်ဆိုမှုများအား ပေးပို့နိုင်သည်။ ဤလုပ်ဆောင်နိုင်ချက်အား မဖွင့်မီ၊ ကျသင့်ငွေနှင့် အခြားအသေးစိတ်များအတွက် သင့် မိုဘိုင်းဝန်ဆောင်မှုဌာနအား မေးမြန်းပါ။"</string>
     <string name="home_settings" msgid="212375129455718176">"ပင်မ​စာ​မျက်နှာ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ဖန်သားပြင်"</string>
     <string name="sound_settings" msgid="5534671337768745343">"အသံ"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"အပြင်အဆင်"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"မီး"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"အမှောင်"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"အလိုအလျောက်"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"ထိုSIM ကဒ် အဆင့်မြှင့်လိုသလား?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> သည် သင့်ကိရိယာတွင်းရှိ တစ်ခုတည်းသော SIM ကဒ်ဖြစ်သည်။ ဆယ်လူလာ ဒေတာ၊ ဖုန်းခေါ်ရန်နှင့် SMS စာတိုများပို့ရန်အတွက် ဤSIM ကဒ်အား သုံးလိုပါသလား?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ဆင်းမ်ကဒ်၏ လျှို့ဝှက်နံပါတ် မှားနေပါသည်၊ သင်၏ စက်ပစ္စည်းကို သော့ဖွင့်ရန် ဖုန်းလိုင်းဌာနသို့ ဆက်သွယ်ရမည် ဖြစ်ပါတယ်"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"ဆင်းမ်ကဒ်၏ လျှို့ဝှက်နံပါတ် မှားနေပါသည်၊ သင်၏ စက်ပစ္စည်းကို သော့ဖွင့်ရန်  ဖုန်းလိုင်းဌာနသို့ မဆက်သွယ်မီ သင့်တွင် <xliff:g id="NUMBER">%d</xliff:g> ခါ ကြိုးစားခွင့် ကျန်ပါသေးသည်။"</item>
-    <item quantity="other" msgid="77103619544346451">"ဆင်းမ်ကဒ်၏ လျှို့ဝှက်နံပါတ် မှားနေပါသည်၊ သင့်တွင် <xliff:g id="NUMBER">%d</xliff:g> ခါ ကြိုးစားခွင့် ကျန်ပါသေးသည်။"</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">ဆင်းမ်ကဒ်၏ ပင်နံပါတ် မှားနေပါသည်၊ သင့်တွင် <xliff:g id="NUMBER_1">%d</xliff:g> ခါ ကြိုးစားခွင့် ကျန်ပါသေးသည်။</item>
+      <item quantity="one">ဆင်းမ်ကဒ်၏ ပင်နံပါတ် မှားနေပါသည်၊ သင့်ကိရိယာကို ဖွင့်ရန်  မိုဘိုင်းဖုန်းဆက်သွယ်ရေးဝန်ဆောင်မှုဌာနသို့ မဆက်သွယ်မီ သင့်တွင် <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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"အပလီကေးရှင်းများ(အပလီကေးရှင်းဒေတာ &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_media_misc_usage" msgid="235452944021647124">"အသေးအဖွဲများ"</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="default" msgid="6915293408836853020">"SDကဒ်အားအထိုင်မှဖြုတ်ခြင်း"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"တပ်ဆင်ရန်"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ထုတ်ရန်"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"ဖျက်ရန် &amp; ဖိုင်ပြန်စီရန်"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ဖျက်&amp; သိုလှောင်မှုအဖြစ်ဖိုင်စီ"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB ကွန်ပြုတာချိတ်ဆက်မှု"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB ကွန်ပြုတာချိတ်ဆက်မှု"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"အနေဖြင့်ဆက်သွယ်ရန်"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"ဝင်းဒိုးထဲရှိမီဒီယာဖိုင်များကို လွှဲပြောင်းခြင်း သို့မဟုတ်မက်ခ်ထဲရှိAndroidဖိုင်လွှဲပြောင်းကို အသုံးပြုမည် (www.android.com/filetransferကို ကြည့်ပါ)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"ကင်မရာ (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"ကင်မရာဆော့ဖ်ဝဲကိုအသုံးပြုကာ သင့်ဓာတ်ပုံများကိုလွှဲပြောင်းပြီး MTPမှအကူအညီမရသော သင့်ကွန်ပြုတာမှမည်သည့်ဖိုင်များကိုမဆို လွှဲပြောင်းမည်"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ဖိုင်ရွှေ့ခြင်းကိရိယာကို ထည့်သွင်းမည်"</string>
+    <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_external_title" msgid="2723851748972673696">"ဖြုတ်၍ရသည့် သိုလှောင်မှု"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> အလွတ် (စုစုပေါင်း <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ကိုတပ်ဆင်ထားသည်"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> အားဖိုင်ပြန်မစီနိုင်ပါ"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"သိုလှောင်မှုကို အမည်​ပြောင်းမည်"</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="3677827796634199714"><b>"<xliff:g id="NAME_0">^1</xliff:g> ကိုသင်ထုတ်လိုက်လျှင်၊ ၎င်းပေါ်တွင်သိုလှောင်ထားသည့် အပ်ဖ်များသည် အလုပ်လုပ်တော့မည်မဟုတ်ဘဲ ၎င်းပေါ်တွင် သိုလှောင်ထားသည့် မီဒီယာဖိုင်များလည်း ၎င်းကိုပြန် မထည့်မချင်းရနိုင်တော့မည်မဟုတ်ပါ။ "</b>" \n\n<xliff:g id="NAME_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_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_next" msgid="2774557300531702572">"ဖျက်မည် &amp; ပုံစံချမည်"</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="1259216693690378749">"ပုံစံချနေစဉ်တွင် <xliff:g id="NAME">^1</xliff:g> ကိုအဖယ်ရှားပါနှင့်။"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ဒေတာကို သိုလှောင်မှုအသစ်သို့ ရွှေ့မည်"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"သင့်ပုံများ၊ ဖိုင်များနှင့် အပ်ဖ်ဒေတာများကို ဤ <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="5035719146373359329"><b>"ရွှေ့လျားမှုသည် <xliff:g id="TIME">^1</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="8641916179067596592">"ရွှေ့နေစဉ်: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ရွှေ့မည်"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"ရွှေ့လျားနေစဉ် <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="battery_status_title" msgid="9159414319574976203">"ဘက်ထရီအခြေအနေ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ဘက်ထရီ အားအဆင့်"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"ကွန်ရက် ချိန်ညှိမှုများ ပြန်လည်သတ်မှတ်ရန်"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"၎င်းသည် :\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="4874737348054213767">"ကွန်ရက်ချိန်ညှိချက်များအားလုံးပြန်လည်သတ်မှတ်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍ မရပါ!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ချိန်ညှိချက်များ ပြန်လည်သတ်မှတ်ရန်"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ပြန်လည်စတင်ရန် ပြုလုပ်မလား?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"ကွန်ရက်ချိန်ညှိချက်များ ပြန်လည်သတ်မှတ်ပြီးပါပြီ"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"ကိရိယာ ပြန်ညှိရန်"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"စက်ရုံထုတ်အခြေအနေပြန်ယူခြင်း"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"တက်ပလက်ထဲရှိဒေတာအားလုံးအားဖျက်မည်"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"ဖုန်းထဲရှိဒေတာအားလုံးအားဖျက်မည်"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ဤသည်မှာ သင့်တက်ဘလက်ထဲရှိ"<b></b>"သင့်ဂူးဂဲလ်အကောင့်\n\n"<li>"စနစ်နှင့် အပ်ပလီကေးရှင်းဒေတာနှင့် ဆက်တင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အပ်ပလီကေးရှင်း"</li>"iအပါအဝင်\n"<li>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</li>"များကို ဖျက်ပါလိမ့်မည်"</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ဤသည်မှာ သင့်ဖုန်းထဲရှိ\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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SDကဒ်ထဲရှိ သီချင်းသို့မဟုတ် ဓါတ်ပုံကဲ့သို့ ဒေတာအားလုံးအား ဖျက်ရန်"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"တက်ဘလက်ကို အစမှပြန်လည်စတင်စေရန်"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ဖုန်းကို အစမှပြန်လည်စတင်စေရန်"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"သင့်ကိုယ်ပိုင်အချက်အလက်များနှင့် ဒေါင်းလုပ်ပြုလုပ်ထားသောအပလီကေးရှင်းများကို ဖျက်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍မရပါ"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"သင့်ကိုယ်ပိုင်အချက်အလက်များနှင့် ဒေါင်းလုပ်ပြုလုပ်ထားသောအပလီကေးရှင်းများကို ဖျက်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍မရပါ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"အားလုံးကိုဖျက်ရန်"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"စက်ရုံထုတ်အခြေအနေအစသို့ ပြန်ရောက်ရန် သော့ဖွင့်သည့်ပုံစံကို ဆွဲပြီး အတည်ပြုရန် လိုအပ်သည်။"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"စနစ်အားရှင်းလင်းခြင်းဝန်ဆောင်မှုမရှိသောကြောင့် အစမှပြန်လည်စတင်နိုင်ခြင်းအားမပြုလုပ်နိုင်ပါ"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ပြန်လည်စတင်ရန် ပြုလုပ်မလား?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ဤအသုံးပြုသူအတွက် စက်ရုံပြန်လည် သတ်မှတ်မှု မရပါ"</string>
@@ -1044,8 +1085,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USBသိမ်းဆည်းသည့်ကဒ်ထဲရှိသိမ်းထားသောဖိုင်အားလုံးကိုဖျက်မည်လား။ ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်ခြင်း မပြုနိုင်ပါ။"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SDကဒ်ထဲရှိသိမ်းထားသောဖိုင်အားလုံးကိုဖျက်မည်လား။ ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်ခြင်း မပြုနိုင်ပါ။"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"အားလုံးကိုဖျက်ရန်"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"ယူအက်စ်ဘီ သိုလှောင်မှုကို ဖျက်လိုလျှင် သော့ဖွင့်သည့်ပုံစံကို ဆွဲပြီး အတည်ပြုရန် လိုအပ်သည်။"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SDကဒ်ကို ဖျက်ပစ်ရန် သော့ဖွင့်သည့်ပုံစံကို ဆွဲပြီး အတည်ပြုရန် လိုအပ်သည်။"</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>
@@ -1077,7 +1116,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"အကူအညီ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"ဆယ်လူလာ ကွန်ရက်များ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"မိုဘိုင်းလ်အစီအစဉ်"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"စာတိုပို့ရန်သုံး အပလီကေးရှင်း"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS အပ်ဖ်"</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_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> ကို သင်၏စာတိုပို့ရန် အပလီကေးရှင်းအဖြစ် သုံးမည်လား ?"</string>
@@ -1105,7 +1144,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"တည်နေရာပြစနစ်"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"တည်နေရာကို ဆုံးဖြတ်ရန် GPS၊ ကြိုးမဲ့ နှင့် ဆယ်လူလာ ကွန်ရက်များကို သုံးရန်"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"တည်နေရာကို ဆုံးဖြတ်ရန် ကြိုးမဲ့ နှင့် ဆယ်လူလာ ကွန်ရက်များကို သုံးရန်"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"တည်နေရာကို ဆုံးဖြတ်ရန် ဂျီပီအက်စ်ကို သုံးပါ။"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"တည်နေရာကို ဆုံးဖြတ်ရန် ဂျီပီအက်စ်ကို သုံးပါ။"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"သေချာစစ်ဆေးနေပါသည်။"</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="2070686681074461301">"ဝိုင်ဖိုင်ပိတ်ထားလျှင်တောင် အပ်ဖ်များနှင့် ဝန်ဆောင်မှုများကို ဝိုင်ဖိုင်ကွန်ရက်များအား ရှာဖွေစေခြင်းဖြင့် တည်နေရာကို တိုးတက်စေပါ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ဘလူးတုသ်ရှာဖွေနေသည်"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ဘလူးတုသ်ပိတ်ထားလျှင်တောင် ဘလူးတုသ်စက်ပစ္စည်းများကို စနစ်ဝန်ဆောင်မှုအား ရှာဖွေခွင့်ပေးခြင်းဖြင့် တည်နေရာကို တိုးတက်စေမည်"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ကြိုးမဲ့ &amp; ဆယ်လူလာ ကွန်ရက် တည်နေရာ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"သင့်တည်နေရာကို ခန့်မှန်းရာတွင် ပိုမြန်စေရန် အပလီကေးရှင်းကို ဂူဂယ်လ်၏ တည်နေရာဝန်ဆောင်မှု အသုံးပြုပါစေ။ အမည်မသိ တည်နေရာ အချက်အလက်များကို စု၍ ဂူဂဲလ်သို့ ပို့ပေးပါမည်။"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ဝိုင်ဖိုင်မှ ဆုံးဖြတ်သော တည်နေရာ"</string>
@@ -1151,11 +1196,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"မျက်နှာပြင်လုံခြုံရေး"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ရှေ့ဆက်ရန် သင့်စက်ပစ္စည်းပုံစံကို အသုံးပြုပါ။"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ရှေ့ဆက်ရန် သင့်စက်ပစ္စည်း ပင်ကုဒ်နံပါတ်ရိုက်ထည့်ပါ။"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ရှေ့ဆက်ရန် သင့်စက်ပစ္စည်းစကားဝှက်ကို ရိုက်ထည့်ပါ။"</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_need_to_unlock" msgid="757935356911054465">"သိမ်းဆည်းသောပုံဖော်မှုကို အတည်ပြုမည်"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"ပြန်ကြိုးစားပါ"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"သော့ဖွင့်သော ပုံဖော်မှုကို ဆွဲပါ"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"အကူအညီရယူရန် Menuကိုနှိပ်ပါ"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ပြီးဆုံးလျှင် လက်ချောင်းကို လွှတ်လိုက်ပါ။"</string>
@@ -1177,8 +1226,7 @@
     <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_header" msgid="819903817323783498">"အကြိမ်ရေများစွာ မှားယွင်းပြီးဖွင့်ရန် ကြိုးစားခြင်း"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> စက္ကန့်အကြာတွင် ပြန်ကြိုးစားပါ"</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="manageapplications_settings_title" msgid="7041951105633616745">"အပ်ပလီကေးရှင်းများအား စီမံခြင်း"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ထည့်သွင်းထားသောအပ်ပလီကေးရှင်းများကို စီမံခြင်းနှင့် ဖယ်ခြင်း"</string>
@@ -1229,6 +1277,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"အရွယ်အစားအလိုက် စီရန်"</string>
     <string name="show_running_services" msgid="5736278767975544570">"လုပ်နေသောဆားဗစ်များပြရန်"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"cachedလုပ်ငန်းများပြသရန်"</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>
@@ -1300,6 +1349,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"အသုံးပြုနေသောသိုလှောင်မှု"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"အပလီကေးရှင်းများမှအသုံးပြုသော သိုလှောင်မှုကို ကြည့်ရန်။"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"အလုပ်လုပ်နေသောဝန်ဆောင်မှုများ"</string>
@@ -1397,17 +1447,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"တက်ဘလက်အကြောင်း"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ဖုန်းအကြောင်း"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"ဘက်ထရီအကြောင်း"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"အမြန်ဖွင့်ရန်"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"အပလီကေးရှင်းများဖွင့်ရန် ကီးဘုတ်အတိုကောက်အားသတ်မှတ်မည်"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"အပလီကေးရှင်းကို တာဝန်ပေးမည်"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"အတိုကောက် မရှိပါ"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"ရှာဖွေခြင်း + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"ရှင်းလင်းရန်"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)အတွက်သင့်အတိုကောက်ကို ပယ်ဖျက်ပါမည်"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ကောင်းပြီ"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ထားတော့"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"အပလီကေးရှင်းများ"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"အတိုကောက်များ"</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>
@@ -1442,23 +1481,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ဘလူးတုသ် HCI အစုလိုက်များကို ဖိုင်တစ်ခုတွင် ဖမ်းယူရန်"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM သော့ဖွင့်ခြင်း"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"အစပြုခြင်းကိရိယာအား သော့ဖွင့်ရန် ခွင့်ပြုမည်"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"သင့်ပင်နံပါတ် ရိုက်ထည့်ပါ"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM သော့ဖွင့်ခြင်း အသုံးပြုရန် သင့်ကိရိယာ ပင်နံပါတ်ရိုက်ထည့်ပါ။"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM သော့ဖွင့်ခြင်း ခွင့်ပြုမလား?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"သတိပေးချက်: ဤချိန်ညှိချက်ဖွင့်ထားလျှင်၊ ဤစက်ပစ္စည်းပေါ်တွင် စက်ပစ္စည်းကာကွယ်သည့် အထူးပြုလုပ်ချက် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"လော့ဂါး ဘာဖား ဆိုက်များ"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"လော့ ဘာဖားတွက် လော့ဂါးဆိုက် ရွေး"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"အရည်အချင်းများ စူးစမ်းမှု မြင်ကွင်းကို ဖွင့်ပေးရန်"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ကွန်ရက်လုပ်ငန်း"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ကြိုးမဲ့ပြသမှု အသိအမှတ်ပြုလက်မှတ်"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi Verbose မှတ်တမ်းတင်ခြင်းအား ဖွင့်မည်"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ထိရောက်သည့် Wi‑Fi မှ ဆယ်လူလာ လွှဲပြောင်းမှု"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi ရွမ်းရှာဖွေမှုကို အမြဲတမ်း ခွင့်ပြုမည်"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"DHCP ကလိုင်းယင့် အဟောင်းအားသုံးရန်"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ကြိုးမဲ့ အခင်းအကျင်း အသိအမှတ်ပြုလက်မှတ်အတွက် ရွေးချယ်စရာများပြရန်"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi မှတ်တမ်းတင်ခြင်း နှုန်းအားမြင့်ကာ၊ Wi‑Fi ရွေးရာတွင် SSID RSSI ဖြင့်ပြပါ"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ဖွင့်ထားလျှင်၊ Wi‑Fi မှ ဆယ်လူလာသို့ အချက်လက် ချိတ်ဆက်မှုအား လွှဲပြောင်းရာ၌ ပိုမိုထိရောက်ပါသည်၊ WIFI အားနည်းနေချိန်တွင်"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"မျက်နှာပြင်တွင် ဖော်ပြသည့် အချက်လက် အသွားအလာ ပမာဏပေါ်တွင် အခြေခံ၍ WIFI ရွမ်းရှာဖွေမှုအား ဖွင့်/ပိတ်မည်"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"လော့ဂါး ဘာဖား ဆိုက်များ"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"လော့ ဘာဖားတွက် လော့ဂါးဆိုက် ရွေး"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB စီစဉ်ဖွဲ့စည်းမှု ရွေးရန်"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB စီစဉ်ဖွဲ့စည်းမှု ရွေးရန်"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"အရည်အချင်းများ စူးစမ်းမှု မြင်ကွင်းကို ဖွင့်ပေးရန်"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Android DHCP ကလိုင်းယင့် အသစ် အစား Lollipop မှ DHCP ကလိုင်းယင့်အား သုံးပါ။"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB ပြသနာရှာခြင်း ခွင့်ပြုပါမလား?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USBအမှားရှားခြင်းမှာ ဆော့ဝဲလ်ရေးသားရန်အတွက်သာ ရည်ရွယ်ပါသည်။ သင့်ကွန်ပြုတာနှင့်သင့်စက်ကြားတွင် ဒေတာများကိုကူးယူရန်၊ အကြောင်းမကြားပဲနှင့် သင့်စက်အတွင်းသို့ အပလီကေးရှင်းများထည့်သွင်းခြင်းနှင့် ဒေတာမှတ်တမ်းများဖတ်ရန်အတွက် အသုံးပြုပါ"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"သင် ယခင်က ခွင့်ပြုခဲ့သော ကွန်ပျူတာအားလုံးမှ ယူအက်စ်ဘီ အမှားစစ်ခွင့်ကို ရုတ်သိမ်းမည်လား ?"</string>
@@ -1562,6 +1609,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"ပန်းခရမ်း"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>ကိုသုံးမည်လား?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> လိုအပ်သည်မှာ :"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"အပလီကေးရှင်းသည် ခွင့်ပြုချက်တောင်းခံမှုကို ပိတ်လိုက်ခြင်းကြောင့်၊ သင့်တုန့်ပြန်မှုကို အချိန်ညှိချက်များ အတည်မပြုနိုင်ပါ။"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"သင် ဖွင့်လိုက်လျှင် <xliff:g id="SERVICE">%1$s</xliff:g>၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"သင်က ရယူသုံးစွဲရန် ဝန်ဆောင်မှုကို ဖွင့်ထား၍ ၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် ရေးဆွဲပုံစံဖြင့် အတည်ပြုရန် လိုသည်။"</string>
@@ -1703,14 +1751,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> အပလီကေးရှင်းများ <xliff:g id="TIME">%2$s</xliff:g> ကျော်လျှင် အဆုံးသတ်မည်"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="TOTALRAM">%2$s</xliff:g> ၏ <xliff:g id="USEDRAM">%1$s</xliff:g>သည် ကျော်အသုံးပြု <xliff:g id="TIMEDURATION">%3$s</xliff:g> ကျော်အသုံးပြုခဲ့သည်"</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_memory_status" msgid="4251599550196193093">"စက်၏မှတ်ဉာဏ်သည် လက်ရှိတွင် <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"ပျမ်းမျှ RAM သုံးစွဲမှု"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"အမြင့်ဆုံး RAM အသုံးပြုမှု"</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 အသုံးပြုခြင်း"</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>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ကြာချိန်"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"မယ်မိုရီ အသေးစိတ်များ"</string>
@@ -1727,6 +1781,7 @@
     <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_hide_system" msgid="4106826741703745733">"စနစ်ကို ဖျောက်မည်"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss သုံးခြင်း"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Stats အမျိုးအစားများ"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"နောက်ခံ"</string>
@@ -1749,7 +1804,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"အောက်ပါမူရင်းဆက်တင်များမှာ အပလီကေးရှင်းဆက်တင်များကို ပယ်ဖျက်မည်"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"မူရင်းအပြင်အဆင်များ"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"မူရင်းအင်ဂျင်"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"ပြောဆိုမည့်စာသားအတွက် အသုံးပြုမည့် စကားသံပေါင်းစပ်အင်ဂျင်အား သတ်မှတ်မည်။"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"စာသားများကို အသံထွက်ဖတ်ရန်အတွက် အသံထွက် စာဖတ်စက်အား ပြင်ဆင်ရန်"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"စကားပြောနှုန်း"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"စာတမ်းအားပြောဆိုသော အမြန်နှုန်း"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"အသံအနိမ့်အမြင့်"</string>
@@ -1823,7 +1878,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာကို အတည်မပြုမီ သင်၏ သော့ဖွင့်သောပုံစံကို ဆွဲရန်လိုအပ်သည်။"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာ၏ စကားဝှက်ကို ထည့်ပါ"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"လက်ရှိ စကားဝှက်"</string>
@@ -1848,12 +1902,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"ကျွန်ုပ်ဒေတာများကို အရန်ထားခြင်း"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"အက်ပ်ဒေတာ၊ ဝိုင်ဖိုင်စကားဝှက်များနှင့် အခြားဆက်တင်များကို ဂူဂယ်လ်ဆာဗာများတွင် အရန်သိမ်းထားပါ"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"အရန်သိမ်း အကောင့်"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"လက်ရှိ မည်သည့်အကောင့်မှ ဒေတာကို အရန်သိုလှောင်ခြင်းမပြုလုပ်နေပါ။"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"app ဒေတာကို ထည့်သွင်းရန်"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"အလိုအလျောက် ပြန်လည်ရယူမည်"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"အပလီကေးရှင်းကို ပြန်လည်ထုတ်လျှင် အရန်ပြုလုပ်ထားသောဆက်တင်များနှင့် ဒေတာများကို ပြန်လည်ရယူရန်ပြုလုပ်မည်။"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"အရန်သိမ်းဆည်းခြင်း ဝန်ဆောင်မှု အလုပ်မလုပ်ပါ။"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"သင့်ကိရိယာ၏ မူဝါဒအရ ဖြစ်၏။"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop အရန်စကားဝှက်"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"အလုပ်ခုံတွင် အရန်သိမ်းဆည်းခြင်းများကို လောလောဆယ် မကာကွယ်နိုင်ပါ။"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"အလုပ်ခုံ တွင် အရန်သိမ်းဆည်းခြင်းအပြည့်လုပ်ရန် အတွက် စကားဝှက်ဖယ်ရန် သို့ ပြောင်းရန် တို့ထိပါ။"</string>
@@ -2025,6 +2077,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"သက်ဝင်အသွင်ပြောင်းခြင်း"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"လှုပ်ရှားမှုကြာချိန်စကေး"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"ဆင့်ပွားမျက်နှာပြင်များအသွင်ဆောင်သည်"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"ဘရောက်ဇာဝင်းဒိုးပူးတွဲသုံးမုဒ်"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"တချိန်တည်းတွင် စခရင်ပေါ် ပူးတွဲလှုပ်ရှားမှုဖြစ်ခြင်း။"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"ဘရောက်ဇာဝင်းဒိုးပူးတွဲသုံးမုဒ်ဖွင့်မလား။"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"သတိပေးချက်- ယခုလတ်တလော app UI ကိုတဆင့်တစ်ချိန်တည်းမှာ on-screen မျိုးစုံလှုပ်ရှားမှုများကိုခွင့်ပြုမြင့်မားတဲ့စမ်းသပ် feature တစ်ခုဖြစ်ပါတယ်။ တချို့ apps များဒီ feature တွေကိုအသုံးပြုတဲ့အခါမှန်ကန်စွာအလုပ်လုပ် crash သို့မဟုတ်မည်မဟုတ်ပါ။"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"အပလီကေးရှင်းများ"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"ဆောင်ရွက်မှုများကို မသိမ်းထားပါနှင့်"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"အသုံးပြုသူထွက်ခွါသွားသည်နှင့် လုပ်ဆောင်ချက်များကို ဖျက်ပစ်မည်"</string>
@@ -2196,7 +2252,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="718192651887726259">"သင်သည် ဒီကိရိယာကို ဖြည့်စွက် အသုံးပြုသူများကို ဖန်တီးပေးလျက် မျှဝေပေးနိုင်သည်။ အသုံးပြုသူတိုင်းဆီမှာ ၎င်း၏ ကိုယ်ပိုင် နေရာ ရှိမည် ဖြစ်ရာ သူတို့သည် ကိုယ်ပိုင် appများ၊ နောက်ခံပုံ၊ စသဖြင့် မိမိစိတ်ကြိုက် ပြုလုပ်နိုင်ကြမည်။ ထို့အပြင် အသုံးပြုသူတို့သည် လူတိုင်း အပေါ် အကျိုးသက်ရောက်နိုင်သည့် ကြိုးမဲ့လို ကိရိယာ ဆက်တင်များကိုပါ ညှိနှိုင်းနိုင်ကြသည်။\n\nသင်က အသုံးပြုသူ အသစ် တစ်ဦးကို ထည့်ပေးလိုက်လျှင်၊ ထိုသူသည် ၎င်း၏ နေရာကို သတ်မှတ်စီစဉ်ရန် လိုအပ်မည်။\n\n အသုံးပြုသူ မည်သူမဆို ကျန်အသုံးပြုသူ အားလုံးတို့အတွက် appများကို မွမ်းမံပေးနိုင်သည်။"</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 အသုံးပြုသူ မည်သူမဆို ကျန်အသုံးပြုသူ အားလုံးတို့အတွက် appများကို မွမ်းမံပေးနိုင်သည်။"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"သုံးစွဲသူကို ယခုသတ်မှတ်မည်လား?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ထိုသူသည် ကိရိယာကို ယူ၍ သူတို့၏ နေရာများကို စဖွင့်သတ်မှတ် ထာတာ သေချာပါစေ"</string>
@@ -2227,13 +2283,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"ဧည့်သည်ကို ဖယ်ထုတ်လိုက်ရမလား?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"ဒီချိတ်ဆက်မှု ထဲက appများ အားလုံး နှင့် ဒေတာကို ဖျက်ပစ်မည်။"</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"ဖယ်ထုတ်ပါ"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"ဖုန်း ခေါ်ဆိုမှုများ ခွင့်ပြုရန်"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"ဖုန်း ခေါ်ဆိုမှုများ နှင့် 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="440218975766968124">"ဖုန်း ခေါ်ဆိုမှုများ ခွင့်ပြုရမလား?"</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_sms_confirm_title" msgid="188164598768941316">"ဖုန်း ခေါ်ဆိုမှုများ နှင့် SMSကို ခွင့်ပြုရမလား?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"ခေါ်ဆိုမှု နှင့် 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="application_restrictions" msgid="8207332020898004394">"အပလီကေးရှင်းနှင့် ပါရှိချက်များကို ခွင့်ပြုရန်"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ကန့်သတ်ချက်များရှိသော အပလီကေးရှင်းများ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"အပလီကေးရှင်းဆက်တင်းများကိုချဲ့ပြပါ"</string>
@@ -2284,8 +2340,8 @@
     <string name="user_rename" msgid="8523499513614655279">"အမည်ပြောင်းပါ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"app ကန့်သတ်ချက်များ သတ်မှတ်ရန်"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> မှထိန်းချုပ်ထားသည်"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"ဤအပလီကေးရှင်းသည် ကန့်သတ်ထားသော ကိုယ်ရေးအကောင့်များတွင် အထောက်အကူမပေးပါ။"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"ဤအပလီကေးရှင်းသည် သင့်အကောင့်များကို အသုံးပြုနိုင်သည်။"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"ဤ app သည် သင့်အကောင့်များအား ကြည့်ရှုခွင့်ရှိ နိုင်သည်။ <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>
@@ -2350,13 +2406,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"ဝိုင်ဖိုင်ကွန်ရက်ချိတ်ဆက်မှုဖြင့်"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"စာတို စာ စာတိုပို့ခြင်း စာများ စာပို့ခြင်း"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ဆဲလ်လူလာ ဆဲလ် မိုဘိုင်းဆက်သွယ်ရေးဝန်ဆောင်မှုဌာန ကြိုးမဲ့ ဒေတာ 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"ဝိုင်ဖိုင် ဝိုင်ဖိုင် ခေါ်ဆိုခြင်း"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ဖွင့်တင်ပေးသူ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"မျက်နှာပြင် တာ့ချမျက်နှာပြင်"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"မြင်ကွင်းမိန်ခြင်း ထိတွေ့မြင်ကွင်း ဘတ်ထရီ"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"မြင်ကွင်းမိန်ခြင်း ထိတွေ့မြင်ကွင်း ဘတ်ထရီ"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"အသုံးပြုသူစိတ်ကြိုက် ပြုလုပ်ထားသည့် နောက်ခံဖော်ပြချက်"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"မဲမှောင်သည့် အပြင်အဆင် ညမုဒ် မှေးမှိန်မျက်နှာပြင် လင်းထိန်မှုကို ပြောင်းမည်"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"အသုံးပြုသူစိတ်ကြိုက် ပြုလုပ်ထားသည့် နောက်ခံဖော်ပြချက်"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"စာလုံးအရွယ်အစား"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"စီမံကိန်း"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"Cast စီမံကိန်း"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"နေရာ ဒစ် ဟက်ဒရိုက် စက်ပစ္စည်း အသုံးပြုမှု"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"ပါဝါအသုံးပြုမှု အားသွင်းခြင်း"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"စာလုံးပေါင်း အဘိဓာန် သတ်ပုံစစ် အလိုအလျောက်အမှားပြင်"</string>
@@ -2373,6 +2431,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"အကောင့်"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ကန့်သတ်မှု ကန့်သတ် ကန့်သတ်ထား"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"စာတို အမှားပြင်ဆင်ခြင်း အမှန် အသံ တုန်ခါခြင်း အလိုအလျောက် ဘာသာစကား အမူအရာ အကြံပေး အကြံပြုခြင်း ပုံစံ ထိခိုက်နစ်နာစေသော စကားလုံး စာရိုက် အီမိုဂျီရုပ်ပုံ အပြည်ပြည်ဆိုင်ရာ"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"ရွေးချယ်စရာများအား မူလအတိုင်း ပြန်ညှိရန်"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"မူလ အရေးပေါ် ice app"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"app များ ဒေါင်းလုပ်ရယူသော အပ္ပလီကေးရှင်းစနစ်"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"အပ်ဖ်များ ခွင့်ပြုချက်လုံခြုံရေး"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps များ ပုံမှန်"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"စကားဝှက် ပုံစံ ပင်ကို ရွှေ့ရန်"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ကြိုးမဲ့ NFC တဲဂ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="write_tag" msgid="8571858602896222537">"ရေးရန်"</string>
@@ -2387,11 +2450,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"ကြားဖြတ်ဖုန်းဝင်မှု"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"ခေါ်ဆိုမှုများ နှင့် အကြောင်းကြားချက်များ ဝင်လာလျှင်"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"အမြဲတမ်း ကြားဖြတ်ဖုန်းဝင်ခွင့်ပေးရန်"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ဦးစားပေး ကြားဖြတ်ဖုန်းဝင်မှုများသာ ခွင့်ပြုရန်"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ကြားဖြတ်ဖုန်း မဝင်ပါနှင့်"</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_option_important_interruptions" msgid="3903928008177972500">"ဦးစားပေးများသာ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"နှိုးစက်များသာ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ကြားဖြတ်ဝင်မှု ခွင့်မပြုရန်"</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="ringtone_title" msgid="5379026328015343686">"ဖုန်းဝင်တီးလုံး"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"အကြောင်းကြားချက် တီးလုံး"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ဖုန်းဝင်လျှင် တုန်ခါရန်"</string>
@@ -2417,62 +2481,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"တုန်ခါရန်"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"အကြောင်းကြားချက်ကို ဖွင့်သုံးခြင်း"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"အကြောင်းကြားချက်များကို အပလီကေးရှင်းများက မဖတ်နိုင်ပါ။"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d အပလီကေးရှင်းသည် အကြောင်းကြားချက်များကို ဖတ်နိုင်သည်။"</item>
-    <item quantity="other" msgid="980049191810249052">"%d အပလီကေးရှင်းများသည် အကြောင်းကြားချက်များကို ဖတ်နိုင်သည်။"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">app %d ခုသည် သတိပေးချက်များကို ဖတ်နိုင်သည်</item>
+      <item quantity="one">app %d ခုသည် သတိပေးချက်များကို ဖတ်နိုင်သည်</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"အကြောင်းကြားချက် လက်ခံသူများ တစ်ခုမှ မထည့်သွင်းထားပါ။"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> ကိုဖွင့်မည်လား?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> သည် စနစ် သို့မဟုတ် ထည့်သွင်းထားသော အပလီကေးရှင်းက ပို့သည့် အကြောင်းကြားချက်များအား ဖတ်နိုင်လိမ့်မည်၊၎င်းတွင် အဆက်အသွယ်၏ အမည်များနှင့် သင့်ကိုပို့ထားသည့်စာများ စသည့် ကိုယ်ရေးကိုယ်တာအချက်အလက်များ ပါ၀င်သည်။ ထိုအကြောင်းကြားချက်များကိုလည်း ထုတ်ပစ်နိုင်သည် သို့မဟုတ် ၎င်းတို့အတွင်းမှာ ပါရှိသော လုပ်ဆောင်ချက်ခလုတ်များကို နှိပ်လိုက်ပါ။"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"အခြေအနေများကို စီမံပေးသူများ"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"မည်သည့် appကမှ အခြေအနေများကို စီမံမပေးပါ"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app အခြေအနေများကို စီမံပေးရန်"</item>
-    <item quantity="other" msgid="358057362115673258">"%d app အခြေအနေများကို စီမံပေးရန်"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"အခြေအနေ စီမံပေးသူများ တပ်ဆင် မထားပါ။"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> ကိုဖွင့်မည်လား?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> သည် မနှောင့်ယှက်ပါနှင့် မုဒ် အထဲမှ ထွက်ရေး အခြေအနေများကို ထည့်ပေးနိုင်မည်။"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"appများကို တင်နေ..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"ပိတ်ဆို့ရန်"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"အားလုံးကို ပိတ်ဆို့ရန်။"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ဒီappမှ အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြနှင့်"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"ဦးစားပေးမှု"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"အကြောင်းကြားချက်များကို စာရင်း ထိပ်မှာ တင်ထားကာ ကိရိယာကို ဦးစားပေး ကြားဖြတ်ဝင်မှုများ အတွက်သာ ဆိုပြီး သတ်မှတ်ထားလျှင် ၎င်းတို့ကို လက်ခံရယူနေရန်"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"သိမ်မွေ့သော"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"သင့်စက်ပစ္စည်းကို သော့ခတ်ထားသည့်အခါ၊ ဤapp၏သတိပေးချက်များမှ ​​လျှို့ဝှက်အချက်အလက်များကို ဝှက်ထား​မည်"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"ဦးစားပေးအဖြစ် ယူဆရန်။"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"မနှောင့်ယှက်ပါနဲ့ကို ဦးစားပေး၌သတ်မှတ်ထားသောအခါ ဤအသုံးပြုပရိုဂြမ်၏သတိပေးချက်များကို ကြားနိုင်ခွင့်ပြုထားရန်။"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"ချောင်းကြည့်ခွင့်ပြုပါ။"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ဤအသုံးပြုပရိုဂြမ်ကို လက်ရှိဖန်သားပေါ်မှမြင်ကွင်းပေါ်မှာ ခဏတာဘေးတိုက်ပွတ်ဆွဲခြင်းအားဖြင့်  အချို့သောသတိပေးချက်များကို အလေးအနက်ထားခွင့်ပြုရန်။"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"အထိမခံသော အချက်အလက်ကို ဝှက်ထားရန်။"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"စက်ကို သော့ခတ်ထားသောအခါ သီးသန့်သတင်းအချက်အလက်ကိုဖော်ပြနိုင်သော ဤအသုံးပြုပရိုဂြမ်၏သတိပေးချက်များမှာ အချက်အလက်ကို ဝှက်ထားရန်။"</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="zen_mode_default_option" msgid="6940069025071935243">"သင်က မပိတ်လိုက်သည့် အထိ"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"ဦးစားပေး  ကြားဖြတ်ဖုန်းဝင်မှုများ"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ကျချိန်"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ရက်"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"မရှိ"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"ကြားဖြတ်ခြင်းများ ခွင့်ပြုသည်"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ဦးစားပေးများသာ"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"မရှိ"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"အော်တိုမက်တစ် ပြုလုပ်ခြင်း"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"အလိုအလျောက် ဖွင့်ရန်"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"စည်းမျဉ်းအမည်"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"စည်းမျဉ်း ထည့်ပါ"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"စည်းမျဉ်းအား ဖျက်မည်"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"စည်းမျဉ်း \"<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="3201273040477861538">"အချိန်ဇယား စည်းမျဉ်း"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"စည်းမျဉ်းမတွေ့ပါ။"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">"၊ "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"မည်သည့်အခါမှ"</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_from" msgid="1033337300289871697">"...ထံမှ ခေါ်ဆိုမှုများ/စာများ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"မည်သူမဆို"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"အဆက်အသွယ်များ သာလျှင်"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"ကြယ်တပ် အဆက်အသွယ်များ သာလျှင်"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"ဖြစ်ရပ်များ နှင့် သတိပေးချက်များ"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"နှိုးစက်များကို ကြားဖြတ် ဝင်လာမှုများထဲမှာ အမြဲတမ်း ဦးစားပေးသည်"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"နှိုးစက်များ"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"သတိပေးချက်များ"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ပွဲစဉ်များ"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ရွေးချယ်ထားသည့် ခေါ်ဆိုသူများ"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ခေါ်ဆိုသူများကို ပြန်ထပ်မည်"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"တစ် <xliff:g id="MINUTES">%d</xliff:g> မိနစ်အကြာတွင် တူညီသည့်လူမှ ဖုန်းပြန်ခေါ်လျှင် ခွင့်ပြုမည်"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"အလိုအလျောက် ဖွင့်ရန်"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"မည်သည့်အခါမှ"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> နောက်န​ေ့"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> သို့မဟုတ် ၎င်းမတိုင်ခင် နှိုးစက်များ"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"ကြားဖြတ်ဖုန်းဝင်မှု"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"ခေါ်ဆိုမှုများ နှင့် အကြောင်းကြားချက်များ ဝင်လာလျှင်"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"သင်ဘယ်အချိန် ကြားဖြတ်စေလိုသလဲ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ဘယ်လောက်ကြာ အတွက်လဲ?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"အမြဲတမ်း ကြားဖြတ်ဖုန်းဝင်ခွင့်ပေးရန်"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ပယ်၊အားလုံး၊အရာတိုင်း"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"ဦးစားပေး ကြားဖြတ်ဖုန်းဝင်မှုများသာ ခွင့်ပြုရန်"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"နှိုးစက်များသာ ခွင့်ပြုရန်"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"ကြားဖြတ်ဖုန်း မဝင်ပါနှင့်"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"အကန့်အသတ်မရှိစွာ"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> မိနစ်</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> မိနစ်</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"ဦးစားပေးအချက်ပေးမှုများသာသို့ အမြဲတမ်း ပြောင်းမည်"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ<xliff:g id="DURATION">%1$d</xliff:g>မိနစ်မျှ ဦးစားပေးအသိပေးချက်များသာလျှင် သို့ပြောင်းမည်</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>အထိတစ်မိနစ်မျှ ဦးစားပေးအသိပေးချက်များသာလျှင် သို့ပြောင်းမည်</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">(<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ)<xliff:g id="DURATION">%1$d</xliff:g>နာရီမျှ ဦးစားပေးအသိပေးချက်များသာလျှင် သို့ပြောင်းမည်</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>အထိတစ်နာရီမျှ ဦးစားပေးအသိပေးချက်များသာလျှင် သို့ပြောင်းမည်</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"နှိုးစက်သာလျှင်ကို အချိန်တိုင်းသို့ပြောင်းမည်"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">(<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ)<xliff:g id="DURATION">%1$d</xliff:g>မိနစ်မျှ နိုးစက်သာလျှင်သို့ပြောင်းမည်</item>
+      <item quantity="one"><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"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ<xliff:g id="DURATION">%1$d</xliff:g>နာရီမျှ နိုးစက်သာလျှင်သို့ပြောင်းမည်</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>အထိတစ်နာရီမျှ နိုးစက်သာလျှင်သို့ပြောင်းမည်</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"ဘယ်တော့မှ ကြားမဖြတ်ရန်သို့ ပြောင်းမည်"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">(<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ)<xliff:g id="DURATION">%1$d</xliff:g>မိနစ်မျှ မနှောက်ယှက်ရ သို့ပြောင်းမည်</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>အထိတစ်မိနစ်မျှ မနှောက်ယှက်ရ သို့ပြောင်းမည်</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>အထိ<xliff:g id="DURATION">%1$d</xliff:g>မျှ မနှောက်ယှက်ရ သို့ပြောင်းမည်</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>အထိတစ်နာရီမျှ မနှောက်ယှက်ရ သို့ပြောင်းမည်</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"အမြဲတမ်း ကြားဖြတ်ရန်သို့ ပြောင်းမည်"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ထာဝရ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App အကြောင်းကြားချက်များ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"အကြောင်းကြားချက် ဆက်တင်များ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ဤကိရိယာအတွက် အကြံပြုချက် ပို့ရန်"</string>
@@ -2513,4 +2630,63 @@
     <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="2184141780491382435">"ပုံမှန်အားဖြင့် ထုတ်လွှင့်ရန်"</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="app_launch_domain_links_title" msgid="458956710410857777">"ဒိုမိန်းကွင်းဆက်များ"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"ဒိုမိန်း URL များဖွင့်မည်"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"အပ်ဖ်ကို ဒိုမိန်း URL များတိုက်ရိုက်ဖွင့်ရန် ခွင့်ပြုမည်"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"ထောက်ပံ့သည့် ဒိုမိန်း URL များ"</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="410824961149037234">"အတွင်းမှတ်ဉာဏ်"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"ပြင်ပမှတ်ဉာဏ်"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"စက်တွင်း သိုလှောင်ထားမှု"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"စက်ပြင်ပ သိုလှောင်ထားမှု"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"App ဒေတာ သုံးစွဲမှု"</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="notifications_enabled" msgid="6983396130566021385">"ဖွင့်ထားသည်"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"ပိတ်ဆို့ရန်"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"သိမ်မွေ့သော"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"ဦးစားပေးမှု"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"ဦးစားပေး နှင့်amp; သိမ်မွေ့သော"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other">ခွင့်ပြုချက် <xliff:g id="COUNT_1">%d</xliff:g> ခုပေးထားသည်</item>
+      <item quantity="one">ခွင့်ပြုချက် <xliff:g id="COUNT_0">%d</xliff:g> ခုပေးထားသည်</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> / <xliff:g id="COUNT_3">%d</xliff:g> ခွင့်ပြုချက် ရရှိခဲ့၏</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> ခွင့်ပြုချက် ရရှိခဲ့၏</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"တချို့အားပုံမှတ်အဖြစ်သတ်မှတ်"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"ပုံမှန်သတ်မှတ်ထားခြင်းမရှိ"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"appများ အားလုံး"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"ဖွင့်ထား"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"ကိုယ်ရေး"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"အလုပ်"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ပိတ်ဆို့ထား"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ဦးစားပေးမှု"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"သိမ်မွေ့သော"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ဒိုမိန်း URL များဖြင့်"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"စီမံအုပ်ချုပ်မှ ပိတ်ထား"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"အဆင့်မြင့်"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"အမည်မသိ အပလီကေးရှင်း"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ပရိုဖိုင်ရွေးရန်"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App ခွင့်ပြုချက်များ"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ၏ <xliff:g id="COUNT_1">%d</xliff:g> အပ်ဖ်များနောက်ထပ် အသုံးပြုမှုများ ခွင့်ပြုထား"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ၏ <xliff:g id="COUNT_1">%d</xliff:g> အပ်ဖ်များ ခွင့်ပြုထား"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"ဒိုမိန်း URL များ"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"မည်သည့် ဒိုမိန်း URL မှမဖွင့်ရန်"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' ကိုဖွင့်"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' နှင့်ဆက်စပ် URL များကိုဖွင့်ရန်"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> အပ်ဖ်များသည် ၎င်းတို့၏ URL များကိုဖွင့်နိုင်သည်</item>
+      <item quantity="one">အပ်ဖ်တစ်ခုသည် ၎င်း၏ URL များကိုဖွင့်နိုင်သည်</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"အသိအမှတ်မပြုပါ"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ပုံမှန် app များ"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ဘရောင်ဇာအပ်ဖ်"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ပုံမှန် ဘရောင်ဇာ မရှိပါ"</string>
+    <string name="default_app" msgid="6864503001385843060">"(မူသေ)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"App များ သိုလှောင်မှု"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 9c174ec..0e7676d 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"Passord"</item>
+    <item msgid="8549485714107012129">"SIM-kort"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Trykk på knappen"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"slå mikrofonen av eller på"</item>
     <item msgid="1148142988678569310">"projiser media"</item>
     <item msgid="9130014005474445273">"aktivér VPN"</item>
+    <item msgid="1165192162975045562">"angi bakgrunn"</item>
+    <item msgid="7129487923652967258">"assistansestruktur"</item>
+    <item msgid="1069023208100114540">"assistanseskjermdump"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Sted"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Slå mikrofonen av eller på"</item>
     <item msgid="5906017727368097853">"Projiser media"</item>
     <item msgid="2486614710846178542">"Aktivér VPN"</item>
+    <item msgid="5586547561693629602">"Angi bakgrunn"</item>
+    <item msgid="32794179825485062">"Assistansestruktur"</item>
+    <item msgid="7872852746938272552">"Assistanseskjermdump"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"lav"</item>
     <item msgid="4212263919458209842">"svært viktig"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Av"</item>
-    <item msgid="5656544177755411222">"Begrensede forstyrrelser"</item>
-    <item msgid="8735337502532332056">"Ingen forstyrrelser"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderat"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Rød"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Lydkilde"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 766c84a..df0d27f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Tillat"</string>
     <string name="deny" msgid="6947806159746484865">"Avslå"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukjent"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Du er nå <xliff:g id="STEP_COUNT">%1$d</xliff:g> trinn fra å bli en utvikler."</item>
-    <item quantity="other" msgid="6722953419953594148">"Du er nå <xliff:g id="STEP_COUNT">%1$d</xliff:g> trinn fra å bli en utvikler."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Nå er du <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steg fra å bli utvikler.</item>
+      <item quantity="one">Nå er du <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> steg fra å bli utvikler.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Du er nå utvikler!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det trengs ikke, du er allerede utvikler."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Trådløst og nettverk"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Deaktiver tekstmelding via IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Aktivering av IMS-registrering er påkrevd"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Deaktivering av IMS-registrering er påkrevd"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Slå på VoLTE-tildelte flagg"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Slå av VoLTE-tildelte flagg"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Aktiver RAM-dump for LTE"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Deaktiver RAM-dump for LTE"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Se SIM-adressebok"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Kringkasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dette deaktiverer:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Tilkoblet"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Tilkobling (ingen telefon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Tilkoblet (ingen medier)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Tilkoblet (ingen meldingstilgang)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Tilkoblet (ingen telefon eller media)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Frakoblet"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Kobler fra…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Kobler til…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Parer…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Bluetooth-enhet uten navn"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Søker"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Finner ingen Bluetooth-enheter."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis mottatte filer"</string>
     <string name="device_picker" msgid="4978696506172252813">"Velg Bluetooth-enhet"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-tillatelse"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app ønsker å slå på Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"En app ønsker å slå på Bluetooth for denne enheten."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app ønsker å gjøre nettbrettet ditt synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app ønsker å gjøre telefonen din synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app ønsker å gjøre nettbrettet ditt synlig for andre Bluetooth-enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
@@ -273,14 +266,12 @@
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefoninformasjon"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-lagring"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Minnekort"</string>
-    <string name="proxy_settings_label" msgid="3271174136184391743">"Mellomtjener-innstillinger"</string>
+    <string name="proxy_settings_label" msgid="3271174136184391743">"Innstillinger for proxy-tjener"</string>
     <string name="cancel" msgid="6859253417269739139">"Avbryt"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"AVBRYT"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"FORTSETT"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEI"</string>
-    <string name="forget" msgid="7267115980248732932">"GLEM"</string>
+    <string name="forget" msgid="1400428660472591263">"Glem"</string>
+    <string name="save" msgid="879993180139353333">"Lagre"</string>
+    <string name="done" msgid="6942539184162713160">"Ferdig"</string>
     <string name="settings_label" msgid="1626402585530130914">"Innstillinger"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Innstillinger"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Snarvei for Innstillinger"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorter etter tidssone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Dato"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Tid"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Forbedre ansiktssamsvar"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Bevegelseskontroll"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Krev blunking for å låse opp"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Låses automatisk"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> etter hvilemodus"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> etter hvilemodus er startet, med mindre den holdes opplåst av <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Posisjon, skjermlås, SIM-kort-lås"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passord"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeravtrykk"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Admin. fingeravtrykk"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Bruk fingeravtrykk for"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Legg til"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"skjermlås"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingeravtrykk er registrert</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingeravtrykk er registrert</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Fingeravtrykkonfig."</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Hvis du vil bruke fingeravtrykk til å låse opp skjermen eller bekrefte kjøp, må du \n\n✓ konfigurere låsemetoden for reserveskjermen din \n\n✓ legge til fingeravtrykket ditt"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Finn sensoren"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Finn fingeravtrykksensoren på baksiden av telefonen."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Navn"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Slett"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"La oss sette i gang!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Plassér fingeren på fingeravtrykksensoren. Løft den når du har kjent en vibrasjon."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Flott! Gjenta nå."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Plassér den samme fingeren på fingeravtrykksensoren, og løft den når du har kjent en vibrasjon."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingeravtr. lagt til."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikonet, kan du bruke fingeravtrykket ditt som identifikasjon eller til å godkjenne kjøp."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Legg til"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Neste"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptér nettbrettet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptér telefonen"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sett inn laderen og prøv på nytt."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ingen personlig kode eller passord for å låse skjermen."</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du må angi en PIN-kode eller et passord for skjermlås før du kan starte krypteringen."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Du må tegne opplåsingsmønsteret ditt for å bekrefte krypteringen av enheten din."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vil du kryptere?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krypteringshandlingen kan ikke angres, og hvis du avbryter den, risikerer du å miste data. Krypteringsprosessen tar minst én time, og nettbrettet kommer til å starte på nytt flere ganger underveis."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Krypteringshandlingen kan ikke angres, og hvis du avbryter den, risikerer du å miste data. Krypteringsprosessen tar minst én time, og telefonen kommer til å starte på nytt flere ganger underveis."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Sveip"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Ingen sikkerhet"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Ansiktslås"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Lav sikkerhet, eksperimentell"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Mønster"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Middels sikkerhet"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Personlig kode"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Middels til høy sikkerhet"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Høy sikkerhet"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Gjeldende skjermlås"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere lenger."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deaktivert av admin., krypteringsregel eller legitimasjonslager"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Sveip"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Ansiktslås"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Mønster"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-kode"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Passord"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Når du har konfigurert en skjermlås, kan du også registrere fingeravtrykket ditt i Innstillinger og sikkerhet."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Slå av skjermlås"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern opplåsingsmønster"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern PIN-koden for opplåsing"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Passordet må inneholde minst én bokstav."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Passordet må inneholde minst ett siffer."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Passordet må inneholde minst ett symbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Passordet må inneholde minst én bokstav."</item>
-    <item quantity="other" msgid="8186027808415585970">"Passordet må inneholde minst %d bokstaver"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Passordet må inneholde minst én liten bokstav."</item>
-    <item quantity="other" msgid="2693910942679679225">"Passordet må inneholde minst %d små bokstaver."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Passordet må inneholde minst én stor bokstav."</item>
-    <item quantity="other" msgid="3030801209112209245">"Passordet må inneholde minst %d store bokstaver."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Passordet må inneholde minst ett siffer."</item>
-    <item quantity="other" msgid="4703982391407595924">"Passordet må inneholde minst %d sifre."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Passordet må inneholde minst ett spesialtegn."</item>
-    <item quantity="other" msgid="1221290525051187757">"Passordet må inneholde minst %d spesialtegn."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Passordet må inneholde minst ett tegn som ikke er en bokstav."</item>
-    <item quantity="other" msgid="3952508584649046404">"Passordet må inneholde minst %d tegn som ikke er bokstaver."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Passordet må inneholde minst %d bokstaver.</item>
+      <item quantity="one">Passordet må inneholde minst én bokstav.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Passordet må inneholde minst %d små bokstaver.</item>
+      <item quantity="one">Passordet må inneholde minst én liten bokstav.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Passordet må inneholde minst %d store bokstaver.</item>
+      <item quantity="one">Passordet må inneholde minst én stor bokstav.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Passordet må inneholde minst %d sifre.</item>
+      <item quantity="one">Passordet må inneholde minst ett siffer.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Passordet må inneholde minst %d spesialtegn.</item>
+      <item quantity="one">Passordet må inneholde minst ett spesialtegn.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Passordet må inneholde minst %d tegn som ikke er bokstaver.</item>
+      <item quantity="one">Passordet må inneholde minst ett tegn som ikke er en bokstav.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Enhetsadmin. forbyr nylig brukte passord."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"En stigende, synkende eller gjentatt sekvens av tall er ikke tillat"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Sånn kobler du til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kontroller at dette passordet vises:&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">"Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vil du koble til denne enheten?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Sånn kobler du til: <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> Skriv inn følgende: <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>, og trykk deretter på Retur eller Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Paring"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"KOBLE"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Avbryt"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Med sammenkobling får den andre enheten tilgang til kontaktene og anropsloggen din når den er tilkoblet."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Kan ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Kan ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g> på grunn av feil personlig kode eller passord."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kan ikke kommunisere med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> avslo paring."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Kunne ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Let etter enheter"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Last inn på nytt"</string>
@@ -509,22 +512,14 @@
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Koble til"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Koble fra"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Par med og koble til"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Fjern paring"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Koble fra"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Koble fra og fjern paring"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Innstillinger…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avansert"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avansert Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Når Bluetooth er slått på, kan enheten kommunisere med andre Bluetooth-enheter i nærheten."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"For å forbedre posisjonsnøyaktigheten, skanner apper og tjenester etter Bluetooth-enheter – selv når Bluetooth er slått av. Du kan endre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>innstillingene for skanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Koble til…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medielyd"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefonlyd"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Filoverføring"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Inndataenhet"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internett-tilgang"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktdeling"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Bruk til kontaktdeling"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling av Internett-tilkobling"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Meldingstilgang"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra medielyd."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra håndfrilyd."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra inndataenheten."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Bruk for"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Gi nytt navn"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Tillat innkommende filoverføringer"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Koblet til medielyd"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Koblet til telefonlyd"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Koblet til tjener for filoverføring"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Koblet til kart"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ikke koblet til tjener for filoverføring"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Koblet til inndataenhet"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Koblet til enhet for Internett-tilgang"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Deler lokal Internett-tilkobling med enhet"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Bruk for medielyd"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Bruk for telefonlyd"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Bruk til filoverføring"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Bruk for inndata"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Bruk for Internett-tilgang"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Bruk for kart"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Innstillinger for forankringsstasjon"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Bruk forankring til lyd"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som høyttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For musikk og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk innstillinger"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Koblet til via en Wi-Fi-assistent"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast skjermen"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktiver trådløs skjermdeling"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Finner ingen enheter i nærheten."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Kobler til"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Glem"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Ferdig"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Navn"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillat datautveksling når nettbrettet berører en annen enhet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillat utveksling av data når telefonen berører en annen enhet"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Slår av Wi-Fi …"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Feil"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"I flymodus"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan ikke søke etter nettverk"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Nettverksvarsel"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Varsle når et offentlig nettverk er tilgjengelig"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Unngå dårlige tilkoblinger"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Ikke bruk et Wi-Fi-nettverk med mindre det har en brukbar Internett-tilkobling"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Bare bruk nettverk som har en god nettilkobling"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skanning er alltid tilgjengelig"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Alltid tillat skanning"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Tillat at Googles posisjonstjeneste og andre apper skanner etter nettverk, selv når Wi-Fi er slått av"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Bruk åpen Wi‑Fi automatisk"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Tillat at en Wi‑Fi-assistent automatisk kobler til nettverk som ser ut til å være av høy kvalitet"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Velg assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer sertifikater"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"For å forbedre posisjonsnøyaktigheten, og for andre formål, kan Google og andre apper søke etter nettverk i nærheten, selv når Wi-Fi er slått av. Hvis du ikke vil at dette skal skje, går du til Avansert &gt; Skanning alltid tilgjengelig."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apper kan søke etter nettverk i nærheten, selv når Wi-Fi er slått av. Hvis du ikke vil at dette skal skje, går du til Avansert &gt; Skanning alltid tilgjengelig."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"For å forbedre posisjonsnøyaktigheten, skanner apper og tjenester etter Wi-Fi-nettverk – selv når Wi-Fi er slått av. Du kan endre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>innstillingene for skanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ikke vis igjen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hold Wi-Fi aktivert i dvalemodus"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi aktivert i hvilemodus"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Legg til et nytt nettverk"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Se mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"For å fullføre konfigurasjonen må nettbrettet være tilkoblet Wi-Fi. Etter konfigurasjonen kan du bytte mellom mobildata og Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Avanserte alternativer"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Beskyttet Wi-Fi-konfigurasjon (WPS)"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS …"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Trykk på Beskyttet Wi-Fi-konfigurasjon-knappen på ruteren din. Den kan være merket WPS eller med dette symbolet:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Trykk på Beskyttet Wi-Fi Protected Setup-knappen på ruteren din. Den kan være merket som «WPS» eller med dette symbolet:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Skriv inn koden <xliff:g id="NUMBER">%1$s</xliff:g> på Wi-Fi-ruteren din. Det kan ta inntil to minutter å fullføre konfigurasjonen."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS var vellykket. Kobler til nettverket …"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Koblet til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Passord"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Vis passord"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfigurer AP-bånd"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GHz-bånd"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz-bånd"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-innstillinger"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(uendret)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ikke spesifisert)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Lagret"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktivert"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurasjonsfeil"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-tilkoblingsfeil"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Utenfor område"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Ingen Internett-tilgang ble funnet. Kan ikke koble til på nytt automatisk."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tilgjengelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tilgjengelig)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Skriv inn nettverkspassordet ditt"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vil du logge på for å koble til?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> krever at du logger på nettet før du kobler til nettverket."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KOBLE TIL"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Dette nettverket har ikke Internett-tilgang. Vil du bruke det uansett?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ikke spør igjen for dette nettverket"</string>
     <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">"Slett"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK bærbar Wi-Fi-sone"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<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-anrop"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Ringeinnstillinger"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-ringemodus"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi er foretrukket"</item>
+    <item msgid="5267397515594230396">"Mobil er foretrukket"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Startside"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Juster skjermens lysstyrke"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Lysstyrken tilpasser seg"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimaliser lysstyrkenivået for tilgjengelig lys"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Lys"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Mørk"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatisk"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Hvilemodus"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skjermen slås av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Oppdater foretrukket SIM-kort?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> er det eneste SIM-kortet i enheten din. Vil du bruke dette SIM-kortet for mobildata, telefonanrop og SMS-meldinger?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Feil PIN-kode for SIM-kortet. Du må nå kontakte operatøren din for å låse opp enheten."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Feil PIN-kode for SIM-kortet. Du har <xliff:g id="NUMBER">%d</xliff:g> forsøk igjen før du må kontakte operatøren din for å låse opp enheten."</item>
-    <item quantity="other" msgid="77103619544346451">"Feil PIN-kode for SIM-kortet. Du har <xliff:g id="NUMBER">%d</xliff:g> forsøk igjen."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Feil PIN-kode for SIM-kortet. Du har <xliff:g id="NUMBER_1">%d</xliff:g> forsøk igjen.</item>
+      <item quantity="one">Feil PIN-kode for SIM-kortet. Du har <xliff:g id="NUMBER_0">%d</xliff:g> forsøk igjen før du må kontakte operatøren din for å låse opp enheten.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"PIN-koden for SIM-kortet ble avvist."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status for nettbrettet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonstatus"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Tilgjengelig (skrivebeskyttet)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total plass"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner …"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apper (appdata og mediainnhold)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apper og appdata"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medier"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Nedlastinger"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Bilder, videoer"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Lyd (musikk, ringetoner, podcaster osv.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Andre filer"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Bufrede data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Koble fra delt lagring"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Avmonter/løs ut minnekort"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Frakobling pågår"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Lite ledig lagringsplass"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Enkelte systemfunksjoner, som for eksempel synkronisering, fungerer muligens ikke slik de skal. Prøv å frigi plass ved å slette eller løsne elementer, slik som apper eller mediainnhold."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Gi nytt navn"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Montér"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Løs ut"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Slett og formatér"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Slett og formatér som intern lagring"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-tilkoblingen til datamaskinen"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-tilkoblingen til datamaskinen"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Koble til som"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Lar deg overføre mediefiler i Windows, eller ved å bruke Android File Transfer på Mac (se www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Gjør at du kan overføre bilder ved hjelp av kameraets programvare samt overføre alle slags filer på datamaskiner som ikke støtter MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installer filoverføringsverktøy"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Gjør at MIDI-aktiverte apper fungerer via USB med MIDI-programvare på datamaskinen din."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Andre brukere"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Lagringsenhet"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Flyttbar lagring"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ledig (totalt <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> er montert"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Kunne ikke montere <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> ble løst ut på en trygg måte"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Kunne ikke løse ut <xliff:g id="NAME">%1$s</xliff:g> på en trygg måte"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> er formatert"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Kunne ikke formatere <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Gi nytt navn til lagring"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Etter formatering kan du bruke <xliff:g id="NAME_0">^1</xliff:g> på andre enheter. \n\nAlle dataene på <xliff:g id="NAME_1">^1</xliff:g> blir slettet. Vurder å ta en sikkerhetskopi først. \n\n"<b>"Sikkerhetskopiér bilder og andre medier"</b>\n"Flytt mediefilene dine til en alternativ lagringsplass på denne enheten, eller overfør dem til en datamaskin ved hjelp av en USB-kabel. \n\n"<b>"Sikkerhetskopiér apper"</b>\n" Alle apper som er lagret på denne <xliff:g id="NAME_6">^1</xliff:g> avinstalleres, og appdata blir slettet. For å beholde disse appene, må du flytte dem til en alternativ lagringsplass på denne enheten."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Når du løser ut <xliff:g id="NAME_0">^1</xliff:g>, slutter apper som er lagret på den å virke, og mediefiler som er lagret på den, blir ikke tilgjengelige før lagringsmediet settes inn igjen."</b>\n\n"<xliff:g id="NAME_1">^1</xliff:g> er formatert til å kun fungere med denne enheten. Lagringsmediet fungerer ikke på andre enheter."</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>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"For å flytte bilder og andre medier mellom enheter."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Bruk som intern lagring"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"For å lagre ting på bare denne enheten, inkludert apper og bilder. Krever formatering som hindrer den i å fungere med andre enheter."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatér som intern lagring"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Dette krever at <xliff:g id="NAME_0">^1</xliff:g> er formatert for å gjøre det sikkert. \n\nEtter formatering fungerer <xliff:g id="NAME_1">^1</xliff:g> bare med denne enheten. \n\n"<b>"Formatering sletter alle data som er lagret på <xliff:g id="NAME_2">^1</xliff:g> for øyeblikket."</b>" For å unngå at data går tapt, bør du vurdere å ta en sikkerhetskopi."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Slett og formatér"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formaterer <xliff:g id="NAME">^1</xliff:g> …"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ikke fjern <xliff:g id="NAME">^1</xliff:g> mens det formateres."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Flytt data til ny lagring"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Du kan flytte bilder, filer og appdata til <xliff:g id="NAME">^1</xliff:g>. \n\nFlyttingen tar ca. <xliff:g id="TIME">^2</xliff:g> og frigjør <xliff:g id="SIZE">^3</xliff:g> intern lagringsplass. Noen apper kommer ikke til å fungere mens flyttingen pågår."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Flytt nå"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Flytt senere"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Flytt data nå"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Flyttingen tar ca. <xliff:g id="TIME">^1</xliff:g>. Den frigjør <xliff:g id="SIZE">^2</xliff:g> intern lagringsplass."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Flytt"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Flytter data …"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Under flyttingen: \n• Ikke fjern <xliff:g id="NAME">^1</xliff:g>. \n• Noen apper kommer ikke til å fungere skikkelig. \n• Hold enheten ladet."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> er klar"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> er klar til bruk med bilder og andre medier."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> fungerer. \n\nFor å flytte bilder, filer og programdata til denne enheten, gå til Innstillinger og lagring."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Flytt <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Det tar bare et par øyeblikk å flytte <xliff:g id="APP">^1</xliff:g> og tilhørende data til <xliff:g id="NAME_0">^2</xliff:g>. Du kan ikke bruke appen før flyttingen er ferdig. \n\nIkke fjern <xliff:g id="NAME_1">^2</xliff:g> mens flyttingen pågår."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Flytter <xliff:g id="APP">^1</xliff:g> …"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ikke fjern <xliff:g id="NAME">^1</xliff:g> under flyttingen. \n\n<xliff:g id="APP">^2</xliff:g>-appen på denne enheten blir ikke tilgjengelig før flyttingen er ferdig."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Avbryt flyttingen"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batterinivå"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Gjenoppretter standard APN-innstillinger."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Tilbakestill til standardvalg"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Tilbakestilling av standard APN-innstillinger er fullført."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Tilbakestill nettverksinnstillingene"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Dette tilbakestiller alle nettverksinnstillingene, 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 innstillinger"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Vil du tilbakestille alle nettverksinnstillingene? Du kan ikke angre denne handlingen."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Tilbakestill innstillinger"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vil du tilbakestille?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Nettverksinnstillingene er tilbakestilt"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Tilbakestill enheten"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrikkinnstillinger"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på nettbrettet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Fjern alle data fra telefonen"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette kommer til å slette alle data fra nettbrettets "<b>"interne lagringsplass"</b>", herunder:\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="9165016501623540228">"Dette vil slette alle data fra telefonens "<b>"interne lagringsplass"</b>", herunder:\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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Slett alle data på SD-kortet, som for eksempel musikk eller bilder"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tilbakestill nettbrettet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Tilbakestill telefonen"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Vil du slette alle dine personlige opplysninger og nedlastede apper? Du kan ikke reversere denne handlingen!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Vil du slette den personlige informasjonen din og nedlastede apper? Du kan ikke angre denne handlingen."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Fjern alt"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestillingen til fabrikkstandard."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Tilbakestilling ble ikke utført fordi tilbakestillingstjenesten ikke er tilgjengelig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vil du tilbakestille?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tilbakestilling til fabrikkstandard er ikke tilgjengelig for denne brukeren"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vil du tømme USB-lageret og slette alle filene som er lagret der? Du kan ikke reversere denne handlingen!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vil du slette SD-kortet og alle filene som er lagret der? Du kan ikke reversere denne handlingen!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Slett alt"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du må tegne opplåsingsmønsteret for å bekrefte formateringen av USB-lagring."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Du må tegne opplåsingsmønsteret for å bekrefte formateringen av SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Samtaleinnstillinger"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Telefonsvarer, viderekobling, samtale venter, nummervisning"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tilknytning"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjelp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilnettverk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilabonnement"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standard SMS-app"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vil du bytte SMS-app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vil du bruke <xliff:g id="NEW_APP">%1$s</xliff:g> i stedet for <xliff:g id="CURRENT_APP">%2$s</xliff:g> for SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vil du bruke <xliff:g id="NEW_APP">%s</xliff:g> som SMS-app?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Posisjonsmodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Bruk GPS, Wi-Fi, og mobilnettverk til å fastslå posisjon"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Bruk Wi-Fi og mobilnettverk til å fastslå posisjon"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Bruk GPS til å fastslå posisjonen din"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Bruk GPS til å fastslå posisjonen din"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Søker"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Søker"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-skanning"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Forbedre posisjonen ved å la apper og tjenester skanne etter Wi-Fi-nettverk – selv når Wi-Fi er slått av"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-skanning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Forbedre posisjonen ved å la systemtjenester skanne etter Bluetooth-enheter – selv når Bluetooth er slått av"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi- og mobilnettverksposisjon"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Tillat at apper bruker posisjonstjenesten fra Google til å finne posisjonen din raskere. Anonym posisjonsdata blir samlet inn og sendt til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Posisjon fastsatt av Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Passordet er angitt"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-kode er angitt"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mønster er angitt"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Skjermsikkerhet"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Bruk enhetsmønsteret ditt for å fortsette."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Skriv inn enhets-PIN-koden din for å fortsette."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Skriv inn enhetspassordet ditt for å fortsette."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Enhetssikkerhet"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Opplåsingsmønster"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Endre PIN-kode for opplåsning"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekreft lagret mønster"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Prøv på nytt:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Tegn et opplåsingsmønster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Trykk menyknappen for hjelp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Slipp fingeren når du er ferdig."</string>
@@ -1176,8 +1225,7 @@
     <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>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hvordan tegne et opplåsingsmønster"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"For mange gale forsøk!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Prøv igjen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"For mange ugyldige forsøk. Prøv på nytt om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Appen er ikke installert på telefonen din."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apper"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerte apper"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter etter størrelse"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Vis kjørende tjenester"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Vis bufrede prosesser"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Nødapp"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Tilbakestill app-innstillingene"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vil du tilbakestille app-innstillingene?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dette tilbakestiller alle innstillinger for:\n\n"<li>"deaktiverte apper"</li>\n<li>"deaktiverte appvarsler"</li>\n<li>"standardapper for handlinger"</li>\n<li>"begrensninger for bakgrunnsdata for apper"</li>\n<li>"eventuelle tillatelsesbegrensninger"</li>\n\n" Du kommer ikke til å miste noe appdata."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Appkjøring"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Kjøres"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(aldri brukt)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Ingen standardapper"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Bruk av lagringsplass"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vis lagring som brukes av apper"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kjørende tjenester"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informasjon om nettbrettet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformasjon"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Batteriinformasjon"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Hurtigtaster"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Angi hurtigtaster for å starte apper"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Tilordne app"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Ingen snarvei"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Søk + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Fjern"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Snarveien for <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) will be fjernet."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Avbryt"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apper"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Snarveier"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Skriving av tekst"</string>
     <string name="input_method" msgid="5434026103176856164">"Inndatametode"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Gjeldende tastatur"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samle alle Bluetooth HCI-pakker i en fil"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-opplåsing"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Tillat at oppstartsinnlasteren låses opp"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Tast inn PIN-koden"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Tast inn enhetens PIN-kode for å aktivere OEM-opplåsing"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vil du tillate OEM-opplåsing?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVARSEL: Enhetsbeskyttelse-funksjoner fungerer ikke på denne enheten mens denne innstillingen er slått på."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Bufferstørrelser for logg"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Velg Loggstørrelser per loggbuffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivér inspeksjon av visningsattributtet"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Nettverk"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Trådløs skjermsertifisering"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktiver detaljert Wi-Fi-loggføring"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiv overføring til Wi-Fi for mobil"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Tillat alltid skanning for Wi-Fi-roaming"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Bruk den eldre versjonen av DHCP-klienten"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Vis alternativer for trådløs skjerm-sertifisering"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Øk Wi-Fi-loggenivå – vis per SSID RSSI i Wi-Fi-velgeren"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Hvis dette slås på, overfører Wi-Fi-nettverket datatilkoblingen til mobil mer aggressivt når Wi-Fi-signalet er lavt"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Tillat / ikke tillat skanning for Wi-Fi-roaming basert på mengden datatrafikk til stede i grensesnittet"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Bufferstørrelser for logg"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Velg Loggstørrelser per loggbuffer"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Velg USB-konfigurasjon"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Velg USB-konfigurasjon"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivér inspeksjon av visningsattributtet"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Bruk DHCP-klienten fra Lollipop i stedet for den nye DHCP-klienten for Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Aktiver USB-debugging?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-feilsøking er bare ment for utviklingsformål. Bruk det til å kopiere data mellom datamaskinen og enheten, installere apper på enheten uten varsel og lese loggdata."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Vil du oppheve tilgangen til USB-feilsøking fra alle datamaskiner du tidligere har autorisert?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> må:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Fordi en app skjuler tillatelsesforespørselen, kan ikke Innstillinger bekrefte svaret ditt."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Hvis du slår på <xliff:g id="SERVICE">%1$s</xliff:g>, bruker ikke enheten skjermlåsen til å forbedre datakryptering."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Fordi du har slått på en tilgjengelighetstjeneste, bruker ikke enheten skjermlåsen til å forbedre datakryptering."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Du må bekrefte mønsteret ditt for å slå på <xliff:g id="SERVICE">%1$s</xliff:g>, fordi den påvirker datakryptering."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Prosess-statistikk"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nerdete statistikk om prosesser som er i gang"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Minnebruk"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apper over <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> av <xliff:g id="TOTALRAM">%2$s</xliff:g> ble brukt på <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Bakgrunn"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Forgrunn"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Bufret"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Enhetsminnet er for tiden <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Gjennomsnittlig RAM-bruk"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimal RAM-bruk"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Innebygd"</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">"Buffere"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM-bruk"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM-bruk (bakgrunn)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Kjøringstid"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Prosesser"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Tjenester"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Varighet"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Minnedetaljer"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 timer"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"Én dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Vis system"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Skjul systemet"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Bruk Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikktype"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Bakgrunn"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Standardinnstillingene nedenfor overstyrer innstillingene for appen"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardvalg"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Standardmotor"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Angir hvilken talesyntesemotor som skal brukes for uttalt tekst"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Angi bruk av talesyntesemotoren ved muntlig tekst"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Talehastighet"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Hvor raskt teksten leses"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Stemmeleie"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Maskinvarebasert"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Bare programvare"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Legitimasjon er ikke tilgjengelig for denne brukeren"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du må tegne opplåsingsmønsteret for å bekrefte installasjonen av legitimasjon."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhetskopier data"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sikkerhetskopiér appdata, Wi-Fi-passord og andre innstillinger til Googles tjenere"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Sikkerhetskopikonto"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ingen konto lagrer for øyeblikket sikkerhetskopierte data"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Inkluder appdata"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Auto-gjenoppretting"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Gjenopprett sikkerhetskopierte innstillinger og data når apper installeres"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Sikkerhetskopieringstjenesten er inaktiv."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dette er angitt i retningslinjene for enheten."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Passord for sikkerhetskopiering på datamaskin"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Fullstendig sikkerhetskopiering på datamaskin beskyttes ikke for øyeblikket."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Trykk for å endre eller fjerne passordet for fullstendige sikkerhetskopier på datamaskinen"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimasjonsskala"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Varighetsskala, animatør"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulering av sekundærskjermer"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Flervindusmodus"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Flere aktiviteter på skjermen samtidig."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Vil du slå på flervindusmodus?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ADVARSEL: Dette er en svært eksperimentell funksjon som gjør at du kan ha flere aktiviteter på skjermen samtidig gjennom Nylige apper-brukergrensesnittet. Noen apper kan krasje eller ikke fungere riktig når de brukes med denne funksjonen."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apper"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ikke behold aktiviteter"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Fjern hver aktivitet så fort brukeren forlater den"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Bruker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begrenset profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Vil du legge til en ny bruker?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Du kan dele denne enheten med andre ved å opprette flere brukere. Hver av brukerne har sitt eget område som kan tilpasses med egne apper, bakgrunnsbilder og så videre. Brukerne kan også justere enhetsinnstillinger (f.eks. Wi-Fi) som påvirker alle.\n\nNå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_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 vedkommende er tilgjengelig for å bruke enheten og konfigurere området sitt"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Vil du fjerne gjesten?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Alle appene og all informasjon i denne økten kommer til å slettes."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Fjern"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Tillat telefonanrop"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Tillat telefonsamtaler og SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Slå på telefonsamtaler"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Slå på telefonsamtaler og SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Slett brukeren"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Vil du tillate anrop?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Vil du slå på telefonsamtaler?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Anropsloggen deles med denne brukeren."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Vil du tillate anrop og tekstmeldinger?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Anrops- og tekstmeldingsloggen deles med denne brukeren."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vil du slå på telefonsamtaler og SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Anrops- og tekstmeldingsloggen deles med denne brukeren."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillat apper og innhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apper med begrensninger"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utvidelsesinnstillinger for appen"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"GI NYTT NAVN"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Angi appbegrensninger"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrollert av <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Denne appen støttes ikke i begrensede profiler"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Denne appen har tilgang til kontoene dine"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Denne appen har tilgang til kontoene dine. Kontrollert av <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi og mobil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Tillat endring av Wi-Fi- og mobilinnstillinger"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"sende melding sende tekstmelding meldinger"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiltelefon mobil operatør trådløs data 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi ringe ringer"</string>
     <string name="keywords_home" msgid="3626170808219458848">"appoversikt"</string>
     <string name="keywords_display" msgid="6709007669501628320">"berøringsskjerm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dimme skjerm berøringsskjerm batteri"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dimme skjerm berøringsskjerm batteri"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"bakgrunn gi personlig preg tilpasse skjerm"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"mørkt tema nattmodus ton ned skjermen inverter lysstyrken"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"bakgrunn gi personlig preg tilpass skjermen"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekststørrelse"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"prosjekt"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projiser casting"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"plass disk harddisk enhetsbruk"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"strømforbruk lade"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"stavemåte ordliste stavekontroll autokorrektur"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"begrensning begrens begrenset"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"sende melding korrigering korrekt lyd vibrer automatisk språk bevegelse foreslå forslag tema støtende ord type emoji internasjonal"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"tilbakestill innstillinger standard"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"standard nødapp"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"apper last ned apper system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"sikkerhet for apptillatelser"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"standardapper"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"dra passord mønster PIN-kode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolum"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Ringevolum"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Varselvolum"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Forstyrrelser"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Ved innkommende anrop og varsler"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Forstyrr alltid"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Tillat bare prioriterte forstyrrelser"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ikke forstyrr"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritet tillater bare"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Bare prioritet"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Bare alarmer"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Ingen forstyrrelser"</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="ringtone_title" msgid="5379026328015343686">"Ringetone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standard varslingslyd"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrer også når det ringer"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrer"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Varseltilgang"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apper kan ikke lese varsler"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app kan lese varsler"</item>
-    <item quantity="other" msgid="980049191810249052">"%d apper kan lese varsler"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d apper kan lese varsler</item>
+      <item quantity="one">%d app kan lese varsler</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Ingen varselslyttere er installert."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vil du aktivere <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan lese alle varsler lagt inn av systemet eller installerte apper. Dette kan omfatte personlig informasjon, som for eksempel kontaktnavn og innholdet i meldinger som sendes til deg. Den kan også avvise disse varslene, eller trykke på handlingsknapper i dem."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Apper som inneholder vilkår"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ingen apper angir betingelser"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app angir betingelser"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apper angir betingelser"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ingen apper som angir vlkår er installert."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vil du aktivere <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan legge til avslutsningsbetingelser for «Ikke forstyrr»-modusen."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blokkér"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkér alle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Vis aldri varsler fra denne appen"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritet"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Vis varsler øverst i listen og fortsett å vise dem når enheten er konfigurert til bare prioriterte forstyrrelser"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensitivt"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Skjul eventuelt sensitivt innhold fra denne appens varsler når enheten er låst"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Behandle som prioritert"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Ikke kutt lyden for varsler fra denne appen når «Ikke forstyrr» er angitt som «Bare prioriterte»"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Tillat smugtitting"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"La denne appen legge vekt på bestemte varsler ved å vise dem kjapt på skjermen"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skjul sensitivt innhold"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Når enheten er låst, skjules innhold i denne appens varsler som kan avsløre privat informasjon"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokkert"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitivt"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Ferdig"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Inntil du slår av funksjonen"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriterte forstyrrelser"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Nedetid"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dager"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ingen"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Avbrudd tillatt"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Bare prioritet"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ingen"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisering"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Slå på automatisk"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Regelnavn"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Legg til regel"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Slett regel"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vil du slette «<xliff:g id="RULE">%1$s</xliff:g>»-regelen?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Slett"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Regeltype"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Ukjent"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigurer regel"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Timeplanregel"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Fant ikke regelen."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dager"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ingen"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Hver dag"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldri"</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> til <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Anrop"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Meldinger"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Anrop/meldinger fra"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Alle"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Bare kontakter"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Bare stjernemerkede kontakter"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Aktiviteter og påminnelser"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmer er alltid prioriterte forstyrrelser"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Påminnelser"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Hendelser"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Utvalgte oppringere"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gjentatte oppringere"</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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Kvelder på ukedager"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttidspunkt"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttidspunkt"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> neste dag"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> eller en alarm før"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> neste dag eller en alarm før"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> neste dag"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Forstyrrelser"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Ved innkommende anrop og varsler"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Når vil du bli forstyrret?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Hvor lenge?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Forstyrr alltid"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"av,alle,alt"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Tillat bare prioriterte forstyrrelser"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Bare tillat alarmer"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Ikke forstyrr"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"På ubestemt tid"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutter</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minutt</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> timer</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> time</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Bytt til Bare prioritetsvarsler på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Bytt til Bare prioritetsvarsler i <xliff:g id="DURATION">%1$d</xliff:g> minutter til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Bytt til Bare prioritetsvarsler i ett minutt til <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Bytt til Bare prioritetsvarsler i <xliff:g id="DURATION">%1$d</xliff:g> timer (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bytt til Bare prioritetsvarsler i én time til <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Bytt til Bare alarmer på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Bytt til Bare alarmer i <xliff:g id="DURATION">%1$d</xliff:g> minutter (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bytt til Bare alarmer i ett minutt til <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">Bytt til Bare alarmer i <xliff:g id="DURATION">%1$d</xliff:g> timer til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Bytt til Bare alarmer i én time til <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Bytt til Ikke forstyrr på ubestemt tid"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Bytt til Ikke forstyrr i <xliff:g id="DURATION">%1$d</xliff:g> minutter (til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bytt til Ikke forstyrr i ett minutt til <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Bytt til Ikke forstyrr i <xliff:g id="DURATION">%1$d</xliff:g> timer til <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Bytt til Ikke forstyrr i én time til <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Bytt til Alltid forstyrr"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"for alltid"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appvarsler"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send tilbakemelding om enheten"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-informasjon"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-relatert informasjon"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Spor <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Start som standard"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> brukt av <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Domenelinker"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Åpne nettadressene på domenet"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"La appen åpne nettadressene på domenet sitt direkte"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Støttede nettadresser på domenet"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Andre standarder"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> brukt av <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"internt minne"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"eksternt minne"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Intern lagring"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Ekstern lagring"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Appens databruk"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> brukt siden <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Lagringsplass som brukes"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"På"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blokkér"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensitivt"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritert"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritert og sensitivt"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tillatelser er gitt</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tillatelse er gitt</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> av <xliff:g id="COUNT_3">%d</xliff:g> tillatelser er gitt</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> tillatelser er gitt</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Noen standardvalg er angitt"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Ingen standardvalg er angitt"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Alle apper"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Slått på"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personlig"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Jobb"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokkert"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritert"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitivt"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med nettadresser på domenet"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Avslått av administratoren"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Avansert"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Ukjent app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Velg profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Apptillatelser"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> apper har ytterligere tilgang"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> apper er tillatt"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Nettadresser på domenet"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Ikke åpne noen nettadresser på domenet"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Åpne «<xliff:g id="DOMAIN">%s</xliff:g>»"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Åpne «<xliff:g id="DOMAIN">%s</xliff:g>» og relaterte nettadresser"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apper kan åpne nettadressene på domenene sine</item>
+      <item quantity="one">Én app kan åpne nettadressene på domenet sitt</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Ikke gjenkjent"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Standardapper"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Nettleserapp"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Ingen standard nettleser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Standard)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Applagring"</string>
 </resources>
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne-rNP/arrays.xml
index 32cdb7f..6a2a759 100644
--- a/res/values-ne-rNP/arrays.xml
+++ b/res/values-ne-rNP/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push बटन"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"माइक्रोफोनको आवाज बन्द/खुला गर्नुहोस्"</item>
     <item msgid="1148142988678569310">"परियोजना मिडिया"</item>
     <item msgid="9130014005474445273">"VPN सक्रिय पार्नुहोस्"</item>
+    <item msgid="1165192162975045562">"वालपेपर लेख्नुहोस्"</item>
+    <item msgid="7129487923652967258">"संरचनालाई मद्दत गर्नुहोस्"</item>
+    <item msgid="1069023208100114540">"स्क्रिनसट मद्दत गर्नुहोस्"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"स्थान"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"माइक्रोफोनको आवाज बन्द्/खुला गर्नुहोस्"</item>
     <item msgid="5906017727368097853">"आयोजना मिडिया"</item>
     <item msgid="2486614710846178542">"VPN सक्रिय पार्नुहोस्"</item>
+    <item msgid="5586547561693629602">"वालपेपर लेख्नुहोस्"</item>
+    <item msgid="32794179825485062">"संरचनालाई मद्दत गर्नुहोस्"</item>
+    <item msgid="7872852746938272552">"स्क्रिनसटलाई मद्दत गर्नुहोस्"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"छोटो"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"कम"</item>
     <item msgid="4212263919458209842">"चिन्ताजनक"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"बन्द"</item>
-    <item msgid="5656544177755411222">"सीमित रोकावट"</item>
-    <item msgid="8735337502532332056">"शून्य रोकावट"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"सामान्य"</item>
     <item msgid="866544120205026771">"मध्यम"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"गुलाबी"</item>
     <item msgid="6131821495505931173">"रातो"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (मिडिया स्थानान्तरण प्रोटोकल)"</item>
+    <item msgid="8856820259201251036">"PTP (चित्र स्थानान्तरण प्रोटोकल)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB इथरनेट)"</item>
+    <item msgid="2686051673589572111">"अडियो स्रोत"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 5de2c94..8d5ab5b 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"अनुमति दिनुहोस्"</string>
     <string name="deny" msgid="6947806159746484865">"अस्वीकार गर्नुहोस्"</string>
     <string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"अहिले तपाईँ डेभेलपर हुनका लागि <xliff:g id="STEP_COUNT">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।"</item>
-    <item quantity="other" msgid="6722953419953594148">"अहिले तपाईँ एउटा विकासकर्ता हुनबाट <xliff:g id="STEP_COUNT">%1$d</xliff:g> पाइला टाढा हुनु हुन्छ।"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">अहिले तपाईँ विकासकर्ता हुनका लागि <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।</item>
+      <item quantity="one">अहिले तपाईँ विकासकर्ता हुनका लागि <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"तपाईं अब एउटा विकासकर्ता हुनुहुन्छ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"आवश्यक छैन, तपाईँ आफैँ नै एउटा विकासकर्ता हुनुहुन्छ।"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ताररहित र सञ्जालहरू"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS मा SMS बन्द गर्नुहोस्"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"आवश्यक IMS रेजिष्ट्रेसन खुला गर्नुहोस्"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS रजिष्ट्रेसन आवश्यकलाई निष्क्रिय पार्नुहोस्"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE प्रावधान गरिएको फ्ल्याग सक्षम पार्नुहोस्"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE प्रावधान गरिएको फ्ल्याग असक्षम गर्नुहोस्"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram dump सक्रिय पार्नुहोस्"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"LTE ram dump बन्द गर्नुहोस्"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM ठेगाना पुस्तिका हेर्नुहोस्"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफाइल असक्षम पार्ने हो?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"यसले अक्षम पार्छ <xliff:g id="PROFILE_NAME">%1$s</xliff:g> यस <xliff:g id="DEVICE_NAME">%2$s</xliff:g>बाट"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"जडान गरिएको"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"जडान (कुनै फोन छैन)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"जडित (कुनै पनि मिडिया छैन)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"जडित छ (सन्देशमा पहुँच छैन)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"जडित (फोन वा मिडिया छैन)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"विच्छेदन गरियो"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"जडान हटाइँदै ..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"जडान हुँदै..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"जोडा बाँध्दै..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"बेनामी ब्लुटुथ उपकरण"</string>
     <string name="progress_scanning" msgid="192587958424295789">"खोजी गर्दै"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"नजिकै कुनै ब्लुटुथ उपकरण भेटिएन।"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त गरिएका फाइलहरू देखाउनुहोस्"</string>
     <string name="device_picker" msgid="4978696506172252813">"ब्लुटुथ उपकरण छान्नुहोस्"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"ब्लुटुथ अनुमति अनुरोध"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"एउटा अनुप्रयोग ब्लुटुथ सक्रिय पार्न चाहन्छ।"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"एउटा अनुप्रयोगले यो उपकरणका लागि ब्लुटुथ चालू गर्न चाहन्छ।"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"एक अनुप्रयोगले तपाईँको ट्याब्लेटलाई अन्य ब्लुटुथ उपकरणहरूले हेर्न मिल्ने बनाउन चाहन्छ<xliff:g id="TIMEOUT">%1$d</xliff:g> सेकेन्डका लागि।"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"एउटा अनुप्रयोगले तपाईंको फोन अन्य ब्लुटुथ उपकरणहरूमा <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकेन्डको लागि प्रदर्शन गर्न चाहन्छ।"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"एउटा अनुप्रयोगले तपाईँको ट्याब्लेटलाई अन्य ब्लुटुथ उपकरणहरूमा लागि देखिने बनाउन खोजिरहेको छ। तपाईँले यसलाई पछि ब्लुटुथ सेटिङहरूमा परिवर्तन गर्न सक्नु हुन्छ।"</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"रद्द गर्नुहोस्"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUE"</string>
     <string name="okay" msgid="1997666393121016642">"ठीक छ"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"हो"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"होइन"</string>
-    <string name="forget" msgid="7267115980248732932">"FORGET"</string>
+    <string name="forget" msgid="1400428660472591263">"बिर्सनुहोस्"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"अनुहार मिलान सुधार गर्नुहोस्"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"जीवन्तता जाँच"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"अनलक गर्दा आँखा झिम्काउन आवश्यक हुन्छ"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"मेरो स्थान, स्क्रिन अनलक, SIM कार्ड लक, प्रामाणिक भण्डारण लक सेट गर्नुहोस्"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरो स्थान, स्क्रिन अनलक, भण्डारण लकका गोप्य डेटा सेट गर्नुहोस्"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"पासवर्डहरू"</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="3453670509485083962">"थप्नुहोस्"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"स्क्रिन लक"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"औँठाछाप सेटअप"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"खरिद पुष्टि गर्न वा तपाईँको स्क्रिन अनलक गर्न तपाईँको औँठा छाप प्रयोग गर्न, हामीलाई : \n\n ✓ तपाईँको जगेडा स्क्रिन लक विधि गर्नुहोस् \n\n आवश्यक पर्छ ✓ तपाईँको औँठाछाप थप्नुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"सेन्सर खोज्नुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"तपाईँको फोनको पछाडि तर्फ औठाछाप सेन्सरको स्थान निर्धारण गर्नुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"सुरु गरौं!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"औठाछाप सेन्सरमा तपाईँको औंला राख्नुहोस्। तपाईंले एक कम्पन महसुस गर्नुभएपछि उठाउनुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"उत्तम! अब दोहोर्‍याउनुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"औंठाछाप सेन्सरमा उही औंला राख्नुहोस् र तपाईंले एक कम्पन महसुस गर्नुभएपछि औंला उठाउनुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"औँठाछाप थपियो!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"तपाईं यस आइकन जहिले देख्नुहुन्छ, तपाईं पहिचानको लागि वा एक खरीद अधिकारको निम्ति आफ्नो औठाछाप प्रयोग गर्न सक्नुहुन्छ।"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"थप्नुहोस्"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"अर्को"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"तपाईंको चार्जरमा प्लग इन गरेर फेरि प्रयास गर्नुहोस्।"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कुनै लक स्क्रिन PIN वा पासवर्ड छैन"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"तपाईंले इन्क्रिप्सन सुरु गर्नु अघि लक स्क्रिन PIN वा पासवर्ड सेट गर्न आवश्यक छ।"</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"तपाईँ आफ्नो उपकरणको सांकेतिक भाषा पुष्टि गर्न तपाईँको अनलक ढाँचा चित्राङ्कन गर्न आवश्यक छ।"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"इन्क्रिप्ट गर्ने हो?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"इन्क्रिप्सन कार्य उल्ट्याउन मिल्दैन र यदि तपाईँले अवरोध पुर्‍याउनु भयो भने तपाईँले डेटा गुमाउनु हुने छ। इन्क्रिप्सनले एक घन्टा वा बढी समय लिन सक्छ, यस समयमा ट्याब्लेट धेरै पटक पुनःस्टार्ट हुन सक्छ।"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"इन्क्रिप्सन अपरेसन उल्टाउन मिल्दैन र यदि तपाईँले यसलाई अवरूद्ध गर्नु भयो भने तपाईँले डेटा गुमाउनु हुने छ। इनक्रिप्सनलाई करिब एक घन्टा वा बढी लाग्छ जुन समय फोन धेरै चोटि पुनःस्टार्ट हुन सक्छ।"</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"फेस अनलक"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"फितलो सुरक्षा, प्रयोगात्मक"</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_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="current_screen_lock" msgid="4104091715420072219">"वर्तमान स्क्रिन लक"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"उपकरण सुरक्षा सुविधाहरूले अब उपरान्त काम गर्नेछैन।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"प्रशासक, इन्क्रिप्सन नीति वा प्रामाणिक डेटा भण्डारणले असक्षम पारेको"</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_biometric_weak" msgid="3008473624490350142">"फेस अनलक"</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_password" msgid="1203938057264146610">"पासवर्ड:"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"तपाईँले एकपटक स्क्रिन लक सेटअप गरिसकेपछि तपाईँले तपाईँको औँठाछाप सेटिङहरू &gt; सुरक्षामा सेटअप गर्न पनि सक्नुहुन्छ।"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"स्क्रिन लक बन्द गर्नुहोस्"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"अनलक ढाँचा हटाउनुहोस्"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"अनलक PIN हटाउनुहोस्"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"पासवर्ड कम्तिमा एक अक्षरको हुनु पर्छ।"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"पासवर्डले कम्तिमा एउटा अंक समावेश हुनुपर्दछ।"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"पासवर्डमा कम्तिमा एउटा सङ्केत हुनुपर्छ।"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"पासवर्ड कम्तीमा एउटा अक्षरको हुनु पर्छ।"</item>
-    <item quantity="other" msgid="8186027808415585970">"पासवर्डमा कम्तिमा %d अक्षरहरू हुनु पर्दछ।"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"पासवर्ड कम्तिमा एउटा सानो अक्षरको हुनुपर्दछ।"</item>
-    <item quantity="other" msgid="2693910942679679225">"पासवर्ड कम्तिमा %d साना अक्षरहरूको हुनु पर्छ।"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"पासवर्डमा कम्तिमा १ ठूलो अक्षर हुनुपर्दछ।"</item>
-    <item quantity="other" msgid="3030801209112209245">"पासवर्डमा कम्तिमा %d ठूलो अक्षर हुनु पर्दछ।"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"पासवर्ड कम से कम १ सङ्ख्यात्मक अङ्कको हुनु पर्छ।"</item>
-    <item quantity="other" msgid="4703982391407595924">"पासवर्डमा कम्तीमा %d संख्यात्मक अङ्क हुनु पर्छ।"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"पासवर्डमा कम्तिमा १ विशेष सिम्बोल हुनु पर्दछ।"</item>
-    <item quantity="other" msgid="1221290525051187757">"पासवर्डमा कम्तिमा %d विशेष चिन्हहरू हुनु पर्छ।"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"पासवर्डमा कम्तिमा १ गैर-अक्षर वर्ण हुनु पर्दछ।"</item>
-    <item quantity="other" msgid="3952508584649046404">"पासवर्ड कम्तिमा %d गैर-अक्षरको हुनुपर्छ।"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other"> पासवर्ड कम्तिमा % d अक्षरहरूको हुनु पर्छ।</item>
+      <item quantity="one">पासवर्ड कम्तिमा १ अक्षरको हुनु पर्छ</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other"> पासवर्ड कम्तिमा% d लोअर केस अक्षरहरूको हुनु पर्छ।</item>
+      <item quantity="one">पासवर्ड कम्तिमा एउटा लोअर केस अक्षरको हुनुपर्दछ।</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other"> पासवर्ड कम्तिमा %d अपर केस अक्षरहरू हुनु पर्छ।</item>
+      <item quantity="one">पासवर्डमा कम्तिमा एउटा अपर केस अक्षर हुनु पर्छ।</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other"> पासवर्ड कम्तिमा %d संख्यात्मक अङ्क हुनु पर्छ।</item>
+      <item quantity="one">पासवर्डमा कम्तिमा १ संख्यात्मक अङ्क हुनु पर्छ</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other"> पासवर्ड कम्तिमा %d विशेष सङ्केत समावेश गरेको हुनुपर्छ।</item>
+      <item quantity="one">पासवर्डले कम्तिमा १ विशेष सङ्केत समावेश गरेको हुनुपर्दछ</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other"> पासवर्ड कम्तिमा% d गैर-अक्षर वर्णको हुनुपर्छ।</item>
+      <item quantity="one">पासवर्ड कम्तिमा १ गैर-अक्षर वर्णको हुनु पर्छ</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"उपकरण प्रशासकले हालसालको पासवर्ड प्रयोग गर्न अनुमति दिदैन।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"बढ्दो, घट्दो वा अंकको बारम्बार अनुक्रम निषेध गरिएको छ"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ठिक छ"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को साथ जोडी पार्न निश्चित गर्नुहोस् यसले यो पास कुञ्जी देखाइरहेको छ <xliff:g id="PASSKEY">%2$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; यस उपकरणका साथ जोडा बाँध्ने हो?"</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_accept" msgid="6163520056536604875">"जोडी"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"जोडी"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"रद्द गर्नुहोस्"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"जब जडान हुन्छ जोडी अनुदानले तपाईँको सम्पर्कहरू पहुँच गर्छ र इतिहास सम्झाउँछ।"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>सँग जोडा मिलाउन सकेन"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>गलत PIN वा पासकिका कारण सँग जोडा बाँध्न सक्दैन।"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सँग कुराकानी हुन सक्दैन।"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारा जोडा बाँध्ने कार्य अस्वीकृत"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"स्थान सटीकता सुधार गर्न, अनुप्रयोगहरू र सेवाहरूले ब्लुटुथ बन्द हुँदा पनि, ब्लुटुथ यन्त्रहरूको स्क्यान गर्नेछ। तपाईँ यसलाई <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_specific_profiles_title" msgid="6952214406025825164">"सँग जडान गर्नुहोस् ..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"मिडिया अडियो"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"फोन अडियो"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"फाइल स्थानान्तरण"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"इनपुट उपकरण"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"इन्टरनेट पहुँच"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"सम्पर्क साझेदारी"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"सम्पर्क साझेदारीका लागि प्रयोग"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"इन्टरनेट जडान साझेदारी गर्दै"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"सन्देश पहुँच"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"मिडिया अडियोसँग जडित"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"फोन अडियोमा जडान गरियो"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"फाइल ट्रान्सफर सर्भरमा जडान गरियो"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"नक्सासँग जडित"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"फाइल ट्रान्सफर सर्भरसँग जडान गरिएको छैन"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"इनपुट उपकरणसँग जोडिएको छ"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"मिडिया अडियोका लागि प्रयोग गर्नुहोस्"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"फोन अडियोको लागि प्रयोग गर्नुहोस्"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"फाइल ट्रान्सफरका लागि प्रयोग गर्नुहोस्"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"इनपुटको लागि प्रयोग गर्नुहोस्"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"इन्टर्नेट पहुँचका लागि प्रयोग गर्नुहोस्"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"नक्साको लागि प्रयोग गर्नुहोस्"</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_assistant_title" msgid="2553267316621598101">"वाइफाइ सहायक"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi-Fi सहायक द्वारा जोडिएको"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"स्क्रिन कास्ट गर्नुहोस्"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"वाइफाइ निष्क्रिय पार्दै..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"त्रुटि"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"हवाइजहाज मोडमा"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"सञ्जालका लागि स्क्यान गर्न सक्दैन"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"नेटवर्क सूचना"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"सूचीत गर्नुहोस् जब एक सार्वजनिक सञ्जाल उपलब्ध हुन्छ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"कमजोर जडान त्याग्नुहोस्"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"वाइफाइ नेटवर्क राम्रो इन्टरनेट जडान नभएसम्म प्रयोग नगर्नुहोस्।"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"केवल राम्रो इन्टरनेट जडान हुने सञ्जालको उपयोग गर्नुहोस्"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"स्क्यान गर्न सधैँ उपलव्ध छ"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"सधैँ स्क्यान गर्न अनुमति दिनुहोस्"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"वाइफाइ बन्द हुँदा पनि Googleको स्थान सेवा र अन्य अनुप्रयोगहरूलाई सञ्जाल स्क्यान गर्न दिनुहोस्"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"खुला Wi-Fi लाई स्वत: प्रयोग गर्नुहोस्"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fi सहायकलाई स्वतः उच्च गुणस्तर निर्धारण भएको खुला सञ्जालहरूसँग जडान गर्ने अनुमति दिनुहोस्"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"सहायक छान्नुहोस्"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्रहरू स्थापना गर्नुहोस्"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान सटिकता सुधार गर्न र अन्य प्रायोजनहरूको लागि, Google र अन्य अनुप्रयोगहरूले नजिकका नेटवर्कहरू स्क्यान गर्न सक्दछ, वाइफाइ बन्द भएता पनि। यदि तपाईं यो भएको चाहनुहुन्न भने जटिलमा जानुहोस् र स्क्यान गर्न सधैँ उपलब्ध हुन्छ।"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"वाइफाइ बन्द हुँदा पनि अनुप्रयोगहरूले आसपासका नेटवर्कहरूको स्क्यान गर्न सक्छ। यदि तपाईँ यस्तो हुन दिन चाहनुहुन्न भने जटिलमा जानुहोस्, स्क्यान गर्ने सधैं उपलब्ध हुन्छ।"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"स्थान सटीकता सुधार गर्न, अनुप्रयोगहरू र सेवाहरूले Wi-Fi बन्द हुँदा पनि 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="5340097010842405981">"फेरि नदेखाउनुहोस्"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"सुतेको बेलामा वाइफाइ खुला राख्नुहोस्"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"सुतेको बेलामा वाइफाइ"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"अर्को सञ्जाल थप्नुहोस्"</string>
     <string name="wifi_more" msgid="3195296805089107950">"बढी"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्वचालित सेटअप (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"सेटअप पुरा गर्नको लागी तपाईँको ट्याब्लेटको पहुँच वाइफाइमा हुनु जरुरी छ। सेटअप भएपछि तपाईँ मोबाइल डेटा र वाइफाइ बिचमा स्विच गर्न सक्नु हुन्छ।"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"उन्नत विकल्पहरू"</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="5940801028985255304">"तपाईँको राउटरमा वाइफाइ सुरक्षित सेटअप बटन थिच्नुहोस्। यसलाई \"WPS\" पनि भन्न सकिन्छ वा यो प्रतीक हुन्छ:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"तपाईँको राउटरमा Wi-Fi संरक्षित सेटअप बटन थिच्नुहोस्। यसलाई \"WPS\" भन्न सकिन्छ वा यो संकेतद्वारा चिन्ह लगाइएको हुन सक्छ:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"pin नम्बर प्रविष्टि गर्नुहोस्<xliff:g id="NUMBER">%1$s</xliff:g> तपाईँको वाइफाइ राउटरमा। यस सेटअपले काम सक्न दुई मिनेट जति लाग्न सक्छ।"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS सफल भयो। नेटवर्कसँग जोड्दै..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"वाइफाइ सञ्जालसँग<xliff:g id="NETWORK_NAME">%s</xliff:g>जडित"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"AP ब्यान्ड कन्फिगर गर्नुहोस्"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(अपरिवर्तित)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(अनिर्दिष्टित)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"बचत गरियो"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"असक्षम पारियो"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP विन्यास असफल"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"वाईफाई जडान असफल"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"प्रमाणीकरण समस्या"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"दायराभित्र छैन"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"कुनै इन्टरनेट पहुँच पाईएन, स्वचालित रूपमा पुन: जडान छैन।"</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_security_none" msgid="7985461072596594400">"कुनै पनि होइन"</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>
@@ -686,6 +659,8 @@
     <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">"CONNECT"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"यो सञ्जालमा कुनै इन्टरनेटमा पहुँच छैन। नभए पनि सञ्जाल प्रयोग गर्न चाँहनु हुन्छ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"यस सञ्जालको लागि फेरि नसोध्नुहोस्"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"जडान गर्नुहोस्"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"सञ्जालमा जडान गर्न विफल"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"बिर्सनुहोस्"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK पोर्टेबल Wi‑Fi हटस्पट"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<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_mode_title" msgid="2164073796253284289">"कलिङ प्राथमिकता"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi कलिङ मोड"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi को सुझाव गरियो"</item>
+    <item msgid="5267397515594230396">"सेलुलरको सुझाव गरियो"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi कलिङ सक्रिय हुँदा तपाईँको प्राथमिकता र कुन संकेत बलियो छ भन्ने आधारमा तपाईँको फोनले कलहरूलाई Wi-Fi नेटवर्हकरू वा तपाईँको वाहकको नेटवर्कमार्फत पठाउन सक्छ। यो सुविधा सक्रिय पार्न अघि शुल्क र अन्य विवरणको बारेमा तपाईँको वाहकसँग जाँच गर्नुहोस्।"</string>
     <string name="home_settings" msgid="212375129455718176">"गृह"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
     <string name="sound_settings" msgid="5534671337768745343">"आवाज"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"विषयवस्तु"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"लाइट"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"गाढा"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"स्वचालित"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"प्रमुख SIM कार्ड अपडेट गर्ने?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"तपाईंको उपकरणमा <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM मात्र छ। के तपाईं सेलुलर डाटा, कल, र SMS सन्देशहरूका लागि यो SIM प्रयोग गर्न चाहनुहुन्छ?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN कोड गलत छ तपाईंले अाफ्नो उपकरण खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्दर्छ।"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM PIN कोड गलत छ, तपाईंले अाफ्नो उपकरण खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्दर्छ यस अघि तपाईंसँग <xliff:g id="NUMBER">%d</xliff:g> प्रयासहरू बाँकी छ।"</item>
-    <item quantity="other" msgid="77103619544346451">"SIM PIN कोड गलत छ, तपाईंसँग <xliff:g id="NUMBER">%d</xliff:g> बाँकी प्रयासहरू छन्।"</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other"> गलत SIM PIN कोड, तपाईं सँग <xliff:g id="NUMBER_1">%d</xliff:g> पटक प्रयास बाँकी छ।</item>
+      <item quantity="one">SIM PIN कोड गलत छ, तपाईंले अाफ्नो यन्त्र खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्न अघि तपाईंसँग <xliff:g id="NUMBER_0">%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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"अनुप्रयोगहरू (अनुप्रयोग डेटा र मिडिया सामग्री)"</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_media_misc_usage" msgid="235452944021647124">"विविध"</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="default" msgid="6915293408836853020">"SD कार्ड अनमाउन्ट गर्नुहोस्"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"माउन्ट गर्नुहोस्"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"निकाल्नुहोस्"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"मेट्ने &amp; फरम्याट"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"मेटेर &amp; आन्तरिक भण्डारणको रूपमा फरम्याट गर्नुहोस्"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB कम्प्युटर जडान"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB कम्प्युटर जडान"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"यस रूपमा जडान गर्नुहोस्"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"तपाईँलाई विन्डोजमा मिडिया फाइलहरू सार्न वा म्याकमा एन्ड्रोइड फाइल सार्न अनुमति दिन्छ (हेर्नुहोस् (www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"क्यामेरा (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"तपाईँलाई क्यामेरा सफ्टवेयर प्रयोग गरेर फोटाहरू स्थानान्तरण गर्न, र MTP समर्थन नगर्ने कम्प्युटरमा कुनै पनि फाइलहरू स्थानान्तरण दिन्छ।"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"फाइल स्थानान्तरण गर्ने उपकरण स्थापना गर्नुहोस्"</string>
+    <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_external_title" msgid="2723851748972673696">"हटाउन योग्य भण्डारण"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> खाली (कुल <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> माउन्ट गरियो"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> फरम्याट गर्न सकिएन"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"भण्डारण पुन: नामाकरण गर्नुहोस्"</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;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="3677827796634199714"><b>"जब तपाईँले यसलाई <xliff:g id="NAME_0">^1</xliff:g> निकाल्नुहुन्छ, यसमा भण्डारित अनुप्रयोगहरूले काम गर्न रोकिनेछ, र यो पुनःनराखे सम्म यसमा भण्डारित मिडिया फाइलहरू उपलब्ध हुनेछैन। "</b>" \n\n यो <xliff:g id="NAME_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_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_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="1259216693690378749">"फरम्याट गर्ने क्रममा <xliff:g id="NAME">^1</xliff:g> नहटाउनुहोस्।"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"नयाँ भण्डारणमा डेटा सार्नुहोस्"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"तपाईँले यो नयाँ <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="5035719146373359329"><b>"यसरी सार्दा करिब <xliff:g id="TIME">^1</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="8641916179067596592">"सार्दाको समयमा: \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 यो उपकरणमा फोटोहरू, फाइलहरू, र अनुप्रयोग डेटा सार्न, सेटिङ् &amp;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="236043946721254139">"<xliff:g id="NAME_0">^2</xliff:g> मा <xliff:g id="APP">^1</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="4288580957960820740">"सार्ने क्रममा <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="battery_status_title" msgid="9159414319574976203">"ब्याट्रि स्थिति"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ब्याट्रि स्तर"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"सञ्जाल सेटिङहरू रिसेट"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"यसले सबै नेटवर्क सेटिङहरू रिसेट गर्नेछ, \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="4874737348054213767">"सबै नेटवर्क सेटिङहरू रिसेट गर्ने हो? तपाईँ यी कार्य अनडू गर्न सक्नुहुन्न!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिङहरू रिसेट गर्नुहोस्"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"रिसेट गर्ने हो?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"सञ्जाल सेटिङ्हरू रिसेट गरियो"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"उपकरण पुनः सेट गर्नुहोस्"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"कारखाना डेटा रिसेट"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"ट्याब्लेटमा सम्पूर्ण डेटा मेटाउँछ"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"फोनका सबै डेटा मेटाउँछ"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"यस कार्यले तपाईँको सम्पूर्ण डेटा मेटाउँछ ट्याब्लेटको "<b>" आन्तरिक भण्डारणबाट "</b>" : जसमा, \n \n "<li>" तपाईँको गुगल खाता "</li>" \n "<li>" प्रणाली र अनुप्रयोग डेटा र सेटिङहरू"</li>" \n "<li>" डाउनलोड गरिएका अनुप्रयोगहरू "</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"यसले सबै डेटा तपाईंको "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD कार्डबाट सबै डाटाहरू जस्तै संगीत वा फोटाहरू मेटाउनुहोस्"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ट्याब्लेट पुनःसेट गर्नुहोस्"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फोन पुनःसेट गर्नुहोस्"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"तपाईँका सम्पूर्ण व्यक्तिगत जानकारी र डाउनलोड गरिएका अनुप्रयोगहरू मेट्ने हो? तपाईँले यस कार्यलाई उल्ट्याउन सक्नुहुन्न!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"तपाईँका सबै व्यक्तिगत जानकारी र डाउनलोड गरिएका अनुप्रयोगहरू मेट्ने हो? तपाईँ यो कार्य अनडू गर्न सक्नुहुन्न!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सबै मेटाउनुहोस्"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"तपाईँको एउटा फ्याक्ट्रि डेटा पुनःसेट पुष्टि गर्नको लागि तपाईँले अनलक ढाँचा बनाउनु पर्छ।"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"कुनै पुनःसेट हुन सकेन किनभने सिस्टम क्लिएर सेवा उपलब्ध छैन।"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"पुनःसेट गर्ने हो?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"यस प्रयोगकर्ताको लागि कारखाना पुनःसेट गर्ने उपलब्ध छैन"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB भण्डारण मेट्ने हो, त्यहाँ भण्डारण गरिएका सम्पूर्ण फाइलहरू मेटाउँदै? तपाईँ यस कार्यलाई उल्ट्याउन सक्नुहुन्न!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"त्यहाँ संरक्षित सबै फाइलहरू हटाएर SD कार्ड मेटाउनुहुन्छ? तपाईं यो कार्यलाई उल्टाउन सक्नुहुन्न!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"सबै चीज मेटाउनुहोस्"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"तपाईँले आफ्नो अनलक ढाँचा कोर्नु पर्छ यो निश्चित गर्न तपाईँ USB भण्डारण मेटाउन चाहनु हुन्छ।"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"तपाईँ SD कार्ड मेटाउन चाहनुहुन्छ भन्ने पुष्टि गर्नको लागि तपाईँले अनलक ढाँचा बनाउनु पर्छ।"</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"मद्दत"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"सेलुलर सञ्जाल"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाईल योजना"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"पूर्वनिर्धारित 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> SMS अनुप्रयोगको सट्टामा <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>लाई SMS अनुप्रयोगको रूपमा प्रयोग गर्नुहुन्छ?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"स्थान निर्धारण गर्न GPS, वाइफाइ र सेलुलर सञ्जाल प्रयोग गर्नुहोस्"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"स्थान निर्धारण गर्न वाइफाइ र सेलुलर सञ्जाल प्रयोग गर्नुहोस्"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"स्थान अनुमानका लागि GPS प्रयोग गर्नुहोस्"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्थान निर्धारण गर्न GPS प्रयोग गर्नुहोस्"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"स्क्यान गर्दै"</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="2070686681074461301">"Wi-Fi बन्द हुँदा पनि Wi-Fi नेटवर्कहरूको लागि स्क्यान गर्न प्रणाली सेवाहरू अनुमति दिएर स्थान सुधार गर्नुहोस्"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्लुटुथ स्क्यान हुँदै"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ब्लुटुथ बन्द हुँदा पनि ब्लुटुथ यन्त्रहरूको लागि स्क्यान गर्न प्रणाली सेवाहरू अनुमति दिएर स्थान सुधार गर्नुहोस्"</string>
     <string name="location_network_based" msgid="6010456018401296590">"वाइफाइ र सेलुलर सञ्जाल स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"तपाईँको स्थानलाई सीघ्र अनुमान गर्न अनुप्रयोगहरूलाई गुगल स्थान सेवा प्रयोग गर्न अनुमति दिनुहोस्। बेनामी स्थान डेटा भेला गरिने छ र गुगलमा पठाइने छ।"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाइ-फाइद्वारा निर्धारित स्थान"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"स्क्रिन सुरक्षा"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"जारी गर्न आफ्नो यन्त्र ढाँचा प्रयोग गर्नुहोस्।"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"जारी गर्न आफ्नो यन्त्र PIN प्रविष्ट गर्नुहोस्।"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"जारी गर्नका लागि तपाईँको यन्त्र पासवर्ड प्रविष्ट गर्नुहोस्।"</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_need_to_unlock" msgid="757935356911054465">"सुरक्षित ढाँचाको निश्चित गर्नुहोस्"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"फेरि प्रयोग गर्नुहोस्:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"एकदम धेरै गलत प्रयासहरू!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> सेकेन्डमा फेरि प्रयास गर्नुहोस्।"</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="manageapplications_settings_title" msgid="7041951105633616745">"अनुप्रयोगहरू व्यवस्थापन गर्नुहोस्"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"स्थापित अनुप्रयोगहरू प्रबन्ध गर्नुहोस् र हटाउनुहोस्"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"भण्डारण प्रयोग"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"अनुप्रयोगद्वारा प्रयोग गरिएको भण्डारण हेर्नुहोस्"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"चलिरहेका सेवाहरू"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ट्याब्लेट जानकारी"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"फोन जानकारी"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"ब्याट्रि जानकारी"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"छिटो सुरुवात"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"अनुप्रयोग सुरु गर्नका लागि किबोर्ड सर्टकट सेट गर्नुहोस्"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"अनुप्रयोगलाई काम लगाउनुहोस्"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"कुनै सर्टकट छैन"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"खोज + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"हटाउनुहोस्"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> ( <xliff:g id="APPLICATION_NAME">%2$s</xliff:g> )का लागि तपाईँको सर्टकट मेटाउनुहोस्।"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ठीक छ"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"रद्द गर्नुहोस्"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"अनुप्रयोगहरू"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"सर्टकटहरू"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"सम्पूर्ण ब्लुटुथ HCI प्याकेटहरू एक फाइलमा कैद गर्नुहोस्"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM अनलक गर्दै"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"अनलक हुन बूटलोडरलाई अनुमति दिनुहोस्"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"तपाईँको PIN प्रविष्ट गर्नुहोस्"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM अनलक सक्षम गर्न तपाईँको उपकरणको PIN प्रविष्ट गर्नुहोस्"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM अनलक गर्न अनुमति दिने?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"चेतावनी: यो सेटिङ खुला हुँदा, यस उपकरणमा उपकरण सुरक्षा सुविधाहरूले काम गर्ने छैनन्।"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"लगर बफर आकारहरू"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"लग बफर प्रति लगर आकार चयन गर्नुहोस्"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"दृष्टिकोण विशेषता निरीक्षण सक्षम पार्नुहोस्"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"नेटवर्किङ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ताररहित प्रदर्शन प्रमाणीकरण"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाइफाइ वर्बोज लग सक्षम पार्नुहोस्"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"सेलुलर समायोजनका लागि आक्रामक वाइफाइ"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"वाइफाइ घुम्ने स्क्यान गर्न सधैँ अनुमति दिनुहोस्"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"लिगेसी DHCP ग्राहक प्रयोग गर्नुहोस्"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ताररहित प्रदर्शन प्रमाणीकरणका लागि विकल्पहरू देखाउनुहोस्"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"वाइफाइ लग स्तर बढाउनुहोस्, वाइफाइ चयनकर्तामा प्रति SSID RSSI देखाइन्छ"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"वाइफाइ संकेत कम हुँदा, सक्षम जब गरिन्छ, वाइफाइ सेलुलर लागि डेटा जडान सुम्पनामा बढी आक्रामक हुनेछ"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"वाइफाइ घुम्ने स्क्यान इन्टरफेसमा रहेको डेटा यातायातको मात्रामा आधारित अनुमति दिनुहोस्/नदिनुहोस्"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"लगर बफर आकारहरू"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"लग बफर प्रति लगर आकार चयन गर्नुहोस्"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB विन्यास चयन गर्नुहोस्"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB विन्यास चयन गर्नुहोस्"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"दृष्टिकोण विशेषता निरीक्षण सक्षम पार्नुहोस्"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"नयाँ Android DHCP ग्राहकको सट्टा Lollipop बाट DHCP ग्राहक प्रयोग गर्नुहोस्।"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB डिबग गर्न लागि अनुमति दिने हो?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"युएसबी डिबगिङ विकास प्रयोजनका लागि मात्र निर्मित हुन्छ। यसलाई तपाईँको कम्प्युटर र तपाईँको उपकरणका बीच डेटा प्रतिलिपि गर्न, बिना सूचना तपाईँको उपकरणमा अनुप्रयोगहरू स्थापना गर्न र लग डेटा पढ्नका लागि प्रयोग गर्नुहोस्।"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"तपाईँ पहिले नै अधिकृत गर्नुभएका सबै कम्प्यूटरबाट USB डिबग गर्नको लागि पहुँच रद्द गर्ने हो?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"म्याजेन्टा"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> प्रयोग गर्नुहुन्छ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई आवश्यक:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"एपले अनुमति अनुरोधलाई अस्पष्ट मानिरहेको हुनाले, सेटिङहरूलले तपाईंको प्रतिक्रियालाई प्रमाणित गर्न सक्दैनन्।"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"यदि तपाईंले <xliff:g id="SERVICE">%1$s</xliff:g> खोल्नुभयो भने, आफ्नो उपकरणले डेटा गुप्तिकरण अभिवृद्धि गर्न स्क्रिन लक प्रयोग गर्ने छैन।"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"आफ्नो उपकरणले डेटा गुप्तिकरण अभिवृद्धि गर्न स्क्रिन लक प्रयोग गर्ने छैन, किनभने तपाईंले पहुँच सेवा खोल्नुभएको छ।"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेवा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईंले आफ्नो प्याटर्न पुष्टि गर्न आवश्यक छ।"</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> अनुप्रयोगको  <xliff:g id="TIME">%2$s</xliff:g> समय सकियो"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<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_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_memory_status" msgid="4251599550196193093">"उपकरण स्मृति वर्तमान <xliff:g id="MEMSTATE">%1$s</xliff:g> मा छ"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"औसत RAM उपयोग"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"अधिकतम RAM उपयोग"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"प्रक्रियाहरू"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"सेवाहरू"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"अवधि"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"स्मरण गर्नुपर्ने विवरणहरू"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"प्रणाली लुकाउनुहोस्"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ओभरराइड अनुप्रयोग सेटिङहरूमुनि पूर्वनिर्धारित सेटिङहरू"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"पूर्वनिर्धारित सेटिङहरू"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"पूर्वनिर्धारित इन्जिन"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"बोलिएको पाठको लागि प्रयोग हुने वाणी संश्लेषण इन्जिन सेट गर्दछ"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"वाणी संश्लेषण इन्जिनलाई पाठ वाचनको लागि मिलाउनहोस्"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"वाणी दर"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"पाठ वाचन हुने गति"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"पिच"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"तपाईँ प्रमाणपत्र स्थापनाको पुष्टि गर्न तपाईँको अनलक ढाँचा बनाउनु पर्छ।"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"प्रमाणपत्र भण्डारणका लागि पासवर्ड टाइप गर्नुहोस्"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"वर्तमान पासवर्ड:"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"मेरो डेटा ब्याकअप गर्नुहोस्।"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"अनुप्रयोग डेटा, वाइफाइ पासवर्डहरू र गुगल सर्भरहरूका अन्य सेटिङहरूको ब्याकअप गर्नुहोस्"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"ब्याकअप खाता"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"कुनै पनि खाताले ब्याकअप गरिएका डेटा हाल भण्डारण गरिरहेको छैन"</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="5355557151569037197">"जगेडा सेवा निष्क्रिय छ।"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"यो तपाईँको यन्त्र नीतिले स्थापना गर्छ।"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्कटप ब्याकअप पासवर्ड"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्कटप पूर्ण जगेडाहरू हाललाई सुरक्षित छैनन्"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटप पूर्ण ब्याकअपको लागि पासवर्ड बदल्न वा हटाउन छुनुहोस्"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"संक्रमण सजीविकरण मापन"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"सजीविकरण अवधि मापन"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"सहायक प्रदर्शनलाई सिमुलेट गर्नुहोस्"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"बहु-सञ्झ्याल मोड"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"एकै समयमा स्क्रिनमा बहुगतिविधिहरु।"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"बहु-सञ्झ्याल मोड सक्षम गर्ने हो?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"चेतावनी: यो हालका अनुप्रयोगहरू UI को माध्यमबाट एकै समयमा धेरै गतिविधिहरुलाई अन-स्क्रिन अनुमति दिने अत्यधिक प्रयोगात्मक सुविधा हो। केही अनुप्रयोगहरू यस सुविधासँग प्रयोग गर्दा क्र्याश हुने वा सही रूपमा कार्य नगर्न सक्छ।"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"अनुप्रयोगहरू"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"गतिविधिहरू नराख्नुहोस्"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"प्रयोगकर्ताले यसलाई छोड्ने बित्तिकै जति सक्दो चाँडो हरेक गतिविधि ध्वस्त पार्नुहोस्"</string>
@@ -2195,7 +2251,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="718192651887726259">"तपाईं थप प्रयोगकर्ताहरू सिर्जना गरेर अन्य व्यक्तिसँग यो उपकरण साझेदारी गर्न सक्नुहुन्छ। प्रत्येक प्रयोगकर्ताको आफ्नै ठाउँ हुन्छ, जुन उनीहरूको आफ्नै अनुप्रयोगहरू, वालपेपर, र यस्तै सँग अनुकूलित गर्न सक्छन्। प्रयोगकर्ताले पनि सबैलाई असर हुने वाइफाइ जस्तै उपकरण सेटिङ समायोजन गर्न सक्नुहुन्छ। \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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"फोन कल अनुमति दिनुहोस्"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"फोन कल र SMS अनुमति दिनुहोस्"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"फोन कलहरू सक्षम पार्नुहोस्"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"फोन कल तथा SMS सक्षम पार्नुहोस्"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"प्रयोगकर्ता हटाउनुहोस्"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"फोन कल अनुमति दिने हो?"</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_sms_confirm_title" msgid="188164598768941316">"फोन र SMS अनुमति दिने हो?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"कल र SMS इतिहास यो प्रयोगकर्ता सँग साझेदारी गरिने छ।"</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="application_restrictions" msgid="8207332020898004394">"अनुप्रयोगहरू र सामग्री अनुमति दिनुहोस्"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबन्धको साथ अनुप्रयोगहरू"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"अनुप्रयोगको लागि सेटिङहरू विस्तार गर्नुहोस्"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"यो अनुप्रयोग प्रतिबन्धित प्रोफाइलहरूमा समर्थित गर्दैन।"</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>
@@ -2311,7 +2367,7 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"डेटा 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">"डेटा 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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi सञ्जाल जडान"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"पाठ सन्देश पाठ सन्देशिकरण सन्देश पठाउदै"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"सेलुलर सेल वाहक वायरलेस डेटा ४जी ३जी २जी lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi कल कलिङ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लन्चर"</string>
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रिन टचस्क्रिन"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"मधुरो स्क्रिन छोएर चल्ने स्क्रिन ब्याट्री"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"मधुरो स्क्रिन छोएर चल्ने स्क्रिन ब्याट्री"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"व्यक्तिगत अनुकूलित प्रदर्शन पृष्ठभूमि"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"अँध्यारो विषयवस्तु रात मोड मधुरो स्क्रिन इन्भर्ट चमक"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"पृष्ठभूमि व्यक्तिगत अनुकूलन प्रदर्शन"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"पाठ आकार"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"परियोजना"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"प्रोजेक्ट cast"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ठाउँ डिस्क हार्ड ड्राइभ उपकरण उपयोग"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"शक्ति उपयोग चार्ज"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"हिज्जे शब्दकोश हिज्जे परीक्षण स्वत सही"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"खाता"</string>
     <string name="keywords_users" msgid="4673901601478559100">"प्रतिबन्ध सीमित सीमित गरिएको"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"पाठ सुधार सही ध्वनि कम्पन स्वतः भाषा इशारा सुझाव दिनु सुझाव विषय आपत्तिजनक शब्द प्रकार इमोजी अन्तर्राष्ट्रिय"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"प्राथमिकताहरू पूर्वनिर्धारित रिसेट गर्नुहोस्"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"आकस्मिक आइस अनुप्रयोग पूर्वनिर्धारित"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"अनुप्रयोगहरू डाउनलोड गर्ने अनुप्रयोग प्रणाली"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"अनुप्रयोगहरू अनुमति सुरक्षा"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"पूर्वनिर्धारित अनुप्रयोगहरू"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"पासवर्ड प्याटर्न पिन स्लाइड गर्नुहोस्"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ट्याग सेट गर्नुहोस्"</string>
     <string name="write_tag" msgid="8571858602896222537">"लेख्नुहोस्"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"रुकावटहरू"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"जब कल र अधिसूचनाहरू आइपुग्छन्"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"सधै रुकावट"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"प्राथमिकता रुकावटहरू मात्रमा अनुमति दिनुहोस्"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"रुकावट नगर्नुहोस्"</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_option_important_interruptions" msgid="3903928008177972500">"प्राथमिकता मात्र"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"अलार्महरू मात्र"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"कुनै अवरोधहरू छैनन्"</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="ringtone_title" msgid="5379026328015343686">"फोन रिङटोन"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"पूर्वनिर्धारित सूचना रिङ्गटोन"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कलका लागि भाइब्रेट पनि"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"भाइब्रेट"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"सूचना पहुँच"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"अनुप्रयोगहरूले सूचनाहरू पढ्न सक्दैन"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d अनुप्रयोगले सूचनाहरू पढ्न सक्छ"</item>
-    <item quantity="other" msgid="980049191810249052">"%d अनुप्रयोगहरूले सूचनाहरू पढ्न सक्छन्।"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d अनुप्रयोगहरूले सूचनाहरू पढ्न सक्छन्</item>
+      <item quantity="one">%d अनुप्रयोगले सूचनाहरू पढ्न सक्छ</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"कुनै सूचना श्रोताहरू स्थापित गरिएका छैनन्।"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> सक्षम गर्ने?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>ले प्रणालीद्वारा पोष्ट गरिएका सबै सूचनाहरू वा कुनै पनि स्थापित अनुप्रयोग पढ्न सक्ने छ, जसमा सम्पर्क नाम र तपाईँलाई पठाइएका सन्देशहरू पनि पर्न सक्छन्। यसले यी सूचनाहरूलाई खारेज पनि गर्न सक्ने छ वा आफूभित्रका कार्य बटनहरू छुन सक्ने छ।"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"सर्त प्रदायकहरू"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"कुनै अनुप्रयोगहरूले सर्तहरु प्रदान गरेका छैनन्"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d अनुप्रयोगले सर्तहरू प्रदान गर्छन्"</item>
-    <item quantity="other" msgid="358057362115673258">"%d अनुप्रयोगहरूले सर्तहरू प्रदान गर्छन्"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"कुनै सर्त प्रदायकहरू स्थापित गरिएका छैनन्।"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> सक्षम गर्ने?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ले Do not disturb ढाँचालाई निकास अवस्थामा थप गर्न सक्षम हुनेछ।"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अनुप्रयोगहरू लोड हुँदै..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"रोक्नुहोस्"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"सबै रोक्नुहोस्"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"यस अनुप्रयोगबाट सूचनाहरू कहिल्यै नदेखाउनुहोस्"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"प्राथमिकता"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"उपकरण लाई प्राथमिकता रुकावट मात्रमा सेट गरिएको बेला सूचीको शीर्षमा सूचनाहरू देखाउनुहोस् र तिनीहरूलाई आउँदै गर्न दिनुहोस्"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"संवेदनशील"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"जब उपकरण बन्द हुन्छ, यो अनुप्रयोगको अधिसूचनाहरूबाट कुनै पनि संवेदनशील सामग्री लुकाउनुहोस्"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"प्राथमिकताको रूपमा व्यवहार गर्नुहोस्"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"प्राथमिकतामा मात्र बाधा नगर्नुहोस् भन्ने सेट भएको बेला यो अनुप्रयोगका सूचनाहरू सुनिने पार्न अनुमति दिनुहोस्"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"हेर्न अनुमति दिनुहोस्"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"हालको स्क्रिनमा दृश्यका लागि हल्का स्लाइड गरेर  यो अनुप्रयोगले निश्चित सूचनाहरूलाई महत्त्व दिने व्यवस्था मिलाउनुहोस्"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"संवेदनशील सामग्री लुकाउनुहोस्"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"यन्त्र लक भएको बेलामा यो अनुप्रयोगको सूचनाहरूमा निजी जानकारी प्रकट गर्ने सामाग्री लुकाउनुहोस्"</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="zen_mode_default_option" msgid="6940069025071935243">"तपाईँले यसलाई बन्द नगरेसम्म"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"प्राथमिकता रुकावटहरू"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"डाउनटाइम"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"दिन"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"कुनै पनि होइन"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"अवरोधहरू अनुमति दिइएको"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"प्राथमिकता मात्र"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"कुनै पनि होइन"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"स्वचालन"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"स्वचालित रूपमा चालू"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"नियम नाम"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"नियम थप्नुहोस्"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"नियम मेटाउनुहोस्"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\" <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="3201273040477861538">"नियम तालिका"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"नियम फेला परेन।"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"कहिले पनि होइन"</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_from" msgid="1033337300289871697">"बाट कल / सन्देशहरू"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"कोही पनि"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"सम्पर्कहरू मात्र"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"ताराङ्कित सम्पर्कहरू मात्र"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"घटना र अनुस्मारकहरू"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"अलार्महरू सधैं प्राथमिक रुकावटहरू हुन्छन"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्महरू"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमान्डरहरू"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"घटनाहरू"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"कलरहरू चयन गर्नुहोस्"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"कलरहरू दोरोर्‍याउनुहोस्"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"यदि एउटै व्यक्तिले <xliff:g id="MINUTES">%d</xliff:g> मिनेट अवधिभित्र दोस्रो पटक कल गर्छ भने यसलाई अनुमति दिनुहोस्।"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वचालित रूपमा चालू"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"कहिले पनि होइन"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अर्को दिन"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> वा कुनै अलार्म अघि"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"रुकावटहरू"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"जब कल र सूचनाहरू आइपुग्छन्"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"कहिले तपाईँ आफुलाई रोक्न चाहनुहुन्छ?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"कति समय सम्मका लागि हो?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"सधै रुकावट"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"बन्द,सम्पूर्ण,हरेक"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"प्राथमिकता रुकावटहरूलाई मात्र अनुमति दिनुहोस्"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"अलार्महरूलाई मात्र अनुमति दिनुहोस्"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"रुकावट नगर्नुहोस्"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"अनिश्चितकालीन"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मिनेट</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> मिनेट</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"प्राथमिकता सूचनाहरू अनिश्चितकालीन मात्र परिवर्तन गर्नुहोस्"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_0">%2$s</xliff:g> सम्मको लागि प्राथमिकता सूचनाहरू एक मिनेटमात्रका लागि परिवर्तन गर्नुहोस् </item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g> सम्मको लागि प्राथमिकता सूचनाहरूमा मात्र परिवर्तन गर्नुहोस्</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"अलार्महरूलाई अनिश्चितकालीन मात्र परिवर्तन गर्नुहोस्"</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>
+      <item quantity="one">एक मिनेट सम्मको अलार्मलाई <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"><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_0">%2$s</xliff:g> लागि मात्र अलार्म लाई परिवर्तन गर्नुहोस्</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"अनिश्चितकालीन अवरोध नपुर्याउने गरी परिवर्तन गर्नुहोस्"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g> सम्मको लागि एक मिनेट अवरोध नगर्ने भनी परिवर्तन गर्नुहोस्</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_0">%2$s</xliff:g> सम्मको लागि एक घन्टाका लागि अवरोध नगर्ने भनी परिवर्तन गर्नुहोस्</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"सधैं अवरोध गर्ने गरी परिवर्तन गर्नुहोस्"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"सधैं"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"अनुप्रयोग सूचनाहरू"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिङहरू"</string>
     <string name="device_feedback" msgid="3238056036766293294">"उपकरण बारेमा प्रतिक्रिया पठाउनुहोस्"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"पूर्वनिर्धारित रूपमा सुरु गर्नुहोस्"</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="app_launch_domain_links_title" msgid="458956710410857777">"डोमेन लिङ्कहरू"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"डोमेन URL हरू खोल्नुहोस्"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"अनुप्रयोगलाई डोमेन URL हरू खोल्न अनुमति दिनुहोस्"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"समर्थन गरिएका डोमेन URLहरू"</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="410824961149037234">"आन्तरिक मेमोरी"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"बाह्य मेमोरी"</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="notifications_enabled" msgid="6983396130566021385">"खोल्नुहोस्"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"रोक्नुहोस्"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"संवेदनशील"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"प्राथमिकता"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"प्राथमिकता र संवेदनशील"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> अनुमतिहरू दिइयो</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> अनुमति दिइयो</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> मध्ये <xliff:g id="COUNT_2">%d</xliff:g> अनुमति प्रदान गरियो</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> मध्ये <xliff:g id="COUNT_0">%d</xliff:g> अनुमति प्रदान गरियो।</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"केही पूर्वनिर्धारितहरू सेट गरिएका छन्"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"कुनै पूर्वनिर्धारित सेट गरिएको छैन"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"सबै अनुप्रयोगहरू"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"सक्षम गरियो"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"रोकियो"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"प्राथमिकता"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"संवेदनशील"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URLहरू मार्फत"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"प्रशासकद्वारा निष्क्रिय पारिएको"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"उन्नत"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अनुप्रयोग"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"प्रोफाइल रोज्नुहोस्"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"अनुप्रयोग अनुमतिहरू"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> को <xliff:g id="COUNT_0">%d</xliff:g> अनुप्रयोगहरूलाई थप पहुँच अनुमति छ"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> को <xliff:g id="COUNT_0">%d</xliff:g> अनुप्रयोगहरूलाई अनुमति छ"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"डोमेन URLहरू"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"कुनै पनि डोमेन URL नखोल्नुहोस्"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' खोल्नुहोस्"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\'र सम्बन्धित URLहरू खोल्नुहोस्"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अनुप्रयोगहरूले तिनीहरूका डोमेन URL हरू खोल्न सक्छन्</item>
+      <item quantity="one"> एउटा अनुप्रयोगले यसका डोमेन URLहरू खोल्न सक्छ।</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"चिनिएन"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"पूर्वनिर्धारित अनुप्रयोगहरू"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ब्राउजर अनुप्रयोग"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"कुनै पूर्वनिर्धारित ब्राउजर छैन"</string>
+    <string name="default_app" msgid="6864503001385843060">"(पूर्वनिर्धारित)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"अनुप्रयोग भण्डारण"</string>
 </resources>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
new file mode 100644
index 0000000..81d7347
--- /dev/null
+++ b/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="card_background">#ff424242</color>
+</resources>
\ No newline at end of file
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 6303425..7e83544 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Knop indrukken"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"microfoon dempen/dempen opheffen"</item>
     <item msgid="1148142988678569310">"media projecteren"</item>
     <item msgid="9130014005474445273">"VPN activeren"</item>
+    <item msgid="1165192162975045562">"achtergrond schrijven"</item>
+    <item msgid="7129487923652967258">"structuur voor ondersteuning"</item>
+    <item msgid="1069023208100114540">"screenshot voor ondersteuning"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Locatie"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Microfoon dempen/dempen opheffen"</item>
     <item msgid="5906017727368097853">"Media projecteren"</item>
     <item msgid="2486614710846178542">"VPN activeren"</item>
+    <item msgid="5586547561693629602">"Achtergrond schrijven"</item>
+    <item msgid="32794179825485062">"Structuur voor ondersteuning"</item>
+    <item msgid="7872852746938272552">"Screenshot voor ondersteuning"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"laag"</item>
     <item msgid="4212263919458209842">"kritiek"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Uit"</item>
-    <item msgid="5656544177755411222">"Beperkte onderbrekingen"</item>
-    <item msgid="8735337502532332056">"Geen onderbrekingen"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normaal"</item>
     <item msgid="866544120205026771">"Gemiddeld"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Roze"</item>
     <item msgid="6131821495505931173">"Rood"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB-Ethernet)"</item>
+    <item msgid="2686051673589572111">"Audiobron"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 078903e..80c202e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Toestaan"</string>
     <string name="deny" msgid="6947806159746484865">"Weigeren"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"U moet nog <xliff:g id="STEP_COUNT">%1$d</xliff:g> stap uitvoeren om ontwikkelaar te worden."</item>
-    <item quantity="other" msgid="6722953419953594148">"U moet nog <xliff:g id="STEP_COUNT">%1$d</xliff:g> stappen uitvoeren om ontwikkelaar te worden."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">U moet nog <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> stappen uitvoeren om ontwikkelaar te worden.</item>
+      <item quantity="one">U moet nog <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> stap uitvoeren om ontwikkelaar te worden.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"U bent nu ontwikkelaar!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Niet nodig, u bent al ontwikkelaar."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Draadloos en netwerken"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Sms via IMS uitschakelen"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Inschakelen van IMS-registratie vereist"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Uitschakelen van IMS-registratie vereist"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Markering voor VoLTE-registratie inschakelen"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Markering voor VoLTE-registratie uitschakelen"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"LTE RAM-dump inschakelen"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"LTE RAM-dump uitschakelen"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM-adresboek weergeven"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitzending"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profiel uitschakelen?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dit zorgt voor het uitschakelen van :&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Verbonden"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Gekoppeld (geen telefoon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Gekoppeld (geen media)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Verbonden (geen toegang tot berichten)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Gekoppeld (geen telefoon of media)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Verbinding verbroken"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Verbinding verbreken..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Verbinding maken..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Koppelen..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Naamloos Bluetooth-apparaat"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Zoeken"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Geen Bluetooth-apparaten in de buurt."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ontvangen bestanden weergeven"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth-apparaat kiezen"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Toestemmingsverzoek voor Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Een app wil Bluetooth inschakelen."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Een app wil Bluetooth inschakelen voor dit apparaat."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Een app wil uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere Bluetooth-apparaten."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Een app wil uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere Bluetooth-apparaten."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Een app wil uw tablet zichtbaar maken voor andere Bluetooth-apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
@@ -262,7 +255,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD-kaart scannen op media..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Gekop. USB-opsl. alleen-lezen."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"De gekoppelde SD-kaart is alleen-lezen."</string>
-    <string name="skip_label" msgid="47510779345218297">"Ovrsl"</string>
+    <string name="skip_label" msgid="47510779345218297">"Overslaan"</string>
     <string name="next_label" msgid="4693520878012668114">"Volgende"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Taal"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Een activiteit kiezen"</string>
@@ -275,19 +268,17 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kaart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-instellingen"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuleren"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANNULEREN"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"DOORGAAN"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEE"</string>
-    <string name="forget" msgid="7267115980248732932">"VERGETEN"</string>
+    <string name="forget" msgid="1400428660472591263">"Vergeten"</string>
+    <string name="save" msgid="879993180139353333">"Opslaan"</string>
+    <string name="done" msgid="6942539184162713160">"Gereed"</string>
     <string name="settings_label" msgid="1626402585530130914">"Instellingen"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Instellingen"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Snelkoppeling voor instellingen"</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"Vliegmodus"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"Vliegtuigmodus"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Meer"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Draadloos en netwerken"</string>
-    <string name="radio_controls_summary" msgid="2837395036275123133">"Wifi, Bluetooth, vliegmodus, mobiele netwerken en VPN\'s beheren"</string>
+    <string name="radio_controls_summary" msgid="2837395036275123133">"Wifi, Bluetooth, vliegtuigmodus, mobiele netwerken en VPN\'s beheren"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobiele gegevens"</string>
     <string name="calls_title" msgid="3544471959217176768">"Oproepen"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"Sms\'jes"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorteren op tijdzone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Tijd"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Gezichtsvergelijking verbeteren"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Liveness-controle"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Ogen knipperen vereist bij ontgrendelen"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Automatisch vergrendelen"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> na slaapstand"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> na slaapstand, behalve wanneer ontgrendeld gehouden door <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Mijn locatie\', schermontgrendeling, SIM- en referentieopslagvergrendeling instellen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, opslag van referenties vergrendelen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wachtwoorden"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vingerafdruk"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Vingerafdrukbeheer"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Vingerafdruk voor"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Toevoegen"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"schermvergrendeling"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> vingerafdrukken ingeschreven</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> vingerafdruk ingeschreven</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Vingerafdruk config."</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Als u uw vingerafdruk wilt gebruiken om uw scherm te ontgrendelen of aankopen te bevestigen, moeten we het volgende doen: \n\n✓ Uw achterliggende schermvergrendelingsmethode instellen \n\n✓ Uw vingerafdruk toevoegen"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"De sensor zoeken"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Zoek de vingerafdruksensor op de achterkant van uw telefoon."</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="1063375657071124812">"Laten we beginnen."</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Plaats uw vinger op de vingerafdruksensor en til deze op zodra u een trilling voelt."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Prima! Herhaal dit nu."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Plaats dezelfde vinger op de vingerafdruksensor en til deze op zodra u een trilling voelt."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Vingerafdr. toegevoegd"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer u dit pictogram ziet, kunt u uw vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Toevoegen"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Volgende"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryptie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet versleutelen"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoon versleutelen"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sluit uw lader aan en probeer het opnieuw."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen PIN-code of wachtwoord voor schermvergrendeling"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"U moet een pincode of wachtwoord voor schermvergrendeling instellen voordat u de encryptie kunt starten."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"U moet uw ontgrendelingspatroon tekenen om te bevestigen dat u uw apparaat wilt versleutelen."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Versleutelen?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"De coderingsbewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het coderen duurt een uur of langer en de tablet wordt meerdere keren opnieuw opgestart."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"De coderingsbewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het coderen duurt een uur of langer en de telefoon wordt meerdere keren opnieuw opgestart."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Vegen"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Geen beveiliging"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Ontgrendelen via gezichtsherkenning"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Lage beveiliging, experimenteel"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patroon"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Gemiddelde beveiliging"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Gemiddelde tot zware beveiliging"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wachtwoord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Zware beveiliging"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Huidige schermvergrendeling"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Functies voor apparaatbeveiliging werken niet meer."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Uitgeschakeld door beheerder, encryptiebeleid of referentieopslag"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vegen"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Ontgrendelen via gezichtsherkenning"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patroon"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Pincode"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Wachtwoord"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Zodra u een schermvergrendeling heeft ingesteld, kunt u ook uw vingerafdruk instellen in \'Instellingen\' &gt; \'Beveiliging\'."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Schermvergrendeling uitschakelen"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ontgrendelingspatroon verwijderen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"PIN-code voor ontgrendelen verwijderen"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Wachtwoord moet ten minste één letter bevatten."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Wachtwoord moet ten minste één cijfer bevatten."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Wachtwoord moet ten minste één symbool bevatten."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Wachtwoord moet ten minste één letter bevatten."</item>
-    <item quantity="other" msgid="8186027808415585970">"Wachtwoord moet ten minste %d letters bevatten."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Wachtwoord moet ten minste één kleine letter bevatten."</item>
-    <item quantity="other" msgid="2693910942679679225">"Wachtwoord moet ten minste %d kleine letters bevatten."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Wachtwoord moet ten minste één hoofdletter bevatten."</item>
-    <item quantity="other" msgid="3030801209112209245">"Wachtwoord moet ten minste %d hoofdletters bevatten."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Wachtwoord moet ten minste één cijfer bevatten."</item>
-    <item quantity="other" msgid="4703982391407595924">"Wachtwoord moet ten minste %d cijfers bevatten."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Wachtwoord moet ten minste één speciaal symbool bevatten."</item>
-    <item quantity="other" msgid="1221290525051187757">"Wachtwoord moet ten minste %d speciale symbolen bevatten."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Wachtwoord moet ten minste één ander teken dan letters bevatten."</item>
-    <item quantity="other" msgid="3952508584649046404">"Wachtwoord moet ten minste %d andere tekens dan letters bevatten."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Wachtwoord moet ten minste %d letters bevatten.</item>
+      <item quantity="one">Wachtwoord moet ten minste 1 letter bevatten.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Wachtwoord moet ten minste %d kleine letters bevatten.</item>
+      <item quantity="one">Wachtwoord moet ten minste 1 kleine letter bevatten.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Wachtwoord moet ten minste %d hoofdletters bevatten.</item>
+      <item quantity="one">Wachtwoord moet ten minste 1 hoofdletter bevatten.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Wachtwoord moet ten minste %d cijfers bevatten.</item>
+      <item quantity="one">Wachtwoord moet ten minste 1 cijfer bevatten.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Wachtwoord moet ten minste %d speciale symbolen bevatten.</item>
+      <item quantity="one">Wachtwoord moet ten minste 1 speciaal symbool bevatten.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Wachtwoord moet ten minste %d andere tekens dan letters bevatten.</item>
+      <item quantity="one">Wachtwoord moet ten minste 1 ander teken dan letters bevatten.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Apparaatbeheerder staat het gebruik van een recent wachtwoord niet toe."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Een oplopende, aflopende of herhaalde reeks cijfers is niet toegestaan"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Koppelen met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zorg ervoor dat de volgende toegangscode wordt vermeld:&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">"Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Koppelen met dit apparaat?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Koppelen met:<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>Typ het volgende:<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> en druk op Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Koppelen"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"KOPPELEN"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuleren"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Koppelen verleent toegang tot uw contacten en oproepgeschiedenis wanneer de apparaten zijn verbonden."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Kan niet koppelen aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Kan niet koppelen aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vanwege een onjuiste pincode of toegangscode."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kan niet communiceren met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Koppeling geweigerd door <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Kan geen verbinding maken met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Scannen naar apparaten"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Vernieuwen"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Geavanceerd"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Geavanceerde Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Als Bluetooth is ingeschakeld, kan uw apparaat communiceren met andere Bluetooth-apparaten in de buurt."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Apps en services scannen naar Bluetooth-apparaten (ook als Bluetooth is uitgeschakeld) om de nauwkeurigheid van locaties te verbeteren. U kunt dit wijzigen in de <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>instellingen voor scannen<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Verbinding maken met…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media-audio"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefoonaudio"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Bestandsoverdracht"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Invoerapparaat"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internettoegang"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Contacten delen"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Gebruiken voor contacten delen"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetverbinding delen"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Toegang tot berichten"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van audio van medium."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van handsfree audio."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van het invoerapparaat."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Gebruiken voor"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Naam wijzigen"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Ink. bestandsoverdr. toestaan"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbonden met audio van medium"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbonden met audio van telefoon"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Verbonden met server voor bestandsoverdracht"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Verbonden met kaart"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Niet verbonden met server voor bestandsoverdracht"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Verbonden met invoerapparaat"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Verbonden met apparaat voor internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Lokale internetverbinding delen met apparaat"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gebruiken voor audio van medium"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gebruiken voor audio van telefoon"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gebruiken voor bestandsoverdracht"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gebruiken voor invoer"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gebruik voor internettoegang"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gebruiken voor kaart"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Instellingen voor dockstation"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Dockstation gebruiken voor audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als luidsprekertelefoon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Voor muziek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Instellingen onthouden"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Verbonden via wifi-assistent"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Scherm casten"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Casten"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Draadloze weergave inschakelen"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Geen apparaten in de buurt gevonden."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Verbinding maken"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Vergeten"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Gereed"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Naam"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Gegevensuitwisseling toestaan wanneer de tablet een ander apparaat fysiek raakt"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Gegevensuitwisseling toestaan wanneer de telefoon een ander apparaat fysiek raakt"</string>
@@ -592,22 +576,17 @@
     <string name="wifi_starting" msgid="6732377932749942954">"Wifi inschakelen…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wifi uitschakelen…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fout"</string>
-    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In vliegmodus"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan niet scannen naar netwerken"</string>
+    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In vliegtuigmodus"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netwerkmelding"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Melden wanneer een openbaar netwerk beschikbaar is"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Slechte verbindingen vermijden"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Wifi-netwerk niet gebruiken, tenzij dit een goede internetverbinding heeft"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Alleen netwerken gebruiken met een goede internetverbinding"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scannen altijd beschikbaar"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Scannen altijd toestaan"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"De locatieservice en andere apps van Google laten scannen naar netwerken, ook wanneer wifi is uitgeschakeld"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automatisch open wifi gebruiken"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Een Wifi-assistent automatisch verbinding laten maken met open netwerken van hoge kwaliteit"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Assistent kiezen"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Certificaten installeren"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Als u de nauwkeurigheid van locaties en voor andere doeleinden wilt verbeteren, kunnen Google en andere apps scannen naar netwerken in de buurt, ook wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps kunnen scannen naar netwerken in de buurt, ook wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Apps en services scannen naar wifi-netwerken (ook als wifi is uitgeschakeld) om de nauwkeurigheid van locaties te verbeteren. U kunt dit wijzigen via de <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scaninstellingen<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Niet opnieuw weergeven"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wifi behouden in slaapstand"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wifi aan in slaapstand"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Nog een netwerk toevoegen"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Meer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. config. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Uw tablet heeft toegang tot wifi nodig om de configuratie te voltooien. Na de configuratie kunt u schakelen tussen mobiele gegevens en wifi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Geavanceerde opties"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Beveiligde configuratie voor wifi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS starten…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Druk op de knop \'Beveiligde configuratie voor wifi\' op uw router. Misschien heet deze knop \'WPS\' of bevat deze het volgende symbool:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Druk op de knop \'Beveiligde configuratie voor wifi\' op uw router. Misschien heet deze knop \'WPS\' of is deze gemarkeerd met het volgende symbool:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Geef de pincode <xliff:g id="NUMBER">%1$s</xliff:g> op uw wifi-router op. De configuratie kan twee minuten duren."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS geslaagd. Bezig met verbinding maken met netwerk…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Verbonden met wifi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonieme identiteit"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Wachtwoord"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Wachtwoord weergeven"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Frequentieband voor toegangspunt configureren"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4-GHz-frequentieband"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5-GHz-frequentieband"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-instellingen"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ongewijzigd)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(niet opgegeven)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Opgeslagen"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Uitgeschakeld"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-configuratie mislukt"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wifi-verbinding mislukt"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authenticatieprobleem"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Niet binnen bereik"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Geen internettoegang gevonden. Er wordt niet automatisch opnieuw verbinding gemaakt."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beschikbaar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beschikbaar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Geef uw netwerkwachtwoord op"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Inloggen om te koppelen?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"Voor <xliff:g id="APP_NAME">%1$s</xliff:g> moet u online inloggen vóór u met het netwerk koppelt."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KOPPELEN"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Dit netwerk heeft geen internettoegang. Wilt u dit netwerk toch gebruiken?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Niet meer vragen voor dit netwerk"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK portable wifi-hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> draagbare wifi-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_mode_title" msgid="2164073796253284289">"Voorkeur voor bellen"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modus voor bellen via wifi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Voorkeur voor wifi"</item>
+    <item msgid="5267397515594230396">"Voorkeur voor mobiel"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wanneer bellen via wifi is ingeschakeld, kan uw telefoon oproepen doorschakelen via wifi-netwerken of het netwerk van uw provider, afhankelijk van uw voorkeur en welk signaal sterker is. Voordat u deze functie inschakelt, neemt u contact met uw provider op over de kosten en andere details."</string>
     <string name="home_settings" msgid="212375129455718176">"Startpagina"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Weergave"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Geluid"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Helderheid van het scherm aanpassen"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Aanpasbare helderheid"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Helderheidsniveau optimaliseren voor beschikbaar licht"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Thema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Licht"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Donker"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatisch"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Slaapstand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Scherm wordt uitgeschakeld"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Voorkeurs-simkaart updaten?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is de enige simkaart in uw apparaat. Wilt u deze simkaart gebruiken voor mobiele gegevens, oproepen en sms\'jes?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Onjuiste pincode voor simkaart. U moet nu contact opnemen met uw provider om uw apparaat te ontgrendelen."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Onjuiste pincode voor simkaart. U heeft nog <xliff:g id="NUMBER">%d</xliff:g> poging over voordat u contact met uw provider moet opnemen om uw apparaat te ontgrendelen."</item>
-    <item quantity="other" msgid="77103619544346451">"Onjuiste pincode voor simkaart. U heeft nog <xliff:g id="NUMBER">%d</xliff:g> pogingen over."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Onjuiste pincode voor simkaart. U heeft nog <xliff:g id="NUMBER_1">%d</xliff:g> pogingen over.</item>
+      <item quantity="one">Onjuiste pincode voor simkaart. U heeft nog <xliff:g id="NUMBER_0">%d</xliff:g> poging over voordat u contact met uw provider moet opnemen om uw apparaat te ontgrendelen.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Bewerking met pincode voor simkaart mislukt."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletstatus"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefoonstatus"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Beschikbaar (alleen-lezen)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totale ruimte"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Berekenen…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (app-gegevens en media-inhoud)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps en app-gegevens"</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">"Foto\'s, video\'s"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muziek, beltonen, podcasts, enzovoort)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversen"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Andere bestanden"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Gegevens in het cachegeheugen"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gedeelde opslag ontkoppelen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-kaart ontkoppelen"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Ontkoppelen wordt uitgevoerd"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Opslagruimte is bijna vol"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Bepaalde systeemfuncties, zoals synchronisatie, werken mogelijk niet correct. Probeer ruimte vrij te maken door items zoals apps of media-inhoud te verwijderen of los te maken."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Naam wijzigen"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Koppelen"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Uitwerpen"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Wissen en formatteren"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Wissen en formatteren als interne opslag"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-computerverbinding"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-computerverbinding"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Verbinding maken als"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Hiermee kunt u mediabestanden overzetten op Windows-computers, of de app Android File Transfer op Mac-computers (ga naar www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Hiermee kunt u foto\'s overzetten met camerasoftware en bestanden overzetten op computers die geen MTP ondersteunen"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Tools voor overdracht installeren"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Hiermee kunnen apps met MIDI-functionaliteit via USB werken met MIDI-software op uw computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Andere gebruikers"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Apparaatopslag"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Verwijderbare opslag"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> beschikbaar (totaal <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> is gekoppeld"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Kan <xliff:g id="NAME">%1$s</xliff:g> niet koppelen"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> is veilig uitgeworpen"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Kan <xliff:g id="NAME">%1$s</xliff:g> niet veilig uitwerpen"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> is geformatteerd"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Kan <xliff:g id="NAME">%1$s</xliff:g> niet formatteren"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Naam van opslag wijzigen"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Na het formatteren kunt u deze <xliff:g id="NAME_0">^1</xliff:g> gebruiken in andere apparaten. \n\nAlle gegevens op deze <xliff:g id="NAME_1">^1</xliff:g> worden gewist. Misschien wilt u daarom eerst een back-up maken. \n\n"<b>"Maak back-ups van foto\'s en andere media"</b>" \nVerplaats uw mediabestanden naar alternatieve opslagruimte op dit apparaat of zet ze over naar een computer via een USB-kabel. \n\n"<b>"Maak back-ups van apps"</b>" \nAlle apps die zijn opgeslagen op deze <xliff:g id="NAME_6">^1</xliff:g>, worden verwijderd en de bijbehorende gegevens worden gewist. Als u deze apps wilt behouden, verplaatst u ze naar alternatieve opslagruimte op dit apparaat."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Wanneer u deze <xliff:g id="NAME_0">^1</xliff:g> uitwerpt, werken apps die erop zijn opgeslagen niet meer. Mediabestanden die hierop zijn opgeslagen, zijn pas weer beschikbaar als het opslagapparaat weer wordt geplaatst."</b>" \n\nDe <xliff:g id="NAME_1">^1</xliff:g> is geformatteerd voor gebruik in dit apparaat en werkt niet in andere apparaten."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Uw <xliff:g id="NAME">^1</xliff:g> configureren"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gebruiken als draagbare opslag"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Voor het verplaatsen van foto\'s en andere media tussen apparaten."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Gebruiken als intern geheugen"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Voor het opslaan van dingen op alleen dit apparaat (waaronder apps en foto\'s). Hiervoor moet het apparaat worden geformatteerd, zodat het niet meer werkt met andere apparaten."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatteren als intern geheugen"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"De <xliff:g id="NAME_0">^1</xliff:g> moet worden geformatteerd om deze te beveiligen. \n\nNa het formatteren werkt deze <xliff:g id="NAME_1">^1</xliff:g> alleen in dit apparaat. \n\n"<b>"Wanneer u formatteert, worden alle gegevens gewist die momenteel op de <xliff:g id="NAME_2">^1</xliff:g> zijn opgeslagen."</b>" Als u wilt voorkomen dat u gegevens kwijtraakt, kunt u eerst een back-up maken."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Wissen en formatteren"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> formatteren…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Verwijder de <xliff:g id="NAME">^1</xliff:g> niet tijdens het formatteren."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Gegevens verpl. n. nieuwe opslag"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"U kunt uw foto\'s, bestanden en app-gegevens verplaatsen naar deze nieuwe <xliff:g id="NAME">^1</xliff:g>. \n\nHet overzetten duurt ongeveer <xliff:g id="TIME">^2</xliff:g> en maakt <xliff:g id="SIZE">^3</xliff:g> intern geheugen vrij. Tijdens het overzetten werken sommige apps niet."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Nu verplaatsen"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Later verplaatsen"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Gegevens nu verplaatsen"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Het overzetten duurt ongeveer <xliff:g id="TIME">^1</xliff:g>. Het maakt <xliff:g id="SIZE">^2</xliff:g> intern geheugen vrij."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Verplaatsen"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Gegevens verplaatsen…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Tijdens het verplaatsen: \n• Verwijder de <xliff:g id="NAME">^1</xliff:g> niet. \n• Sommige apps werken niet correct. \n• Zorg dat het apparaat voldoende opgeladen blijft."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> is klaar voor gebruik"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Uw <xliff:g id="NAME">^1</xliff:g> kan nu worden gebruikt voor foto\'s en andere media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Uw nieuwe <xliff:g id="NAME">^1</xliff:g> werkt nu. \n\nAls u foto\'s, bestanden en app-gegevens naar dit apparaat wilt verplaatsen, gaat u naar \'Instellingen\' &gt; \'Opslagruimte\'."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> verplaatsen"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"U kunt <xliff:g id="APP">^1</xliff:g> en de bijbehorende gegevens snel overzetten naar de <xliff:g id="NAME_0">^2</xliff:g>. U kunt de app pas weer gebruiken nadat deze volledig is overgezet. \n\nVerwijder de <xliff:g id="NAME_1">^2</xliff:g> niet tijdens het overzetten."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> verplaatsen…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Verwijder de <xliff:g id="NAME">^1</xliff:g> niet tijdens het verplaatsen. \n\nDe app <xliff:g id="APP">^2</xliff:g> op dit apparaat is pas weer beschikbaar zodra het verplaatsen is voltooid."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Verplaatsen annuleren"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Accustatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Accuniveau"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN\'s"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Standaard-APN-instellingen herstellen."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Standaardinstellingen herstellen"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Herstellen van standaard-APN-instellingen voltooid."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Netwerkinstellingen herstellen"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Hiermee worden alle netwerkinstellingen opnieuw ingesteld, waaronder:\n\n"<li>"Wifi"</li>\n<li>"Mobiele gegevens"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Instellingen herstellen"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Alle netwerkinstellingen opnieuw instellen? U kunt deze actie niet ongedaan maken."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Instellingen herstellen"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Herstellen?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Netwerkinstellingen zijn opnieuw ingesteld"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Apparaat opnieuw instellen"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksinstellingen terug"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Alle gegevens op de tablet wissen"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Alle gegevens op de telefoon wissen"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw tablet gewist, waaronder:\n\n"<li>"Uw 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="9165016501623540228">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:\n\n"<li>"Uw 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"U bent momenteel aangemeld bij de volgende accounts:\n"</string>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Alle gegevens op de SD-kaart wissen, zoals muziek en foto\'s"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tablet opnieuw instellen"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefoon opnieuw instellen"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Wilt u al uw persoonlijke gegevens en gedownloade apps verwijderen? U kunt deze actie niet ongedaan maken."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Al uw persoonlijke gegevens en gedownloade apps verwijderen? U kunt deze actie niet ongedaan maken."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles wissen"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"U moet uw ontgrendelingspatroon tekenen om het terugzetten op de fabrieksinstellingen te bevestigen."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Niet opnieuw ingesteld, omdat de service \'Systeem wissen\' niet beschikbaar is."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Opnieuw instellen?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Terugzetten op fabrieksinstellingen is niet beschikbaar voor deze gebruiker"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB-opslag formatteren en alle opgeslagen bestanden wissen? U kunt deze actie niet ongedaan maken."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD-kaart wissen en alle opgeslagen bestanden verwijderen? U kunt deze actie niet ongedaan maken."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Alles wissen"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de USB-opslag wilt wissen."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de SD-kaart wilt wissen."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Oproepinstellingen"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Voicemail, oproepen doorschakelen, wisselgesprek, beller-id instellen"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tethering"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobiele netwerken"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiel abonnement"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standaard sms-app"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Sms-app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Sms-app wijzigen?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Wilt u <xliff:g id="NEW_APP">%1$s</xliff:g> als uw sms-app gebruiken in plaats van <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Wilt u <xliff:g id="NEW_APP">%s</xliff:g> gebruiken als uw sms-app?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Locatiemodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, wifi en mobiele netwerken gebruiken om locatie te bepalen"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wifi en mobiele netwerken gebruiken om locatie te bepalen"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS gebruiken om uw locatie te bepalen"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS gebruiken om locatie te bepalen"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scannen"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scannen"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wifi-scannen"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Locatie verbeteren door apps en services te laten scannen naar wifi-netwerken, ook als wifi is uitgeschakeld"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-scannen"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Locatie verbeteren door systeemservices toe te staan te scannen naar Bluetooth-apparaten, ook als Bluetooth is uitgeschakeld"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Locatie via wifi en mob. netw."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps toestaan de locatieservice van Google te gebruiken om uw locatie sneller te schatten. Anonieme locatiegegevens worden verzameld en verzonden naar Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locatie bepaald via wifi"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Wachtwoord is ingesteld"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-code is ingesteld"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Patroon is ingesteld"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Schermbeveiliging"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Gebruik het patroon van uw apparaat om door te gaan."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Geef de pincode van uw apparaat op om door te gaan."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Geef het wachtwoord van uw apparaat op om door te gaan."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Apparaatbeveiliging"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Ontgrendelingspatroon wijzigen"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"PIN-code voor ontgrendelen wijzigen"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Opgeslagen patroon bevestigen"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Probeer het opnieuw:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Teken een ontgrendelingspatroon"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Druk op \'Menu\' voor hulp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Haal uw vinger van het scherm als u klaar bent"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ontgrendelingspatroon instellen"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Ontgrendelingspatroon wijzigen"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"U tekent als volgt een ontgrendelingspatroon"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Te veel onjuiste pogingen!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Probeer het over <xliff:g id="NUMBER">%d</xliff:g> seconden opnieuw."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Te veel onjuiste pogingen. Probeer het over <xliff:g id="NUMBER">%d</xliff:g> seconden opnieuw."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Deze app is niet geïnstalleerd op uw telefoon."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps beheren"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Geïnstalleerde apps beheren en verwijderen"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sorteren op grootte"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Actieve services weergeven"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Gecachte processen weerg."</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Nood-app"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Appvoorkeuren herstellen"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Appvoorkeuren herstellen?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hiermee worden alle voorkeuren opnieuw ingesteld voor:\n\n "<li>"Uitgeschakelde apps"</li>\n" "<li>"Uitgeschakelde app-meldingen"</li>\n" "<li>"Standaardapps voor acties"</li>\n" "<li>"Beperkingen voor achtergrondgegevens voor apps"</li>\n" "<li>"Beperkingen voor machtigingen"</li>\n\n" U verliest geen app-gegevens."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"App-bewerkingen"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Actief"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nooit gebruikt)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Geen standaard-apps."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Opslaggebruik"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Gebruikte opslagruimte voor apps weergeven"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Actieve services"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tabletinformatie"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefooninformatie"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Accu-informatie"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Snelstarten"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Snelkoppelingen instellen voor het starten van apps"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"App toewijzen"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Geen sneltoets"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Zoeken + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Wissen"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Uw sneltoets voor <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) wordt gewist."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Annuleren"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apps"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Sneltoetsen"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Tekstinvoer"</string>
     <string name="input_method" msgid="5434026103176856164">"Invoermethode"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Huidig toetsenbord"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth-HCI-pakketten tot één bestand samenvoegen"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-ontgrendeling"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Toestaan dat de bootloader wordt ontgrendeld"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Geef uw pincode op"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Geef de pincode van uw apparaat op om OEM-ontgrendeling in te schakelen"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM-ontgrendeling toestaan?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WAARSCHUWING: De apparaatbeveiligingsfuncties werken niet op dit apparaat wanneer deze instelling is ingeschakeld."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger-buffergrootten"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Kies Logger-grootten per logbuffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Inspectie van weergavekenmerk inschakelen"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Netwerken"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificering van draadloze weergave"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Uitgebreide wifi-logregistratie insch."</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agressieve handover van wifi naar mobiel"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Altijd roamingscans voor wifi toestaan"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Oude DHCP-client gebruiken"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Opties weergeven voor certificering van draadloze weergave"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Logniveau voor wifi verhogen, weergeven per SSID RSSI in wifi-kiezer"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Indien ingeschakeld, is wifi agressiever bij het overgeven van de gegevensverbinding aan mobiel wanneer het wifi-signaal zwak is"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Roamingscans voor wifi (niet) toestaan op basis van de hoeveelheid dataverkeer die aanwezig is bij de interface"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Logger-buffergrootten"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Kies Logger-grootten per logbuffer"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB-configuratie selecteren"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB-configuratie selecteren"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Inspectie van weergavekenmerk inschakelen"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"De DHCP-client van Lollipop gebruiken in plaats van de nieuwe Android DHCP-client."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-foutopsporing toestaan?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-foutopsporing is alleen bedoeld voor ontwikkeldoeleinden. Het kan worden gebruikt om gegevens te kopiëren tussen uw computer en uw apparaat, apps zonder melding op uw apparaat te installeren en loggegevens te lezen."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Toegang tot USB-foutopsporing intrekken voor alle computers waarvoor u dit eerder heeft toegestaan?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> gebruiken?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> moet het volgende kunnen:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Aangezien een app een toestemmingsverzoek afdekt, kan Instellingen uw reactie niet verifiëren."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Als u <xliff:g id="SERVICE">%1$s</xliff:g> inschakelt, maakt uw apparaat geen gebruik van schermvergrendeling om de gegevensversleuteling te verbeteren."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Omdat u een toegankelijkheidsservice heeft ingeschakeld, maakt uw apparaat geen gebruik van schermvergrendeling om de gegevensversleuteling te verbeteren."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Aangezien het inschakelen van <xliff:g id="SERVICE">%1$s</xliff:g> van invloed is op de gegevensversleuteling, moet u uw patroon bevestigen."</string>
@@ -1671,7 +1719,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Accu gebruikt wanneer tablet inactief is"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Accu gebruikt wanneer telefoon inactief is"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Accu gebruikt door radio"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"Schakel over naar de vliegmodus om energie te besparen in gebieden zonder mobiel bereik"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Schakel over naar de vliegtuigmodus om energie te besparen in gebieden zonder mobiel bereik"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"Accu gebruikt door de zaklamp"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Accu gebruikt door scherm en achtergrondverlichting"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Verlaag de helderheid van het scherm en/of geef een kortere time-out voor het scherm op"</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistieken"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistieken voor nerds over actieve processen"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Geheugengebruik"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apps voor <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> van <xliff:g id="TOTALRAM">%2$s</xliff:g> gebruikt gedurende <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Achtergrond"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Voorgrond"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"In cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Apparaatgeheugen is momenteel <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Gemiddeld RAM-gebruik"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximaal RAM-gebruik"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android-besturingssysteem"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Systeemeigen"</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-gebruik"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM-gebruik (achtergrond)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Uitvoeringstijd"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Processen"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duur"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Geheugendetails"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 uur"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Systeem weergeven"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Systeemprocessen verbergen"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS gebruiken"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiektype"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Achtergrond"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Onderstaande standaardinstellingen overschrijven instellingen van app"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standaardinstellingen"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Standaardengine"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"De engine voor spraaksynthese instellen die moet worden gebruikt voor gesproken tekst"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"De spraaksynthese-engine instellen die wordt gebruikt voor gesproken tekst"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Spraaksnelheid"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Snelheid waarmee de tekst wordt gesproken"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Hoogte"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Ondersteund door hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Alleen software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Er zijn geen inloggegevens beschikbaar voor deze gebruiker"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"U moet uw ontgrendelingspatroon tekenen om de identificatie-installatie te bevestigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Typ het wachtwoord voor referentieopslag."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidig wachtwoord:"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Back-up maken van mijn gegevens"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Een back-up van gegevens voor apps, wifi-wachtwoorden en andere instellingen maken op de Google-servers"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Back-upaccount"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Er is momenteel geen account ingesteld voor het opslaan van back-upgegevens"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Appgegevens opnemen"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisch terugzetten"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In een back-up opgeslagen instellingen of andere gegevens herstellen bij het opnieuw installeren van een app"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Back-upservice is inactief."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dit wordt ingesteld door uw apparaatbeleid."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Wachtwoord desktopback-up"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Volledige back-ups naar desktops zijn momenteel niet beveiligd"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Raak dit aan om het wachtwoord voor volledige back-ups naar desktops te wijzigen of te verwijderen"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimatieschaal"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Duur van animatieschaal"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Secundaire displays simuleren"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Modus meerdere vensters"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Meerdere activiteiten tegelijk op het scherm."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Modus voor meerdere vensters inschakelen?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"WAARSCHUWING: Dit is een bijzonder experimentele functie waarmee meerdere activiteiten tegelijk op het scherm kunnen worden weergegeven via de gebruikersinterface voor recente apps. Sommige apps kunnen vastlopen of functioneren mogelijk niet correct wanneer ze met deze functie worden gebruikt."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Activiteiten niet opslaan"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Activiteit wissen zodra de gebruiker deze verlaat"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Gebruiker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Beperkt profiel"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Nieuwe gebruiker toevoegen?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"U kunt dit apparaat met andere mensen delen door extra gebruikers te maken. Elke gebruiker heeft zijn eigen profiel dat ze onder andere kunnen aanpassen met hun eigen apps en achtergrond. Gebruikers kunnen ook apparaatinstellingen (zoals wifi) aanpassen, die invloed hebben op alle gebruikers.\n\nWanneer u een nieuwe gebruiker toevoegt, moet die persoon zijn eigen profiel instellen.\n\nElke gebruiker kan apps updaten voor alle andere gebruikers."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"U kunt dit apparaat met andere mensen delen door extra gebruikers te maken. Elke gebruiker heeft zijn eigen profiel dat hij onder andere kan aanpassen met zijn eigen apps en achtergrond. Gebruikers kunnen ook apparaatinstellingen, zoals wifi, aanpassen die van invloed zijn op alle gebruikers.\n\nWanneer u een nieuwe gebruiker toevoegt, moet die persoon zijn eigen profiel instellen.\n\nElke gebruiker kan apps updaten voor alle andere gebruikers."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Wanneer u een nieuwe gebruiker toevoegt, moet die persoon zijn eigen profiel instellen.\n\nElke gebruiker kan apps updaten voor alle andere gebruikers."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Gebruiker nu instellen?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Zorg ervoor dat de persoon het apparaat kan overnemen om zijn profiel te configureren"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Gast verwijderen?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Alle apps en gegevens in deze sessie worden verwijderd."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Verwijderen"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Telefoontjes toestaan"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Telefoontjes en sms toestaan"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Telefoonoproepen inschakelen"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Telefoonoproepen en sms inschakelen"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Gebruiker verwijderen"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Telefoontjes toestaan?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Telefoonoproepen inschakelen?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"De oproepgeschiedenis wordt met deze gebruiker gedeeld."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Telefoontjes en sms toestaan?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"De oproep- en sms-geschiedenis worden met deze gebruiker gedeeld."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefoonoproepen en sms inschakelen?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"De oproep- en sms-geschiedenis wordt gedeeld met deze gebruiker."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Apps en inhoud toestaan"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps met beperkingen"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Inst. uitbreiden voor app"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"NAAM WIJZIGEN"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"App-beperkingen instellen"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Beheerd door <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Deze app wordt niet ondersteund voor beperkte profielen"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Deze app heeft toegang tot uw accounts"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Deze app kan toegang krijgen tot uw accounts. Beheerd door <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wifi en mobiel"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Aanpassing van mobiele en wifi-instellingen toestaan"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi netwerk verbinding"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekst bericht tekstbericht sms sms\'en berichten verzenden sturen"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiel gsm provider draadloos gegevens 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi oproep bellen"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"scherm touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dimmen scherm touchscreen accu"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dimmen scherm touchscreen accu"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"achtergrond personaliseren aanpassen weergave"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"donker thema nachtmodus scherm dimmen helderheid omkeren"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"achtergrond personaliseren aanpassen weergave"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekstgrootte"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projecteren"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projecteren casten"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ruimte schijf harde schijf apparaat gebruik"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"stroomverbruik opladen"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling woordenboek spellingcontrole automatisch corrigeren"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"beperking beperken beperkt"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekst correctie corrigeren geluid trillen automatisch taal gebaar voorstellen suggestie thema aanstootgevend woord type emoji internationaal"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"herstellen voorkeuren standaard"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"standaardapp voor noodgevallen"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"apps downloaden applicaties systeem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps rechten beveiliging"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"standaard voor apps"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"vegen wachtwoord patroon pincode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wifi NFC-tag instellen"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schrijven"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolume"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Beltoonvolume"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Meldingsvolume"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Onderbrekingen"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Bij inkomende oproepen en meldingen"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Altijd onderbreken"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Alleen prioriteitsonderbrekingen toestaan"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Niet onderbreken"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Alleen prioriteit toestaan"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatische regels"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Alleen prioriteit"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alleen alarmen"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Geen onderbrekingen"</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="ringtone_title" msgid="5379026328015343686">"Beltoon telefoon"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standaardbeltoon voor meldingen"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Ook trillen voor oproepen"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Trillen"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Toegang tot meldingen"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps kunnen geen meldingen lezen"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app kan meldingen lezen"</item>
-    <item quantity="other" msgid="980049191810249052">"%d apps kunnen meldingen lezen"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d apps kunnen meldingen lezen</item>
+      <item quantity="one">%d app kan meldingen lezen</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Er zijn geen listeners voor meldingen geïnstalleerd."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> inschakelen?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan alle meldingen lezen die door het systeem of een geïnstalleerde app worden gegenereerd, waaronder mogelijk persoonlijke gegevens zoals de namen van contacten en de tekst van berichten die naar u worden verzonden. De app kan deze meldingen ook sluiten of actieknoppen in de meldingen aanraken."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Apps die voorwaarden leveren"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Er zijn geen apps die voorwaarden leveren"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app levert voorwaarden"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apps leveren voorwaarden"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Er zijn geen apps geïnstalleerd die voorwaarden leveren."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> inschakelen?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan voorwaarden voor sluiten toevoegen voor de modus \'Niet storen\'."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps laden..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blokkeren"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Alles blokkeren"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nooit meldingen van deze app weergeven"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioriteit"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Meldingen boven aan de lijst weergeven en blijven aanvullen wanneer het apparaat is ingesteld op alleen prioriteitsonderbrekingen"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Gevoelig"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Gevoelige inhoud verbergen uit de meldingen van deze app wanneer het apparaat is vergrendeld"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Behandelen als prioriteit"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Laat de meldingen van deze app horen wanneer \'Niet storen\' is ingesteld op \'Alleen prioriteit\'"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Korte weergave toestaan"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Laat deze app bepaalde meldingen benadrukken door ze kort in beeld te schuiven op het huidige scherm"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Gevoelige inhoud verbergen"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Inhoud in meldingen van deze app verbergen die privégegevens openbaar kan maken wanneer het apparaat is vergrendeld"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Geblokkeerd"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioriteit"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Gevoelig"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gereed"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Totdat u dit uitschakelt"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriteitsonderbrekingen"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Downtime"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dagen"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Geen"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Onderbrekingen toegestaan"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Alleen prioriteit"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Geen"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisering"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatisch inschakelen"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Regelnaam"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Regel toevoegen"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Regel verwijderen"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Regel \'<xliff:g id="RULE">%1$s</xliff:g>\' verwijderen?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Verwijderen"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Regeltype"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Onbekend"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Regel configureren"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Planningsregel"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regel niet gevonden."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dagen"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Geen"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Elke dag"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nooit"</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> t/m <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Oproepen"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Berichten"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Oproepen/berichten van"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Iedereen"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Alleen contacten"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Alleen contacten met ster"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Evenementen en herinneringen"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmen zijn altijd prioriteitsonderbrekingen"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmen"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Herinneringen"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Evenementen"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Geselecteerde bellers"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Terugkerende bellers"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Gesprekken toestaan wanneer dezelfde persoon binnen <xliff:g id="MINUTES">%d</xliff:g> minuten een tweede keer belt"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatisch aan"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nooit"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Elke avond"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Doordeweekse avonden"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttijd"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Eindtijd"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> de volgende dag"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> of een eerder alarm"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> de volgende dag of een eerder alarm"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> de volgende dag"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Onderbrekingen"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Bij inkomende oproepen en meldingen"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Wanneer wilt u worden onderbroken?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Hoe lang?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Altijd onderbreken"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"uit,alle,alles"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Alleen prioriteitsonderbrekingen toestaan"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Alleen alarmen toestaan"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Niet onderbreken"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Voor onbepaalde tijd"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuten</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> uur</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> uur</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Wijzigen in \'Alleen prioriteitsmeldingen\' voor onbepaalde tijd"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Wijzigen in \'Alleen prioriteitsmeldingen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> minuten (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Alleen prioriteitsmeldingen\' gedurende één minuut (tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Wijzigen in \'Alleen prioriteitsmeldingen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> uur (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Alleen prioriteitsmeldingen\' gedurende één uur (tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Wijzigen in \'Alleen alarmen\' voor onbepaalde tijd"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Wijzigen in \'Alleen alarmen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> minuten (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Alleen alarmen\' gedurende één minuut (tot <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">Wijzigen in \'Alleen alarmen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> uur (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Alleen alarmen\' gedurende één uur (tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Wijzigen in \'Niet storen\' voor onbepaalde tijd"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Wijzigen in \'Niet storen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> minuten (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Niet storen\' gedurende één minuut (tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Wijzigen in \'Niet storen\' gedurende <xliff:g id="DURATION">%1$d</xliff:g> uur (tot <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Wijzigen in \'Niet storen\' gedurende één uur (tot <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Wijzigen in \'Altijd onderbreken\'"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"Voor altijd"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-meldingen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback sturen over dit apparaat"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-informatie"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Relatieve IMEI-informatie"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Positie <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Standaard starten"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> gebruikt in <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Domeinlinks"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Domein-URL\'s openen"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"App toestaan rechtstreeks domein-URL\'s te openen"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Ondersteunde domein-URL\'s"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Andere standaardinstellingen"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> gebruikt in <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"intern geheugen"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"extern geheugen"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Interne opslag"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Externe opslag"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Gegevensgebruik van app"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> gebr. sinds <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Gebruikte opslag"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Aan"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blokkeren"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Gevoelig"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioriteit"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioriteit en gevoelig"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> machtigingen verleend</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> machtiging verleend</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> van <xliff:g id="COUNT_3">%d</xliff:g> rechten verleend</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> recht verleend</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Enkele standaardwaarden ingesteld"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Geen standaardwaarden ingesteld"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Alle apps"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Ingeschakeld"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Persoonlijk"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Werk"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Geblokkeerd"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioriteit"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Gevoelig"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Met domein-URL\'s"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Uitgeschakeld door beheerder"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Geavanceerd"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Onbekende app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profiel kiezen"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App-rechten"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Extra toegang verleend aan <xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> apps"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Verleend aan <xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> apps"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domein-URL\'s"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Geen domein-URL\'s openen"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' openen"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' en verwante URL\'s openen"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps kunnen de domein-URL\'s openen</item>
+      <item quantity="one">Eén app kan de domein-URL\'s openen</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Niet herkend"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Standaardapps"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser-app"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Geen standaardbrowser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Standaard)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"App-opslag"</string>
 </resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
new file mode 100644
index 0000000..dfe2eb9
--- /dev/null
+++ b/res/values-pa-rIN/strings.xml
@@ -0,0 +1,4306 @@
+<?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">
+    <!-- no translation found for yes (4676390750360727396) -->
+    <skip />
+    <!-- no translation found for no (6731231425810196216) -->
+    <skip />
+    <!-- no translation found for create (3578857613172647409) -->
+    <skip />
+    <!-- no translation found for allow (3349662621170855910) -->
+    <skip />
+    <!-- no translation found for deny (6947806159746484865) -->
+    <skip />
+    <!-- no translation found for device_info_default (7847265875578739287) -->
+    <skip />
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">ਤੁਸੀਂ ਹੁਣ ਇੱਕ ਵਿਕਾਸਕਾਰ ਬਣਨ ਤੋਂ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ਕਦਮ ਦੂਰ ਹੋ।</item>
+      <item quantity="other">ਤੁਸੀਂ ਹੁਣ ਇੱਕ ਵਿਕਾਸਕਾਰ ਬਣਨ ਤੋਂ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ਕਦਮ ਦੂਰ ਹੋ।</item>
+    </plurals>
+    <!-- no translation found for show_dev_on (1110711554982716293) -->
+    <skip />
+    <string name="show_dev_already" msgid="2151632240145446227">"ਕੋਈ ਲੋੜ ਨਹੀਂ, ਤੁਸੀਂ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਵਿਕਾਸਕਾਰ ਹੋ।"</string>
+    <!-- no translation found for header_category_wireless_networks (5110914332313954940) -->
+    <skip />
+    <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>
+    <!-- no translation found for turn_on_radio (8706561489788373676) -->
+    <skip />
+    <!-- no translation found for turn_off_radio (1820294552893884115) -->
+    <skip />
+    <string name="sms_over_ims_on" msgid="5085290395865632925">"IMS ਤੇ SMS ਚਾਲੂ ਕਰੋ"</string>
+    <!-- no translation found for sms_over_ims_off (8354792045992793959) -->
+    <skip />
+    <!-- no translation found for ims_reg_required_on (3885152087309614653) -->
+    <skip />
+    <!-- no translation found for ims_reg_required_off (1720570343422743943) -->
+    <skip />
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE ਪ੍ਰੋਵਿਜਨਡ ਫਲੈਡ ਚਾਲੂ ਕਰੋ"</string>
+    <!-- no translation found for volte_provisioned_flag_off (6168612015904744405) -->
+    <skip />
+    <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram ਡੰਪ ਚਾਲੂ ਕਰੋ"</string>
+    <!-- no translation found for lte_ram_dump_off (2514507918652378283) -->
+    <skip />
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM ਪਤਾ ਬੁਕ ਦੇਖੋ"</string>
+    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ਫਿਕਸਡ ਡਾਇਲਿੰਗ ਨੰਬਰ ਦੇਖੋ"</string>
+    <!-- no translation found for radioInfo_menu_viewSDN (7130280686244955669) -->
+    <skip />
+    <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDP ਸੂਚੀ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <!-- no translation found for radioInfo_service_in (1915416319177520020) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_out (5238736759641916278) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_emergency (2485604591272668370) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_off (1434084741785525415) -->
+    <skip />
+    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"ਰੋਮਿੰਗ"</string>
+    <!-- no translation found for radioInfo_roaming_not (2851853244069662307) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_idle (7489244938838742820) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_ringing (4883724645684297895) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_offhook (4174402846862780998) -->
+    <skip />
+    <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"ਡਿਸਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="radioInfo_data_connecting" msgid="8404571440697917823">"ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="radioInfo_data_connected" msgid="7074301157399238697">"ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <!-- no translation found for radioInfo_data_suspended (5315325487890334196) -->
+    <skip />
+    <string name="radioInfo_unknown" msgid="737385314432468266">"ਅਗਿਆਤ"</string>
+    <!-- no translation found for radioInfo_display_packets (8654359809877290639) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_bytes (4018206969492931883) -->
+    <skip />
+    <string name="radioInfo_display_dbm" msgid="3621221793699882781">"dBm"</string>
+    <!-- no translation found for radioInfo_display_asu (1422248392727818082) -->
+    <skip />
+    <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
+    <!-- no translation found for radioInfo_cid (4362599198392643138) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (6325292633327972272) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (3364184561355611897) -->
+    <skip />
+    <!-- no translation found for sdcard_format (6285310523155166716) -->
+    <skip />
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD ਕਾਰਡ ਮਿਟਾਓ"</string>
+    <!-- no translation found for small_font (2295331917424072635) -->
+    <skip />
+    <!-- no translation found for medium_font (2068475425515133701) -->
+    <skip />
+    <string name="large_font" msgid="599055175160971446">"ਵੱਡੇ"</string>
+    <!-- no translation found for font_size_save (3450855718056759095) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (8281011784066476192) -->
+    <skip />
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD ਕਾਰਡ"</string>
+    <!-- no translation found for battery_info_status_label (8109155295509700309) -->
+    <skip />
+    <!-- no translation found for battery_info_power_label (7465140230991349382) -->
+    <skip />
+    <string name="battery_info_scale_label" msgid="3649763192389778437">"ਬੈਟਰੀ ਸਕੇਲ:"</string>
+    <string name="battery_info_level_label" msgid="8706526709307788737">"ਬੈਟਰੀ ਪੱਧਰ:"</string>
+    <!-- no translation found for battery_info_health_label (6416051542741886958) -->
+    <skip />
+    <string name="battery_info_technology_label" msgid="788304533220748681">"ਬੈਟਰੀ ਟੈਕਨਾਲੋਜੀ:"</string>
+    <!-- no translation found for battery_info_voltage_label (8971764146757637863) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_units (8658490792208288107) -->
+    <skip />
+    <string name="battery_info_temperature_label" msgid="1968383098818648037">"ਬੈਟਰੀ ਤਾਪਮਾਨ:"</string>
+    <!-- no translation found for battery_info_temperature_units (9098950587249987550) -->
+    <skip />
+    <!-- no translation found for battery_info_uptime (5548545143573527992) -->
+    <skip />
+    <string name="battery_info_awake_battery" msgid="2557725975486185849">"ਬੈਟਰੀ ਤੇ ਸਚੇਤ ਕਰਨ ਦਾ ਸਮਾਂ:"</string>
+    <!-- no translation found for battery_info_awake_plugged (176716874713478188) -->
+    <skip />
+    <!-- no translation found for battery_info_screen_on (376277447175613889) -->
+    <skip />
+    <string name="battery_info_status_unknown" msgid="196130600938058547">"ਅਗਿਆਤ"</string>
+    <!-- no translation found for battery_info_status_charging (1705179948350365604) -->
+    <skip />
+    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"AC ਤੇ ਚਾਰਜਿੰਗ"</string>
+    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USB ਤੇ ਚਾਰਜਿੰਗ"</string>
+    <!-- no translation found for battery_info_status_charging_wireless (3574032603735446573) -->
+    <skip />
+    <!-- no translation found for battery_info_status_discharging (310932812698268588) -->
+    <skip />
+    <!-- no translation found for battery_info_status_not_charging (2820070506621483576) -->
+    <skip />
+    <!-- no translation found for battery_info_status_full (2824614753861462808) -->
+    <skip />
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"ਅਨਪਲਗ ਕੀਤਾ"</string>
+    <!-- no translation found for battery_info_power_ac (6808516193001604634) -->
+    <skip />
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"ਵਾਇਰਲੈਸ"</string>
+    <!-- no translation found for battery_info_power_ac_usb (6777734146838328688) -->
+    <skip />
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"ਅਗਿਆਤ"</string>
+    <!-- no translation found for battery_info_health_unknown (5664295556921944255) -->
+    <skip />
+    <!-- no translation found for battery_info_health_good (8070356565806711806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_overheat (8442959549291368806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_dead (1725917445762829059) -->
+    <skip />
+    <!-- no translation found for battery_info_health_over_voltage (2420269351664490121) -->
+    <skip />
+    <!-- no translation found for battery_info_health_unspecified_failure (6347021103185471590) -->
+    <skip />
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"ਠੰਡਾ"</string>
+    <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
+    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (2849387702249327748) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
+    <skip />
+    <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>
+    <!-- no translation found for bluetooth_device_name (8415828355207423800) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_details (4594773497930028085) -->
+    <skip />
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
+    <!-- no translation found for bluetooth_name_not_set (2653752006416027426) -->
+    <skip />
+    <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"ਡਿਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰੋ"</string>
+    <!-- no translation found for bluetooth_rename_device (4352483834491958740) -->
+    <skip />
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"ਮੁੜ ਨਾਮ ਦਿਓ"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ਕੀ ਡਿਸਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
+    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
+    <skip />
+    <!-- no translation found for bluetooth_empty_list_user_restricted (1185354873716211496) -->
+    <skip />
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੇੜਲੀਆਂ ਡਿਵਾਈਸਾਂ ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ ਹੁੰਦੀ ਹੈ ਜਦੋਂ Bluetooth ਸੈਟਿੰਗਾਂ ਖੁੱਲ੍ਹੀਆਂ ਹੁੰਦੀਆਂ ਹਨ।"</string>
+    <!-- no translation found for bluetooth_is_disconnect_question (5334933802445256306) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting (16583128958125247) -->
+    <skip />
+    <!-- no translation found for bluetooth_disable_profile_title (5916643979709342557) -->
+    <skip />
+    <!-- no translation found for bluetooth_disable_profile_message (2895844842011809904) -->
+    <skip />
+    <string name="bluetooth_unknown" msgid="644716244548801421"></string>
+    <!-- no translation found for bluetooth_device (5291950341750186887) -->
+    <skip />
+    <!-- no translation found for progress_scanning (192587958424295789) -->
+    <skip />
+    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ਕੋਈ ਨੇੜਲੀਆਂ Bluetooth ਡਿਵਾਈਸਾਂ ਨਹੀਂ ਮਿਲੀਆਂ।"</string>
+    <!-- no translation found for bluetooth_notif_ticker (4726721390078512173) -->
+    <skip />
+    <!-- no translation found for bluetooth_notif_title (2485175521845371514) -->
+    <skip />
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਪੇਅਰ ਕਰਨ ਲਈ ਛੋਹਵੋ।"</string>
+    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
+    <skip />
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
+    <!-- no translation found for bluetooth_permission_request (1523129741266262748) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement (1712443355224737143) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_discovery (786921566047356213) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_discovery (5510358858113713272) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (8863617309580598607) -->
+    <skip />
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"ਇੱਕ ਐਪ ਹੋਰਾਂ Bluetooth ਡਿਵਾਈਸਾਂ ਤੇ ਤੁਹਾਡੇ ਫੋਨ ਨੂੰ ਦ੍ਰਿਸ਼ਮਾਨ ਬਣਾਉਣਾ ਚਾਹੁੰਦਾ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ Bluetooth ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
+    <!-- no translation found for bluetooth_ask_start_broadcast (3535628155254187911) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (8810858601242763295) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_explaination (4249322115655011799) -->
+    <skip />
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"ਇੱਕ ਐਪ Bluetooth ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ ਅਤੇ <xliff:g id="TIMEOUT">%1$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਹੋਰਾਂ ਡਿਵਾਈਸਾਂ ਤੇ ਆਪਣੇ ਫੋਨ ਨੂੰ ਦ੍ਰਿਸ਼ਮਾਨ ਬਣਾਓ।"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"ਇੱਕ ਐਪ Bluetooth ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ ਅਤੇ <xliff:g id="TIMEOUT">%1$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਹੋਰਾਂ ਡਿਵਾਈਸਾਂ ਤੇ ਆਪਣੇ ਫੋਨ ਨੂੰ ਦ੍ਰਿਸ਼ਮਾਨ ਬਣਾਓ।"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (989613204829097159) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6671615712909139801) -->
+    <skip />
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <!-- no translation found for bluetooth_turning_off (2337747302892025192) -->
+    <skip />
+    <!-- no translation found for bluetooth_auto_connect (40711424456733571) -->
+    <skip />
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth ਕਨੈਕਸ਼ਨ ਬੇਨਤੀ"</string>
+    <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"\"<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>
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ। ਕੀ %2$s ਨੂੰ ਪਹੁੰਚ ਦੇਣੀ ਹੈ?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"ਦੁਬਾਰਾ ਨਾ ਪੁੱਛਣਾ"</string>
+    <!-- no translation found for bluetooth_pb_remember_choice (2901499974259177202) -->
+    <skip />
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ਤੁਹਾਡੇ ਸੁਨੇਹਿਆਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ। ਕੀ %2$s ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨੀ ਹੈ?"</string>
+    <!-- no translation found for date_and_time (9062980487860757694) -->
+    <skip />
+    <!-- no translation found for choose_timezone (1362834506479536274) -->
+    <skip />
+    <!-- no translation found for display_preview_label (1127597250917274792) -->
+    <skip />
+    <!-- no translation found for display_font_size_label (8941851418397475389) -->
+    <skip />
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <!-- no translation found for intent_sender_sendbroadcast_text (1415735148895872715) -->
+    <skip />
+    <!-- no translation found for intent_sender_action_label (616458370005452389) -->
+    <skip />
+    <!-- no translation found for intent_sender_startactivity_text (5080516029580421895) -->
+    <skip />
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <!-- no translation found for intent_sender_account_label (465210404475603404) -->
+    <skip />
+    <string name="proxy_settings_title" msgid="9049437837600320881">"ਪ੍ਰੌਕਸੀ"</string>
+    <!-- no translation found for proxy_clear_text (5555400754952012657) -->
+    <skip />
+    <!-- no translation found for proxy_port_label (5655276502233453400) -->
+    <skip />
+    <!-- no translation found for proxy_exclusionlist_label (7700491504623418701) -->
+    <skip />
+    <!-- no translation found for proxy_exclusionlist_hint (6084099226687226948) -->
+    <skip />
+    <string name="proxy_defaultView_text" msgid="6387985519141433291">"ਡਿਫੌਲਟਸ ਰੀਸਟੋਰ ਕਰੋ"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"ਹੋ ਗਿਆ"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"ਪ੍ਰੌਕਸੀ ਹੋਸਟਨਾਮ"</string>
+    <!-- no translation found for proxy_hostname_hint (2076157057003936176) -->
+    <skip />
+    <string name="proxy_error" msgid="8926675299638611451">"ਧਿਆਨ ਦਿਓ"</string>
+    <!-- no translation found for proxy_error_dismiss (4993171795485460060) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_host (8052095511862922213) -->
+    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤੀ ਵਰਜਨ ਸੂਚੀ ਸਹੀ ਢੰਗ ਨਾਲ ਫੌਰਮੈਟ ਨਹੀਂ ਕੀਤੀ ਹੋਈ ਹੈ। ਵਰਜਨ ਵਾਲੇ ਡੋਮੇਨਾਂ ਦੀ ਇੱਕ ਕਾਮਾ-ਵੱਖ ਕੀਤੀ ਸੂਚੀ ਟਾਈਪ ਕਰੋ।"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"ਤੁਹਾਨੂੰ ਪੋਰਟ ਖੇਤਰ ਪੂਰਾ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"ਜੇਕਰ ਹੋਸਟ ਖੇਤਰ ਖਾਲੀ ਹੈ ਤਾਂ ਪੋਰਟ ਖੇਤਰ ਖਾਲੀ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"</string>
+    <!-- no translation found for proxy_error_invalid_port (2671425042711054494) -->
+    <skip />
+    <!-- no translation found for proxy_warning_limited_support (7229337138062837422) -->
+    <skip />
+    <!-- no translation found for proxy_url_title (7185282894936042359) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_location_label (16475158265551708) -->
+    <skip />
+    <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"ਨੇਬਰਿੰਗ CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
+    <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ਡਾਟਾ ਕੋਸ਼ਿਸ਼ਾਂ:"</string>
+    <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS ਸੇਵਾ:"</string>
+    <string name="radio_info_roaming_label" msgid="6141505430275138647">"ਰੋਮਿੰਗ:"</string>
+    <!-- no translation found for radio_info_imei_label (1220524224732944192) -->
+    <skip />
+    <!-- no translation found for radio_info_call_redirect_label (1654674226961476872) -->
+    <skip />
+    <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"ਬੂਟ ਤੋਂ ਬਾਅਦ PPP ਰੀਸੈਟ ਦੀ ਸੰਖਿਆ:"</string>
+    <!-- no translation found for radio_info_gsm_disconnects_label (1683069665736339820) -->
+    <skip />
+    <!-- no translation found for radio_info_current_network_label (3256402602440102610) -->
+    <skip />
+    <!-- no translation found for radio_info_data_successes_label (4417894113689054945) -->
+    <skip />
+    <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"PPP ਪ੍ਰਾਪਤ ਕੀਤੀ:"</string>
+    <!-- no translation found for radio_info_gsm_service_label (2082332114596916985) -->
+    <skip />
+    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"ਸਿਗਨਲ ਸਟ੍ਰੈਂਥ:"</string>
+    <!-- no translation found for radio_info_call_status_label (4896238900685510883) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_sent_label (5009102250704375687) -->
+    <skip />
+    <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"ਰੇਡੀਓ ਰੀਸੈਟ:"</string>
+    <!-- no translation found for radio_info_message_waiting_label (6981842420058672207) -->
+    <skip />
+    <!-- no translation found for radio_info_phone_number_label (7192944627907412169) -->
+    <skip />
+    <!-- no translation found for radio_info_band_mode_label (441469694142042022) -->
+    <skip />
+    <!-- no translation found for radio_info_network_type_label (3706382548257257987) -->
+    <skip />
+    <!-- no translation found for radio_info_set_perferred_label (9039200405863503267) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_ipaddr (498747917793263530) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_hostname (3054888474808217853) -->
+    <skip />
+    <!-- no translation found for radio_info_http_client_test (5733604021077701555) -->
+    <skip />
+    <string name="ping_test_label" msgid="7255376471490860631">"ਪਿੰਗ ਟੈਸਟ ਚਲਾਓ"</string>
+    <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
+    <!-- no translation found for radio_info_smsc_update_label (7258686760358791539) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_refresh_label (6902302130315125102) -->
+    <skip />
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
+    <!-- no translation found for oem_radio_info_label (6163141792477958941) -->
+    <skip />
+    <!-- no translation found for band_mode_title (954174198903776205) -->
+    <skip />
+    <string name="band_mode_loading" msgid="548764766363847336">"ਬੈਂਡ ਸੂਚੀ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <!-- no translation found for band_mode_set (5730560180249458484) -->
+    <skip />
+    <!-- no translation found for band_mode_failed (1495968863884716379) -->
+    <skip />
+    <string name="band_mode_succeeded" msgid="2701016190055887575">"ਸਫਲ"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"ਬਦਲਾਵ ਉਦੋਂ ਲਾਗੂ ਹੋਣਗੇ ਜਦੋਂ USB ਕੇਬਲ ਨੂੰ ਰੀਕਨੈਕਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
+    <!-- no translation found for sdcard_settings_screen_mass_storage_text (3741220147296482474) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_total_bytes_label (9184160745785062144) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (1636218515775929394) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (2048419626134861599) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_available_bytes_label (763232429899373001) -->
+    <skip />
+    <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>
+    <!-- no translation found for sdcard_settings_unmounted_status (9191210735703409245) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (6462544066195404905) -->
+    <skip />
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB ਸਟੋਰੇਜ ਵਰਤਣ ਵਿੱਚ ਹੋਣ ਵੇਲੇ ਹੀ ਹਟਾ ਦਿੱਤੀ ਗਈ ਸੀ!"</string>
+    <!-- no translation found for sdcard_settings_bad_removal_status (5145797653495907970) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_used_bytes_label (8820289486001170836) -->
+    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB ਸਟੋਰੇਜ ਲਈ ਮੀਡੀਆ ਕਾਰਡ ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"ਮੀਡੀਆ ਲਈ SD ਕਾਰਡ ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <!-- no translation found for sdcard_settings_read_only_status (3624143937437417788) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (4518291824764698112) -->
+    <skip />
+    <string name="skip_label" msgid="47510779345218297">"ਛੱਡੋ"</string>
+    <!-- no translation found for next_label (4693520878012668114) -->
+    <skip />
+    <!-- no translation found for language_picker_title (5349877711342869319) -->
+    <skip />
+    <!-- no translation found for activity_picker_label (6295660302548177109) -->
+    <skip />
+    <!-- no translation found for device_info_label (6551553813651711205) -->
+    <skip />
+    <string name="battery_info_label" msgid="4132685016148679403">"ਬੈਟਰੀ ਜਾਣਕਾਰੀ"</string>
+    <!-- no translation found for display_label (8074070940506840792) -->
+    <skip />
+    <!-- no translation found for phone_info_label (7820855350955963628) -->
+    <skip />
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"ਫੋਨ ਜਾਣਕਾਰੀ"</string>
+    <!-- no translation found for sd_card_settings_label (8101475181301178428) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (5743100901106177102) -->
+    <skip />
+    <!-- no translation found for proxy_settings_label (3271174136184391743) -->
+    <skip />
+    <!-- no translation found for cancel (6859253417269739139) -->
+    <skip />
+    <string name="okay" msgid="1997666393121016642">"ਠੀਕ"</string>
+    <string name="forget" msgid="1400428660472591263">"ਭੁੱਲਣਾ"</string>
+    <string name="save" msgid="879993180139353333">"ਸੁਰੱਖਿਅਤ ਕਰੋ"</string>
+    <string name="done" msgid="6942539184162713160">"ਹੋ ਗਿਆ"</string>
+    <!-- no translation found for settings_label (1626402585530130914) -->
+    <skip />
+    <!-- no translation found for settings_label_launcher (8344735489639482340) -->
+    <skip />
+    <!-- no translation found for settings_shortcut (3936651951364030415) -->
+    <skip />
+    <!-- no translation found for airplane_mode (8837269988154128601) -->
+    <skip />
+    <string name="radio_controls_title" msgid="3447085191369779032">"ਹੋਰ"</string>
+    <!-- no translation found for wireless_networks_settings_title (3643009077742794212) -->
+    <skip />
+    <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, Bluetooth, ਏਅਰਪਲੇਨ ਮੋਡ, ਸੈਲਿਊਲਰ ਨੈਟਵਰਕਸ &amp; VPN ਵਿਵਸਥਿਤ ਕਰੋ"</string>
+    <!-- no translation found for cellular_data_title (2525947635539415202) -->
+    <skip />
+    <string name="calls_title" msgid="3544471959217176768">"ਕਾਲਾਂ"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
+    <string name="cellular_data_summary" msgid="4575500999626276446">"ਸੈਲਿਊਲਰ ਨੈਟਵਰਕ ਤੇ ਡਾਟਾ ਵਰਤੋਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="allow_data_usage_title" msgid="2238205944729213062">"ਰੋਮਿੰਗ ਵੇਲੇ ਡਾਟਾ ਵਰਤੋਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <string name="roaming_enable" msgid="3737380951525303961">"ਰੋਮਿੰਗ ਵੇਲੇ ਡਾਟਾ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (7625933694709170887) -->
+    <skip />
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"ਜਦੋਂ ਤੁਸੀਂ ਡਾਟਾ ਰੋਮਿੰਗ ਦੀ ਆਗਿਆ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਖ਼ਾਸ ਰੋਮਿੰਗ ਖ਼ਰਚੇ ਪੈ ਸਕਦੇ ਹਨ!\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਟੈਬਲੇਟ ਦੇ ਸਾਰੇ ਉਪਭੋਗਤਾਵਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
+    <!-- no translation found for roaming_warning_multiuser (6368421100292355440) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (6068100976707316772) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (3616956422251879163) -->
+    <skip />
+    <string name="date_and_time_settings_title" msgid="3350640463596716780">"ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ"</string>
+    <!-- no translation found for date_and_time_settings_title_setup_wizard (2391530758339384324) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_summary (7095318986757583584) -->
+    <skip />
+    <!-- no translation found for date_time_auto (7076906458515908345) -->
+    <skip />
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ਨੈਟਵਰਕ ਵੱਲੋਂ-ਮੁਹੱਈਆ ਕੀਤਾ ਸਮਾਂ ਵਰਤੋ"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"ਨੈਟਵਰਕ ਵੱਲੋਂ-ਮੁਹੱਈਆ ਕੀਤਾ ਸਮਾਂ ਵਰਤੋ"</string>
+    <!-- no translation found for zone_auto (334783869352026648) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
+    <skip />
+    <!-- no translation found for date_time_24hour_title (3203537578602803850) -->
+    <skip />
+    <!-- no translation found for date_time_24hour (1193032284921000063) -->
+    <skip />
+    <!-- no translation found for date_time_set_time_title (6296795651349047016) -->
+    <skip />
+    <!-- no translation found for date_time_set_time (5716856602742530696) -->
+    <skip />
+    <!-- no translation found for date_time_set_timezone_title (3047322337368233197) -->
+    <skip />
+    <!-- no translation found for date_time_set_timezone (5045627174274377814) -->
+    <skip />
+    <!-- no translation found for date_time_set_date_title (6928286765325608604) -->
+    <skip />
+    <!-- no translation found for date_time_set_date (7021491668550232105) -->
+    <skip />
+    <!-- no translation found for zone_list_menu_sort_alphabetically (5683377702671088588) -->
+    <skip />
+    <!-- no translation found for zone_list_menu_sort_by_timezone (2720190443744884114) -->
+    <skip />
+    <!-- no translation found for date_picker_title (1338210036394128512) -->
+    <skip />
+    <!-- no translation found for time_picker_title (483460752287255019) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout (4590337686681194648) -->
+    <skip />
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"ਸਲੀਪ ਤੋਂ ਬਾਅਦ <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
+    <!-- no translation found for lock_after_timeout_summary_with_exception (5579064842797188409) -->
+    <skip />
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
+    <string name="security_enable_widgets_title" msgid="2754833397070967846">"ਵਿਜੇਟਸ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਅਸਮਰਥਿਤ"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <!-- no translation found for owner_info_settings_edit_text_hint (4608681417960923911) -->
+    <skip />
+    <!-- no translation found for show_user_info_on_lockscreen_label (8408914624925608365) -->
+    <skip />
+    <string name="user_info_settings_title" msgid="1195015434996724736">"ਉਪਭੋਗਤਾ ਜਾਣਕਾਰੀ"</string>
+    <!-- no translation found for show_profile_info_on_lockscreen_label (2741208907263877990) -->
+    <skip />
+    <!-- no translation found for profile_info_settings_title (3518603215935346604) -->
+    <skip />
+    <!-- no translation found for Accounts_settings_title (1643879107901699406) -->
+    <skip />
+    <!-- no translation found for location_settings_title (1369675479310751735) -->
+    <skip />
+    <!-- no translation found for account_settings_title (626177544686329806) -->
+    <skip />
+    <!-- no translation found for security_settings_title (7945465324818485460) -->
+    <skip />
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ਮੇਰਾ ਨਿਰਧਾਰਿਤ ਸਥਾਨ, ਸਕ੍ਰੀਨ ਅਨਲੌਕ, ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲੌਕ ਸੈਟ ਕਰੋ"</string>
+    <!-- no translation found for security_passwords_title (2930627259125138363) -->
+    <skip />
+    <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="3453670509485083962">"ਜੋੜੋ"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟਅਪ"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਜਾਂ ਖ਼ਰੀਦਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ, ਸਾਨੂੰ ਇਸਦੀ ਲੋੜ ਹੋਵੇਗੀ: \n\n✓ ਆਪਣੀ ਬੈਕਅਪ ਸਕ੍ਰੀਨ ਲੌਕ ਵਿਧੀ ਸੈਟ ਅਪ ਕਰੋ \n\n✓ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਜੋੜੋ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ਸੰਵੇਦਕ ਲੱਭੋ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ਆਪਣੇ ਫੋਨ ਦੇ ਪਿੱਛੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਦਾ ਪਤਾ ਲਗਾਓ।"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"ਆਓ ਸ਼ੁਰੂ ਕਰੀਏ!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਤੇ ਆਪਣੀ ਉਂਗਲ ਰੱਖੋ। ਇੱਕ ਵਾਈਬ੍ਰੇਸ਼ਨ ਮਹਿਸੂਸ ਹੋਣ ਤੋਂ ਬਾਅਦ ਹਟਾ ਲਓ।"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"ਬਹੁਤ ਵਧੀਆ! ਹੁਣ ਦੁਹਰਾਓ।"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਤੇ ਉਹੀ ਉਂਗਲ ਰੱਖੋ ਅਤੇ ਇੱਕ ਵਾਈਬ੍ਰੇਸ਼ਨ ਮਹਿਸੂਸ ਹੋਣ ਤੋਂ ਬਾਅਦ ਹਟਾ ਲਓ।"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਜੋੜਿਆ ਗਿਆ!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਇਹ ਆਈਕਨ ਦੇਖੋ, ਤਾਂ ਤੁਸੀਂ ਪਛਾਣ ਲਈ ਜਾਂ ਇੱਕ ਖ਼ਰੀਦ ਦਾ ਅਧਿਕਾਰ ਦੇਣ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ।"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"ਜੋੜੋ"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ਅਗਲਾ"</string>
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (2876073029767953111) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (5573427498609458721) -->
+    <skip />
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"ਟੈਬਲੇਟ ਐਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
+    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_low_charge_text (2029407131227814893) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (4785376766063053901) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
+    <skip />
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ਤੁਹਾਨੂੰ ਐਨਕ੍ਰਿਪਸ਼ਨ ਸ਼ੁਰੂ ਸਕਣ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਲੌਕ ਸਕ੍ਰੀਨ PIN ਜਾਂ ਪਾਸਵਰਡ ਸੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</string>
+    <!-- no translation found for crypt_keeper_confirm_title (5100339496381875522) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (4453629424172409792) -->
+    <skip />
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"ਐਨਕ੍ਰਿਪਸ਼ਨ ਓਪਰੇਸ਼ਨ ਅਬਦਲ ਹੈ ਅਤੇ ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਐਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਇਸਤੋਂ ਵੱਧ ਸਮਾਂ ਲੱਗਦਾ ਹੈ, ਜਿਸਦੇ ਦੌਰਾਨ ਫੋਨ ਕਈ ਵਾਰ ਰੀਸਟਾਰਟ ਹੋਵੇਗਾ।"</string>
+    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (6689952371032099350) -->
+    <skip />
+    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"ਜਦੋਂ ਤੁਹਾਡਾ ਫੋਨ ਐਨਕ੍ਰਿਪਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਠਹਿਰੋ। <xliff:g id="PERCENT">^1</xliff:g>% ਪੂਰਾ।"</string>
+    <!-- no translation found for crypt_keeper_setup_time_remaining (1655047311546745695) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_time_remaining (1862964662304683072) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_force_power_cycle (556504311511212648) -->
+    <skip />
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ਆਪਣਾ ਫੋਨ ਅਨਲੌਕ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਬੰਦ ਅਤੇ ਫਿਰ ਚਾਲੂ ਕਰੋ।"</string>
+    <!-- no translation found for crypt_keeper_warn_wipe (2738374897337991667) -->
+    <skip />
+    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"ਆਪਣਾ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ਐਨਕ੍ਰਿਪਸ਼ਨ ਅਸਫਲ"</string>
+    <!-- no translation found for crypt_keeper_failed_summary (4478225241476039013) -->
+    <skip />
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ਐਨਕ੍ਰਿਪਸ਼ਨ ਰੋਕਿਆ ਗਿਆ ਸੀ ਅਤੇ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਸਿੱਟੇ ਵਜੋਂ, ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਡਾਟਾ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ। \n\nਆਪਣਾ ਫੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈਟ ਤੋਂ ਬਾਅਦ ਆਪਣਾ ਫੋਨ ਸੈਟ ਅਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
+    <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"ਡੀਕ੍ਰਿਪਸ਼ਨ ਅਸਫਲ"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="3775740783651700375">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡਾਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣੀ ਟੈਬਲੈਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੇਟ ਸੈਟ ਅਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
+    <!-- no translation found for crypt_keeper_data_corrupt_summary (6898436151871328007) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_switch_input_method (4168332125223483198) -->
+    <skip />
+    <!-- no translation found for lock_settings_picker_title (1095755849152582712) -->
+    <skip />
+    <!-- no translation found for backup_lock_settings_picker_title (8530380598637963916) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (2084576942666016993) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (5045866882028324941) -->
+    <skip />
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ਪੈਟਰਨ, PIN ਜਾਂ ਪਾਸਵਰਡ ਸੁਰੱਖਿਆ ਬਦਲੋ ਜਾਂ ਅਸਮਰੱਥ ਬਣਾਓ"</string>
+    <!-- no translation found for unlock_set_unlock_launch_picker_enable_summary (4791110798817242301) -->
+    <skip />
+    <!-- no translation found for unlock_backup_info_summary (108524727803788172) -->
+    <skip />
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <!-- no translation found for unlock_set_unlock_none_title (5679243878975864640) -->
+    <skip />
+    <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"ਕੋਈ ਸੁਰੱਖਿਆ ਨਹੀਂ"</string>
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (7062696666227725593) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (907878650556383388) -->
+    <skip />
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ਪਾਸਵਰਡ"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ਉੱਚ ਸੁਰੱਖਿਆ"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"ਮੌਜੂਦਾ ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (2120729867788851674) -->
+    <skip />
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ਸਵਾਈਪ ਕਰੋ"</string>
+    <!-- no translation found for unlock_set_unlock_mode_pattern (7837270780919299289) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_pin (3541326261341386690) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_password (1203938057264146610) -->
+    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈਟ ਅਪ ਕਰ ਲਓ, ਤਾਂ ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ &gt; ਸੁਰੱਖਿਆ ਵਿੱਚ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟ ਅਪ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <!-- no translation found for unlock_disable_lock_title (1427036227416979120) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_pattern_summary (6801602880568869201) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_pin_summary (8856842745366993387) -->
+    <skip />
+    <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"ਅਨਲੌਕ ਪਾਸਵਰਡ ਹਟਾਓ"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"ਸਕ੍ਰੀਨ ਲੌਕ ਹਟਾਓ"</string>
+    <!-- no translation found for unlock_change_lock_pattern_title (2044092014872741130) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_pin_title (806629901095938484) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_password_title (5606298470358768865) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_too_short (7328975683669256660) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_short (1677649103470518953) -->
+    <skip />
+    <!-- no translation found for lockpassword_press_continue (122706614386757182) -->
+    <skip />
+    <!-- no translation found for lockpassword_continue_label (4602203784934526940) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_too_long (7016906583950201704) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6419879099090294052) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_contains_non_digits (1079053457942945709) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_recently_used (7909781183925861119) -->
+    <skip />
+    <!-- no translation found for lockpassword_illegal_character (8742901630116866738) -->
+    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"ਪਾਸਵਰਡ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਅੱਖਰ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"ਪਾਸਵਰਡ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਅੰਕ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"</string>
+    <!-- no translation found for lockpassword_password_requires_symbol (7226621405629726899) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_letters (5677371623980347934) -->
+    <!-- no translation found for lockpassword_password_requires_lowercase (5396846200894553640) -->
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">ਪਾਸਵਰਡ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ %d ਅਪਰਕੇਸ ਅੱਖਰ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।</item>
+      <item quantity="other">ਪਾਸਵਰਡ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ %d ਅਪਰਕੇਸ ਅੱਖਰ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">ਪਾਸਵਰਡ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ %d ਸੰਖਿਆਤਮਿਕ ਅੰਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।</item>
+      <item quantity="other">ਪਾਸਵਰਡ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ %d ਸੰਖਿਆਤਮਿਕ ਅੰਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">ਪਾਸਵਰਡ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ %d ਖ਼ਾਸ ਚਿੰਨ੍ਹ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।</item>
+      <item quantity="other">ਪਾਸਵਰਡ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ %d ਖ਼ਾਸ ਚਿੰਨ੍ਹ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।</item>
+    </plurals>
+    <!-- no translation found for lockpassword_password_requires_nonletter (4175064976268466293) -->
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"ਡਿਵਾਈਸ ਪ੍ਰਬੰਧਕ ਇੱਕ ਹਾਲੀਆ ਪਾਸਵਰਡ ਵਰਤਣ ਦੀ ਆਗਿਆ ਨਹੀਂ ਦਿੰਦਾ।"</string>
+    <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ਅੰਕਾਂ ਦਾ ਚੜ੍ਹਦਾ, ਉੱਤਰਦਾ ਜਾਂ ਦੁਹਰਾਇਆ ਕ੍ਰਮ ਵਰਜਿਤ ਹੈ"</string>
+    <!-- no translation found for lockpassword_ok_label (313822574062553672) -->
+    <skip />
+    <!-- no translation found for lockpassword_cancel_label (8818529276331121899) -->
+    <skip />
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"ਰੱਦ ਕਰੋ"</string>
+    <!-- no translation found for lockpattern_tutorial_continue_label (3559793618653400434) -->
+    <skip />
+    <!-- no translation found for lock_setup (3355847066343753943) -->
+    <!-- no translation found for lock_setup (5507462851158901718) -->
+    <skip />
+    <!-- no translation found for device_admin_title (3562216873644263804) -->
+    <skip />
+    <!-- no translation found for manage_device_admin (5059296715271077278) -->
+    <skip />
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"ਡਿਵਾਈਸ ਪ੍ਰਬੰਧਕ ਦੇਖੋ ਜਾਂ ਨਿਸ਼ਕਿਰਿਆ ਬਣਾਓ"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"ਭਰੋਸੇਯੋਗ ਏਜੰਟ"</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"ਵਰਤਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈਟ ਕਰੋ"</string>
+    <!-- no translation found for manage_trust_agents_summary (6804319935640148441) -->
+    <skip />
+    <!-- no translation found for bluetooth_quick_toggle_title (1037056952714061893) -->
+    <skip />
+    <!-- no translation found for bluetooth_quick_toggle_summary (5293641680139873341) -->
+    <skip />
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <!-- no translation found for bluetooth_settings_title (1908745291161353016) -->
+    <skip />
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"ਕਨੈਕਸ਼ਨ ਵਿਵਸਥਿਤ ਕਰੋ, ਡਿਵਾਈਸ ਨਾਮ &amp; ਖੋਜਯੋਗਤਾ ਸੈਟ ਕਰੋ"</string>
+    <!-- no translation found for bluetooth_pairing_request (6385750334766370310) -->
+    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="4954085254142996877">"ਡਿਵਾਈਸ:"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="333005542843637754">"ਪੇਅਰਿੰਗ ਕੋਡ"</string>
+    <!-- no translation found for bluetooth_enter_passkey_msg (6813273136442138444) -->
+    <skip />
+    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
+    <skip />
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"ਆਮ ਤੌਰ ਤੇ 0000 ਜਾਂ 1234"</string>
+    <!-- no translation found for bluetooth_enter_pin_other_device (4637977124526813470) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_other_device (2798719004030279602) -->
+    <skip />
+    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
+    <skip />
+    <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_will_share_phonebook" msgid="4982239145676394429">"ਪੇਅਰ ਕਰਨਾ ਕਨੈਕਟ ਕੀਤੇ ਜਾਣ ਤੇ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਤੱਕ ਪਹੁੰਚ ਦੀ ਅਨੁਮਤੀ ਦਿੰਦਾ ਹੈ।"</string>
+    <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
+    <!-- no translation found for bluetooth_connecting_error_message (229861986106185022) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_scan_title (2277464653118896016) -->
+    <skip />
+    <!-- no translation found for bluetooth_search_for_devices (2754007356491461674) -->
+    <skip />
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"ਖੋਜ ਰਿਹਾ ਹੈ..."</string>
+    <!-- no translation found for bluetooth_preference_device_settings (907776049862799122) -->
+    <skip />
+    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"ਪੇਅਰ ਕੀਤੀ ਡਿਵਾਈਸ"</string>
+    <!-- no translation found for bluetooth_preference_paired_dialog_name_label (8111146086595617285) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_internet_option (7112953286863428412) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_keyboard_option (2271954176947879628) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_contacts_option (7747163316331917594) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_dialog_title (1417255032435317301) -->
+    <skip />
+    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ਕੀ ਫੋਨ ਬੁਕ ਸ਼ੇਅਰ ਕਰਨੀ ਹੈ?"</string>
+    <!-- no translation found for bluetooth_pairing_dialog_contants_request (5531109163573611348) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_dialog_paring_request (8451248193517851958) -->
+    <skip />
+    <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>
+    <!-- no translation found for bluetooth_device_context_connect (3997659895003244941) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_disconnect (8220072022970148683) -->
+    <skip />
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"ਪੇਅਰ &amp; ਕਨੈਕਟ ਕਰੋ"</string>
+    <!-- no translation found for bluetooth_device_context_unpair (662992425948536144) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_disconnect_unpair (7644014238070043798) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_connect_advanced (2643129703569788771) -->
+    <skip />
+    <!-- no translation found for bluetooth_menu_advanced (8572178316357220524) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_titlebar (2142159726881547669) -->
+    <skip />
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ਜਦੋਂ Bluetooth ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਡੀ ਡਿਵਾਈਸ ਹੋਰਾਂ ਨੇੜਲੀਆਂ Bluetooth ਡਿਵਾਈਸਾਂ ਨਾਲ ਸੰਚਾਰ ਕਰ ਸਕਦੀ ਹੈ।"</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, ਐਪਸ ਅਤੇ ਸੇਵਾਵਾਂ Bluetooth ਡਿਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ, ਭਾਵੇਂ Bluetooth ਬੰਦ ਹੋਵੇ। ਤੁਸੀਂ ਇਸਨੂੰ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ਸਕੈਨਿੰਗ ਸੈਟਿੰਗਾਂ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ਇਸ ਨਾਲ ਕਨੈਕਟ ਕਰੋ…"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਮੀਡੀਆ ਔਡੀਓ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
+    <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
+    <skip />
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਨਪੁਟ ਡਿਵਾਈਸ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
+    <!-- no translation found for bluetooth_disconnect_pan_user_profile (8037627994382458698) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5455448395850929200) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5266851881175033601) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_title (6066342531927499308) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_online_mode_title (3689050071425683114) -->
+    <skip />
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Bluetooth ਡਿਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <!-- no translation found for bluetooth_device_advanced_profile_header_title (102745381968579605) -->
+    <skip />
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"ਮੁੜ ਨਾਮ ਦਿਓ"</string>
+    <!-- no translation found for bluetooth_device_advanced_enable_opp_title (8222550640371627365) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_user_profile_summary_connected (4602294638909590612) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_nap_profile_summary_connected (1561383706411975199) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings (3218335822716052885) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_title (5543069893044375188) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_headset (1001821426078644650) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_a2dp (8791004998846630574) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_remember (5551459057010609115) -->
+    <skip />
+    <!-- no translation found for wifi_assistant_title (2553267316621598101) -->
+    <skip />
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"ਜੋੜੋ"</string>
+    <!-- no translation found for wifi_display_enable_menu_item (4883036464138167674) -->
+    <skip />
+    <!-- no translation found for wifi_display_no_devices_found (1382012407154143453) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_connecting (5688608834000748607) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_connected (8364125226376985558) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_not_available (5714978725794210102) -->
+    <skip />
+    <!-- no translation found for wifi_display_details (7791118209992162698) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_title (5740656401635054838) -->
+    <skip />
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"ਭੁੱਲਣਾ"</string>
+    <!-- no translation found for wifi_display_options_done (5703116500357822557) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_name (4756080222307467898) -->
+    <skip />
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_title (6769159366307299004) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_summary (8302974395787498915) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_summary (5237208142892767592) -->
+    <skip />
+    <string name="android_beam_settings_title" msgid="7832812974600338649">"Android ਬੀਮ"</string>
+    <!-- no translation found for android_beam_on_summary (3618057099355636830) -->
+    <skip />
+    <!-- no translation found for android_beam_off_summary (4663095428454779138) -->
+    <skip />
+    <!-- no translation found for android_beam_disabled_summary (1737782116894793393) -->
+    <skip />
+    <!-- no translation found for android_beam_label (6257036050366775040) -->
+    <skip />
+    <!-- no translation found for android_beam_explained (6981652347448777459) -->
+    <skip />
+    <!-- no translation found for nsd_quick_toggle_title (3125572815278848258) -->
+    <skip />
+    <!-- no translation found for nsd_quick_toggle_summary (155692215972781276) -->
+    <skip />
+    <!-- no translation found for wifi_quick_toggle_title (8850161330437693895) -->
+    <skip />
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi ਚਾਲੂ ਕਰੋ"</string>
+    <!-- no translation found for wifi_settings (29722149822540994) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (8719175790520448014) -->
+    <skip />
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
+    <!-- no translation found for wifi_settings_summary (668767638556052820) -->
+    <skip />
+    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
+    <skip />
+    <!-- no translation found for wifi_select_network (4210954938345463209) -->
+    <skip />
+    <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <!-- no translation found for wifi_stopping (8952524572499500804) -->
+    <skip />
+    <!-- no translation found for wifi_error (3207971103917128179) -->
+    <skip />
+    <!-- no translation found for wifi_in_airplane_mode (8652520421778203796) -->
+    <skip />
+    <!-- no translation found for wifi_notify_open_networks (3755768188029653293) -->
+    <skip />
+    <!-- no translation found for wifi_notify_open_networks_summary (3716818008370391253) -->
+    <skip />
+    <!-- no translation found for wifi_poor_network_detection (4925789238170207169) -->
+    <skip />
+    <!-- no translation found for wifi_poor_network_detection_summary (7843672905900544785) -->
+    <skip />
+    <!-- no translation found for wifi_avoid_poor_network_detection_summary (4674423884870027498) -->
+    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ਆਟੋਮੈਟਿਕਲੀ ਓਪਨ Wi‑Fi ਵਰਤੋ"</string>
+    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
+    <skip />
+    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
+    <skip />
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
+    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, ਐਪਸ ਅਤੇ ਸੇਵਾਵਾਂ Wi‑Fi ਨੈਟਵਰਕਾਂ ਲਈ ਸਕੈਨ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ, ਭਾਵੇਂ 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="5340097010842405981">"ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ"</string>
+    <!-- no translation found for wifi_setting_sleep_policy_title (5149574280392680092) -->
+    <skip />
+    <!-- no translation found for wifi_setting_on_during_sleep_title (8308975500029751565) -->
+    <skip />
+    <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"ਸੈਟਿੰਗ ਬਦਲਣ ਵਿੱਚ ਇੱਕ ਸਮੱਸਿਆ ਹੋਈ ਸੀ"</string>
+    <!-- no translation found for wifi_suspend_efficiency_title (2338325886934703895) -->
+    <skip />
+    <!-- no translation found for wifi_suspend_optimizations (1220174276403689487) -->
+    <skip />
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ਜਦੋਂ Wi‑Fi ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਬੈਟਰੀ ਵਰਤੋਂ ਘੱਟ ਕਰੋ"</string>
+    <!-- no translation found for wifi_limit_optimizations_summary (9000801068363468950) -->
+    <skip />
+    <!-- no translation found for wifi_add_network (6234851776910938957) -->
+    <skip />
+    <!-- no translation found for wifi_access_points (7053990007031968609) -->
+    <skip />
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS ਪੁਸ਼ ਬਟਨ"</string>
+    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
+    <skip />
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin ਐਂਟਰੀ"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ਡਾਇਰੈਕਟ"</string>
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"ਸਕੈਨ ਕਰੋ"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"ਉੱਨਤ"</string>
+    <!-- no translation found for wifi_menu_connect (4996220309848349408) -->
+    <skip />
+    <!-- no translation found for wifi_menu_remember (8814185749388713796) -->
+    <skip />
+    <!-- no translation found for wifi_menu_forget (8736964302477327114) -->
+    <skip />
+    <!-- no translation found for wifi_menu_modify (2068554918652440105) -->
+    <skip />
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
+    <!-- no translation found for wifi_empty_list_wifi_off (8056223875951079463) -->
+    <skip />
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi‑Fi ਨੈਟਵਰਕਾਂ ਦੀ ਖੋਜ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
+    <skip />
+    <!-- no translation found for wifi_other_network (1484433183857764750) -->
+    <skip />
+    <!-- no translation found for wifi_more (3195296805089107950) -->
+    <skip />
+    <!-- no translation found for wifi_setup_wps (8128702488486283957) -->
+    <skip />
+    <!-- no translation found for wifi_show_advanced (3409422789616520979) -->
+    <skip />
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi ਸੁਰੱਖਿਅਤ ਸੈਟਅਪ"</string>
+    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
+    <skip />
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"ਆਪਣੇ ਰੂਟਰ ਤੇ Wi‑Fi ਸੁਰੱਖਿਅਤ ਸੈਟਅਪ ਬਟਨ ਦਬਾਓ। ਇਸਨੂੰ \"WPS\" ਕਿਹਾ ਜਾ ਸਕਦਾ ਹੈ ਜਾਂ ਇਸ ਚਿੰਨ੍ਹ ਨਾਲ ਚਿੰਨ੍ਹਿਤ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ:"</string>
+    <!-- no translation found for wifi_wps_onstart_pin (223344506445335358) -->
+    <skip />
+    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
+    <skip />
+    <!-- no translation found for wifi_wps_connected (7153432445748931183) -->
+    <skip />
+    <!-- no translation found for wifi_wps_in_progress (3372311348221357944) -->
+    <skip />
+    <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>
+    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
+    <skip />
+    <!-- no translation found for wifi_ssid (5519636102673067319) -->
+    <skip />
+    <!-- no translation found for wifi_ssid_hint (897593601067321355) -->
+    <skip />
+    <!-- no translation found for wifi_security (6603611185592956936) -->
+    <skip />
+    <!-- no translation found for wifi_signal (5514120261628065287) -->
+    <skip />
+    <!-- no translation found for wifi_status (4824568012414605414) -->
+    <skip />
+    <string name="wifi_speed" msgid="3526198708812322037">"ਲਿੰਕ ਸਪੀਡ"</string>
+    <!-- no translation found for wifi_frequency (7791090119577812214) -->
+    <skip />
+    <string name="wifi_ip_address" msgid="1440054061044402918">"IP ਪਤਾ"</string>
+    <!-- no translation found for wifi_eap_method (8529436133640730382) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
+    <!-- no translation found for wifi_eap_user_cert (1291089413368160789) -->
+    <skip />
+    <string name="wifi_eap_identity" msgid="4359453783379679103">"ਪਛਾਣ"</string>
+    <!-- no translation found for wifi_eap_anonymous (2989469344116577955) -->
+    <skip />
+    <!-- no translation found for wifi_password (5948219759936151048) -->
+    <skip />
+    <!-- no translation found for wifi_show_password (6461249871236968884) -->
+    <skip />
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"AP ਬੈਂਡ ਕੌਂਫਿਗਰ ਕਰੋ"</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>
+    <!-- no translation found for wifi_unchanged (3410422020930397102) -->
+    <skip />
+    <!-- no translation found for wifi_unspecified (5431501214192991253) -->
+    <skip />
+    <!-- no translation found for wifi_wps_available_first_item (4422547079984583502) -->
+    <skip />
+    <!-- no translation found for wifi_wps_available_second_item (8427520131718215301) -->
+    <skip />
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_turnon_message (203123538572122989) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_turnoff_message (5538901671131941043) -->
+    <skip />
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ਆਗਿਆ ਦਿਓ"</string>
+    <!-- no translation found for wifi_scan_always_confirm_deny (4463982053823520710) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_title (7726205804813286950) -->
+    <skip />
+    <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="1509171132175355674">"ਇਸ ਨੈੱਟਵਰਕ ਵਿੱਚ ਇੰਟਰਨੈੱਟ ਐਕਸੈਸ ਨਹੀਂ ਹੈ. ਕੀ ਫਿਰ ਵੀ ਇਹ ਨੈੱਟਵਰਕ ਉਪਯੋਗ ਕਰਨਾ ਹੈ?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ਇਸ ਨੈੱਟਵਰਕ ਲਈ ਦੁਬਾਰਾ ਨਾ ਆਖੋ"</string>
+    <!-- no translation found for wifi_connect (1076622875777072845) -->
+    <skip />
+    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
+    <skip />
+    <!-- no translation found for wifi_forget (8168174695608386644) -->
+    <skip />
+    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
+    <skip />
+    <!-- no translation found for wifi_save (3331121567988522826) -->
+    <skip />
+    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
+    <skip />
+    <string name="wifi_cancel" msgid="6763568902542968964">"ਰੱਦ ਕਰੋ"</string>
+    <!-- no translation found for wifi_skip_anyway (6965361454438011190) -->
+    <skip />
+    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
+    <skip />
+    <!-- no translation found for wifi_skipped_message (6761689889733331124) -->
+    <skip />
+    <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ਚਿਤਾਵਨੀ: ਜੇਕਰ ਤੁਸੀਂ Wi‑Fi ਛੱਡਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਡਿਵਾਈਸ ਅਰੰਭਿਤ ਡਾਊਨਲੋਡਾਂ ਅਤੇ ਅਪਡੇਟਾਂ ਲਈ ਕੇਵਲ ਸੈਲਿਊਲਰ ਡਾਟਾ ਵਰਤੋ। ਸੰਭਾਵਿਤ ਡਾਟਾ ਖ਼ਰਚਿਆਂ ਤੋਂ ਬਚਣ ਲਈ, Wi‑Fi ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"</string>
+    <!-- no translation found for wifi_skipped_message (6084295135297772350) -->
+    <skip />
+    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
+    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"ਜੇਕਰ ਤੁਸੀਂ Wi‑Fi ਛੱਡਦੇ ਹੋ:\n\nਤੁਹਾਡੀ ਡਿਵਾਈਸ ਦਾ ਇੱਕ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੋਵੇਗਾ।\n\nਤੁਸੀਂ ਉਦੋਂ ਤੱਕ ਸੌਫਟਵੇਅਰ ਅਪਡੇਟਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰੋਗੇ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਨਾ ਕਰ ਲਓ।\n\nਤੁਸੀਂ ਹੁਣ ਡਿਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਕਿਰਿਆ ਨਹੀਂ ਬਣਾ ਸਕਦੇ ਹੋ।"</string>
+    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
+    <skip />
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ਟੈਬਲੇਟ ਇਸ Wi‑Fi ਨੈਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ ਸੀ।"</string>
+    <!-- no translation found for wifi_connect_failed_message (8870885845666880869) -->
+    <skip />
+    <!-- no translation found for wifi_connect_failed_message (2185803140161396572) -->
+    <skip />
+    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"ਸੁਰੱਖਿਅਤ ਕੀਤੇ ਨੈਟਵਰਕ"</string>
+    <!-- no translation found for wifi_advanced_titlebar (4485841401774142908) -->
+    <skip />
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi‑Fi ਬਾਰੰਬਾਰਤਾ ਬੈਂਡ"</string>
+    <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_error (837281974489794378) -->
+    <skip />
+    <!-- no translation found for wifi_advanced_mac_address_title (6571335466330978393) -->
+    <skip />
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ਪਤਾ"</string>
+    <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"ਸੁਰੱਖਿਅਤ ਕੀਤੇ ਨੈਟਵਰਕ"</string>
+    <!-- no translation found for wifi_advanced_settings_label (3654366894867838338) -->
+    <skip />
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"ਸੁਰੱਖਿਅਤ ਕਰੋ"</string>
+    <!-- no translation found for wifi_ip_settings_menu_cancel (6582567330136502340) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (2513142355364274970) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (8164264988361096450) -->
+    <skip />
+    <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"ਇੱਕ ਪ੍ਰਮਾਣਿਕ DNS ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (40470058023181052) -->
+    <skip />
+    <!-- no translation found for wifi_dns1 (7344118050720080045) -->
+    <skip />
+    <!-- no translation found for wifi_dns2 (1368601006824882659) -->
+    <skip />
+    <!-- no translation found for wifi_gateway (163914742461092086) -->
+    <skip />
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_settings_title (5444461191435291082) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_device_info (3191876744469364173) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_search (3436429984738771974) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_searching (2396704492143633876) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_rename (8448896306960060415) -->
+    <skip />
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"ਪੀਅਰ ਡਿਵਾਈਸਾਂ"</string>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"ਕਨੈਕਟ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"ਡਿਵਾਈਸ ਨੂੰ ਮੁੜ ਨਾਮ ਦੇਣ ਵਿੱਚ ਅਸਫਲ।"</string>
+    <!-- no translation found for wifi_p2p_disconnect_title (3216846049677448420) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_disconnect_message (8227342771610125771) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_disconnect_multiple_message (3283805371034883105) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_cancel_connect_title (255267538099324413) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_cancel_connect_message (7477756213423749402) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (834559380069647086) -->
+    <skip />
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ਪੋਰਟੇਬਲ Wi‑Fi ਹੌਟਸਪੌਟ"</string>
+    <!-- no translation found for wifi_hotspot_checkbox_text (7763495093333664887) -->
+    <skip />
+    <string name="wifi_hotspot_checkbox_text_summary" msgid="3800646230853724318">"Wi‑Fi ਨੈਟਵਰਕ ਮੁਹੱਈਆ ਕਰਨ ਲਈ ਸੈਲਿਊਲਰ ਕਨੈਕਸ਼ਨ ਵਰਤੋ"</string>
+    <!-- no translation found for wifi_tether_starting (1322237938998639724) -->
+    <skip />
+    <!-- no translation found for wifi_tether_stopping (4835852171686388107) -->
+    <skip />
+    <!-- no translation found for wifi_tether_enabled_subtext (8948641212931906143) -->
+    <skip />
+    <!-- no translation found for wifi_tether_failed_subtext (1484941858530919002) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_ap_text (7974681394041609308) -->
+    <skip />
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi ਹੌਟਸਪੌਟ ਸੈਟਅਪ"</string>
+    <!-- no translation found for wifi_hotspot_configure_ap_text_summary (5618031116920832182) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_subtext (7957547035983257748) -->
+    <skip />
+    <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_mode_title" msgid="2164073796253284289">"ਕਾਲਿੰਗ ਤਰਜੀਹ"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi ਕਾਲਿੰਗ ਮੋਡ"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"ਤਰਜੀਹੀ Wi-Fi"</item>
+    <item msgid="5267397515594230396">"ਤਰਜੀਹੀ ਸੈਲਿਊਲਰ"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"ਜਦੋਂ Wi-Fi ਕਾਲਿੰਗ ਚਾਲੂ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਫੋਨ ਤੁਹਾਡੀ ਤਰਜੀਹ ਅਤੇ ਕਿਹੜਾ ਸਿਗਨਲ ਵੱਧ ਮਜ਼ਬੂਤ ਹੈ, ਦੇ ਆਧਾਰ ਤੇ Wi-Fi ਨੈਟਵਰਕਾਂ ਜਾਂ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦੇ ਨੈਟਵਰਕ ਰਾਹੀਆਂ ਕਾਲਾਂ ਰੂਟ ਕਰ ਸਕਦਾ ਹੈ। ਇਸ ਡਿਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਫੀਸ ਅਤੇ ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
+    <string name="display_settings_title" msgid="1708697328627382561">"ਡਿਸਪਲੇ ਕਰੋ"</string>
+    <!-- no translation found for sound_settings (5534671337768745343) -->
+    <skip />
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <string name="all_volume_title" msgid="4296957391257836961">"ਵੋਲਯੂਮ"</string>
+    <!-- no translation found for musicfx_title (3415566786340790345) -->
+    <skip />
+    <!-- no translation found for ring_volume_title (7938706566797464165) -->
+    <skip />
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ਸਾਈਲੈਂਟ ਹੋਣ ਵੇਲੇ ਵਾਈਬ੍ਰੇਟ"</string>
+    <!-- no translation found for notification_sound_title (5137483249425507572) -->
+    <skip />
+    <!-- no translation found for incoming_call_volume_title (8073714801365904099) -->
+    <skip />
+    <!-- no translation found for notification_volume_title (2012640760341080408) -->
+    <skip />
+    <!-- no translation found for checkbox_notification_same_as_incoming_call (1073644356290338921) -->
+    <skip />
+    <string name="home_work_profile_not_supported" msgid="1357721012342357037">"ਕੰਮ ਪ੍ਰੋਫਾਈਲਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ"</string>
+    <!-- no translation found for notification_sound_dialog_title (3805140135741385667) -->
+    <skip />
+    <!-- no translation found for media_volume_title (3576565767317118106) -->
+    <skip />
+    <!-- no translation found for media_volume_summary (5363248930648849974) -->
+    <skip />
+    <!-- no translation found for alarm_volume_title (2285597478377758706) -->
+    <skip />
+    <string name="dock_settings_summary" msgid="455802113668982481">"ਅਟੈਚ ਕੀਤੇ ਡੌਕ ਲਈ ਔਡੀਓ ਸੈਟਿੰਗਾਂ"</string>
+    <!-- no translation found for dtmf_tone_enable_title (8533399267725365088) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_title (1171590821131077296) -->
+    <skip />
+    <!-- no translation found for lock_sounds_enable_title (450098505659399520) -->
+    <skip />
+    <!-- no translation found for haptic_feedback_enable_title (2438293710530828760) -->
+    <skip />
+    <!-- no translation found for audio_record_proc_title (4271091199976457534) -->
+    <skip />
+    <!-- no translation found for volume_media_description (7949355934788807863) -->
+    <skip />
+    <!-- no translation found for volume_ring_description (5936851631698298989) -->
+    <skip />
+    <!-- no translation found for volume_notification_description (5810902320215328321) -->
+    <skip />
+    <!-- no translation found for volume_alarm_description (8322615148532654841) -->
+    <skip />
+    <!-- no translation found for volume_ring_mute (3018992671608737202) -->
+    <skip />
+    <string name="volume_media_mute" msgid="3399059928695998166">"ਸੰਗੀਤ &amp; ਹੋਰ ਮੀਡੀਆ ਨੂੰ ਮਿਊਟ ਕਰੋ"</string>
+    <!-- no translation found for volume_notification_mute (7955193480006444159) -->
+    <skip />
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"ਅਲਾਰਮਾਂ ਨੂੰ ਮਿਊਟ ਕਰੋ"</string>
+    <!-- no translation found for dock_settings (1820107306693002541) -->
+    <skip />
+    <!-- no translation found for dock_settings_title (9161438664257429372) -->
+    <skip />
+    <!-- no translation found for dock_audio_settings_title (3324750259959570305) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_desk (6487784412371139335) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_car (6740897586006248450) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_none (8215337394914283607) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_none (289909253741048784) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_unknown (4465059868974255693) -->
+    <skip />
+    <!-- no translation found for dock_not_found_title (3290961741828952424) -->
+    <skip />
+    <!-- no translation found for dock_not_found_text (8405432495282299143) -->
+    <skip />
+    <!-- no translation found for dock_not_found_text (1460497923342627801) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_title (885839627097024110) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_on (838102386448981339) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_on (8491180514199743771) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_off (5077843049805652363) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_off (3151046599205265919) -->
+    <skip />
+    <string name="account_settings" msgid="6403589284618783461">"ਖਾਤੇ"</string>
+    <!-- no translation found for category_personal (1299663247844969448) -->
+    <skip />
+    <!-- no translation found for category_work (8699184680584175622) -->
+    <skip />
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
+    <!-- no translation found for display_settings (7965901687241669598) -->
+    <skip />
+    <!-- no translation found for accelerometer_title (7854608399547349157) -->
+    <skip />
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ਟੈਬਲੇਟ ਨੂੰ ਰੋਟੇਟ ਕਰਨ ਵੇਲੇ ਆਟੋਮੈਟਿਕਲੀ ਅਨੁਕੂਲਨ ਸਵਿਚ ਕਰੋ"</string>
+    <!-- no translation found for accelerometer_summary_on (1133737282813048021) -->
+    <skip />
+    <!-- no translation found for accelerometer_summary_off (4781734213242521682) -->
+    <skip />
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"ਫੋਨ ਨੂੰ ਰੋਟੇਟ ਕਰਨ ਵੇਲੇ ਆਟੋਮੈਟਿਕਲੀ ਅਨੁਕੂਲਨ ਸਵਿਚ ਕਰੋ"</string>
+    <string name="brightness" msgid="8480105032417444275">"ਚਮਕ  ਦਾ ਪੱਧਰ"</string>
+    <!-- no translation found for brightness_title (5746272622112982836) -->
+    <skip />
+    <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="night_mode_title" msgid="6928425617491943384">"ਵਿਸ਼ਾ"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"ਲਾਈਟ"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"ਗੂੜ੍ਹਾ"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"ਆਟੋਮੈਟਿਕ"</string>
+    <!-- no translation found for screen_timeout (4351334843529712571) -->
+    <skip />
+    <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_fragment_title" msgid="519078346877860129">"ਇਸਤੋਂ ਵਾਲਪੇਪਰ ਚੁਣੋ"</string>
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
+    <skip />
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"ਜਦੋਂ ਫੋਨ ਡੌਕ ਕੀਤਾ ਅਤੇ/ਜਾਂ ਸਲੀਪ ਤੇ ਹੁੰਦਾ ਹੈ ਤਾਂ ਇਸਤੇ ਨਿਯੰਤਰਣ ਪਾਉਣ ਲਈ ਕਿ ਕੀ ਵਾਪਰਦਾ ਹੈ, ਡੇਡ੍ਰੀਮ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"ਜਦੋਂ ਡੇਡ੍ਰੀਮ ਲਈ"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ਹੁਣ ਚਾਲੂ ਕਰੋ"</string>
+    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
+    <skip />
+    <string name="automatic_brightness" msgid="5014143533884135461">"ਆਟੋਮੈਟਿਕ ਚਮਕ"</string>
+    <!-- no translation found for lift_to_wake_title (4555378006856277635) -->
+    <skip />
+    <!-- no translation found for doze_title (2259176504273878294) -->
+    <skip />
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
+    <!-- no translation found for title_font_size (4405544325522105222) -->
+    <skip />
+    <!-- no translation found for dialog_title_font_size (2231507851258955038) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings (3392331196873564292) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_category (5136244267576697004) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_title (9018585580955414596) -->
+    <skip />
+    <!-- no translation found for sim_pin_toggle (1742123478029451888) -->
+    <skip />
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ਟੈਬਲੇਟ ਵਰਤਣ ਲਈ PIN ਦੀ ਲੋੜ ਹੈ"</string>
+    <!-- no translation found for sim_lock_on (2503536505568814324) -->
+    <skip />
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ਟੈਬਲੇਟ ਵਰਤਣ ਲਈ PIN ਦੀ ਲੋੜ ਹੈ"</string>
+    <!-- no translation found for sim_lock_off (258981978215428916) -->
+    <skip />
+    <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>
+    <!-- no translation found for sim_disable_sim_lock (7664729528754784824) -->
+    <skip />
+    <!-- no translation found for sim_enter_old (6074196344494634348) -->
+    <skip />
+    <string name="sim_enter_new" msgid="8742727032729243562">"ਨਵਾਂ SIM PIN"</string>
+    <!-- no translation found for sim_reenter_new (6523819386793546888) -->
+    <skip />
+    <!-- no translation found for sim_change_pin (7328607264898359112) -->
+    <skip />
+    <string name="sim_bad_pin" msgid="2345230873496357977">"ਗ਼ਲਤ PIN"</string>
+    <!-- no translation found for sim_pins_dont_match (8449681619822460312) -->
+    <skip />
+    <!-- no translation found for sim_change_failed (304964924772218382) -->
+    <skip />
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN ਸਫਲਤਾਪੂਰਵਕ ਬਦਲਿਆ ਗਿਆ"</string>
+    <!-- no translation found for sim_lock_failed (5651596916127873626) -->
+    <skip />
+    <!-- no translation found for sim_enter_ok (6475946836899218919) -->
+    <skip />
+    <!-- no translation found for sim_enter_cancel (6240422158517208036) -->
+    <skip />
+    <!-- no translation found for sim_multi_sims_title (9159427879911231239) -->
+    <skip />
+    <!-- no translation found for sim_multi_sims_summary (7018740080801483990) -->
+    <skip />
+    <string name="sim_change_data_title" msgid="294357201685244532">"ਕੀ ਡਾਟਾ SIM ਬਦਲਣਾ ਹੈ?"</string>
+    <string name="sim_change_data_message" msgid="1313940695939674633">"ਕੀ ਸੈਲਿਊਲਰ ਡਾਟਾ ਲਈ <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>
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ਗ਼ਲਤ SIM PIN ਕੋਡ, ਹੁਣ ਤੁਹਾਨੂੰ ਆਪਣੀ ਡਿਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰਨਾ ਪਵੇਗਾ।"</string>
+    <!-- no translation found for wrong_pin_code (1582398808893048097) -->
+    <!-- no translation found for pin_failed (1848423634948587645) -->
+    <skip />
+    <!-- no translation found for device_info_settings (1119755927536987178) -->
+    <skip />
+    <!-- no translation found for device_info_settings (475872867864762157) -->
+    <skip />
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"ਸਿਸਟਮ ਅਪਡੇਟਾਂ"</string>
+    <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
+    <!-- no translation found for firmware_version (4801135784886859972) -->
+    <skip />
+    <!-- no translation found for model_number (3765737700545384794) -->
+    <skip />
+    <string name="fcc_equipment_id" msgid="149114368246356737">"ਉਪਕਰਨ ID"</string>
+    <!-- no translation found for baseband_version (1848990160763524801) -->
+    <skip />
+    <!-- no translation found for kernel_version (9192574954196167602) -->
+    <skip />
+    <!-- no translation found for build_number (3075795840572241758) -->
+    <skip />
+    <!-- no translation found for selinux_status (6212165375172061672) -->
+    <skip />
+    <!-- no translation found for device_info_not_available (8062521887156825182) -->
+    <skip />
+    <!-- no translation found for device_status_activity_title (1411201799384697904) -->
+    <skip />
+    <!-- no translation found for device_status (607405385799807324) -->
+    <skip />
+    <!-- no translation found for device_status_summary (3292717754497039686) -->
+    <skip />
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"ਫੋਨ ਨੰਬਰ, ਸਿਗਨਲ ਆਦਿ"</string>
+    <!-- no translation found for storage_settings (4211799979832404953) -->
+    <skip />
+    <string name="storage_settings_title" msgid="8746016738388094064">"ਸਟੋਰੇਜ ਸੈਟਿੰਗਾਂ"</string>
+    <!-- no translation found for storage_settings_summary (3543813623294870759) -->
+    <skip />
+    <!-- no translation found for storage_settings_summary (9176693537325988610) -->
+    <skip />
+    <!-- no translation found for status_number (1138837891091222272) -->
+    <skip />
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_msid_number (909010114445780530) -->
+    <skip />
+    <!-- no translation found for status_prl_version (1007470446618081441) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
+    <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
+    <string name="status_network_type" msgid="952552009117455166">"ਸੈਲਿਊਲਰ ਨੈਟਵਰਕ ਪ੍ਰਕਾਰ"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"ਓਪਰੇਟਰ ਜਾਣਕਾਰੀ"</string>
+    <!-- no translation found for status_data_state (4578972321533789767) -->
+    <skip />
+    <string name="status_service_state" msgid="2323931627519429503">"ਸੇਵਾ ਸਥਿਤੀ"</string>
+    <string name="status_signal_strength" msgid="3732655254188304547">"ਸਿਗਨਲ ਸਟ੍ਰੈਂਥ"</string>
+    <string name="status_roaming" msgid="2638800467430913403">"ਰੋਮਿੰਗ"</string>
+    <!-- no translation found for status_operator (2274875196954742087) -->
+    <skip />
+    <!-- no translation found for status_wifi_mac_address (2202206684020765378) -->
+    <skip />
+    <!-- no translation found for status_bt_address (4195174192087439720) -->
+    <skip />
+    <string name="status_serial_number" msgid="2257111183374628137">"ਕ੍ਰਮ ਸੰਖਿਆ"</string>
+    <!-- no translation found for status_unavailable (7862009036663793314) -->
+    <skip />
+    <!-- no translation found for status_up_time (7294859476816760399) -->
+    <skip />
+    <!-- no translation found for status_awake_time (2393949909051183652) -->
+    <skip />
+    <!-- no translation found for internal_memory (9129595691484260784) -->
+    <skip />
+    <!-- no translation found for sd_memory (2510246194083052841) -->
+    <skip />
+    <!-- no translation found for sd_memory (151871913888051515) -->
+    <skip />
+    <string name="memory_available" msgid="5052397223077021181">"ਉਪਲਬਧ"</string>
+    <!-- no translation found for memory_available_read_only (6497534390167920206) -->
+    <skip />
+    <!-- no translation found for memory_size (6629067715017232195) -->
+    <skip />
+    <!-- no translation found for memory_calculating_size (2188358544203768588) -->
+    <skip />
+    <string name="memory_apps_usage" msgid="5128673488173839077">"ਐਪਸ &amp; ਐਪ ਡਾਟਾ"</string>
+    <!-- no translation found for memory_media_usage (3738830697707880405) -->
+    <skip />
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"ਡਾਊਨਲੋਡਸ"</string>
+    <string name="memory_dcim_usage" msgid="558887013613822577">"ਤਸਵੀਰਾਂ, ਵੀਡੀਓ"</string>
+    <!-- no translation found for memory_music_usage (1363785144783011606) -->
+    <skip />
+    <!-- no translation found for memory_media_misc_usage (6094866738586451683) -->
+    <skip />
+    <!-- no translation found for memory_media_cache_usage (6704293333141177910) -->
+    <skip />
+    <!-- no translation found for sd_eject (4988563376492400073) -->
+    <skip />
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD ਕਾਰਡ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰੋ ਤਾਂ ਜੋ ਤੁਸੀਂ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੂਪ ਨਾਲ ਹਟਾ ਸਕੋ।"</string>
+    <!-- no translation found for sd_insert_summary (5264016886409577313) -->
+    <skip />
+    <!-- no translation found for sd_insert_summary (2048640010381803841) -->
+    <skip />
+    <!-- no translation found for sd_mount (8966695015677343116) -->
+    <skip />
+    <!-- no translation found for sd_mount (5940523765187704135) -->
+    <skip />
+    <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>
+    <!-- no translation found for sd_format (2576054280507119870) -->
+    <skip />
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਂਦਾ ਹੈ, ਜਿਵੇਂ ਸੰਗੀਤ ਅਤੇ ਫੋਟੋਆਂ"</string>
+    <!-- no translation found for sd_format_summary (212703692181793109) -->
+    <skip />
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"ਕੀ ਕੈਚ ਕੀਤਾ ਡਾਟਾ ਹਟਾਉਣਾ ਹੈ?"</string>
+    <!-- no translation found for memory_clear_cache_message (4550262490807415948) -->
+    <skip />
+    <!-- no translation found for mtp_ptp_mode_summary (3710436114807789270) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_title (3077285629197874055) -->
+    <skip />
+    <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>
+    <!-- no translation found for dlg_confirm_unmount_text (6998379994779187692) -->
+    <skip />
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
+    <!-- no translation found for dlg_error_unmount_text (4346280469528260684) -->
+    <skip />
+    <!-- no translation found for dlg_error_unmount_text (3073562815631781894) -->
+    <skip />
+    <!-- no translation found for unmount_inform_text (7120241136790744265) -->
+    <skip />
+    <!-- no translation found for unmount_inform_text (1904212716075458402) -->
+    <skip />
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"ਅਨਮਾਉਂਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"ਪ੍ਰਗਤੀ ਵਿੱਚ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
+    <!-- no translation found for storage_low_title (1388569749716225155) -->
+    <skip />
+    <string name="storage_low_summary" msgid="7737465774892563129">"ਕੁਝ ਸਿਸਟਮ ਫੰਕਸ਼ਨ, ਜਿਵੇਂ ਸਿੰਕ ਕਰਨਾ, ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਹੀਂ ਵੀ ਕਰ ਸਕਦੇ। ਆਈਟਮਾਂ ਮਿਟਾ ਕੇ ਜਾਂ ਅਨਪਿੰਨ ਕਰਕੇ ਸਪੇਸ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ, ਜਿਵੇਂ ਐਪਸ ਜਾਂ ਮੀਡੀਆ ਸਮੱਗਰੀ।"</string>
+    <!-- no translation found for storage_menu_rename (7141058657592615390) -->
+    <skip />
+    <string name="storage_menu_mount" msgid="1014683672493425425">"ਮਾਉਂਟ ਕਰੋ"</string>
+    <!-- no translation found for storage_menu_unmount (681485356885955898) -->
+    <skip />
+    <!-- no translation found for storage_menu_format (8334422679047059459) -->
+    <skip />
+    <!-- no translation found for storage_menu_format_internal (6553368530402755543) -->
+    <skip />
+    <!-- no translation found for storage_menu_usb (5708207885333243384) -->
+    <skip />
+    <string name="storage_title_usb" msgid="679612779321689418">"USB ਕੰਪਿਊਟਰ ਕਨੈਕਸ਼ਨ"</string>
+    <!-- no translation found for usb_connection_category (7805945595165422882) -->
+    <skip />
+    <string name="usb_mtp_title" msgid="3399663424394065964">"ਮੀਡੀਆ ਡਿਵਾਈਸ (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows ਤੇ ਜਾਂ Mac Android ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਵਰਤਦੇ ਹੋਏ ਤੁਹਾਨੂੰ ਮੀਡੀਆ ਫਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ (www.android.com/filetransfer ਦੇਖੋ)"</string>
+    <!-- no translation found for usb_ptp_title (3852760810622389620) -->
+    <skip />
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"ਤੁਹਾਨੂੰ ਕੈਮਰਾ ਸੌਫਟਵੇਅਰ ਵਰਤਦੇ ਹੋਏ ਫੋਟੋਆਂ ਅਤੇ ਕੰਪਿਊਟਰ ਤੇ ਕੋਈ ਵੀ ਫਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ ਜੋ 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>
+    <!-- no translation found for storage_internal_title (690771193137801021) -->
+    <skip />
+    <!-- no translation found for storage_external_title (2723851748972673696) -->
+    <skip />
+    <!-- no translation found for storage_volume_summary (476551204412943800) -->
+    <skip />
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ਮਾਉਂਟ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
+    <!-- no translation found for storage_mount_failure (8928389741212129060) -->
+    <skip />
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> ਸੁਰੱਖਿਅਤ ਰੂਪ ਨਾਲ ਕੱਢੀ ਗਈ ਹੈ"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੂਪ ਨਾਲ ਨਹੀਂ ਕੱਢ ਸਕਿਆ"</string>
+    <!-- no translation found for storage_format_success (3023144070597190555) -->
+    <skip />
+    <!-- no translation found for storage_format_failure (8343688274191391889) -->
+    <skip />
+    <!-- no translation found for storage_rename_title (8242663969839491485) -->
+    <skip />
+    <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="3677827796634199714"><b>"ਜਦੋਂ ਤੁਸੀਂ ਇਸ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਬਾਹਦ ਕੱਢਦੇ ਹੋ, ਤਾਂ ਇਸ \'ਤੇ ਸਟੋਰ ਕੀਤੀਆਂ ਐਪਸ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਦੇਣਗੀ, ਅਤੇ ਇਸ \'ਤੇ ਸਟੋਰ ਕੀਤੀਆਂ ਮੀਡੀਆ ਫ਼ਾਈਲਾਂ ਉਦੋਂ ਤੱਕ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ ਜਦੋਂ ਤੱਕ ਇਸਨੂੰ ਮੁੜ ਸੰਮਿਲਿਤ ਨਾ ਕੀਤਾ ਜਾਵੇ."</b>" \n\nਇਸ <xliff:g id="NAME_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_format_confirm_body" msgid="4401758710076806509">"ਇਸਨੂੰ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਸੁਰੱਖਿਅਤ ਬਣਾਉਣ ਲਈ ਇਹ ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ. \n\nਫਾਰਮੈਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ <xliff:g id="NAME_1">^1</xliff:g> will ਸਿਰਫ਼ ਇਸ ਡਿਵਾਈਸ ਵਿੱਚ ਕੰਮ ਕਰੇਗਾ. \n\n "<b>"ਫਾਰਮੈਟ ਕਰਨਾ ਵਰਤਮਾਨ ਵਿੱਚ <xliff:g id="NAME_2">^1</xliff:g> \'ਤੇ ਸਟੋਰ ਕੀਤੀ ਸਾਰੇ ਡੇਟਾ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੰਦਾ ਹੈ."</b>" ਡੇਟਾ ਗੁਆਚਣ ਤੋਂ ਬੱਚਣ ਲਈ, ਇਸਦਾ ਬੈੱਕ ਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ."</string>
+    <string name="storage_wizard_format_confirm_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="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਨਾ ਹਟਾਓ."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ਡੇਟਾ ਨੂੰ ਨਵੇਂ ਸਟੋਰੇਜ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"ਤੁਸੀਂ ਇਸ ਨਵੇਂ <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="5035719146373359329"><b>"ਇਹ ਮੂਵ ਲਗਭਗ <xliff:g id="TIME">^1</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="8641916179067596592">"ਮੂਵ ਦੇ ਦੌਰਾਨ \n• <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ. \n• ਕੁਝ ਐਪ ਸਹੀ ਤਰੀਕੇ ਦੇ ਨਾਲ ਕੰਮ ਨਹੀਂ ਕਰਨSome apps won\'t work correctly. \n• Keep the device charged."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> ਤਿਆਰ ਹੈ"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"ਤੁਹਾਡ <xliff:g id="NAME">^1</xliff:g> ਫੋਟੋਆਂ ਅਤੇ ਦੂਜੇ ਮੀਡੀਆ ਦੇ ਨਾਲ ਉਪਯੋਗ ਕਰਨ ਲਈ ਬਿਲਕੁਲ ਤਿਆਰ ਹੈ."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ਤੁਹਾਡਾ ਨਵਾਂ <xliff:g id="NAME">^1</xliff:g> ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ. \n\nਇਸ ਡਿਵਾਈਸ ਵਿੱਚ ਫੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ, ਅਤੇ ਐਪ ਡੇਟਾ ਨੂੰ ਮੂਵ ਕਰਨ ਲਈ, ਸੈੱਟਿੰਗਜ਼ ਅਤੇ ਸਟੋਰੇਜ \'ਤੇ ਜਾਓ."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ਨੂੰ ਮੂਵ ਕਰੋ"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"ਮੂਵ ਦੇ ਦੌਰਾਨ <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="battery_status_title" msgid="9159414319574976203">"ਬੈਟਰੀ ਸਥਿਤੀ"</string>
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <string name="apn_edit" msgid="1354715499708424718">"ਪਹੁੰਚ ਬਿੰਦੂ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
+    <string name="apn_not_set" msgid="4974192007399968164">"ਸੈਟ ਨਹੀਂ ਕੀਤਾ"</string>
+    <string name="apn_name" msgid="4115580098369824123">"ਨਾਮ"</string>
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <string name="apn_http_proxy" msgid="1826885957243696354">"ਪ੍ਰੌਕਸੀ"</string>
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <string name="apn_user" msgid="455637547356117761">"ਉਪਭੋਗਤਾ ਨਾਮ"</string>
+    <string name="apn_password" msgid="5412301994998250968">"ਪਾਸਵਰਡ"</string>
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
+    <string name="apn_mms_proxy" msgid="5374082621073999275">"MMS ਪ੍ਰੌਕਸੀ"</string>
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <!-- no translation found for apn_auth_type (6167205395676037015) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_none (5069592676845549926) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_pap (1666934536996033383) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_chap (3369626283789068360) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_pap_chap (9102343063036134541) -->
+    <skip />
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for apn_roaming_protocol (3386954381510788422) -->
+    <skip />
+    <!-- no translation found for carrier_enabled (407655861175280806) -->
+    <skip />
+    <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ਸਮਰਥਿਤ"</string>
+    <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN ਅਸਮਰਥਿਤ"</string>
+    <!-- no translation found for bearer (594270280031923558) -->
+    <skip />
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO ਵੈਲਯੂ"</string>
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <string name="menu_new" msgid="3014205883303921729">"ਨਵਾਂ APN"</string>
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <string name="error_title" msgid="7631322303341024692"></string>
+    <string name="error_name_empty" msgid="8418502878620394756">"ਨਾਮ ਖੇਤਰ ਨੂੰ ਖਾਲੀ ਨਹੀਂ ਛੱਡਿਆ ਜਾ ਸਕਦਾ।"</string>
+    <!-- no translation found for error_apn_empty (6056233831214537267) -->
+    <skip />
+    <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ਖੇਤਰ 3 ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"</string>
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <string name="restore_default_apn" msgid="8178010218751639581">"ਡਿਫੌਲਟ APN ਸੈਟਿੰਗਾਂ ਰੀਸਟੋਰ ਕਰ ਰਿਹਾ ਹੈ।"</string>
+    <!-- no translation found for menu_restore (8260067415075573273) -->
+    <skip />
+    <!-- no translation found for restore_default_apn_completed (2824775307377604897) -->
+    <skip />
+    <string name="reset_network_title" msgid="4557113742173895074">"ਨੈਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈਟ"</string>
+    <!-- no translation found for reset_network_desc (581668983587311282) -->
+    <skip />
+    <string name="reset_network_button_text" msgid="2035676527471089853">"ਰੀਸੈਟ ਸੈਟਿੰਗਾਂ"</string>
+    <!-- no translation found for reset_network_final_desc (4874737348054213767) -->
+    <skip />
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ਰੀਸੈਟ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ਕੀ ਰੀਟੈਸ ਕਰਨਾ ਹੈ?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"ਨੈਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈਟ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ"</string>
+    <!-- no translation found for device_reset_title (2384019005638768076) -->
+    <skip />
+    <string name="master_clear_title" msgid="5907939616087039756">"ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈਟ"</string>
+    <!-- no translation found for master_clear_desc (8317211882509025841) -->
+    <skip />
+    <!-- no translation found for master_clear_desc (9165016501623540228) -->
+    <skip />
+    <!-- no translation found for master_clear_accounts (6412857499147999073) -->
+    <skip />
+    <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>
+    <!-- no translation found for master_clear_desc_erase_external_storage (7744115866662613411) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (4801026652617377093) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (969364037450286809) -->
+    <skip />
+    <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>
+    <!-- no translation found for master_clear_button_text (3130786116528304116) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (7550632653343157971) -->
+    <skip />
+    <!-- no translation found for master_clear_final_desc (1062841478823409667) -->
+    <skip />
+    <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
+    <skip />
+    <string name="master_clear_failed" msgid="7959646179737950703">"ਕੋਈ ਰੀਸੈਟ ਪਰਫੌਰਮ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਸੀ ਕਿਉਂਕਿ ਸਿਸਟਮ ਕਲੀਅਰ ਸੇਵਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
+    <string name="master_clear_confirm_title" msgid="7572642091599403668">"ਕੀ ਰੀਸੈਟ ਕਰਨਾ ਹੈ?"</string>
+    <!-- no translation found for master_clear_not_available (1000370707967468909) -->
+    <skip />
+    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
+    <skip />
+    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
+    <skip />
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB ਸਟੋਰੇਜ ਮਿਟਾਓ"</string>
+    <!-- no translation found for media_format_title (4427528440306787972) -->
+    <skip />
+    <!-- no translation found for media_format_summary (776603298628082065) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (4557243156946319034) -->
+    <skip />
+    <!-- no translation found for media_format_desc (8764037252319942415) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (6293669371185352810) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (6721544380069373626) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (699929778486375913) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (3344525419872744989) -->
+    <skip />
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"ਸਭ ਕੁਝ ਮਿਟਾਓ"</string>
+    <!-- no translation found for call_settings_title (5188713413939232801) -->
+    <skip />
+    <!-- no translation found for call_settings_summary (7291195704801002886) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_usb (6688416425801386511) -->
+    <skip />
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ਪੋਰਟੇਬਲ ਹੌਟਸਪੌਟ"</string>
+    <!-- no translation found for tether_settings_title_bluetooth (355855408317564420) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_usb_bluetooth (5355828977109785001) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_all (8356136101061143841) -->
+    <skip />
+    <!-- no translation found for usb_title (7483344855356312510) -->
+    <skip />
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ਟੀਥਰਿੰਗ"</string>
+    <!-- no translation found for usb_tethering_available_subtext (156779271296152605) -->
+    <skip />
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"ਟੀਥਰ ਕੀਤਾ"</string>
+    <!-- no translation found for usb_tethering_storage_active_subtext (5210094834194907094) -->
+    <skip />
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB ਕਨੈਕਟ ਨਹੀਂ ਕੀਤੀ"</string>
+    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ਚਾਲੂ ਕਰਨ ਲਈ ਕਨੈਕਟ ਕਰੋ"</string>
+    <!-- no translation found for usb_tethering_errored_subtext (1377574819427841992) -->
+    <skip />
+    <!-- no translation found for bluetooth_tether_checkbox_text (2379175828878753652) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_available_subtext (8811610320942954709) -->
+    <skip />
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"ਇਸ ਫੋਨ ਦਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"ਇਸ ਫੋਨ ਦਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ 1 ਡਿਵਾਈਸ ਨਾਲ ਸ਼ੇਅਰ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext_config (1790242032929221788) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext (2093881379028235555) -->
+    <skip />
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"ਇਸ ਫੋਨ ਦਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"ਟੀਥਰ ਨਹੀਂ ਕੀਤਾ"</string>
+    <!-- no translation found for bluetooth_tethering_overflow_error (6285122039489881969) -->
+    <skip />
+    <!-- no translation found for bluetooth_untether_blank (2871192409329334813) -->
+    <skip />
+    <!-- no translation found for tethering_help_button_text (656117495547173630) -->
+    <skip />
+    <string name="network_settings_title" msgid="4871233236744292831">"ਸੈਲਿਊਲਰ ਨੈਟਵਰਕਸ"</string>
+    <!-- no translation found for manage_mobile_plan_title (7630170375010107744) -->
+    <skip />
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS ਐਪ"</string>
+    <!-- no translation found for sms_change_default_dialog_title (1958688831875804286) -->
+    <skip />
+    <!-- no translation found for sms_change_default_dialog_text (1522783933230274787) -->
+    <skip />
+    <!-- no translation found for sms_change_default_no_previous_dialog_text (602683880284921998) -->
+    <skip />
+    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"ਕੀ Wi‑Fi ਸਹਾਇਕ ਬਦਲਣਾ ਹੈ?"</string>
+    <!-- no translation found for network_scorer_change_active_dialog_text (8035173880322990715) -->
+    <skip />
+    <!-- no translation found for network_scorer_change_active_no_previous_dialog_text (7444620909047611601) -->
+    <skip />
+    <!-- no translation found for mobile_unknown_sim_operator (2156912373230276157) -->
+    <skip />
+    <!-- no translation found for mobile_no_provisioning_url (2399426808423775711) -->
+    <skip />
+    <!-- no translation found for mobile_insert_sim_card (9052590985784056395) -->
+    <skip />
+    <!-- no translation found for mobile_connect_to_internet (1733894125065249639) -->
+    <skip />
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
+    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
+    <skip />
+    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
+    <skip />
+    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
+    <skip />
+    <!-- no translation found for location_mode_title (3982009713118421689) -->
+    <skip />
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ਉੱਚ ਸ਼ੁੱਧਤਾ"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ਬੈਟਰੀ ਦੀ ਬਚਤ"</string>
+    <!-- no translation found for location_mode_sensors_only_title (3040366132175435160) -->
+    <skip />
+    <!-- no translation found for location_mode_location_off_title (2829713015012529465) -->
+    <skip />
+    <!-- no translation found for location_category_recent_location_requests (1938721350424447421) -->
+    <skip />
+    <!-- no translation found for location_no_recent_apps (2800907699722178041) -->
+    <skip />
+    <!-- no translation found for location_category_location_services (7437150886946685979) -->
+    <skip />
+    <!-- no translation found for location_high_battery_use (517199943258508020) -->
+    <skip />
+    <!-- no translation found for location_low_battery_use (8602232529541903596) -->
+    <skip />
+    <string name="location_mode_screen_title" msgid="4528716772270246542">"ਸਥਿਤੀ ਮੋਡ"</string>
+    <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS, Wi‑Fi ਅਤੇ ਸੈਲਿਊਲਰ ਨੈਟਵਰਕ ਵਰਤੋ"</string>
+    <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ Wi‑Fi ਅਤੇ ਸੈਲਿਊਲਰ ਨੈਟਵਰਕ ਵਰਤੋ"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੋ"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ"</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="2070686681074461301">"ਐਪਸ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ Wi‑Fi ਨੈਟਵਰਕਾਂ ਲਈ ਸਕੈਨ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਬਿਹਤਰ ਬਣਾਓ ਭਾਵੇ Wi‑Fi ਬੰਦ ਹੋਵੇ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth ਸਕੈਨਿੰਗ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ਸਿਸਟਮ ਸੇਵਾਵਾਂ ਨੂੰ Bluetooth ਡਿਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਬਿਹਤਰ ਬਣਾਓ, ਭਾਵੇ Bluetooth ਬੰਦ ਹੋਵੇ"</string>
+    <!-- no translation found for location_network_based (6010456018401296590) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level (5626515380188353712) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level_wifi (4234820941954812210) -->
+    <skip />
+    <!-- no translation found for location_gps (8392461023569708478) -->
+    <skip />
+    <!-- no translation found for location_street_level (1669562198260860802) -->
+    <skip />
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"ਆਪਣੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਨੂੰ ਸੁਨਿਸ਼ਚਿਤ ਕਰਨ ਲਈ ਐਪਸ ਨੂੰ ਆਪਣੇ ਫੋਨ ਤੇ GPS ਵਰਤਣ ਦਿਓ"</string>
+    <!-- no translation found for assisted_gps (4649317129586736885) -->
+    <skip />
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ਦੀ ਸਹਾਇਤਾ ਲਈ ਸਰਵਰ ਵਰਤੋ (ਨੈਟਵਰਕ ਵਰਤੋਂ ਘੱਟ ਕਰਨ ਲਈ ਅਨਚੈਕ ਕਰੋ)"</string>
+    <!-- no translation found for assisted_gps_disabled (6982698333968010748) -->
+    <skip />
+    <string name="use_location_title" msgid="5206937465504979977">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ &amp; Google ਖੋਜ"</string>
+    <!-- no translation found for use_location_summary (3978805802386162520) -->
+    <skip />
+    <!-- no translation found for location_access_title (7064108942964081243) -->
+    <skip />
+    <!-- no translation found for location_access_summary (69031404093194341) -->
+    <skip />
+    <!-- no translation found for location_sources_heading (1278732419851088319) -->
+    <skip />
+    <!-- no translation found for about_settings (593457295516533765) -->
+    <skip />
+    <!-- no translation found for about_settings (1743378368185371685) -->
+    <skip />
+    <!-- no translation found for about_settings_summary (3371517697156165959) -->
+    <skip />
+    <!-- no translation found for legal_information (5769301644270604095) -->
+    <skip />
+    <!-- no translation found for contributors_title (5917703088825286504) -->
+    <skip />
+    <!-- no translation found for regulatory_information (5695464367088752150) -->
+    <skip />
+    <string name="copyright_title" msgid="865906688917260647">"ਕਾਪੀਰਾਈਟ"</string>
+    <!-- no translation found for license_title (1990487604356037871) -->
+    <skip />
+    <string name="terms_title" msgid="7697580845616764642">"ਨਿਯਮ ਅਤੇ ਸ਼ਰਤਾਂ"</string>
+    <!-- no translation found for webview_license_title (2813507464175738967) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_title (7553683406244228650) -->
+    <skip />
+    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ਲਸੰਸ ਲੋਡ ਕਰਨ ਵਿੱਚ ਇੱਕ ਸਮੱਸਿਆ ਹੋਈ ਸੀ।"</string>
+    <!-- no translation found for settings_license_activity_loading (3337535809093591740) -->
+    <skip />
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"</string>
+    <!-- no translation found for settings_safetylegal_activity_unreachable (232523852222964470) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_activity_loading (8059022597639516348) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_password_header (8624900666929394990) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_pattern_header (6949761069941694050) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_pin_header (7598849519816138302) -->
+    <skip />
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <!-- no translation found for lockpassword_confirm_your_pattern_header (7543433733032330821) -->
+    <skip />
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ਆਪਣੇ PIN ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <!-- no translation found for lockpassword_confirm_passwords_dont_match (6850677112663979120) -->
+    <skip />
+    <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
+    <!-- no translation found for lockpassword_choose_lock_generic_header (3811438094903786145) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_set_toast (4875050283108629383) -->
+    <skip />
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN ਸੈਟ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
+    <!-- no translation found for lockpassword_pattern_set_toast (6867259621331406236) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pattern_generic (7050256155547273836) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pin_generic (1072670959803859869) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_password_generic (1022239625083264596) -->
+    <skip />
+    <!-- no translation found for lockpassword_invalid_pin (15588049067548470) -->
+    <skip />
+    <!-- no translation found for lockpassword_invalid_password (4038507398784975200) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_unlock_wrong (1745247595356012176) -->
+    <skip />
+    <string name="lock_settings_title" msgid="4213839087748988686">"ਡਿਵਾਈਸ ਸੁਰੱਖਿਆ"</string>
+    <!-- no translation found for lockpattern_change_lock_pattern_label (5679630792003440352) -->
+    <skip />
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ਅਨਲੌਕ PIN ਬਦਲੋ"</string>
+    <!-- no translation found for lockpattern_recording_intro_header (308287052221942814) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_intro_footer (1118579101409152113) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_inprogress (6667844062721656773) -->
+    <skip />
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ਘੱਟੋ-ਘੱਟ <xliff:g id="NUMBER">%d</xliff:g> ਬਿੰਦੀਆਂ ਤੇ ਕਨੈਕਟ ਕਰੋ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <!-- no translation found for lockpattern_pattern_entered_header (4316818983675591604) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_confirm (8054853451639221265) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_confirmed_header (8455614172231880211) -->
+    <skip />
+    <!-- no translation found for lockpattern_confirm_button_text (1128204343957002841) -->
+    <skip />
+    <!-- no translation found for lockpattern_restart_button_text (3337574403350953926) -->
+    <skip />
+    <!-- no translation found for lockpattern_retry_button_text (1949847413862309134) -->
+    <skip />
+    <!-- no translation found for lockpattern_continue_button_text (4723771754714471410) -->
+    <skip />
+    <string name="lockpattern_settings_title" msgid="3207750489460466680">"ਪੈਟਰਨ ਅਨਲੌਕ ਕਰੋ"</string>
+    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"ਲੁੜੀਂਦਾ ਪੈਟਰਨ"</string>
+    <!-- no translation found for lockpattern_settings_enable_summary (1165707416664252167) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_visible_pattern_title (2615606088906120711) -->
+    <skip />
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"ਛੋਹਣ ਤੇ ਵਾਈਬ੍ਰੇਟ"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ਪਾਵਰ ਬਟਨ ਤੁਰੰਤ ਲੌਕ ਹੁੰਦਾ ਹੈ"</string>
+    <!-- no translation found for lockpattern_settings_power_button_instantly_locks_summary (8196258755143711694) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_choose_lock_pattern (1652352830005653447) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_change_lock_pattern (1123908306116495545) -->
+    <skip />
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"ਇੱਕ ਅਨਲੌਕ ਪੈਟਰਨ ਕਿਵੇਂ ਡ੍ਰਾ ਕਰੋ"</string>
+    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts (6909161623701848863) -->
+    <skip />
+    <string name="activity_not_found" msgid="5551664692991605325">"ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀ ਹੈ।"</string>
+    <!-- no translation found for manageapplications_settings_title (7041951105633616745) -->
+    <skip />
+    <!-- no translation found for manageapplications_settings_summary (1794401500935451259) -->
+    <skip />
+    <!-- no translation found for applications_settings (1721442176406964682) -->
+    <skip />
+    <!-- no translation found for applications_settings_summary (6683465446264515367) -->
+    <skip />
+    <string name="applications_settings_header" msgid="1014813055054356646">"ਐਪ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="install_applications" msgid="4872012136210802181">"ਅਗਿਆਤ ਸ੍ਰੋਤ"</string>
+    <string name="install_applications_title" msgid="4987712352256508946">"ਸਾਰੇ ਐਪ ਸ੍ਰੋਤਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <!-- no translation found for install_unknown_applications_title (663831043139080992) -->
+    <skip />
+    <string name="install_unknown_applications" msgid="176855644862942064">"ਅਗਿਆਤ ਸ੍ਰੋਤਾਂ ਦੇ ਐਪਸ ਦੀ ਇੰਸਟੌਲੇਸ਼ਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਅਗਿਆਤ ਸ੍ਰੋਤਾਂ ਦੇ ਐਪਸ ਵੱਲੋਂ ਹਮਲਾ ਕਰਨ ਲਈ ਵੱਧ ਕਮਜ਼ੋਰ ਹਨ। ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਤੁਸੀਂ ਆਪਣੀ ਟੈਬਲੇਟ ਨੂੰ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਹੋਣ ਅਤੇ ਡਾਟਾ ਦੇ ਨਸ਼ਟ ਲਈ ਕੇਵਲ ਖੁਦ ਜ਼ੁੰਮੇਵਾਰ ਹੋ, ਜੋ ਇਹਨਾਂ ਐਪਸ ਨੂੰ ਵਰਤਣ ਦੇ ਸਿੱਟੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <!-- no translation found for install_all_warning (8113734576826384682) -->
+    <skip />
+    <!-- no translation found for advanced_settings (1777249286757067969) -->
+    <skip />
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"ਹੋਰ ਸੈਟਿੰਗਾਂ ਚੋਣਾਂ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"ਐਪ ਜਾਣਕਾਰੀ"</string>
+    <!-- no translation found for storage_label (8700867073480107253) -->
+    <skip />
+    <!-- no translation found for auto_launch_label (3012617472833815382) -->
+    <skip />
+    <!-- no translation found for auto_launch_label_generic (3230569852551968694) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_label (663250687205465394) -->
+    <skip />
+    <string name="permissions_label" msgid="2605296874922726203">"ਅਨੁਮਤੀਆਂ"</string>
+    <!-- no translation found for cache_header_label (1877197634162461830) -->
+    <skip />
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"ਕੈਚ ਹਟਾਓ"</string>
+    <!-- no translation found for cache_size_label (7505481393108282913) -->
+    <skip />
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <string name="force_stop" msgid="7435006169872876756">"ਰੋਕਣ ਤੇ ਜ਼ੋਰ ਪਾਓ"</string>
+    <string name="total_size_label" msgid="1048676419552557254">"ਕੁੱਲ"</string>
+    <!-- no translation found for application_size_label (8494609207373874267) -->
+    <skip />
+    <!-- no translation found for external_code_size_label (3459343140355961335) -->
+    <skip />
+    <!-- no translation found for data_size_label (8679376373625710107) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (7533821466482000453) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (626414192825329708) -->
+    <skip />
+    <string name="uninstall_text" msgid="3644892466144802466">"ਅਣਇੰਸਟੌਲ ਕਰੋ"</string>
+    <!-- no translation found for uninstall_all_users_text (851857393177950340) -->
+    <skip />
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
+    <!-- no translation found for disable_text (6544054052049395202) -->
+    <skip />
+    <!-- no translation found for enable_text (9217362512327828987) -->
+    <skip />
+    <!-- no translation found for clear_user_data_text (5597622864770098388) -->
+    <skip />
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
+    <string name="auto_launch_enable_text" msgid="2652825923953591251">"ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਕੁਝ ਕਿਰਿਆਵਾਂ ਲਈ ਬਾਇ ਡਿਫੌਲਟ ਲੌਂਚ ਕਰਨ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ।"</string>
+    <!-- no translation found for always_allow_bind_appwidgets_text (3368654672141202604) -->
+    <skip />
+    <string name="auto_launch_disable_text" msgid="7800385822185540166">"ਕੋਈ ਡਿਫੌਲਟਸ ਸੈਟ ਨਹੀਂ ਕੀਤੇ"</string>
+    <!-- no translation found for clear_activities (7408923511535174430) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_text (1616155457673106022) -->
+    <skip />
+    <string name="ask_compatibility" msgid="7225195569089607846">"ਜਦੋਂ ਲੌਂਚ ਕੀਤਾ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ"</string>
+    <!-- no translation found for enable_compatibility (5806819252068617811) -->
+    <skip />
+    <string name="unknown" msgid="1592123443519355854">"ਅਗਿਆਤ"</string>
+    <!-- no translation found for sort_order_alpha (1410278099123670628) -->
+    <skip />
+    <string name="sort_order_size" msgid="7024513286636502362">"ਆਕਾਰ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
+    <!-- no translation found for show_running_services (5736278767975544570) -->
+    <skip />
+    <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>
+    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
+    <skip />
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"ਐਪਸ ਰੀਸੈਟ ਕਰੋ"</string>
+    <!-- no translation found for manage_space_text (8852711522447794676) -->
+    <skip />
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <string name="filter_dlg_title" msgid="8693024463731076091">"ਫਿਲਟਰ ਚੋਣਾਂ ਚੁਣੋ"</string>
+    <!-- no translation found for filter_apps_all (5142129378749391876) -->
+    <skip />
+    <!-- no translation found for filter_apps_disabled (5364447573326472890) -->
+    <skip />
+    <!-- no translation found for filter_apps_third_party (7786348047690140979) -->
+    <skip />
+    <!-- no translation found for filter_apps_running (7767071454371350486) -->
+    <skip />
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB ਸਟੋਰੇਜ"</string>
+    <!-- no translation found for filter_apps_onsdcard (1477351142334784771) -->
+    <skip />
+    <!-- no translation found for disabled (9206776641295849915) -->
+    <skip />
+    <string name="not_installed" msgid="2797554494953450291">"ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ"</string>
+    <!-- no translation found for no_applications (7336588977497084921) -->
+    <skip />
+    <!-- no translation found for internal_storage (1584700623164275282) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (2673203150465132465) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (7623513618171928235) -->
+    <skip />
+    <string name="recompute_size" msgid="7722567982831691718">"ਅਕਾਰ ਰੀਕੰਪਿਊਟ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"ਕੀ ਐਪ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
+    <!-- no translation found for clear_data_dlg_text (8847257251846779938) -->
+    <skip />
+    <!-- no translation found for dlg_ok (2402639055725653590) -->
+    <skip />
+    <!-- no translation found for dlg_cancel (1674753358972975911) -->
+    <skip />
+    <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
+    <!-- no translation found for app_not_found_dlg_text (8333723538280257243) -->
+    <skip />
+    <!-- no translation found for clear_data_failed (1907582169616856698) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_title (7441012826373143593) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (6371247225487725860) -->
+    <skip />
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"ਡਾਟਾ ਹਟਾਓ"</string>
+    <!-- no translation found for clear_failed_dlg_text (1092177570631523106) -->
+    <skip />
+    <!-- no translation found for security_settings_desc (1292421279262430109) -->
+    <skip />
+    <!-- no translation found for security_settings_desc (61749028818785244) -->
+    <skip />
+    <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>
+    <!-- no translation found for security_settings_desc_multi (6610268420793984752) -->
+    <skip />
+    <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>
+    <!-- no translation found for join_many_items_last (5925635036718502724) -->
+    <skip />
+    <!-- no translation found for join_many_items_first (4333907712038448660) -->
+    <skip />
+    <!-- no translation found for join_many_items_middle (7556692394478220814) -->
+    <skip />
+    <!-- no translation found for security_settings_billing_desc (8061019011821282358) -->
+    <skip />
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ਪ੍ਰੀਮੀਅਮ SMS ਭੇਜੋ"</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
+    <!-- no translation found for invalid_size_value (7563537715280712285) -->
+    <skip />
+    <!-- no translation found for empty_list_msg (5993162337235907160) -->
+    <skip />
+    <string name="version_text" msgid="9189073826278676425">"ਵਰਜਨ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="move_app" msgid="5042838441401731346">"ਮੂਵ ਕਰੋ"</string>
+    <!-- no translation found for move_app_to_internal (2299714147283854957) -->
+    <skip />
+    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
+    <skip />
+    <!-- no translation found for move_app_to_sdcard (4350451696315265420) -->
+    <skip />
+    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
+    <skip />
+    <string name="moving" msgid="6431016143218876491">"ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="insufficient_storage" msgid="481763122991093080">"ਕਾਫ਼ੀ ਸਟੋਰੇਜ ਸਪੇਸ ਨਹੀਂ।"</string>
+    <!-- no translation found for does_not_exist (3476487214886606748) -->
+    <skip />
+    <string name="app_forward_locked" msgid="6331564656683790866">"ਐਪ ਕਾਪੀ-ਸੁਰੱਖਿਅਤ ਹੈ।"</string>
+    <string name="invalid_location" msgid="2786030127356312746">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਇੰਸਟੌਲ ਕਰਨਾ ਪ੍ਰਮਾਣਿਕ ਨਹੀਂ ਹੈ।"</string>
+    <string name="system_package" msgid="6222593098063037137">"ਸਿਸਟਮ ਅਪਡੇਟਾਂ ਬਾਹਰੀ ਮੀਡੀਆ ਤੇ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ।"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"ਕੀ ਰੋਕਣ ਤੇ ਜ਼ੋਰ ਦੇਣਾ ਹੈ?"</string>
+    <!-- no translation found for force_stop_dlg_text (7208364204467835578) -->
+    <skip />
+    <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
+    <!-- no translation found for move_app_failed_dlg_text (3465267182923054022) -->
+    <skip />
+    <string name="app_install_location_title" msgid="2068975150026852168">"ਤਰਜੀਹੀ ਇੰਸਟੌਲ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string>
+    <!-- no translation found for app_install_location_summary (5155453752692959098) -->
+    <skip />
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"ਕੀ ਬਿਲਟ-ਇਨ ਐਪ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"ਜੇਕਰ ਤੁਸੀਂ ਇੱਕ ਬਿਲਟ-ਇਨ ਐਪ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਹੋਰ ਐਪਸ ਦੁਰਵਿਵਹਾਰ ਕਰ ਸਕਦੇ ਹਨ।"</string>
+    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
+    <skip />
+    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
+    <skip />
+    <!-- no translation found for app_disable_notifications_dlg_title (7669264654851761857) -->
+    <skip />
+    <!-- no translation found for app_disable_notifications_dlg_text (5088484670924769845) -->
+    <skip />
+    <!-- no translation found for app_ops_settings (5108481883575527511) -->
+    <skip />
+    <!-- no translation found for app_ops_running (7706949900637284122) -->
+    <skip />
+    <!-- no translation found for app_ops_never_used (9114608022906887802) -->
+    <skip />
+    <string name="no_default_apps" msgid="2915315663141025400">"ਕੋਈ ਡਿਫੌਲਟ ਐਪਸ ਨਹੀਂ।"</string>
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"ਸਟੋਰੇਜ ਵਰਤੋਂ"</string>
+    <!-- no translation found for storageuse_settings_summary (3748286507165697834) -->
+    <skip />
+    <!-- no translation found for runningservices_settings_title (8097287939865165213) -->
+    <skip />
+    <!-- no translation found for runningservices_settings_summary (854608995821032748) -->
+    <skip />
+    <!-- no translation found for service_restarting (2242747937372354306) -->
+    <skip />
+    <!-- no translation found for cached (1059590879740175019) -->
+    <skip />
+    <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) -->
+    <skip />
+    <!-- no translation found for service_background_processes (6844156253576174488) -->
+    <skip />
+    <!-- no translation found for service_foreground_processes (7583975676795574276) -->
+    <skip />
+    <!-- no translation found for memory (6609961111091483458) -->
+    <skip />
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <!-- no translation found for running_process_item_user_label (3129887865552025943) -->
+    <skip />
+    <!-- no translation found for running_process_item_removed_user_label (8250168004291472959) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_s_s (5790575965282023145) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_s_p (8019860457123222953) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_p_s (744424668287252915) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_p_p (1607384595790852782) -->
+    <skip />
+    <!-- no translation found for running_processes_header_title (6588371727640789560) -->
+    <skip />
+    <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>
+    <!-- no translation found for running_processes_header_free_prefix (4620613031737078415) -->
+    <skip />
+    <!-- no translation found for running_processes_header_used_prefix (5924288703085123978) -->
+    <skip />
+    <!-- no translation found for running_processes_header_cached_prefix (7950853188089434987) -->
+    <skip />
+    <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>
+    <!-- no translation found for no_services (7133900764462288263) -->
+    <skip />
+    <string name="runningservicedetails_services_title" msgid="391168243725357375">"ਸੇਵਾਵਾਂ"</string>
+    <string name="runningservicedetails_processes_title" msgid="928115582044655268">"ਪ੍ਰਕਿਰਿਆਵਾਂ"</string>
+    <!-- no translation found for service_stop (6369807553277527248) -->
+    <skip />
+    <!-- no translation found for service_manage (1876642087421959194) -->
+    <skip />
+    <!-- no translation found for service_stop_description (9146619928198961643) -->
+    <skip />
+    <!-- no translation found for heavy_weight_stop_description (2979218727598321095) -->
+    <skip />
+    <!-- no translation found for background_process_stop_description (5034773197139654588) -->
+    <skip />
+    <!-- no translation found for service_manage_description (7050092269951613102) -->
+    <skip />
+    <!-- no translation found for main_running_process_description (1130702347066340890) -->
+    <skip />
+    <string name="process_service_in_use_description" msgid="8993335064403217080">"ਸੇਵਾ <xliff:g id="COMP_NAME">%1$s</xliff:g> ਵਰਤੋਂ ਵਿੱਚ ਹੈ।"</string>
+    <!-- no translation found for process_provider_in_use_description (5586603325677678940) -->
+    <skip />
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"ਕੀ ਸਿਸਟਮ ਸੇਵਾ ਬੰਦ ਕਰਨੀ ਹੈ?"</string>
+    <!-- no translation found for runningservicedetails_stop_dlg_text (3371302398335665793) -->
+    <skip />
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਸੇਵਾ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਫੋਨ ਦੀਆਂ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਸਕਦੀਆਂ ਹਨ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਦੀ ਪਾਵਰ ਬੰਦ ਅਤੇ ਫਿਰ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ।"</string>
+    <!-- no translation found for language_settings (5292716747264442359) -->
+    <skip />
+    <!-- no translation found for language_keyboard_settings_title (243220021717425813) -->
+    <skip />
+    <!-- no translation found for language_settings_category (2288258489940617043) -->
+    <skip />
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"ਕੀਬੋਰਡ &amp; ਇਨਪੁਟ ਵਿਧੀਆਂ"</string>
+    <!-- no translation found for phone_language (8870144109924299673) -->
+    <skip />
+    <string name="phone_language_summary" msgid="3871309445655554211"></string>
+    <!-- no translation found for auto_replace (6199184757891937822) -->
+    <skip />
+    <string name="auto_replace_summary" msgid="370288728200084466">"ਗ਼ਲਤ ਟਾਈਪ ਕੀਤੇ ਸ਼ਬਦਾਂ ਨੂੰ ਠੀਕ ਕਰੋ"</string>
+    <!-- no translation found for auto_caps (6379232078052591265) -->
+    <skip />
+    <string name="auto_caps_summary" msgid="6358102538315261466">"ਵਾਕਾਂ ਵਿੱਚ ਪਹਿਲਾ ਅੱਖਰ ਕੈਪਿਟਲਾਈਜ਼ ਕਰੋ"</string>
+    <string name="auto_punctuate" msgid="4595367243950425833">"ਆਟੋ-ਵਿਸ਼ਰਾਮ ਚਿੰਨ੍ਹ ਲਗਾਓ"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
+    <string name="auto_punctuate_summary" msgid="4372126865670574837">"\" \" ਦਰਜ ਕਰਨ ਲਈ ਸਪੇਸ ਕੁੰਜੀ ਦੋ ਵਾਰ ਦਬਾਓ।"</string>
+    <!-- no translation found for show_password (3001113966880559611) -->
+    <skip />
+    <!-- no translation found for ime_security_warning (4135828934735934248) -->
+    <skip />
+    <!-- no translation found for spellchecker_security_warning (9060897418527708922) -->
+    <skip />
+    <!-- no translation found for spellchecker_quick_settings (246728645150092058) -->
+    <skip />
+    <string name="spellchecker_language" msgid="6041050114690541437">"ਭਾਸ਼ਾ"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> ਲਈ ਸੈਟਿੰਗਾਂ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ"</string>
+    <!-- no translation found for pointer_settings_category (8183819795164034286) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"ਗੇਮ ਕੰਟ੍ਰੋਲਰ"</string>
+    <!-- no translation found for vibrate_input_devices (2599591466928793082) -->
+    <skip />
+    <!-- no translation found for vibrate_input_devices_summary (4595570516865299153) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_title (8030087214949381372) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_setup_button (8514583747236476384) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_switch_hint (3889961090676293795) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_default_label (2952672513543482165) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_picker_title (556081931972771610) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_title (3427169369758733521) -->
+    <skip />
+    <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
+    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"ਜੋੜੋ"</string>
+    <!-- no translation found for user_dict_settings_add_dialog_title (4702613990174126482) -->
+    <skip />
+    <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"ਵਾਕਾਂਸ਼"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"ਹੋਰ ਚੋਣਾਂ"</string>
+    <!-- no translation found for user_dict_settings_add_dialog_less_options (2441785268726036101) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_confirm (6225823625332416144) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_word_option_name (7868879174905963135) -->
+    <skip />
+    <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>
+    <!-- no translation found for user_dict_settings_add_shortcut_hint (7333763456561873445) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_edit_dialog_title (8967476444840548674) -->
+    <skip />
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ਸੰਪਾਦਿਤ ਕਰੋ"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"ਮਿਟਾਓ"</string>
+    <!-- no translation found for user_dict_settings_empty_text (8165273379942105271) -->
+    <skip />
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"ਸਾਰੀਆਂ ਭਾਸ਼ਾਵਾਂ ਲਈ"</string>
+    <!-- no translation found for user_dict_settings_more_languages (7316375944684977910) -->
+    <skip />
+    <string name="testing" msgid="6584352735303604146">"ਜਾਂਚ"</string>
+    <!-- no translation found for testing_phone_info (193561832258534798) -->
+    <skip />
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ਫੋਨ ਜਾਣਕਾਰੀ"</string>
+    <!-- no translation found for testing_battery_info (3497865525976497848) -->
+    <skip />
+    <!-- no translation found for input_methods_settings_title (6800066636850553887) -->
+    <skip />
+    <string name="input_method" msgid="5434026103176856164">"ਇਨਪੁਟ ਵਿਧੀ"</string>
+    <!-- no translation found for current_input_method (2636466029213488159) -->
+    <skip />
+    <!-- no translation found for input_method_selector (4311213129681430709) -->
+    <skip />
+    <!-- no translation found for input_method_selector_show_automatically_title (1001612945471546158) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_show_title (3891824124222371634) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_hide_title (7699647095118680424) -->
+    <skip />
+    <!-- no translation found for configure_input_method (1317429869771850228) -->
+    <skip />
+    <!-- no translation found for input_method_settings (5801295625486269553) -->
+    <skip />
+    <string name="input_method_settings_button" msgid="6778344383871619368">"ਸੈਟਿੰਗਾਂ"</string>
+    <!-- no translation found for active_input_method_subtypes (3596398805424733238) -->
+    <skip />
+    <!-- no translation found for use_system_language_to_select_input_method_subtypes (3346751753141428573) -->
+    <skip />
+    <!-- no translation found for input_methods_settings_label_format (6002887604815693322) -->
+    <skip />
+    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"ਸਕਿਰਿਆ ਇਨਪੁਟ ਵਿਧੀਆਂ ਚੁਣੋ"</string>
+    <!-- no translation found for onscreen_keyboard_settings_summary (5841558383556238653) -->
+    <skip />
+    <!-- no translation found for builtin_keyboard_settings_title (7688732909551116798) -->
+    <skip />
+    <!-- no translation found for builtin_keyboard_settings_summary (2392531685358035899) -->
+    <skip />
+    <!-- no translation found for development_settings_title (215179176067683667) -->
+    <skip />
+    <!-- no translation found for development_settings_summary (1815795401632854041) -->
+    <skip />
+    <!-- no translation found for development_settings_not_available (4308569041701535607) -->
+    <skip />
+    <!-- no translation found for vpn_settings_not_available (956841430176985598) -->
+    <skip />
+    <!-- no translation found for tethering_settings_not_available (6765770438438291012) -->
+    <skip />
+    <!-- no translation found for apn_settings_not_available (7873729032165324000) -->
+    <skip />
+    <!-- no translation found for enable_adb (7982306934419797485) -->
+    <skip />
+    <!-- no translation found for enable_adb_summary (4881186971746056635) -->
+    <skip />
+    <!-- no translation found for clear_adb_keys (4038889221503122743) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (1778455732762984579) -->
+    <skip />
+    <!-- no translation found for keep_screen_on (1146389631208760344) -->
+    <skip />
+    <!-- no translation found for keep_screen_on_summary (2173114350754293009) -->
+    <skip />
+    <!-- no translation found for bt_hci_snoop_log (3340699311158865670) -->
+    <skip />
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ਇੱਕ ਫਾਈਲ ਵਿੱਚ ਸਾਰੇ bluetooth HCI ਪੈਕੇਟ ਕੈਪਚਰ ਕਰੋ"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM ਅਨਲੌਕ ਕਰਨਾ"</string>
+    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
+    <skip />
+    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
+    <skip />
+    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
+    <skip />
+    <!-- no translation found for select_logd_size_title (7433137108348553508) -->
+    <skip />
+    <!-- no translation found for select_logd_size_dialog_title (1206769310236476760) -->
+    <skip />
+    <!-- no translation found for allow_mock_location (2787962564578664888) -->
+    <skip />
+    <!-- no translation found for allow_mock_location_summary (317615105156345626) -->
+    <skip />
+    <!-- no translation found for debug_view_attributes (6485448367803310384) -->
+    <skip />
+    <string name="debug_networking_category" msgid="7044075693643009662">"ਨੈਟਵਰਕਿੰਗ"</string>
+    <string name="wifi_display_certification" msgid="8611569543791307533">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਪ੍ਰਮਾਣੀਕਰਨ"</string>
+    <!-- no translation found for wifi_verbose_logging (4203729756047242344) -->
+    <skip />
+    <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ਸੈਲਿਊਲਰ ਹੈਂਡਓਵਰ ਲਈ ਅਗਰੈਸਿਵ Wi‑Fi"</string>
+    <!-- no translation found for wifi_allow_scan_with_traffic (3601853081178265786) -->
+    <skip />
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"ਲੀਗੇਸੀ DHCP ਕਲਾਈਂਟ ਵਰਤੋ"</string>
+    <!-- no translation found for wifi_display_certification_summary (1155182309166746973) -->
+    <skip />
+    <!-- no translation found for wifi_verbose_logging_summary (6615071616111731958) -->
+    <skip />
+    <!-- no translation found for wifi_aggressive_handover_summary (6328455667642570371) -->
+    <skip />
+    <!-- no translation found for wifi_allow_scan_with_traffic_summary (2575101424972686310) -->
+    <skip />
+    <!-- no translation found for select_logd_size_title (7433137108348553508) -->
+    <skip />
+    <!-- no translation found for select_logd_size_dialog_title (1206769310236476760) -->
+    <skip />
+    <!-- no translation found for select_usb_configuration_title (2649938511506971843) -->
+    <skip />
+    <!-- no translation found for select_usb_configuration_dialog_title (6385564442851599963) -->
+    <skip />
+    <!-- no translation found for allow_mock_location (2787962564578664888) -->
+    <skip />
+    <!-- no translation found for allow_mock_location_summary (317615105156345626) -->
+    <skip />
+    <!-- no translation found for debug_view_attributes (6485448367803310384) -->
+    <skip />
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ਨਵੇਂ Android DHCP ਕਲਾਈਂਟ ਦੀ ਬਜਾਇ Lollipop ਦਾ DHCP ਕਲਾਈਂਟ ਵਰਤੋ।"</string>
+    <!-- no translation found for adb_warning_title (6234463310896563253) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (7316799925425402244) -->
+    <skip />
+    <string name="adb_keys_warning_message" msgid="6932230298032192937">"ਕੀ ਉਹਨਾਂ ਸਾਰੇ ਕੰਪਿਊਟਰਾਂ ਤੋਂ USB ਡੀਬਗਿੰਗ ਤੱਕ ਪਹੁੰਚ ਰੱਦ ਕਰਨੀ ਹੈ, ਜਿਹਨਾਂ ਲਈ ਪਹਿਲਾਂ ਤੁਸੀਂ ਅਧਿਕਾਰਤ ਕੀਤਾ ਹੈ?"</string>
+    <!-- no translation found for dev_settings_warning_title (7244607768088540165) -->
+    <skip />
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"ਇਹ ਸੈਟਿੰਗਾਂ ਕੇਵਲ ਵਿਕਾਸਕਾਰ ਦੀ ਵਰਤੋਂ ਲਈ ਹਨ। ਇਹ ਤੁਹਾਡੀ ਡਿਵਾਈਸ ਅਤੇ ਇਸਤੇ ਮੌਜੂਦ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਬ੍ਰੇਕ ਕਰਨ ਜਾਂ ਦੁਰਵਿਵਹਾਰ ਕਰਨ ਦਾ ਕਾਰਨ ਬਣ ਸਕਦੇ ਹਨ।"</string>
+    <!-- no translation found for verify_apps_over_usb_title (4177086489869041953) -->
+    <skip />
+    <!-- no translation found for verify_apps_over_usb_summary (9164096969924529200) -->
+    <skip />
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB ਸਟੋਰੇਜ ਸੁਰੱਖਿਅਤ ਕਰੋ"</string>
+    <!-- no translation found for enforce_read_external_summary (1798088409346660567) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_title (2112813067171502209) -->
+    <skip />
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"ਜਦੋਂ USB ਸਟੋਰੇਜ ਸੁਰੱਖਿਅਤ ਹੈ, ਐਪਸ ਨੂੰ ਬਾਹਰੀ ਸਟੋਰੇਜ ਤੋਂ ਡਾਟਾ ਪੜ੍ਹਨ ਲਈ ਅਨੁਮਤੀ ਦੀ ਬੇਨਤੀ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ। \n\nਕੁਝ ਐਪਸ ਉਹਨਾਂ ਦੇ ਵਿਕਾਸਕਾਰਾਂ ਵੱਲੋਂ ਅਪਡੇਟ ਕੀਤੇ ਜਾਣ ਤੱਕ ਕੰਮ ਨਹੀਂ ਵੀ ਕਰ ਸਕਦੇ।"</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD ਕਾਰਡ ਸੁਰੱਖਿਅਤ ਕਰੋ"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"ਐਪਸ ਨੂੰ SD ਕਾਰਡ ਪੜ੍ਹਨ ਦੀ ਅਨੁਮਤੀ ਦੀ ਬੇਨਤੀ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ।"</string>
+    <!-- no translation found for enforce_read_external_confirm_title (273220585729800783) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_message (3858482712337574407) -->
+    <skip />
+    <!-- no translation found for enable_terminal_title (95572094356054120) -->
+    <skip />
+    <!-- no translation found for enable_terminal_summary (67667852659359206) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
+    <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>
+    <!-- no translation found for allow_bind_app_widget_activity_always_allow_bind (7037503685859688034) -->
+    <skip />
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
+    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
+    <skip />
+    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (5440362857006046193) -->
+    <skip />
+    <!-- no translation found for last_time_used_label (8459441968795479307) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings (3975902491934816215) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_title (2130492524656204459) -->
+    <skip />
+    <string name="accessibility_services_title" msgid="2592221829284342237">"ਸੇਵਾਵਾਂ"</string>
+    <!-- no translation found for accessibility_system_title (7187919089874130484) -->
+    <skip />
+    <string name="accessibility_display_title" msgid="7610175687949675162">"ਡਿਸਪਲੇ ਕਰੋ"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"ਸੁਰਖੀਆਂ"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"ਵਿਸਤਰੀਕਰਨ ਸੰਕੇਤ"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"ਜਦੋਂ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਚਾਲੂ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਤੇ ਟ੍ਰਿਪਲ-ਟੈਪ ਕਰਕੇ ਜ਼ੂਮ ਇਨ ਅਤੇ ਆਉਟ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜਦੋਂ ਜ਼ੂਮ ਇਨ ਕੀਤਾ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਇਹ ਕਰ ਸਕਦੇ ਹੋ:\n"<ul><li>"ਪੈਨ: ਸਕ੍ਰੀਨ ਤੇ ਦੋ ਜਾਂ ਵੱਧ ਉਂਗਲਾਂ ਡ੍ਰੈਗ ਕਰੋ।"</li>\n<li>"ਜ਼ੂਮ ਪੱਧਰ ਵਿਵਸਥਿਤ ਕਰੋ: ਦੋ ਜਾਂ ਤਿੰਨ ਉਂਗਲਾਂ ਨੂੰ ਇਕੱਠੇ ਪਿੰਚ ਕਰੋ ਜਾਂ ਉਹਨਾਂ ਨੂੰ ਵੱਖ ਕਰਕੇ ਫੈਲਾਓ"</li></ul>\n\n"ਤੁਸੀਂ ਟ੍ਰਿਪਲ-ਟੈਪ ਅਤੇ ਹੋਲਡ ਕਰਕੇ ਆਪਣੀ ਉਂਗਲ ਦੇ ਹੇਠ ਜੋ ਵੀ ਹੋਵੇ, ਅਸਥਾਈ ਤੌਰ ਤੇ ਉਸਦਾ ਵਿਸਤਰੀਕਰਨ ਵੀ ਕਰ ਸਕਦੇ ਹੋ। ਇਸ ਵਿਸਤਰੀਕ੍ਰਿਤ ਸਥਿਤੀ ਵਿੱਚ, ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਵੱਖ-ਵੱਖ ਭਾਗਾਂ ਨੂੰ ਐਕਸਪਲੋਰ ਕਰਨ ਲਈ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਡ੍ਰੈਗ ਕਰ ਸਕਦੇ ਹੋ। ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਪਿਛਲੀ ਸਥਿਤੀ ਵਿੱਚ ਵਾਪਸ ਕਰਨ ਲਈ ਚੁੱਕੋ।\n\nਨੋਟ: ਵਿਸਤਰੀਕਰਨ ਲਈ ਟ੍ਰਿਪਲ-ਟੈਪ ਕੀਬੋਰਡ ਅਤੇ ਨੈਵੀਗੇਸ਼ਨ ਬਾਰ ਦੇ ਸਿਵਾਏ ਹਰ ਕਿਤੇ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
+    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
+    <skip />
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"ਚਾਲੂ"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ਬੰਦ"</string>
+    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
+    <skip />
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"ਵੱਡਾ ਟੈਕਸਟ"</string>
+    <!-- no translation found for accessibility_toggle_high_text_contrast_preference_title (2567402942683463779) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_preference_title (2472285215737820469) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_auto_update_preference_title (7218498768415430963) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_auto_update_preference_summary (4392059334816220155) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call_prerefence_title (6673851944175874235) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_speak_password_preference_title (5986628515113204844) -->
+    <skip />
+    <!-- no translation found for accessibility_long_press_timeout_preference_title (6708467774619266508) -->
+    <skip />
+    <!-- no translation found for accessibility_display_inversion_preference_title (2119647786141420802) -->
+    <skip />
+    <!-- no translation found for accessibility_display_inversion_preference_subtitle (8658240868230680912) -->
+    <skip />
+    <!-- no translation found for accessibility_display_daltonizer_preference_title (5800761362678707872) -->
+    <skip />
+    <!-- no translation found for accessibility_display_daltonizer_preference_subtitle (3484969015295282911) -->
+    <skip />
+    <string name="enable_quick_setting" msgid="2366999897816894536">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਦਿਖਾਓ"</string>
+    <string name="daltonizer_type" msgid="1124178250809091080">"ਸੰਸ਼ੋਧਨ ਮੋਡ"</string>
+    <!-- no translation found for daltonizer_type_overridden (3116947244410245916) -->
+    <skip />
+    <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"ਅਸਮਰੱਥ ਬਣਾਇਆ"</string>
+    <!-- no translation found for daltonizer_mode_monochromacy (8485709880666106721) -->
+    <skip />
+    <string name="daltonizer_mode_deuteranomaly" msgid="5475532989673586329">"Deuteranomaly (ਲਾਲ-ਹਰਾ)"</string>
+    <!-- no translation found for daltonizer_mode_protanomaly (8424148009038666065) -->
+    <skip />
+    <!-- no translation found for daltonizer_mode_tritanomaly (481725854987912389) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_settings (3344942964710773365) -->
+    <skip />
+    <!-- no translation found for accessibility_feature_state_on (2864292320042673806) -->
+    <skip />
+    <!-- no translation found for accessibility_feature_state_off (4172584906487070211) -->
+    <skip />
+    <string name="accessibility_feature_or_input_method_not_allowed" msgid="5950315477009501647">"ਤੁਹਾਡੀ ਕੰਪਨੀ ਵੱਲੋਂ ਆਗਿਆ ਨਹੀਂ"</string>
+    <!-- no translation found for captioning_preview_title (1234015253497016890) -->
+    <skip />
+    <!-- no translation found for captioning_standard_options_title (3284211791180335844) -->
+    <skip />
+    <string name="captioning_locale" msgid="4559155661018823503">"ਭਾਸ਼ਾ"</string>
+    <!-- no translation found for captioning_text_size (6737002449104466028) -->
+    <skip />
+    <!-- no translation found for captioning_preset (8939737196538429044) -->
+    <skip />
+    <!-- no translation found for captioning_custom_options_title (5067500939930322405) -->
+    <skip />
+    <!-- no translation found for captioning_background_color (9053011212948992570) -->
+    <skip />
+    <!-- no translation found for captioning_background_opacity (6029993616419971202) -->
+    <skip />
+    <!-- no translation found for captioning_window_color (6902052743419717394) -->
+    <skip />
+    <!-- no translation found for captioning_window_opacity (5041556024849862376) -->
+    <skip />
+    <!-- no translation found for captioning_foreground_color (85623486537640059) -->
+    <skip />
+    <!-- no translation found for captioning_foreground_opacity (4370967856995419788) -->
+    <skip />
+    <!-- no translation found for captioning_edge_color (3670094753735263238) -->
+    <skip />
+    <string name="captioning_edge_type" msgid="5997247394951682154">"ਐਜ ਪ੍ਰਕਾਰ"</string>
+    <!-- no translation found for captioning_typeface (1826169240566563259) -->
+    <skip />
+    <!-- no translation found for captioning_preview_text (4067935959797375065) -->
+    <skip />
+    <!-- no translation found for captioning_preview_characters (7105909138497851769) -->
+    <skip />
+    <!-- no translation found for locale_default (2593883646136326969) -->
+    <skip />
+    <!-- no translation found for color_title (4258931051732243983) -->
+    <skip />
+    <!-- no translation found for color_unspecified (5179683785413568326) -->
+    <skip />
+    <!-- no translation found for color_none (3475640044925814795) -->
+    <skip />
+    <!-- no translation found for color_white (8045195170201590239) -->
+    <skip />
+    <!-- no translation found for color_gray (9192312087142726313) -->
+    <skip />
+    <string name="color_black" msgid="7517353520909872561">"ਕਾਲਾ"</string>
+    <!-- no translation found for color_red (4949354900304125428) -->
+    <skip />
+    <!-- no translation found for color_green (5537717328428845841) -->
+    <skip />
+    <string name="color_blue" msgid="7731984529016953223">"ਨੀਲਾ"</string>
+    <!-- no translation found for color_cyan (7033027180641173211) -->
+    <skip />
+    <string name="color_yellow" msgid="9112680561610873529">"ਪੀਲਾ"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"ਮਜੈਂਟਾ"</string>
+    <!-- no translation found for enable_service_title (3061307612673835592) -->
+    <skip />
+    <!-- no translation found for capabilities_list_title (86713361724771971) -->
+    <skip />
+    <!-- no translation found for touch_filtered_warning (8644034725268915030) -->
+    <skip />
+    <!-- no translation found for enable_service_encryption_warning (3064686622453974606) -->
+    <skip />
+    <string name="secure_lock_encryption_warning" msgid="464101518421886337">"ਕਿਉਂਕਿ ਤੁਸੀਂ ਇੱਕ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾ ਚਾਲੂ ਕੀਤੀ ਹੈ, ਤੁਹਾਡੀ ਡਿਵਾਈਸ ਡਾਟਾ ਐਨਕ੍ਰਿਪਸ਼ਨ ਨੂੰ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡਾ ਸਕ੍ਰੀਨ ਅਨਲੌਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡਾਟਾ ਐਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <!-- no translation found for enable_service_pin_reason (7882035264853248228) -->
+    <skip />
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡਾਟਾ ਐਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <!-- no translation found for capability_title_receiveAccessibilityEvents (1869032063969970755) -->
+    <skip />
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਐਪ ਨਾਲ ਇੰਟਰੈਕਟ ਕਰ ਰਹੇ ਹੋਵੋ ਤਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰੋ।"</string>
+    <!-- no translation found for disable_service_title (3624005212728512896) -->
+    <skip />
+    <string name="disable_service_message" msgid="2012273739481042318">"ਠੀਕ ਨੂੰ ਛੋਹਣ ਨਾਲ <xliff:g id="SERVICE">%1$s</xliff:g>ਬੰਦ ਹੋ ਜਾਏਗਾ।"</string>
+    <!-- no translation found for accessibility_no_services_installed (7200948194639038807) -->
+    <skip />
+    <string name="accessibility_service_default_description" msgid="1072730037861494125">"ਕੋਈ ਵਰਣਨ ਮੁਹੱਈਆ ਨਹੀਂ ਕੀਤਾ ਗਿਆ।"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
+    <!-- no translation found for print_settings (4742428530112487843) -->
+    <skip />
+    <!-- no translation found for print_settings_title (3685449667822217816) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_title (2338435517408144841) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
+    <skip />
+    <!-- no translation found for print_no_services_installed (8443039625463872294) -->
+    <skip />
+    <!-- no translation found for print_no_printers_found (989018646884973683) -->
+    <skip />
+    <!-- no translation found for print_menu_item_settings (6591330373682227082) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_printers (2890738028215834012) -->
+    <skip />
+    <!-- no translation found for print_feature_state_on (8098901852502441048) -->
+    <skip />
+    <!-- no translation found for print_feature_state_off (7294876968403966040) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_service (3811645167869797802) -->
+    <skip />
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ਪ੍ਰਿੰਟਰ ਜੋੜੋ"</string>
+    <!-- no translation found for print_menu_item_search (7025589328240514553) -->
+    <skip />
+    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
+    <skip />
+    <!-- no translation found for print_service_disabled (7739452396114245222) -->
+    <skip />
+    <!-- no translation found for print_print_jobs (3582094777756968793) -->
+    <skip />
+    <!-- no translation found for print_print_job (7563741676053287211) -->
+    <skip />
+    <!-- no translation found for print_restart (8373999687329384202) -->
+    <skip />
+    <!-- no translation found for print_cancel (3621199386568672235) -->
+    <skip />
+    <!-- no translation found for print_job_summary (8472427347192930694) -->
+    <skip />
+    <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>
+    <!-- no translation found for print_failed_state_title_template (1436099128973357969) -->
+    <skip />
+    <!-- no translation found for print_blocked_state_title_template (9065391617425962424) -->
+    <skip />
+    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"ਖੋਜ ਬੌਕਸ ਦਿਖਾਇਆ"</string>
+    <!-- no translation found for print_search_box_hidden_utterance (7980832833405818400) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (7190304207330319919) -->
+    <skip />
+    <string name="power_usage_summary" msgid="7237084831082848168">"ਬੈਟਰੀ ਵਰਤਦੇ ਹੋਏ ਕੀ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
+    <!-- no translation found for power_usage_not_available (3214000535532434353) -->
+    <skip />
+    <!-- no translation found for power_usage_level_and_status (7449847570973811784) -->
+    <skip />
+    <!-- no translation found for power_discharge_remaining (4925678997049911808) -->
+    <skip />
+    <!-- no translation found for power_charge_remaining (6132074970943913135) -->
+    <skip />
+    <!-- no translation found for power_discharging_duration (1605929174734600590) -->
+    <skip />
+    <!-- no translation found for power_charging (1779532561355864267) -->
+    <skip />
+    <!-- no translation found for power_charging_duration (2853265177761520490) -->
+    <skip />
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> AC ਤੇ ਪੂਰਾ ਹੋਣ ਤੱਕ"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB ਤੇ ਪੂਰਾ ਹੋਣ ਤੱਕ"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ਵਾਇਰਲੈਸ ਤੋਂ ਪੂਰਾ ਹੋਣ ਤੱਕ"</string>
+    <!-- no translation found for power_usage_list_summary (2409288197839512482) -->
+    <skip />
+    <string name="battery_since_unplugged" msgid="338073389740738437">"ਅਨਪਲਗ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"ਬੈਟਰੀ ਤੇ <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for battery_stats_charging_label (4223311142875178785) -->
+    <skip />
+    <!-- no translation found for battery_stats_screen_on_label (7150221809877509708) -->
+    <skip />
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ਚਾਲੂ"</string>
+    <!-- no translation found for battery_stats_wifi_running_label (1845839195549226252) -->
+    <skip />
+    <!-- no translation found for battery_stats_wake_lock_label (1908942681902324095) -->
+    <skip />
+    <string name="battery_stats_phone_signal_label" msgid="3537569115723850618">"ਸੈਲਿਊਲਰ ਨੈਟਵਰਕ ਸਿਗਨਲ"</string>
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (3208518458663637035) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (3056108148042308690) -->
+    <skip />
+    <!-- no translation found for history_details_title (3608240585315506067) -->
+    <skip />
+    <!-- no translation found for details_title (3792801565213935385) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <string name="packages_subtitle" msgid="4736416171658062768">"ਸ਼ਾਮਲ ਕੀਤੇ ਪੈਕੇਜ"</string>
+    <!-- no translation found for power_screen (3023346080675904613) -->
+    <skip />
+    <!-- no translation found for power_flashlight (7794409781003567614) -->
+    <skip />
+    <!-- no translation found for power_wifi (1135085252964054957) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <string name="power_cell" msgid="6596471490976003056">"ਸੈਲ ਸਟੈਂਡਬਾਇ"</string>
+    <string name="power_phone" msgid="5392641106474567277">"ਵੌਇਸ ਕਾਲਾਂ"</string>
+    <!-- no translation found for power_idle (4612478572401640759) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for power_unaccounted (709925017022660740) -->
+    <skip />
+    <!-- no translation found for power_overcounted (2762354976171358445) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ਫੋਰਗ੍ਰਾਉਂਡ"</string>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"ਸਕਿਰਿਆ ਰੱਖੋ"</string>
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_wifi_running (3134357198266380400) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (262638572890253393) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (8971710128438365919) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (5468564329333954445) -->
+    <skip />
+    <!-- no translation found for usage_type_radio_active (1732647857619420121) -->
+    <skip />
+    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"Wi‑Fi ਪੈਕੇਟ ਭੇਜੇ"</string>
+    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"Wi‑Fi ਪੈਕੇਟ ਪ੍ਰਾਪਤ ਕੀਤੇ"</string>
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
+    <skip />
+    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
+    <skip />
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"ਕੁੱਲ ਬੈਟਰੀ ਸਮਰੱਥਾ"</string>
+    <!-- no translation found for usage_type_computed_power (5862792259009981479) -->
+    <skip />
+    <!-- no translation found for usage_type_actual_power (7047814738685578335) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <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>
+    <!-- no translation found for battery_action_wifi (8181553479021841207) -->
+    <skip />
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth ਸੈਟਿੰਗਾਂ"</string>
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"ਜਦੋਂ ਟੈਬਲੇਟ ਨਿਸ਼ਕਿਰਿਆ ਹੁੰਦੀ ਹੈ ਤਾਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"ਕੋਈ ਸੈਲ ਕਵਰੇਜ ਨਹੀਂ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਪਾਵਰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਏਅਰਪਲੇਨ ਮੋਡ ਤੇ ਸਵਿਚ ਕਰੋ"</string>
+    <!-- no translation found for battery_desc_flashlight (2908579430841025494) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi‑Fi ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
+    <!-- no translation found for battery_sugg_wifi (3355461362094706957) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (8069070756186680367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (1942935021750897422) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (4071352514714259230) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8530418792605735226) -->
+    <skip />
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ਐਪ ਰੋਕੋ ਜਾਂ ਅਣਇੰਸਟੌਲ ਕਰੋ"</string>
+    <!-- no translation found for battery_sugg_apps_gps (5959067516281866135) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (3974902365643634514) -->
+    <skip />
+    <string name="battery_desc_users" msgid="7682989161885027823">"ਉਪਭੋਗਤਾ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
+    <!-- no translation found for battery_desc_unaccounted (7404256448541818019) -->
+    <skip />
+    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ਬੈਟਰੀ ਵਰਤੋਂ ਪਾਵਰ ਵਰਤੋਂ ਦਾ ਇੱਕ ਅਨੁਮਾਨ ਹੈ ਅਤੇ ਇਸ ਵਿੱਚ ਬੈਟਰੀ ਖ਼ਰਚ ਦਾ ਹਰੇਕ ਸ੍ਰੋਤ ਸ਼ਾਮਲ ਨਹੀਂ ਹੁੰਦਾ। ਵਿਵਿਧ ਹਿਸਾਬ ਲਗਾਈ ਅਨੁਮਾਨਿਤ ਪਾਵਰ ਵਰਤੋਂ ਅਤੇ ਬੈਟਰੀ ਤੇ ਦੇਖੇ ਗਏ ਅਸਲੀ ਖ਼ਰਚ ਵਿਚਕਾਰ ਅੰਤਰ ਹੈ।"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"ਓਵਰ-ਕਾਉਂਟਿਡ ਪਾਵਰ ਵਰਤੋਂ"</string>
+    <!-- no translation found for mah (95245196971239711) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <string name="menu_stats_total" msgid="8973377864854807854">"ਕੁੱਲ ਵਰਤੋਂ"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"ਤਾਜ਼ਾ"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for battery_saver (1426682272004907982) -->
+    <skip />
+    <!-- no translation found for battery_saver_turn_on_automatically_title (9023847300114669426) -->
+    <skip />
+    <!-- no translation found for battery_saver_turn_on_automatically_never (6610846456314373) -->
+    <skip />
+    <!-- no translation found for battery_saver_turn_on_automatically_pct (7536784431655058267) -->
+    <skip />
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"ਪ੍ਰਕਿਰਿਆ ਸਟੈਟਸ"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"ਚੱਲ ਰਹੀਆਂ ਪ੍ਰਕਿਰਿਆਵਾਂ ਬਾਰੇ Geeky ਸਟੈਟਸ"</string>
+    <!-- no translation found for app_memory_use (7849258480392171939) -->
+    <skip />
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<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>
+    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
+    <skip />
+    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
+    <skip />
+    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
+    <skip />
+    <!-- no translation found for process_stats_memory_status (4251599550196193093) -->
+    <skip />
+    <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">"ਕੈਚਿਸ"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM ਵਰਤੋਂ"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM ਵਰਤੋਂ (ਪਿਛੋਕੜ)"</string>
+    <!-- no translation found for process_stats_run_time (6520628955709369115) -->
+    <skip />
+    <string name="processes_subtitle" msgid="6827502409379462438">"ਪ੍ਰਕਿਰਿਆਵਾਂ"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"ਸੇਵਾਵਾਂ"</string>
+    <!-- no translation found for menu_proc_stats_duration (2323483592994720196) -->
+    <skip />
+    <!-- no translation found for mem_details_title (6548392825497290498) -->
+    <skip />
+    <string name="mem_state_subtitle" msgid="2407238869781011933">"ਮੈਮਰੀ ਸਟੇਟਸ"</string>
+    <!-- no translation found for mem_use_subtitle (7319468770222422412) -->
+    <skip />
+    <!-- no translation found for mem_use_kernel_type (8698327165935012484) -->
+    <skip />
+    <!-- no translation found for mem_use_native_type (5976704902328347400) -->
+    <skip />
+    <!-- no translation found for mem_use_kernel_cache_type (6411475064463957513) -->
+    <skip />
+    <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam ਸਵੈਪ"</string>
+    <!-- no translation found for mem_use_free_type (717708548454880840) -->
+    <skip />
+    <!-- no translation found for mem_use_total (6308786055749777934) -->
+    <skip />
+    <!-- no translation found for menu_duration_3h (4714866438374738385) -->
+    <skip />
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ਘੰਟੇ"</string>
+    <!-- no translation found for menu_duration_12h (7890465404584356294) -->
+    <skip />
+    <!-- no translation found for menu_duration_1d (3393631127622285458) -->
+    <skip />
+    <!-- no translation found for menu_show_system (8864603400415567635) -->
+    <skip />
+    <string name="menu_hide_system" msgid="4106826741703745733">"ਸਿਸਟਮ ਲੁਕਾਓ"</string>
+    <!-- no translation found for menu_use_uss (467765290771543089) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
+    <skip />
+    <!-- no translation found for voice_input_output_settings (1336135218350444783) -->
+    <skip />
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ਵੌਇਸ ਇਨਪੁਟ &amp; ਆਉਟਪੁਟ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"ਵੌਇਸ ਖੋਜ"</string>
+    <!-- no translation found for keyboard_settings_title (5080115226780201234) -->
+    <skip />
+    <!-- no translation found for voice_category (1430370497125803904) -->
+    <skip />
+    <!-- no translation found for voice_input_settings (1099937800539324567) -->
+    <skip />
+    <string name="voice_input_settings_title" msgid="2676028028084981891">"ਵੌਇਸ ਇਨਪੁਟ"</string>
+    <!-- no translation found for voice_service_preference_section_title (3778706644257601021) -->
+    <skip />
+    <!-- no translation found for voice_interactor_preference_summary (1801414022026937190) -->
+    <skip />
+    <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_settings" msgid="8186971894801348327">"ਟੈਕਸਟ-ਟੂ-ਸਪੀਚ ਸੈਟਿੰਗਾਂ"</string>
+    <!-- no translation found for tts_settings_title (1237820681016639683) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ਹੇਠਾਂ ਡਿਫੌਲਟ ਸੈਟਿੰਗਾਂ ਐਪ ਸੈਟਿੰਗਾਂ ਨੂੰ ਓਵਰਰਾਈਡ ਕਰਦੀਆਂ ਹਨ"</string>
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_synth_title (4755558388333117572) -->
+    <skip />
+    <!-- no translation found for tts_default_synth_summary (7326298606388069173) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"ਬੋਲੇ ਗਏ ਟੈਕਸਟ ਦੀ ਟੋਨ ਤੇ ਅਸਰ ਪਾਉਂਦਾਾ ਹੈ"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"ਭਾਸ਼ਾ"</string>
+    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
+    <skip />
+    <!-- no translation found for tts_lang_not_selected (7395787019276734765) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <string name="tts_engine_error" msgid="3305141107104670703">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਚੁਣਿਆ ਗਿਆ ਇੰਜਣ ਚੱਲ ਨਹੀਂ ਸਕਦਾ।"</string>
+    <!-- no translation found for tts_engine_error_config (5820525416624637313) -->
+    <skip />
+    <!-- no translation found for tts_engine_error_reselect (2415399149293842112) -->
+    <skip />
+    <!-- no translation found for tts_engine_security_warning (8786238102020223650) -->
+    <skip />
+    <!-- no translation found for tts_engine_network_required (1190837151485314743) -->
+    <skip />
+    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
+    <skip />
+    <!-- no translation found for tts_status_title (7268566550242584413) -->
+    <skip />
+    <!-- no translation found for tts_status_ok (1309762510278029765) -->
+    <skip />
+    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
+    <skip />
+    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
+    <skip />
+    <string name="tts_status_checking" msgid="4983413982985913047">"ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <string name="tts_engines_section" msgid="7515470972378742429">"ਇੰਜਣ"</string>
+    <!-- no translation found for tts_engine_name_settings (4974538563074395920) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_is_enabled_summary (4909484006804022115) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_is_disabled_summary (7644198182255168200) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
+    <!-- no translation found for pico_languages_and_voices (4611320375917773238) -->
+    <skip />
+    <!-- no translation found for pico_installed (2452546687858267414) -->
+    <skip />
+    <!-- no translation found for pico_not_installed (6266845418419994311) -->
+    <skip />
+    <!-- no translation found for pico_voice_summary_female (8047327176247727492) -->
+    <skip />
+    <!-- no translation found for pico_voice_summary_male (8331266854058577610) -->
+    <skip />
+    <!-- no translation found for tts_notif_engine_install_title (7000346872482649034) -->
+    <skip />
+    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ ਨਵਾਂ ਇੰਜਣ ਸਮਰੱਥ ਬਣਾਓ।"</string>
+    <!-- no translation found for tts_engine_settings_button (1030512042040722285) -->
+    <skip />
+    <!-- no translation found for tts_engine_preference_section_title (448294500990971413) -->
+    <skip />
+    <!-- no translation found for tts_general_section_title (4402572014604490502) -->
+    <skip />
+    <!-- no translation found for gadget_title (5519037532720577836) -->
+    <skip />
+    <!-- no translation found for gadget_toggle_wifi (319262861956544493) -->
+    <skip />
+    <!-- no translation found for gadget_toggle_bluetooth (7538903239807020826) -->
+    <skip />
+    <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>
+    <!-- no translation found for gadget_state_on (6909119593004937688) -->
+    <skip />
+    <string name="gadget_state_off" msgid="5220212352953066317">"ਬੰਦ"</string>
+    <!-- no translation found for gadget_state_turning_on (3395992057029439039) -->
+    <skip />
+    <!-- no translation found for gadget_state_turning_off (2395546048102176157) -->
+    <skip />
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
+    <!-- no translation found for gadget_bluetooth (8998572807378694410) -->
+    <skip />
+    <!-- no translation found for gadget_location (2974757497945178165) -->
+    <skip />
+    <!-- no translation found for gadget_sync (858895763714222152) -->
+    <skip />
+    <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>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"ਪੂਰੀ"</string>
+    <!-- no translation found for gadget_brightness_state_half (3696671957608774204) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_off (946382262872753084) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (5662579425832406705) -->
+    <skip />
+    <!-- no translation found for credentials_title (4446234003860769883) -->
+    <skip />
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ਸਟੋਰੇਜ ਤੋਂ ਇੰਸਟੌਲ ਕਰੋ"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"SD ਕਾਰਡ ਤੋਂ ਇੰਸਟੌਲ ਕਰੋ"</string>
+    <!-- no translation found for credentials_install_summary (4220422806818210676) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
+    <skip />
+    <string name="credentials_reset" msgid="3239382277144980418">"ਕ੍ਰੈਡੈਂਸੀਅਲ ਹਟਾਓ"</string>
+    <!-- no translation found for credentials_reset_summary (3369361230171260282) -->
+    <skip />
+    <!-- no translation found for trusted_credentials (4266945289534242402) -->
+    <skip />
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"ਭਰੋਸੇਯੋਗ CA ਸਰਟੀਫਿਕੇਟਸ ਡਿਸਪਲੇ ਕਰੋ"</string>
+    <!-- no translation found for advanced_security_title (2434776238010578865) -->
+    <skip />
+    <string name="credential_storage_type" msgid="8629968543494001364">"ਸਟੋਰੇਜ ਪ੍ਰਕਾਰ"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ਹਾਰਡਵੇਅਰ-ਬੈਕ ਕੀਤਾ"</string>
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
+    <!-- no translation found for credentials_settings_not_available (7968275634486624215) -->
+    <skip />
+    <string name="credentials_unlock" msgid="385427939577366499"></string>
+    <!-- no translation found for credentials_unlock_hint (2301301378040499348) -->
+    <skip />
+    <!-- no translation found for credentials_old_password (7553393815538684028) -->
+    <skip />
+    <string name="credentials_reset_hint" msgid="6297256880896133631">"ਕੀ ਸਾਰੀਆਂ ਸਮੱਗਰੀਆਂ ਹਟਾਉਣੀਆਂ ਹਨ?"</string>
+    <!-- no translation found for credentials_password_too_short (7502749986405522663) -->
+    <skip />
+    <!-- no translation found for credentials_wrong_password (2541932597104054807) -->
+    <skip />
+    <!-- no translation found for credentials_reset_warning (5320653011511797600) -->
+    <skip />
+    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
+    <skip />
+    <!-- no translation found for credentials_erased (2907836028586342969) -->
+    <skip />
+    <!-- no translation found for credentials_not_erased (93461830775441220) -->
+    <skip />
+    <!-- no translation found for credentials_enabled (7588607413349978930) -->
+    <skip />
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"ਤੁਹਾਨੂੰ ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵਰਤ ਸਕਣ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਲੌਕ ਸਕ੍ਰੀਨ PIN ਜਾਂ ਪਾਸਵਰਡ ਸੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</string>
+    <!-- no translation found for usage_access_title (332333405495457839) -->
+    <skip />
+    <string name="allow_usage_access_title" msgid="2134237975190472249">"ਕੀ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
+    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
+    <!-- no translation found for privacy_settings (5446972770562918934) -->
+    <skip />
+    <!-- no translation found for privacy_settings_title (4856282165773594890) -->
+    <skip />
+    <!-- no translation found for backup_section_title (7952232291452882740) -->
+    <skip />
+    <string name="personal_data_section_title" msgid="7815209034443782061">"ਨਿੱਜੀ ਡਾਟਾ"</string>
+    <!-- no translation found for backup_data_title (1239105919852668016) -->
+    <skip />
+    <string name="backup_data_summary" msgid="708773323451655666">"Google ਸਰਵਰਾਂ ਤੇ ਐਪ ਡਾਟਾ, Wi‑Fi ਪਾਸਵਰਡਾਂ ਅਤੇ ਹੋਰ ਸੈਟਿੰਗਾਂ ਬੈਕ ਅਪ ਕਰੋ"</string>
+    <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
+    <skip />
+    <!-- no translation found for include_app_data_title (2829970132260278394) -->
+    <skip />
+    <!-- no translation found for auto_restore_title (5397528966329126506) -->
+    <skip />
+    <!-- no translation found for auto_restore_summary (4235615056371993807) -->
+    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"ਬੈਕਅਪ ਸੇਵਾ ਨਿਸ਼ਕਿਰਿਆ ਹੈ।"</string>
+    <!-- no translation found for local_backup_password_title (3860471654439418822) -->
+    <skip />
+    <!-- no translation found for local_backup_password_summary_none (393503434408227110) -->
+    <skip />
+    <!-- no translation found for local_backup_password_summary_change (2731163425081172638) -->
+    <skip />
+    <!-- no translation found for local_backup_password_toast_success (582016086228434290) -->
+    <skip />
+    <!-- no translation found for local_backup_password_toast_confirmation_mismatch (3495167398824569524) -->
+    <skip />
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"ਬੈਕਅਪ ਪਾਸਵਰਡ ਸੈਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲਤਾ"</string>
+    <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
+    <!-- no translation found for backup_erase_dialog_message (5221011285568343155) -->
+    <skip />
+    <!-- no translation found for device_admin_settings_title (1335557832906433309) -->
+    <skip />
+    <!-- no translation found for active_device_admin_msg (6930903262612422111) -->
+    <skip />
+    <string name="remove_device_admin" msgid="3596845261596451437">"ਨਿਸ਼ਕਿਰਿਆ ਬਣਾਓ"</string>
+    <!-- no translation found for select_device_admin_msg (2645509057946368094) -->
+    <skip />
+    <string name="no_device_admins" msgid="702695100241728775">"ਕੋਈ ਉਪਲਬਧ ਡਿਵਾਈਸ ਪ੍ਰਬੰਧਕ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
+    <!-- no translation found for managed_profile_device_admin_info (5048846624960067582) -->
+    <skip />
+    <string name="personal_device_admin_title" msgid="2849617316347669861">"ਨਿੱਜੀ"</string>
+    <!-- no translation found for managed_device_admin_title (7853955652864478435) -->
+    <skip />
+    <string name="no_trust_agents" msgid="7450273545568977523">"ਕੋਈ ਉਪਲਬਧ ਭਰੋਸੇਯੋਗ ਏਜੰਟ ਨਹੀਂ"</string>
+    <!-- no translation found for add_device_admin_msg (6246742476064507965) -->
+    <skip />
+    <string name="add_device_admin" msgid="7133327675884827091">"ਸਕਿਰਿਆ ਬਣਾਓ"</string>
+    <!-- no translation found for device_admin_add_title (7705551449705676363) -->
+    <skip />
+    <string name="device_admin_warning" msgid="2026747446313628233">"ਇਸਨੂੰ ਸਕਿਰਿਆ ਬਣਾਉਣ ਨਾਲ ਪ੍ਰਬੰਧਕ ਐਪ <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਹੇਠਾਂ ਦਿੱਤੇ ਓਪਰੇਸ਼ਨ ਪਰਫੌਰਮ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਵੇਗਾ:"</string>
+    <!-- no translation found for device_admin_status (4252975713178851910) -->
+    <skip />
+    <!-- no translation found for profile_owner_add_title (6249331160676175009) -->
+    <skip />
+    <string name="adding_profile_owner_warning" msgid="6469780138110334180">"ਅੱਗੇ ਵਧਣ ਨਾਲ, ਤੁਹਾਡਾ ਉਪਭੋਗਤਾ ਨੂੰ ਤੁਹਾਡੇ ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਵਿਵਸਥਿਤ ਕੀਤਾ ਜਾਏਗਾ ਜੋ ਸੰਬੰਧਿਤ ਡਾਟਾ ਸਟੋਰ ਕਰਨ ਦੇ ਵੀ ਯੋਗ ਹੋ ਸਕਦਾ ਹੈ, ਤੁਹਾਡੇ ਨਿੱਜੀ ਡਾਟਾ ਤੋਂ ਇਲਾਵਾ।\n\nਤੁਹਾਡੇ ਪ੍ਰਬੰਧਕ ਕੋਲ ਸੈਟਿੰਗਾਂ, ਪਹੁੰਚ, ਐਪਸ ਅਤੇ ਇਸ ਉਪਭੋਗਤਾ ਨਾਲ ਸੰਬੰਧਿਤ ਡਾਟਾ ਦਾ ਨਿਰੀਖਣ ਕਰਨ ਅਤੇ ਇਸਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਦੀ ਸਮਰੱਥਆ ਹੈ, ਨੈਟਵਰਕ ਗਤੀਵਿਧੀ ਅਤੇ ਤੁਹਾਡੀ ਡਿਵਾਈਸ ਦੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਜਾਣਕਾਰੀ ਸਮੇਤ।"</string>
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
+    <!-- no translation found for sound_category_sound_title (1488759370067953996) -->
+    <skip />
+    <string name="notification_log_title" msgid="3766148588239398464">"ਸੂਚਨਾ ਲੌਗ"</string>
+    <!-- no translation found for sound_category_call_ringtone_vibrate_title (1543777228646645163) -->
+    <skip />
+    <!-- no translation found for sound_category_system_title (1480844520622721141) -->
+    <skip />
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi‑Fi ਸੈਟਅਪ"</string>
+    <!-- no translation found for wifi_setup_title_editing_network (6020614644556717979) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connecting_network (5572226790101017822) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connected_network (1608788657122010919) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_add_network (6932651000151032301) -->
+    <skip />
+    <!-- no translation found for wifi_setup_not_connected (6997432604664057052) -->
+    <skip />
+    <!-- no translation found for wifi_setup_add_network (5939624680150051807) -->
+    <skip />
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ਸੂਚੀ ਤਾਜ਼ਾ ਕਰੋ"</string>
+    <!-- no translation found for wifi_setup_skip (6661541841684895522) -->
+    <skip />
+    <string name="wifi_setup_next" msgid="3388694784447820477">"ਅਗਲਾ"</string>
+    <!-- no translation found for wifi_setup_back (144777383739164044) -->
+    <skip />
+    <!-- no translation found for wifi_setup_detail (2336990478140503605) -->
+    <skip />
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"ਕਨੈਕਟ ਕਰੋ"</string>
+    <!-- no translation found for wifi_setup_forget (2562847595567347526) -->
+    <skip />
+    <!-- no translation found for wifi_setup_save (3659235094218508211) -->
+    <skip />
+    <!-- no translation found for wifi_setup_cancel (3185216020264410239) -->
+    <skip />
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"ਨੈਟਵਰਕਾਂ ਨੂੰ ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"ਇਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਇੱਕ ਨੈਟਵਰਕ ਨੂੰ ਛੋਹਵੋ"</string>
+    <!-- no translation found for wifi_setup_status_existing_network (6394925174802598186) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_unsecured_network (8143046977328718252) -->
+    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"ਨੈਟਵਰਕ ਕੌਂਫਿਗਰੇਸ਼ਨ ਟਾਈਪ ਕਰੋ"</string>
+    <!-- no translation found for wifi_setup_status_new_network (7468952850452301083) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_connecting (4971421484401530740) -->
+    <skip />
+    <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"ਅਗਲੇ ਸਟੈਪ ਤੇ ਜਾਓ"</string>
+    <!-- no translation found for wifi_setup_status_eap_not_supported (5335338851032315905) -->
+    <skip />
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"ਤੁਸੀਂ ਸੈਟਅਪ ਦੇ ਦੌਰਾਨ ਇੱਕ EAP Wi‑Fi ਕਨੈਕਸ਼ਨ ਕੌਂਫਿਗਰ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਸੈਟਅਪ ਤੋਂ ਬਾਅਦ, ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ &gt; ਵਾਇਰਲੈਸ &amp; ਨੈਟਵਰਕਾਂ ਵਿੱਚ ਅਜਿਹਾ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <!-- no translation found for wifi_setup_description_connecting (2793554932006756795) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connected (736032046548460779) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_enabled (558480439730263116) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_disabled (1741194106479011384) -->
+    <skip />
+    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ਹੁਣ ਸਿੰਕ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
+    <skip />
+    <!-- no translation found for sync_failed (1696499856374109647) -->
+    <skip />
+    <!-- no translation found for sync_active (8476943765960863040) -->
+    <skip />
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
+    <string name="sync_is_failing" msgid="1591561768344128377">"ਸਿੰਕ ਵਿੱਚ ਇਸ ਵੇਲੇ ਸਮੱਸਿਆਵਾਂ ਹੋ ਰਹੀਆਂ ਹਨ। ਇਹ ਜਲਦੀ ਹੀ ਠੀਕ ਹੋ ਜਾਏਗਾ।"</string>
+    <!-- no translation found for add_account_label (7811707265834013767) -->
+    <skip />
+    <!-- no translation found for managed_profile_not_available_label (3489771164851107822) -->
+    <skip />
+    <string name="remove_managed_profile_label" msgid="3856519337797285325">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਹਟਾਓ"</string>
+    <string name="background_data" msgid="5779592891375473817">"ਪਿਛੋਕੜ ਡਾਟਾ"</string>
+    <!-- no translation found for background_data_summary (8328521479872763452) -->
+    <skip />
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"ਕੀ ਪਿਛੋਕੜ ਡਾਟਾ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"ਪਿਛੋਕੜ ਡਾਟਾ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣ ਨਾਲ ਇਹ ਬੈਟਰੀ ਸਮਰੱਥਾ ਵਧਾਉਂਦਾ ਹੈ ਅਤੇ ਡਾਟਾ ਵਰਤੋਂ ਨੂੰ ਘੱਟ ਕਰਦਾ ਹੈ। ਕੁਝ ਐਪਸ ਤਦ ਵੀ ਪਿਛੋਕੜ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਵਰਤ ਸਕਦੇ ਹਨ।"</string>
+    <!-- no translation found for sync_automatically (1682730255435062059) -->
+    <skip />
+    <!-- no translation found for sync_enabled (4551148952179416813) -->
+    <skip />
+    <string name="sync_disabled" msgid="8511659877596511991">"ਸਿੰਕ ਬੰਦ ਹੈ"</string>
+    <string name="sync_error" msgid="5060969083117872149">"ਸਿੰਕ ਅਸ਼ੁੱਧੀ"</string>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
+    <string name="settings_backup" msgid="2274732978260797031">"ਬੈਕ ਅਪ ਸੈਟਿੰਗਾਂ"</string>
+    <!-- no translation found for settings_backup_summary (7916877705938054035) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"ਸਿੰਕ ਰੱਦ ਕਰੋ"</string>
+    <!-- no translation found for sync_one_time_sync (6766593624598183090) -->
+    <skip />
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <!-- no translation found for sync_plug (3905078969081888738) -->
+    <skip />
+    <!-- no translation found for header_application_sync_settings (6205903695598000286) -->
+    <skip />
+    <!-- no translation found for header_data_and_synchronization (5165024023936509896) -->
+    <skip />
+    <string name="preference_change_password_title" msgid="8955581790270130056">"ਪਾਸਵਰਡ ਬਦਲੋ"</string>
+    <!-- no translation found for header_account_settings (5382475087121880626) -->
+    <skip />
+    <!-- no translation found for remove_account_label (5921986026504804119) -->
+    <skip />
+    <!-- no translation found for header_add_an_account (756108499532023798) -->
+    <skip />
+    <!-- no translation found for finish_button_label (481587707657751116) -->
+    <skip />
+    <!-- no translation found for really_remove_account_title (8800653398717172460) -->
+    <skip />
+    <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="4010643669489606536">"ਤੁਹਾਡੇ ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਇਸ ਬਦਲਾਵ ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ"</string>
+    <string name="provider_label" msgid="7724593781904508866">"Push ਸਬਸਕ੍ਰਿਪਸ਼ੰਸ"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_title (8923508322291625282) -->
+    <skip />
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ਇਸ ਆਈਟਮ ਲਈ ਸਿੰਕ ਇਸ ਵੇਲੇ ਅਸਮਰਥਿਤ ਹੈ। ਇਸ ਸੈਟਿੰਗ ਨੂੰ ਬਦਲਣ ਲਈ, ਪਿਛੋਕੜ ਡਾਟਾ ਅਤੇ ਆਟੋਮੈਟਿਕ ਸਿੰਕ ਅਸਥਾਈ ਤੌਰ ਤੇ ਚਾਲੂ ਕਰੋ।"</string>
+    <!-- no translation found for wimax_settings (2655139497028469039) -->
+    <skip />
+    <!-- no translation found for status_wimax_mac_address (8390791848661413416) -->
+    <skip />
+    <!-- no translation found for enter_password (8035706727471334122) -->
+    <skip />
+    <!-- no translation found for enter_pin (5305333588093263790) -->
+    <skip />
+    <string name="enter_pattern" msgid="4187435713036808566">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪੈਟਰਨ ਡ੍ਰਾ ਕਰੋ"</string>
+    <!-- no translation found for cryptkeeper_wrong_pattern (8423835922362956999) -->
+    <skip />
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"ਗ਼ਲਤ ਪਾਸਵਰਡ"</string>
+    <!-- no translation found for cryptkeeper_wrong_pin (755720788765259382) -->
+    <skip />
+    <!-- no translation found for checking_decryption (8287458611802609493) -->
+    <skip />
+    <!-- no translation found for starting_android (8581493237458496835) -->
+    <skip />
+    <string name="delete" msgid="4219243412325163003">"ਮਿਟਾਓ"</string>
+    <string name="misc_files" msgid="6720680815969643497">"ਵਿਵਿਧ ਫਾਈਲਾਂ"</string>
+    <!-- no translation found for misc_files_selected_count (4647048020823912088) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
+    <!-- no translation found for select_all (1562774643280376715) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_title (8605478913544273282) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
+    <skip />
+    <!-- no translation found for debug_debugging_category (6781250159513471316) -->
+    <skip />
+    <string name="debug_app" msgid="8349591734751384446">"ਡੀਬਗ ਐਪ ਚੁਣੋ"</string>
+    <!-- no translation found for debug_app_not_set (718752499586403499) -->
+    <skip />
+    <string name="debug_app_set" msgid="2063077997870280017">"ਡੀਬਗਿੰਗ ਐਪਲੀਕੇਸ਼ਨ: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ"</string>
+    <string name="no_application" msgid="2813387563129153880">"ਕੁਝ ਨਹੀਂ"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"ਡੀਬਗਰ ਦੀ ਉਡੀਕ ਕਰੋ"</string>
+    <!-- no translation found for wait_for_debugger_summary (1766918303462746804) -->
+    <skip />
+    <string name="debug_input_category" msgid="1811069939601180246">"ਇਨਪੁਟ"</string>
+    <!-- no translation found for debug_drawing_category (6755716469267367852) -->
+    <skip />
+    <!-- no translation found for debug_hw_drawing_category (6220174216912308658) -->
+    <skip />
+    <!-- no translation found for media_category (4388305075496848353) -->
+    <skip />
+    <!-- no translation found for debug_monitoring_category (7640508148375798343) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_touches (1356420386500834339) -->
+    <skip />
+    <!-- no translation found for show_touches_summary (6684407913145150041) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (5470814345876056420) -->
+    <skip />
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"ਸਮੁੱਚੀ ਵਿੰਡੋ ਸਰਫੇਸਾਂ ਫਲੈਸ਼ ਕਰੋ ਜਦੋਂ ਉਹ ਅਪਡੇਟ ਹੁੰਦੀਆਂ ਹਨ"</string>
+    <!-- no translation found for show_hw_screen_updates (5036904558145941590) -->
+    <skip />
+    <!-- no translation found for show_hw_screen_updates_summary (1115593565980196197) -->
+    <skip />
+    <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+    <skip />
+    <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+    <skip />
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU ਓਵਰਡ੍ਰਾ ਡੀਬਗ ਕਰੋ"</string>
+    <!-- no translation found for disable_overlays (2074488440505934665) -->
+    <skip />
+    <!-- no translation found for disable_overlays_summary (3578941133710758592) -->
+    <skip />
+    <!-- no translation found for simulate_color_space (6745847141353345872) -->
+    <skip />
+    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
+    <skip />
+    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
+    <skip />
+    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
+    <skip />
+    <!-- no translation found for usb_audio_disable_routing (8114498436003102671) -->
+    <skip />
+    <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ਔਡੀਓ ਪੈਰੀਫਰਲ ਲਈ ਆਟੋਮੈਟਿਕ ਰੂਟਿੰਗ ਅਸਮਰੱਥ ਬਣਾਓ"</string>
+    <!-- no translation found for debug_layout (5981361776594526155) -->
+    <skip />
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
+    <!-- no translation found for force_rtl_layout_all_locales (2259906643093138978) -->
+    <skip />
+    <!-- no translation found for force_rtl_layout_all_locales_summary (9192797796616132534) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"ਸਕ੍ਰੀਨ ਓਵਰਲੇ ਵਰਤਮਾਨ CPU ਵਰਤੋਂ ਦਿਖਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="force_hw_ui" msgid="6426383462520888732">"GPU ਪ੍ਰਗਟਾਅ ਤੇ ਜ਼ੋਰ ਪਾਓ"</string>
+    <!-- no translation found for force_hw_ui_summary (5535991166074861515) -->
+    <skip />
+    <!-- no translation found for force_msaa (7920323238677284387) -->
+    <skip />
+    <string name="force_msaa_summary" msgid="9123553203895817537">"OpenGL ES 2.0 ਐਪਸ ਵਿੱਚ 4x MSAA ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <!-- no translation found for show_non_rect_clip (505954950474595172) -->
+    <skip />
+    <!-- no translation found for track_frame_time (6146354853663863443) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"ਟ੍ਰਾਂਜਿਸ਼ਨ ਐਨੀਮੇਸ਼ਨ ਸਕੇਲ"</string>
+    <!-- no translation found for animator_duration_scale_title (3406722410819934083) -->
+    <skip />
+    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
+    <skip />
+    <string name="enable_multi_window" msgid="1091779249819137016">"ਮਲਟੀ-ਵਿੰਡੋ ਮੋਡ"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"ਇੱਕੋ ਵੇਲੇ ਸਕ੍ਰੀਨ ਤੇ ਮਲਟੀਪਲ ਗਤੀਵਿਧੀਆਂ।"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"ਕੀ ਮਲਟੀ-ਵਿੰਡੋ ਮੋਡ ਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ਚਿਤਾਵਨੀ: ਇਹ ਇੱਕ ਉੱਚ ਪ੍ਰਯੋਗਾਤਮਕ ਵਿਸ਼ੇਸ਼ਤਾ ਹੈ, ਜੋ ਹਾਲੀਆ ਐਪਸ UI ਰਾਹੀਂ ਇੱਕੋ ਵੇਲੇ ਔਨ-ਸਕ੍ਰੀਨ ਮਲਟੀਪਲ ਗਤੀਵਿਧੀਆਂ ਦੀ ਆਗਿਆ ਦਿੰਦੀ ਹੈ। ਕੁਝ ਐਪਸ ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨਾਲ ਵਰਤਣ ਵੇਲੇ ਕ੍ਰੈਸ਼ ਹੋ ਸਕਦੇ ਹਨ ਜਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਹੀਂ ਵੀ ਕਰ ਸਕਦੇ।"</string>
+    <string name="debug_applications_category" msgid="4206913653849771549">"ਐਪਸ"</string>
+    <!-- no translation found for immediately_destroy_activities (8366775083630234121) -->
+    <skip />
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ਹਰੇਕ ਗਤੀਵਿਧੀ ਨੂੰ ਨਸ਼ਟ ਕਰੋ ਜਿਵੇਂ ਹੀ ਉਪਭੋਗਤਾ ਇਸਨੂੰ ਛੱਡ ਦੇਵੇ"</string>
+    <!-- no translation found for app_process_limit_title (4280600650253107163) -->
+    <skip />
+    <!-- no translation found for show_all_anrs (28462979638729082) -->
+    <skip />
+    <string name="show_all_anrs_summary" msgid="641908614413544127">"ਪਿਛੋਕੜ ਐਪਸ ਲਈ ਐਪਸ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਹੇ ਡਾਇਲੌਗ ਦਿਖਾਓ"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"ਡਾਟਾ ਵਰਤੋਂ"</string>
+    <!-- no translation found for data_usage_app_summary_title (4147258989837459172) -->
+    <skip />
+    <!-- no translation found for data_usage_accounting (7170028915873577387) -->
+    <skip />
+    <string name="data_usage_app" msgid="4970478397515423303">"ਐਪ ਵਰਤੋਂ"</string>
+    <!-- no translation found for data_usage_app_info_label (3409931235687866706) -->
+    <skip />
+    <string name="data_usage_cellular_data" msgid="4859424346276043677">"ਸੈਲਿਊਲਰ ਡਾਟਾ"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"ਡਾਟਾ ਸੀਮਾ ਸੈਟ ਕਰੋ"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"ਡਾਟਾ ਵਰਤੋਂ ਸਾਈਕਲ"</string>
+    <!-- no translation found for data_usage_app_items_header_text (5017850810459372828) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_roaming (8042359966835203296) -->
+    <skip />
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"ਪਿਛੋਕੜ ਡਾਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਓ"</string>
+    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"ਪਿਛੋਕੜ ਡਾਟਾ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <!-- no translation found for data_usage_menu_split_4g (5322857680792601899) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (2296217964873872571) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_hide_wifi (7290056718050186769) -->
+    <skip />
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"ਈਥਰਨੈਟ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
+    <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"ਈਥਰਨੈਟ ਵਰਤੋਂ ਲੁਕਾਓ"</string>
+    <!-- no translation found for data_usage_menu_metered (6235119991372755026) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_sim_cards (6410498422797244073) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_cellular_networks (5243515735055652279) -->
+    <skip />
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"ਡਾਟਾ ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
+    <!-- no translation found for account_settings_menu_auto_sync_personal (785541379617346438) -->
+    <skip />
+    <!-- no translation found for account_settings_menu_auto_sync_work (329565580969147026) -->
+    <skip />
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"ਸਾਈਕਲ ਬਦਲੋ..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"ਡਾਟਾ ਵਰਤੋਂ ਸਾਈਕਲ ਰੀਸੈਟ ਕਰਨ ਲਈ ਮਹੀਨੇ ਦਾ ਦਿਨ:"</string>
+    <!-- no translation found for data_usage_empty (8621855507876539282) -->
+    <skip />
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"ਫੋਰਗ੍ਰਾਉਂਡ"</string>
+    <!-- no translation found for data_usage_label_background (3225844085975764519) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restricted (3568465218866589705) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile (2613595056882494652) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (3934211003105066167) -->
+    <skip />
+    <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G ਡਾਟਾ ਸੀਮਾ ਸੈਟ ਕਰੋ"</string>
+    <!-- no translation found for data_usage_disable_3g_limit (2558557840444266906) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_wifi_limit (1394901415264660888) -->
+    <skip />
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
+    <!-- no translation found for data_usage_tab_ethernet (7298064366282319911) -->
+    <skip />
+    <string name="data_usage_tab_mobile" msgid="2084466270343460491">"ਸੈਲਿਊਲਰ"</string>
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
+    <!-- no translation found for data_usage_list_mobile (7219011330831181312) -->
+    <skip />
+    <!-- no translation found for data_usage_list_none (3933892774251050735) -->
+    <skip />
+    <string name="data_usage_enable_mobile" msgid="5900650720568852325">"ਸੈਲਿਊਲਰ ਡਾਟਾ"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G ਡਾਟਾ"</string>
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <string name="data_usage_forground_label" msgid="7654319010655983591">"ਫੋਰਗ੍ਰਾਉਂਡ:"</string>
+    <!-- no translation found for data_usage_background_label (2722008379947694926) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (2279171379771253165) -->
+    <skip />
+    <string name="data_usage_app_restrict_background" msgid="7510046552380574925">"ਐਪ ਪਿਛੋਕੜ ਡਾਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਓ"</string>
+    <!-- no translation found for data_usage_app_restrict_background_summary (3720075732277934106) -->
+    <skip />
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="1446565717342917727">"ਇਸ ਐਪ ਲਈ ਪਿਛੋਕੜ ਡਾਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਸੈਲਿਊਲਰ ਡਾਟਾ ਸੀਮਾ ਸੈਟ ਕਰੋ।"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ਕੀ ਪਿਛੋਕੜ ਡਾਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣਾ ਹੈ?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="5871168521456832764">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਇੱਕ ਅਜਿਹੇ ਐਪ ਦਾ ਕਾਰਨ ਬਣ ਸਕਦੀ ਹੈ ਜੋ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰਨ ਲਈ ਪਿਛੋਕੜ ਡਾਟਾ ਤੇ ਨਿਰਭਰ ਹੈ, ਕੇਵਲ ਉਦੋਂ ਜਦੋਂ ਸੈਲਿਊਲਰ ਨੈਟਵਰਕ ਉਪਲਬਧ ਹੋਣ।\n\nਤੁਸੀਂ ਐਪ ਵਿੱਚ ਉਪਲਬਧ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਹੋਰ ਉਚਿਤ ਡਾਟਾ ਵਰਤੋਂ ਨਿਯੰਤਰਣ ਲੱਭ ਸਕਦੇ ਹੋ।"</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="4674085030810350875">"ਪਿਛੋਕੜ ਡਾਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣਾ ਕੇਵਲ ਉਦੋਂ ਸੰਭਵ ਹੁੰਦਾ ਹੈ ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਸੈਲਿਊਲਰ ਡਾਟਾ ਸੀਮਾ ਸੈਟ ਕੀਤੀ ਹੋਵੇ।"</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (8581983093524041669) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (8651376294887142858) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"ਇਹ ਡਾਟਾ ਅਤੇ ਬੈਟਰੀ ਵਰਤੋਂ ਤੇ ਨਿਗਰਾਨੀ ਰੱਖਦਾ ਹੈ, ਪਰੰਤੂ ਤੁਹਾਨੂੰ ਹਾਲੀਆ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਕਰਨ ਲਈ ਹਰੇਕ ਖਾਤੇ ਨੂੰ ਮੈਨੂਅਲੀ ਸਿੰਕ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਇਸਤੋਂ ਇਲਾਵਾ ਜਦੋਂ ਅਪਡੇਟ ਹੁੰਦੀ ਹੈ ਤਾਂ ਤੁਸੀਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰੋਗੇ।"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"ਵਰਤੋਂ ਸਾਈਕਲ ਰੀਸੈਟ ਤਾਰੀਖ"</string>
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"ਸੈਟ ਕਰੋ"</string>
+    <!-- no translation found for data_usage_warning_editor_title (3704136912240060339) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_editor_title (9153595142385030015) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (5788774061143636263) -->
+    <skip />
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3511301596446820549">"ਤੁਹਾਡਾ ਫੋਨ ਸੈਲਿਊਲਰ ਡਾਟਾ ਬੰਦ ਕਰ ਦੇਵੇਗਾ ਜਦੋਂ ਤੁਹਾਡੇ ਵੱਲੋਂ ਸੈਟ ਕੀਤੀ ਇਸਦੀ ਸੀਮਾ ਪੂਰੀ ਹੋ ਜਾਂਦੀ ਹੈ।\n\nਡਾਟਾ ਵਰਤੋਂ ਤੁਹਾਡੇ ਫੋਨ ਵੱਲੋਂ ਮਾਪੀ ਜਾਂਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡਾ ਕੈਰੀਅਰ ਵਰਤੋਂ ਨੂੰ ਵੱਖਰੇ ਤੌਰ ਤੇ ਗਿਣ ਸਕਦਾ ਹੈ, ਇੱਕ ਦਰਮਿਆਨੀ ਸੀਮਾ ਸੈਟ ਕਰਨ ਤੇ ਵਿਚਾਰ ਕਰੋ।"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ਕੀ ਪਿਛੋਕੜ ਡਾਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣਾ ਹੈ?"</string>
+    <!-- no translation found for data_usage_restrict_background (8210134218644196511) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background_multiuser (3262993384666280985) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background_multiuser (4352615206362479722) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_limit (860566507375933039) -->
+    <skip />
+    <!-- no translation found for data_usage_uninstalled_apps (614263770923231598) -->
+    <skip />
+    <!-- no translation found for data_usage_uninstalled_apps_users (7986294489899813194) -->
+    <skip />
+    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
+    <skip />
+    <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>
+    <!-- no translation found for data_usage_total_during_range_mobile (5961720793603268572) -->
+    <skip />
+    <!-- no translation found for data_usage_total_during_range_mobile (1625833170144610767) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_title (7383175371006596441) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_body (3262343834446126044) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_mobile (2326986339431119372) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_wifi (1761738002328299714) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_wifi_disabled (727808462375941567) -->
+    <skip />
+    <!-- no translation found for data_usage_disclaimer (6887858149980673444) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
+    <skip />
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ਕਾਲ ਤੇ ਵਾਪਸ ਜਾਓ"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"ਨਾਮ"</string>
+    <!-- no translation found for vpn_type (5435733139514388070) -->
+    <skip />
+    <!-- no translation found for vpn_server (2123096727287421913) -->
+    <skip />
+    <!-- no translation found for vpn_mppe (6639001940500288972) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_identifier (4098175859460006296) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_secret (4526453255704888704) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_user_cert (6880651510020187230) -->
+    <skip />
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA ਸਰਟੀਫਿਕੇਟ"</string>
+    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
+    <skip />
+    <string name="vpn_show_options" msgid="7182688955890457003">"ਉੱਨਤ ਚੋਣਾਂ ਦਿਖਾਓ"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <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>
+    <!-- no translation found for vpn_password (6756043647233596772) -->
+    <skip />
+    <string name="vpn_save_login" msgid="6350322456427484881">"ਖਾਤਾ ਜਾਣਕਾਰੀ ਸੁਰੱਖਿਅਤ ਕਰੋ"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(ਵਰਤਿਆ ਨਹੀਂ)"</string>
+    <!-- no translation found for vpn_no_ca_cert (2095005387500126113) -->
+    <skip />
+    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
+    <skip />
+    <string name="vpn_cancel" msgid="1979937976123659332">"ਰੱਦ ਕਰੋ"</string>
+    <!-- no translation found for vpn_save (4233484051644764510) -->
+    <skip />
+    <!-- no translation found for vpn_connect (8469608541746132301) -->
+    <skip />
+    <!-- no translation found for vpn_edit (8647191407179996943) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
+    <skip />
+    <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
+    <!-- no translation found for vpn_create (5628219087569761496) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (408275284159243490) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
+    <skip />
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
+    <!-- no translation found for vpn_no_network (3050233675132726155) -->
+    <skip />
+    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_system_tab (3984284264816924534) -->
+    <skip />
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"ਉਪਭੋਗਤਾ"</string>
+    <!-- no translation found for trusted_credentials_disable_label (3864493185845818506) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_label (2498444573635146913) -->
+    <skip />
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"ਹਟਾਓ"</string>
+    <!-- no translation found for trusted_credentials_enable_confirmation (83215982842660869) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_confirmation (8199697813361646792) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_confirmation (443561923016852941) -->
+    <skip />
+    <!-- no translation found for spellcheckers_settings_title (399981228588011501) -->
+    <skip />
+    <!-- no translation found for current_backup_pw_prompt (7735254412051914576) -->
+    <skip />
+    <!-- no translation found for new_backup_pw_prompt (8755501377391998428) -->
+    <skip />
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"ਆਪਣਾ ਨਵਾਂ ਪੂਰਾ ਬੈਕਅਪ ਪਾਸਵਰਡ ਇੱਥੇ ਦੁਬਾਰਾ ਟਾਈਪ ਕਰੋ"</string>
+    <!-- no translation found for backup_pw_set_button_text (2387480910044648795) -->
+    <skip />
+    <!-- no translation found for backup_pw_cancel_button_text (8845630125391744615) -->
+    <skip />
+    <!-- no translation found for additional_system_update_settings_list_item_title (214987609894661992) -->
+    <skip />
+    <string name="selinux_status_disabled" msgid="924551035552323327">"ਅਸਮਰੱਥ ਬਣਾਇਆ"</string>
+    <!-- no translation found for selinux_status_permissive (6004965534713398778) -->
+    <skip />
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"ਲਾਗੂ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (4583879256548819713) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8216218659139190498) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
+    <!-- no translation found for user_settings_title (6151874007858148344) -->
+    <skip />
+    <!-- no translation found for user_list_title (7937158411137563543) -->
+    <skip />
+    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ਉਪਭੋਗਤਾ ਜਾਂ ਪ੍ਰੋਫਾਈਲ ਜੋੜੋ"</string>
+    <!-- no translation found for user_add_user_menu (1675956975014862382) -->
+    <skip />
+    <!-- no translation found for user_summary_restricted_profile (6354966213806839107) -->
+    <skip />
+    <!-- no translation found for user_need_lock_message (2596365678651842785) -->
+    <skip />
+    <!-- no translation found for user_set_lock_button (8311219392856626841) -->
+    <skip />
+    <!-- no translation found for user_summary_not_set_up (8778205026866794909) -->
+    <skip />
+    <!-- no translation found for user_summary_restricted_not_set_up (1628116001964325544) -->
+    <skip />
+    <!-- no translation found for user_summary_managed_profile_not_set_up (1659125858619760573) -->
+    <skip />
+    <!-- no translation found for user_owner (3879126011135546571) -->
+    <skip />
+    <!-- no translation found for user_you (1639158809315025986) -->
+    <skip />
+    <!-- no translation found for user_nickname (5148818000228994488) -->
+    <skip />
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"ਜੋੜੋ"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ਉਪਭੋਗਤਾਵਾਂ ਕੋਲ ਉਹਨਾਂ ਦੇ ਆਪਣੇ ਐਪਸ ਅਤੇ ਸਮੱਗਰੀ ਹੁੰਦੀ ਹੈ"</string>
+    <!-- no translation found for user_add_profile_item_summary (5931663986889138941) -->
+    <skip />
+    <!-- no translation found for user_add_user_item_title (8212199632466198969) -->
+    <skip />
+    <!-- no translation found for user_add_profile_item_title (8353515490730363621) -->
+    <skip />
+    <!-- no translation found for user_add_user_title (2108112641783146007) -->
+    <skip />
+    <!-- no translation found for user_add_user_message_long (8562152293752222985) -->
+    <skip />
+    <string name="user_add_user_message_short" msgid="1511354412249044381">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਉਪਭੋਗਤਾ ਜੋੜਦੇ ਹੋ, ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣਾ ਸਪੇਸ ਸੈਟ ਅਪ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਉਪਭੋਗਤਾ ਹੋਰ ਸਾਰੇ ਉਪਭੋਗਤਾਵਾਂ ਦੇ ਐਪਸ ਨੂੰ ਅਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <!-- no translation found for user_setup_dialog_title (1765794166801864563) -->
+    <skip />
+    <!-- no translation found for user_setup_dialog_message (1004068621380867148) -->
+    <skip />
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"ਕੀ ਹੁਣ ਪ੍ਰੋਫਾਈਲ ਸੈਟ ਅਪ ਕਰਨੀ ਹੈ?"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"ਹੁਣ ਸੈਟ ਅਪ ਕਰੋ"</string>
+    <!-- no translation found for user_setup_button_setup_later (3068729597269172401) -->
+    <skip />
+    <!-- no translation found for user_cannot_manage_message (8440449301994432789) -->
+    <skip />
+    <!-- no translation found for user_cannot_manage_message (1133251987818014757) -->
+    <skip />
+    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
+    <skip />
+    <!-- no translation found for user_remove_user_menu (6897150520686691355) -->
+    <skip />
+    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"ਉਪਭੋਗਤਾ ਜੋੜੋ ਜਦੋਂ ਡਿਵਾਈਸ ਲੌਕ ਹੋਵੇ"</string>
+    <string name="user_new_user_name" msgid="369856859816028856">"ਨਵਾਂ ਉਪਭੋਗਤਾ"</string>
+    <!-- no translation found for user_new_profile_name (2632088404952119900) -->
+    <skip />
+    <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>
+    <!-- no translation found for work_profile_confirm_remove_title (2017323555783522213) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_self_message (8167855311779740207) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_self_message (5391888073786090274) -->
+    <skip />
+    <string name="user_confirm_remove_message" msgid="1020629390993095037">"ਸਾਰੇ ਐਪਸ ਅਤੇ ਡਾਟਾ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ"</string>
+    <!-- no translation found for work_profile_confirm_remove_message (7593793549364168783) -->
+    <skip />
+    <!-- no translation found for user_profile_confirm_remove_message (7373754145959298522) -->
+    <skip />
+    <!-- no translation found for user_adding_new_user (1521674650874241407) -->
+    <skip />
+    <string name="user_delete_user_description" msgid="3158592592118767056">"ਉਪਭੋਗਤਾ ਨੂੰ ਮਿਟਾਓ"</string>
+    <!-- no translation found for user_delete_button (5131259553799403201) -->
+    <skip />
+    <!-- no translation found for user_guest (8475274842845401871) -->
+    <skip />
+    <string name="user_exit_guest_title" msgid="5613997155527410675">"ਮਹਿਮਾਨ ਹਟਾਓ"</string>
+    <!-- no translation found for user_exit_guest_confirm_title (3405527634738147409) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_message (2194459201944413257) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_dialog_remove (6351370829952745350) -->
+    <skip />
+    <!-- no translation found for user_enable_calling (5128605672081602348) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_sms (9172507088023097063) -->
+    <skip />
+    <!-- no translation found for user_remove_user (6490483480937295389) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_confirm_title (4315789475268695378) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_confirm_message (8061594235219352787) -->
+    <skip />
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ਕੀ ਫੋਨ ਕਾਲਾਂ &amp; SMS ਚਾਲੂ ਕਰਨੇ ਹਨ?"</string>
+    <!-- no translation found for user_enable_calling_and_sms_confirm_message (4025082715546544967) -->
+    <skip />
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
+    <!-- no translation found for only_one_home_message (3538846733750242759) -->
+    <skip />
+    <!-- no translation found for global_change_warning (8045013389464294039) -->
+    <skip />
+    <string name="global_change_warning" product="default" msgid="2461264421590324675">"ਇਹ ਸੈਟਿੰਗ ਇਸ ਫੋਨ ਦੇ ਸਾਰੇ ਉਪਭੋਗਤਾਵਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
+    <string name="global_locale_change_title" msgid="5956281361384221451">"ਭਾਸ਼ਾ ਬਦਲੋ"</string>
+    <!-- no translation found for global_font_change_title (1887126466191012035) -->
+    <skip />
+    <!-- no translation found for nfc_payment_settings_title (1807298287380821613) -->
+    <skip />
+    <string name="google_wallet" msgid="9122936252378589227">"Google Wallet"</string>
+    <!-- no translation found for nfc_payment_no_apps (2481080809791416010) -->
+    <skip />
+    <!-- no translation found for nfc_payment_favor_foreground (8881893980929835838) -->
+    <skip />
+    <string name="nfc_payment_learn_more" msgid="5583407773744324447">"ਹੋਰ ਜਾਣੋ"</string>
+    <string name="nfc_more_title" msgid="815910943655133280">"ਹੋਰ..."</string>
+    <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"ਐਪਸ ਲੱਭੋ"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"ਕੀ ਆਪਣੀ ਤਰਜੀਹਾਂ ਦੇ ਤੌਰ ਤੇ ਸੈਟ ਕਰਨਾ ਹੈ?"</string>
+    <!-- no translation found for nfc_payment_set_default (8961120988148253016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (3803693771001226795) -->
+    <skip />
+    <string name="restriction_settings_title" msgid="4233515503765879736">"ਪ੍ਰਤਿਬੰਧ"</string>
+    <!-- no translation found for restriction_menu_reset (2067644523489568173) -->
+    <skip />
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN ਬਦਲੋ"</string>
+    <!-- no translation found for app_notifications_switch_label (9124072219553687583) -->
+    <skip />
+    <string name="help_label" msgid="6886837949306318591">"ਸਹਾਇਤਾ &amp; ਫੀਡਬੈਕ"</string>
+    <!-- no translation found for user_account_title (1127193807312271167) -->
+    <skip />
+    <!-- no translation found for user_picture_title (7297782792000291692) -->
+    <skip />
+    <!-- no translation found for extreme_threats_title (6549541803542968699) -->
+    <skip />
+    <!-- no translation found for extreme_threats_summary (8777860706500920667) -->
+    <skip />
+    <!-- no translation found for severe_threats_title (8362676353803170963) -->
+    <skip />
+    <!-- no translation found for severe_threats_summary (8848126509420177320) -->
+    <skip />
+    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER ਚਿਤਾਵਨੀਆਂ"</string>
+    <!-- no translation found for amber_alerts_summary (4312984614037904489) -->
+    <skip />
+    <!-- no translation found for repeat_title (6473587828597786996) -->
+    <skip />
+    <string name="call_manager_enable_title" msgid="7718226115535784017">"ਕਾਲ ਮੈਨੇਜਰ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <!-- no translation found for call_manager_enable_summary (8458447798019519240) -->
+    <skip />
+    <!-- no translation found for call_manager_title (4479949569744516457) -->
+    <skip />
+    <!-- no translation found for call_manager_summary (5918261959486952674) -->
+    <skip />
+    <!-- no translation found for cell_broadcast_settings (2451014351355183338) -->
+    <skip />
+    <!-- no translation found for network_operators_settings (2583178259504630435) -->
+    <skip />
+    <string name="access_point_names" msgid="1381602020438634481">"ਪਹੁੰਚ ਬਿੰਦੂ ਨਾਮ"</string>
+    <!-- no translation found for enhanced_4g_lte_mode_title (5808043757309522392) -->
+    <skip />
+    <!-- no translation found for enhanced_4g_lte_mode_summary (1376589643017218924) -->
+    <skip />
+    <!-- no translation found for preferred_network_type_title (3431041717309776341) -->
+    <skip />
+    <!-- no translation found for preferred_network_type_summary (6564884693884755019) -->
+    <skip />
+    <string name="work_sim_title" msgid="4843322164662606891">"ਦਫ਼ਤਰ SIM"</string>
+    <!-- no translation found for user_restrictions_title (5794473784343434273) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"ਐਪ ਪ੍ਰਤਿਬੰਧ ਸੈਟ ਕਰੋ"</string>
+    <!-- no translation found for user_restrictions_controlled_by (3164078767438313899) -->
+    <skip />
+    <!-- no translation found for app_sees_restricted_accounts (7503264525057246240) -->
+    <skip />
+    <!-- no translation found for app_sees_restricted_accounts_and_controlled_by (6968697624437267294) -->
+    <skip />
+    <!-- no translation found for restriction_wifi_config_title (8889556384136994814) -->
+    <skip />
+    <!-- no translation found for restriction_wifi_config_summary (70888791513065244) -->
+    <skip />
+    <!-- no translation found for restriction_bluetooth_config_title (8871681580962503671) -->
+    <skip />
+    <!-- no translation found for restriction_bluetooth_config_summary (8372319681287562506) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_title (5888100955212267941) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_summary_config (3232480757215851738) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_summary (3891097373396149915) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_summary (825331120501418592) -->
+    <skip />
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string>
+    <!-- no translation found for restriction_location_enable_summary (3489765572281788755) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
+    <!-- no translation found for user_image_take_photo (1280274310152803669) -->
+    <!-- no translation found for user_image_take_photo (7496128293167402354) -->
+    <skip />
+    <!-- no translation found for user_image_choose_photo (7940990613897477057) -->
+    <!-- no translation found for user_image_choose_photo (3746334626214970837) -->
+    <skip />
+    <!-- no translation found for user_image_photo_selector (5492565707299454873) -->
+    <skip />
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <!-- no translation found for sim_setup_wizard_title (1732682852692274928) -->
+    <skip />
+    <string name="sim_settings_title" msgid="6822745211458959756">"SIM ਕਾਰਡ"</string>
+    <!-- no translation found for sim_settings_summary (4050372057097516088) -->
+    <skip />
+    <!-- no translation found for sim_cards_changed_message (7900721153345139783) -->
+    <skip />
+    <!-- no translation found for sim_cards_changed_message_summary (5452545583546944683) -->
+    <skip />
+    <!-- no translation found for sim_cellular_data_unavailable (9018555543451203035) -->
+    <skip />
+    <!-- no translation found for sim_cellular_data_unavailable_summary (3654805961942166428) -->
+    <skip />
+    <!-- no translation found for sim_calls_always_use (7936774751250119715) -->
+    <skip />
+    <!-- no translation found for select_sim_for_data (2366081042162853044) -->
+    <skip />
+    <!-- no translation found for data_switch_started (2040761479817166311) -->
+    <skip />
+    <!-- no translation found for select_sim_for_calls (3503094771801109334) -->
+    <skip />
+    <!-- no translation found for sim_select_card (211285163525563293) -->
+    <skip />
+    <!-- no translation found for sim_card_number_title (7845379943474336488) -->
+    <skip />
+    <!-- no translation found for sim_slot_empty (8964505511911854688) -->
+    <skip />
+    <string name="sim_editor_name" msgid="1722945976676142029">"SIM ਨਾਮ"</string>
+    <!-- no translation found for sim_name_hint (7038643345238968930) -->
+    <skip />
+    <!-- no translation found for sim_editor_title (4034301817366627870) -->
+    <skip />
+    <!-- no translation found for sim_editor_carrier (5684523444677746573) -->
+    <skip />
+    <!-- no translation found for sim_editor_number (6705955651035440667) -->
+    <skip />
+    <!-- no translation found for sim_editor_color (2542605938562414355) -->
+    <skip />
+    <string name="sim_card_select_title" msgid="6668492557519243456">"SIM ਕਾਰਡ ਚੁਣੋ"</string>
+    <string name="color_orange" msgid="4417567658855022517">"ਸੰਤਰੀ"</string>
+    <!-- no translation found for color_purple (3888532466427762504) -->
+    <skip />
+    <!-- no translation found for sim_no_inserted_msg (210316755353227087) -->
+    <skip />
+    <!-- no translation found for sim_status_title (6744870675182447160) -->
+    <skip />
+    <!-- no translation found for sim_call_back_title (5181549885999280334) -->
+    <skip />
+    <!-- no translation found for sim_outgoing_call_title (1019763076116874255) -->
+    <skip />
+    <string name="sim_other_call_settings" msgid="8247802316114482477">"ਹੋਰ ਕਾਲ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="preferred_network_offload_title" msgid="1605829724169550275">"ਤਰਜੀਹੀ ਨੈਟਵਰਕ ਔਫਲੋਡ"</string>
+    <!-- no translation found for preferred_network_offload_header (2321173571529106767) -->
+    <skip />
+    <!-- no translation found for preferred_network_offload_footer (5857279426054744020) -->
+    <skip />
+    <!-- no translation found for preferred_network_offload_popup (2252915199889604600) -->
+    <skip />
+    <!-- no translation found for sim_signal_strength (9144010043784767984) -->
+    <skip />
+    <!-- no translation found for sim_notification_title (6272913297433198340) -->
+    <skip />
+    <!-- no translation found for sim_notification_summary (5024470200658902406) -->
+    <skip />
+    <!-- no translation found for sim_pref_divider (6778907671867621874) -->
+    <skip />
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
+    <!-- no translation found for sim_selection_required_pref (3446721423206414652) -->
+    <skip />
+    <!-- no translation found for dashboard_title (5453710313046681820) -->
+    <skip />
+    <string name="search_results_title" msgid="1796252422574886932">"ਸੈਟਿੰਗਾਂ"</string>
+    <string name="search_menu" msgid="7053532283559077164">"ਖੋਜੋ"</string>
+    <!-- no translation found for query_hint_text (3350700807437473939) -->
+    <skip />
+    <!-- no translation found for search_recents_queries_label (2128811638532309069) -->
+    <skip />
+    <!-- no translation found for search_results_label (4163304782363526148) -->
+    <skip />
+    <!-- no translation found for keywords_wifi (8947676711698613374) -->
+    <skip />
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ਟੈਕਸਟ ਸੁਨੇਹਾ ਟੈਕਸਿੰਗ ਸੁਨੇਹੇ ਮੈਸੇਜ਼ਿੰਗ"</string>
+    <!-- no translation found for keywords_more_mobile_networks (4939725094449606744) -->
+    <skip />
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi ਕਾਲ ਕਾਲਿੰਗ"</string>
+    <!-- no translation found for keywords_home (3626170808219458848) -->
+    <skip />
+    <!-- no translation found for keywords_display (6709007669501628320) -->
+    <skip />
+    <!-- no translation found for keywords_display_brightness_level (8923289340474728990) -->
+    <skip />
+    <!-- no translation found for keywords_display_auto_brightness (8357056338746666901) -->
+    <skip />
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ਗੂੜ੍ਹਾ ਵਿਸ਼ਾ ਰਾਤ ਮੋਡ ਮੱਧਮ ਸਕ੍ਰੀਨ ਉਲਟਾਓ ਚਮਕ"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"ਪਿਛੋਕੜ ਨਿੱਜੀ ਬਣਾਉਣਾ ਅਨੁਕੂਲ ਬਣਾਉਣਾ ਡਿਸਪਲੇ"</string>
+    <!-- no translation found for keywords_display_font_size (3404655440064726124) -->
+    <skip />
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"ਪ੍ਰੋਜੈਕਟ ਕਾਸਟ"</string>
+    <!-- no translation found for keywords_storage (6572905220031852173) -->
+    <skip />
+    <!-- no translation found for keywords_battery (2096185085932675704) -->
+    <skip />
+    <!-- no translation found for keywords_spell_checker (6106749039734174140) -->
+    <skip />
+    <!-- no translation found for keywords_voice_input (3519547605812413860) -->
+    <skip />
+    <!-- no translation found for keywords_text_to_speech_output (392447904221657930) -->
+    <skip />
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ਘੜੀ ਸੈਨਾ"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"ਹਟਾਓ ਮਿਟਾਓ ਰੀਸਟੋਰ ਕਰੋ ਹਟਾਓ ਹਟਾਓ"</string>
+    <string name="keywords_printing" msgid="1701778563617114846">"ਪ੍ਰਿੰਟਰ"</string>
+    <!-- no translation found for keywords_sounds_and_notifications (5965996187974887000) -->
+    <skip />
+    <!-- no translation found for keywords_sounds_and_notifications_interruptions (2912933812460077912) -->
+    <skip />
+    <string name="keywords_app" msgid="6334757056536837791">"ਰੈਮ"</string>
+    <string name="keywords_location" msgid="782326973714313480">"ਨੇੜਲੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਇਤਿਹਾਸ ਰਿਪੋਰਟਿੰਗ"</string>
+    <!-- no translation found for keywords_location_mode (8584992704568356084) -->
+    <skip />
+    <string name="keywords_accounts" msgid="1957925565953357627">"ਖਾਤਾ"</string>
+    <!-- no translation found for keywords_users (4673901601478559100) -->
+    <skip />
+    <!-- no translation found for keywords_keyboard_and_ime (5251531893531063855) -->
+    <skip />
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"ਡਿਫੌਲਟ ਤਰਜੀਹਾਂ ਰੀਸੈਟ ਕਰੋ"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"ਅਪਾਤਕਾਲ ਬਰਫ਼ ਐਪ ਡਿਫੌਲਟ"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"ਐਪਸ ਡਾਊਨਲੋਡ ਐਪਲੀਕੇਸ਼ਨ ਸਿਸਟਮ"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ਐਪ ਅਨੁਮਤੀਆਂ ਦੀ ਸੁਰੱਖਿਆ"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ਡਿਫੌਲਟ ਐਪਸ"</string>
+    <!-- no translation found for keywords_lockscreen (4806191868723291541) -->
+    <skip />
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
+    <string name="write_tag" msgid="8571858602896222537">"ਲਿਖੋ"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"ਲਿਖਣ ਲਈ ਇੱਕ ਟੈਗ ਟੈਪ ਕਰੋ..."</string>
+    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <skip />
+    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <skip />
+    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC ਟੈਗ ਤੇ ਡਾਟਾ ਲਿਖਣ ਵਿੱਚ ਅਸਮਰੱਥ। ਜੇਕਰ ਸਮੱਸਿਆ ਬਣੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਇੱਕ ਵੱਖਰੇ ਟੈਗ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ਟੈਗ ਲਿਖਣਯੋਗ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਵੱਖਰਾ ਟੈਗ ਵਰਤੋ।"</string>
+    <!-- no translation found for default_sound (8821684447333687810) -->
+    <skip />
+    <string name="notification_settings" msgid="8791730980212496561">"ਅਵਾਜ਼ &amp; ਸੂਚਨਾ"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"ਮੀਡੀਆ ਵੌਲਯੂਮ"</string>
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <!-- no translation found for notification_volume_option_title (6064656124416882130) -->
+    <skip />
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ਕੇਵਲ ਤਰਜੀਹੀ ਦੀ ਆਗਿਆ ਹੈ"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ਆਟੋਮੈਟਿਕ ਨਿਯਮ"</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="1168212070233080706">"ਕੋਈ ਰੁਕਾਵਟਾਂ ਨਹੀਂ"</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>
+    <!-- no translation found for ringtone_title (5379026328015343686) -->
+    <skip />
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ਕਾਲਾਂ ਲਈ ਵਾਈਬ੍ਰੇਟ ਵੀ ਕਰੋ"</string>
+    <!-- no translation found for notification_section_header (95661783916799134) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"ਪਲਸ ਸੂਚਨਾ ਲਾਈਟ"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ਸਾਰੀ ਸੂਚਨਾ ਸਮੱਗਰੀ ਦਿਖਾਓ"</string>
+    <!-- no translation found for lock_screen_notifications_summary_hide (7891552853357258782) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_interstitial_message (6164532459432182244) -->
+    <skip />
+    <!-- no translation found for app_notifications_title (5810577805218003760) -->
+    <skip />
+    <string name="other_sound_settings" msgid="3151004537006844718">"ਹੋਰ ਅਵਾਜ਼ਾਂ"</string>
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"ਸਕ੍ਰੀਨ ਲੌਕ ਕਰਨ ਦੀਆਂ ਅਵਾਜ਼ਾਂ"</string>
+    <!-- no translation found for docking_sounds_title (155236288949940607) -->
+    <skip />
+    <!-- no translation found for touch_sounds_title (5326587106892390176) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for dock_audio_media_title (1346838179626123900) -->
+    <skip />
+    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"ਸਾਰੇ ਔਡੀਓ"</string>
+    <!-- no translation found for dock_audio_media_enabled (667849382924908673) -->
+    <skip />
+    <string name="emergency_tone_silent" msgid="1067515631635824291">"ਸਾਈਲੈਂਟ"</string>
+    <!-- no translation found for emergency_tone_alert (8941852695428130667) -->
+    <skip />
+    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ਵਾਈਬ੍ਰੇਟ"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"ਸੂਚਨਾ ਪਹੁੰਚ"</string>
+    <!-- no translation found for manage_notification_access_summary_zero (2409912785614953348) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_summary_nonzero (7930130030691218387) -->
+    <!-- no translation found for no_notification_listeners (2767405417723149879) -->
+    <skip />
+    <!-- no translation found for notification_listener_security_warning_title (6494221261778885893) -->
+    <skip />
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ਸਿਸਟਮ ਜਾਂ ਕਿਸੇ ਵੀ ਇੰਸਟੌਲ ਕੀਤੇ ਐਪਸ ਵੱਲੋਂ ਪੋਸਟ ਕੀਤੀਆਂ ਸਾਰੀਆਂ ਸੂਚਨਾਵਾਂ ਪੜ੍ਹਨ ਦੇ ਯੋਗ ਹੋਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਹੋ ਸਕਦੀ ਹੈ ਜਿਵੇਂ ਸੰਪਰਕ ਨਾਮ ਅਤੇ ਤੁਹਾਨੂੰ ਭੇਜੇ ਗਏ ਸੁਨੇਹਿਆਂ ਦਾ ਟੈਕਸਟ ਸ਼ਾਮਲ ਹੋ ਸਕਦਾ ਹੈ। ਇਹ ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੱਦ ਬਰਖ਼ਾਸਤ ਕਰਨ ਜਾਂ ਉਹਨਾਂ ਵਿੱਚ ਕਿਰਿਆ ਬਟਨ ਛੋਹਣ ਦੇ ਯੋਹ ਵੀ ਹੋਵੇਗਾ।"</string>
+    <!-- no translation found for loading_notification_apps (5031818677010335895) -->
+    <skip />
+    <string name="app_notification_block_title" msgid="4069351066849087649">"ਸਾਰੇ ਬਲੌਕ ਕਰੋ"</string>
+    <!-- no translation found for app_notification_block_summary (9049487483231233726) -->
+    <skip />
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"ਤਰਜੀਹੀ ਦੇ ਤੌਰ ਤੇ ਵਿਹਾਰ ਕਰੋ"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਸੁਣਨ ਦਿਓ ਜਦੋਂ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਨੂੰ ਕੇਵਲ ਤਰਜੀਹੀ ਤੇ ਸੈਟ ਕੀਤਾ ਗਿਆ ਹੋਵੇ"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"ਪੀਕਿੰਗ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ਇਸ ਐਪ ਨੂੰ ਮੌਜੂਦਾ ਸਕ੍ਰੀਨ ਤੇ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਸੰਖੇਪ ਵਿੱਚ ਸਲਾਈਡ ਕਰਕੇ ਕੁਝ ਐਪਲੀਕੇਸ਼ਨਾਂ ਜ਼ੋਰ ਦੇਣ ਦਿਓ"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਲੁਕਾਓ"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"ਜਦੋਂ ਡਿਵਾਈਸ ਲੌਕ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਉਹ ਸਮੱਗਰੀ ਲੁਕਾਓ, ਜਿਸ ਨਾਲ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਪ੍ਰਗਟ ਹੋ ਸਕਦੀ ਹੈ"</string>
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <string name="app_notification_row_priority" msgid="7723839972982746568">"ਤਰਜੀਹ"</string>
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_done (3484067728568791014) -->
+    <skip />
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"ਨਿਯਮ ਦਾ ਨਾਮ"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"ਨਿਯਮ ਜੋੜੋ"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ਨਿਯਮ ਮਿਟਾਓ"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"ਕੀ \"<xliff:g id="RULE">%1$s</xliff:g>\" ਨਿਯਮ ਮਿਟਾਉਣਾ ਹੈ?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"ਮਿਟਾਓ"</string>
+    <!-- no translation found for zen_mode_rule_type (2289413469580142888) -->
+    <skip />
+    <!-- no translation found for zen_mode_rule_type_unknown (3049377282766700600) -->
+    <skip />
+    <!-- no translation found for zen_mode_configure_rule (8865785428056490305) -->
+    <skip />
+    <!-- no translation found for zen_schedule_rule_type_name (3201273040477861538) -->
+    <skip />
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"ਨਿਯਮ ਨਹੀਂ ਮਿਲਿਆ।"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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>
+    <!-- no translation found for summary_divider_text (7228986578690919294) -->
+    <skip />
+    <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>
+    <!-- no translation found for zen_mode_calls (7051492091133751208) -->
+    <skip />
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
+    <skip />
+    <!-- no translation found for zen_mode_from (1033337300289871697) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"ਕੇਵਲ ਸ਼ੇਅਰ ਕੀਤੇ ਸੰਪਰਕ"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"ਅਲਾਰਮ"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"ਰੀਮਾਈਂਡਰ"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ਇਵੈਂਟਸ"</string>
+    <string name="zen_mode_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>
+    <!-- no translation found for zen_mode_when (2767193283311106373) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <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_interruptions_voice_title" msgid="855256211259132964">"ਰੁਕਾਵਟਾਂ"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"ਜਦੋਂ ਕਾਲਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ ਆਉਂਦੀਆਂ ਹਨ"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_prompt (3041817362475695079) -->
+    <skip />
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ਕਿੰਨੀ ਦੇਰ ਤੱਕ?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"ਹਮੇਸ਼ਾ ਰੁਕਾਵਟ ਕਰੋ"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ਬੰਦ,ਸਭ,ਸਭ ਕੁਝ"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"ਸਿਰਫ਼ ਪ੍ਰਥਮਤਾ ਰੁਕਾਵਟਾਂ ਨੂੰ ਅਨੁਮਤੀ ਦਿਓ"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"ਸਿਰਫ ਅਲਾਰਮ ਨੂੰ ਅਨੁਮਤੀ ਦਿਓ"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"ਰੁਕਾਵਟ ਨਾ ਕਰੋ"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <!-- no translation found for zen_mode_duration_indefinte_voice_label (9026001994945950539) -->
+    <skip />
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <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>
+    <!-- no translation found for zen_mode_duration_hours_voice_label (175180249071227957) -->
+    <!-- no translation found for zen_mode_summary_priority_indefinitely (5417246022606171241) -->
+    <skip />
+    <!-- no translation found for zen_mode_summary_priority_by_minute (1938955186728929112) -->
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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>
+    </plurals>
+    <!-- no translation found for zen_mode_summary_alarams_only_indefinite (7941708969866496605) -->
+    <skip />
+    <!-- no translation found for zen_mode_summary_alarms_only_by_minute (6122003583875424601) -->
+    <!-- no translation found for zen_mode_summary_alarms_only_by_hour (2407703455581767748) -->
+    <!-- no translation found for zen_mode_summary_no_interruptions_indefinite (5705225870569410806) -->
+    <skip />
+    <!-- no translation found for zen_mode_summary_no_interruptions_by_minute (4719882120685708458) -->
+    <!-- no translation found for zen_mode_summary_no_interruptions_by_hour (1508397683895056389) -->
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ਹਮੇਸ਼ਾਂ ਵਿਘਨ ਪਾਓ ਵਿੱਚ ਬਦਲੋ"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ਹਮੇਸ਼ਾਂ"</string>
+    <!-- no translation found for notification_settings_apps_title (1125354590652967250) -->
+    <skip />
+    <!-- no translation found for notification_app_settings_button (6685640230371477485) -->
+    <skip />
+    <!-- no translation found for device_feedback (3238056036766293294) -->
+    <skip />
+    <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"ਪ੍ਰਬੰਧਕ PIN ਦਰਜ ਕਰੋ"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
+    <string name="screen_pinning_title" msgid="2292573232264116542">"ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ"</string>
+    <!-- no translation found for screen_pinning_description (1137904524037468263) -->
+    <skip />
+    <!-- no translation found for screen_pinning_unlock_pattern (8282268570060313339) -->
+    <skip />
+    <!-- no translation found for screen_pinning_unlock_pin (8757588350454795286) -->
+    <skip />
+    <!-- no translation found for screen_pinning_unlock_password (2514079566873826434) -->
+    <skip />
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ਅਨਪਿੰਨ ਕਰਨ ਵੇਲੇ ਡਿਵਾਈਸ ਲੌਕ ਕਰੋ"</string>
+    <!-- no translation found for managed_user_title (8101244883654409696) -->
+    <skip />
+    <!-- no translation found for experimental_preference (7083015446690681376) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_title (6176450657107806043) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_rotate (4544299861233497728) -->
+    <skip />
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ਪੋਰਟਰੇਟ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਰਹੋ"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ਲੈਂਡਸਕੇਪ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਰਹੋ"</string>
+    <!-- no translation found for display_auto_rotate_stay_in_current (317932372686498096) -->
+    <skip />
+    <!-- no translation found for imei_information_title (8499085421609752290) -->
+    <skip />
+    <!-- no translation found for encryption_interstitial_header (5790264941172726485) -->
+    <skip />
+    <!-- no translation found for encryption_continue_button (1121880322636992402) -->
+    <skip />
+    <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ਤੁਸੀਂ ਇਸ ਡਿਵਾਈਸ ਨੂੰ ਸਟਾਰਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣੇ PIN ਦੀ ਮੰਗ ਕਰਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੱਕ ਡਿਵਾਈਸ ਸਟਾਰਟ ਅਪ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਅਲਾਰਮਾਂ ਸਮੇਤ। \n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡਿਵਾਈਸਾਂ ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ।"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="2944051427890104942">"ਤੁਸੀਂ ਇਸ ਡਿਵਾਈਸ ਨੂੰ ਸਟਾਰਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣੇ PIN ਦੀ ਮੰਗ ਕਰਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੱਕ ਡਿਵਾਈਸ ਸਟਾਰਟ ਅਪ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਅਲਾਰਮਾਂ ਸਮੇਤ। \n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡਿਵਾਈਸਾਂ ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ।"</string>
+    <!-- no translation found for encryption_interstitial_message_password (1439296580879440802) -->
+    <skip />
+    <!-- no translation found for encrypt_require_pin (2063945047845243752) -->
+    <skip />
+    <!-- no translation found for encrypt_require_pattern (6898479411004015810) -->
+    <skip />
+    <string name="encrypt_require_password" msgid="8770628366276570518">"ਡਿਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੈ"</string>
+    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
+    <!-- no translation found for encrypt_dont_require_pattern (6668299362640433843) -->
+    <skip />
+    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
+    <!-- no translation found for encrypt_talkback_dialog_require_pin (8299960550048989807) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_require_pattern (1499790256154146639) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_require_password (8841994614218049215) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_message_pin (1890374082842868489) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_message_pattern (4474332516537386384) -->
+    <skip />
+    <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡਿਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪਾਸਵਰਡ ਦਰਜ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ  <xliff:g id="SERVICE">%1$s</xliff:g> ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।"</string>
+    <!-- no translation found for imei_information_title (8499085421609752290) -->
+    <skip />
+    <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="2184141780491382435">"ਬਾਇ ਡਿਫੌਲਟ ਲੌਂਚ ਕਰੋ"</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="app_launch_domain_links_title" msgid="458956710410857777">"ਡੋਮੇਨ ਲਿੰਕ"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"ਡੋਮੇਨ URL ਖੋਲ੍ਹੋ"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"ਐਪ ਨੂੰ ਡੋਮੇਨ URL ਸਿੱਧੇ ਖੋਲ੍ਹਣ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"ਸਮਰਥਿਤ ਡੋਮੇਨ URL"</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="410824961149037234">"ਅੰਦਰੂਨੀ ਮੈਮਰੀ"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"ਬਾਹਰੀ ਮੈਮੋਰੀ"</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="storage_used" msgid="7128074132917008743">"ਸਟੋਰੇਜ ਵਰਤੀ"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"ਚਾਲੂ"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"ਬਲੌਕ ਕਰੋ"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"ਸੰਵੇਦਨਸ਼ੀਲ"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"ਤਰਜੀਹ"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"ਤਰਜੀਹ &amp; ਸੰਵੇਦਨਸ਼ੀਲ"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <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="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_3">%d</xliff:g> ਦੀਆਂ <xliff:g id="COUNT_2">%d</xliff:g>  ਅਨੁਮਤੀਆਂ ਦਿੱਤੀਆਂ</item>
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> ਦੀਆਂ <xliff:g id="COUNT_2">%d</xliff:g> ਅਨੁਮਤੀਆਂ ਦਿੱਤੀਆਂ</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"ਕੁਝ ਡਿਫੌਲਟਸ ਸੈਟ ਕੀਤੇ"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"ਕੋਈ ਡਿਫੌਲਟਸ ਸੈਟ ਨਹੀਂ ਕੀਤੇ"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"ਸਾਰੇ ਐਪਸ"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"ਸਮਰੱਥ ਬਣਾਇਆ"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"ਨਿੱਜੀ"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"ਦਫ਼ਤਰ"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ਬਲੌਕ ਕੀਤਾ"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ਤਰਜੀਹ"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"ਸੰਵੇਦਨਸ਼ੀਲ"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ਡੋਮੇਨ URL ਨਾਲ"</string>
+    <!-- no translation found for trust_agent_disabled_device_admin (5982562414642596563) -->
+    <skip />
+    <string name="advanced_apps" msgid="4812975097124803873">"ਉੱਨਤ"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"ਅਗਿਆਤ ਐਪ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ਪ੍ਰੋਫਾਈਲ ਚੁਣੋ"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"ਐਪ ਅਨੁਮਤੀਆਂ"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> ਦੇ <xliff:g id="COUNT_0">%d</xliff:g> ਨੂੰ ਵਾਧੂ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿੱਤੀ"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> ਦੇ <xliff:g id="COUNT_0">%d</xliff:g> ਐਪਸ ਦੀ ਆਗਿਆ ਦਿੱਤੀ"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"ਡੋਮੇਨ URL"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"ਕੋਈ ਵੀ ਡੋਮੇਨ URL ਨਾ ਖੋਲ੍ਹੋ"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' ਖੋਲ੍ਹੋ"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' ਅਤੇ ਸੰਬੰਧਿਤ URL ਖੋਲ੍ਹੋ"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਐਪਸ ਆਪਣੇ ਡੋਮੇਨ URL ਖੋਲ੍ਹ ਸਕਦੇ ਹਨ</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ਐਪਸ ਆਪਣੇ ਡੋਮੇਨ URL ਖੋਲ੍ਹ ਸਕਦੇ ਹਨ</item>
+    </plurals>
+    <!-- no translation found for fingerprint_not_recognized (1739529686957438119) -->
+    <skip />
+    <string name="default_apps_title" msgid="1854974637597514435">"ਡਿਫੌਲਟ ਐਪਸ"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ਬ੍ਰਾਉਜ਼ਰ ਐਪ"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ਕੋਈ ਡਿਫੌਲਟ ਬ੍ਰਾਊਜ਼ਰ ਨਹੀਂ"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ਡਿਫ਼ੌਲਟ)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ਐਪਸ ਸਟੋਰੇਜ਼"</string>
+</resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 0e6fe8b..cbc1086 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Naciśnij przycisk"</item>
@@ -198,7 +201,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Brak"</item>
-    <item msgid="8673874894887358090">"Własne"</item>
+    <item msgid="8673874894887358090">"Własny"</item>
     <item msgid="168893341855953140">"Autokonfiguracja proxy"</item>
   </string-array>
   <string-array name="apn_auth_entries">
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"wycisz mikrofon/wyłącz wyciszenie"</item>
     <item msgid="1148142988678569310">"wyświetl multimedia"</item>
     <item msgid="9130014005474445273">"aktywuj VPN"</item>
+    <item msgid="1165192162975045562">"zapis tapety"</item>
+    <item msgid="7129487923652967258">"wsparcie struktury"</item>
+    <item msgid="1069023208100114540">"wsparcie robienia zrzutów ekranu"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokalizacja"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Wycisz mikrofon/wyłącz wyciszenie"</item>
     <item msgid="5906017727368097853">"Wyświetl multimedia"</item>
     <item msgid="2486614710846178542">"Aktywuj VPN"</item>
+    <item msgid="5586547561693629602">"Zapis tapety"</item>
+    <item msgid="32794179825485062">"Wsparcie struktury"</item>
+    <item msgid="7872852746938272552">"Wsparcie robienia zrzutów ekranu"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krótkie"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"niski poziom"</item>
     <item msgid="4212263919458209842">"poziom krytyczny"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Wył."</item>
-    <item msgid="5656544177755411222">"Nieliczne powiadomienia"</item>
-    <item msgid="8735337502532332056">"Brak powiadomień"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normalny"</item>
     <item msgid="866544120205026771">"Umiarkowany"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Różowy"</item>
     <item msgid="6131821495505931173">"Czerwony"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet przez USB)"</item>
+    <item msgid="2686051673589572111">"Źródło dźwięku"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9616c53..bf79efc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -22,10 +22,12 @@
     <string name="allow" msgid="3349662621170855910">"Zezwól"</string>
     <string name="deny" msgid="6947806159746484865">"Odmów"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nieznane"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Od zostania programistą dzieli Cię już tylko <xliff:g id="STEP_COUNT">%1$d</xliff:g> krok."</item>
-    <item quantity="other" msgid="6722953419953594148">"Od zostania programistą dzieli Cię już tylko tyle kroków: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="few">Od zostania programistą dzielą Cię już tylko <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroki.</item>
+      <item quantity="many">Od zostania programistą dzieli Cię już tylko <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroków.</item>
+      <item quantity="other">Od zostania programistą dzieli Cię już tylko <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroku.</item>
+      <item quantity="one">Od zostania programistą dzieli Cię już tylko <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> krok.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Jesteś teraz programistą!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"W porządku, już jesteś programistą."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Sieci zwykłe i bezprzewodowe"</string>
@@ -40,6 +42,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Wyłącz SMS przez IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Włącz wymóg rejestracji IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Wyłącz wymóg rejestracji IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Włącz flagę obsługi głosu przez LTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Wyłącz flagę obsługi głosu przez LTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Włącz zrzut pamięci RAM LTE"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Wyłącz zrzut pamięci RAM LTE"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Wyświetl książkę adresową na karcie SIM"</string>
@@ -130,21 +134,12 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Rozłączyć?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Spowoduje to zakończenie połączenia z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nie masz uprawnień, by zmienić ustawienia Bluetootha."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> jest widoczne dla urządzeń w pobliżu, gdy są otwarte ustawienia Bluetooth."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> jest widoczne dla urządzeń w pobliżu, gdy ustawienia Bluetooth są otwarte."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odłączyć urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisja"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wyłączyć profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Spowoduje to wyłączenie profilu:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Urządzenie:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Połączony"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Połączono (bez telefonu)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Połączono (bez multimediów)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Połączono (brak dostępu do wiadomości)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Połączono (bez telefonu ani multimediów)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Rozłączona"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Rozłączanie..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Łączenie..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Parowanie..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Urządzenie Bluetooth bez nazwy"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Wyszukiwanie"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Brak urządzeń Bluetooth w pobliżu"</string>
@@ -154,7 +149,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaż odebrane pliki"</string>
     <string name="device_picker" msgid="4978696506172252813">"Wybierz urządzenie Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Prośba o pozwolenie na włączenie modułu Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacja chce włączyć Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Aplikacja chce na tym urządzeniu włączyć Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacja chce ustawić Twój tablet jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacja chce ustawić Twój telefon jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacja chce ustawić Twój tablet jako wykrywalny dla innych urządzeń Bluetooth. Później możesz to zmienić w ustawieniach Bluetooth."</string>
@@ -275,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Karta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ustawienia proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Anuluj"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANULUJ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"DALEJ"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"TAK"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NIE"</string>
-    <string name="forget" msgid="7267115980248732932">"ZAPOMNIJ"</string>
+    <string name="forget" msgid="1400428660472591263">"Zapomnij"</string>
+    <string name="save" msgid="879993180139353333">"Zapisz"</string>
+    <string name="done" msgid="6942539184162713160">"Gotowe"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ustawienia"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ustawienia"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Skrót do ustawień"</string>
@@ -310,7 +303,7 @@
     <string name="date_time_auto" msgid="7076906458515908345">"Automatyczna data i czas"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Użyj czasu podanego przez sieć"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Użyj czasu podanego przez sieć"</string>
-    <string name="zone_auto" msgid="334783869352026648">"Auto strefa czasowa"</string>
+    <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_title" msgid="3203537578602803850">"Format 24-godzinny"</string>
@@ -325,9 +318,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortuj według strefy czasowej"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Godzina"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Popraw rozpoznawanie twarzy"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Sprawdzanie, czy użytkownik jest żywym człowiekiem"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Wymagaj mrugnięcia podczas odblokowywania"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Blokuj automatycznie"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Po <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> uśpienia"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po uśpieniu (z wyjątkiem sytuacji, gdy blokadę anuluje <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>)"</string>
@@ -348,19 +338,44 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych logowania"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hasła"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Odcisk palca"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Zarządzaj odciskami"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Używaj odcisku palca do"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Dodaj"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"blokada ekranu"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> zarejestrowane odciski palca</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> zarejestrowanych odcisków palca</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> zarejestrowanego odcisku palca</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> zarejestrowany odcisk palca</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Konf. odcisku palca"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Aby odblokowywać ekran lub potwierdzać zakupy odciskiem palca, musisz: \n\n✓ Skonfigurować zapasową metodę blokowania ekranu \n\n✓ Dodać swój odcisk palca"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Znajdź czytnik"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Znajdź czytnik linii papilarnych z tyłu telefonu."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nazwa"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Usuń"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Rozpocznij"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Przyłóż palec do czytnika linii papilarnych. Unieś go, gdy poczujesz wibracje."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Świetnie. Teraz powtórz czynność."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Przyłóż ten sam palec do czytnika linii papilarnych i unieś go, gdy poczujesz wibracje."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Dodano odcisk palca."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Gdy wyświetla się ta ikona, możesz użyć odcisku palca na potrzeby identyfikacji lub autoryzacji zakupu."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Dodaj"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Dalej"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Szyfrowanie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Zaszyfruj tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Zaszyfruj telefon"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Zaszyfrowane"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Jeśli korzystasz z szyfrowania tabletu i masz na nim ustawione blokowanie ekranu (wykorzystujesz do tego wzór, kod PIN lub hasło), po każdym uruchomieniu urządzenia konieczne będzie odblokowanie ekranu, by odszyfrować dane. Jedynym innym sposobem odszyfrowania tabletu jest przywrócenie danych fabrycznych, co powoduje usunięcie wszystkich danych.\n\nSzyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj tabletu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Jeśli korzystasz z szyfrowania telefonu i masz na nim ustawione blokowanie ekranu (wykorzystujesz do tego wzór, kod PIN lub hasło), po każdym uruchomieniu urządzenia konieczne będzie odblokowanie ekranu, by odszyfrować dane. Jedynym innym sposobem odszyfrowania telefonu jest przywrócenie danych fabrycznych, co powoduje wymazanie wszystkich danych.\n\nSzyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj telefonu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Jeśli korzystasz z szyfrowania tabletu i masz na nim ustawione blokowanie ekranu (wykorzystujesz do tego wzór, kod PIN lub hasło), po każdym uruchomieniu urządzenia konieczne będzie odblokowanie ekranu, by odszyfrować dane. Jedynym innym sposobem odszyfrowania tabletu jest przywrócenie danych fabrycznych, co powoduje usunięcie wszystkich danych.\n\nSzyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj tabletu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Jeśli korzystasz z szyfrowania telefonu i masz na nim ustawione blokowanie ekranu (wykorzystujesz do tego wzór, kod PIN lub hasło), po każdym uruchomieniu urządzenia konieczne będzie odblokowanie ekranu, by odszyfrować dane. Jedynym innym sposobem odszyfrowania telefonu jest przywrócenie danych fabrycznych, co powoduje wymazanie wszystkich danych.\n\nSzyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj telefonu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Zaszyfruj tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Zaszyfruj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Naładuj baterię i spróbuj ponownie."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Podłącz ładowarkę i spróbuj ponownie."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Brak kodu PIN lub hasła blokowania ekranu"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Przed rozpoczęciem szyfrowania musisz ustawić kod PIN lub hasło blokady ekranu."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Aby potwierdzić zaszyfrowanie urządzenia, musisz narysować wzór odblokowania."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Zaszyfrować?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operacja szyfrowania jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie trwa co najmniej godzinę, a tablet zostanie w tym czasie kilkakrotnie uruchomiony ponownie."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operacja szyfrowania jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie trwa co najmniej godzinę, a telefon zostanie w tym czasie kilkakrotnie uruchomiony ponownie."</string>
@@ -391,22 +406,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Przesuń palcem"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Bez zabezpieczeń"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Rozpoznanie twarzy"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Niski poziom zabezpieczeń, eksperymentalny"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Wzór"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Średni poziom zabezpieczeń"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Kod PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Średni i wysoki poziom zabezpieczeń"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Hasło"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Wysoki poziom zabezpieczeń"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Aktualna blokada ekranu"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funkcje chroniące urządzenie przestaną działać."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Wyłączone przez administratora lub ze względu na zasady szyfrowania albo magazyn danych logowania"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Brak"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Przesuń palcem"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Rozpoznanie twarzy"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Wzór"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Kod PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Hasło"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Po ustawieniu blokady ekranu możesz też skonfigurować rozpoznawanie odcisku palca. Kliknij Ustawienia &gt; Zabezpieczenia."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Wyłącz blokadę ekranu"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Usuń wzór odblokowania"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Usuń kod PIN odblokowania"</string>
@@ -427,30 +441,42 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Hasło musi zawierać co najmniej jedną literę."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Hasło musi zawierać co najmniej jedną cyfrę."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Hasło musi zawierać co najmniej jeden symbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Hasło musi zawierać co najmniej jedną literę."</item>
-    <item quantity="other" msgid="8186027808415585970">"Hasło musi zawierać litery (co najmniej %d)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Hasło musi zawierać co najmniej jedną małą literę."</item>
-    <item quantity="other" msgid="2693910942679679225">"Hasło musi zawierać małe litery (co najmniej %d)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Hasło musi zawierać co najmniej jedną wielką literę."</item>
-    <item quantity="other" msgid="3030801209112209245">"Hasło musi zawierać wielkie litery (co najmniej %d)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Hasło musi zawierać co najmniej jedną cyfrę."</item>
-    <item quantity="other" msgid="4703982391407595924">"Hasło musi zawierać cyfry (co najmniej %d)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Hasło musi zawierać co najmniej jeden symbol specjalny."</item>
-    <item quantity="other" msgid="1221290525051187757">"Hasło musi zawierać symbole specjalne (co najmniej %d)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Hasło musi zawierać co najmniej jeden znak niebędący literą."</item>
-    <item quantity="other" msgid="3952508584649046404">"Hasło musi zawierać znaki inne niż litery (co najmniej %d)."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="few">Hasło musi zawierać co najmniej %d litery.</item>
+      <item quantity="many">Hasło musi zawierać co najmniej %d liter.</item>
+      <item quantity="other">Hasło musi zawierać co najmniej %d litery.</item>
+      <item quantity="one">Hasło musi zawierać co najmniej jedną literę.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="few">Hasło musi zawierać co najmniej %d małe litery.</item>
+      <item quantity="many">Hasło musi zawierać co najmniej %d małych liter.</item>
+      <item quantity="other">Hasło musi zawierać co najmniej %d małej litery.</item>
+      <item quantity="one">Hasło musi zawierać co najmniej jedną małą literę.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="few">Hasło musi zawierać co najmniej %d wielkie litery.</item>
+      <item quantity="many">Hasło musi zawierać co najmniej %d wielkich liter.</item>
+      <item quantity="other">Hasło musi zawierać co najmniej %d wielkiej litery.</item>
+      <item quantity="one">Hasło musi zawierać co najmniej jedną wielką literę.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="few">Hasło musi zawierać co najmniej %d cyfry.</item>
+      <item quantity="many">Hasło musi zawierać co najmniej %d cyfr.</item>
+      <item quantity="other">Hasło musi zawierać co najmniej %d cyfry.</item>
+      <item quantity="one">Hasło musi zawierać co najmniej jedną cyfrę.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="few">Hasło musi zawierać co najmniej %d symbole specjalne.</item>
+      <item quantity="many">Hasło musi zawierać co najmniej %d symboli specjalnych.</item>
+      <item quantity="other">Hasło musi zawierać co najmniej %d symbolu specjalnego.</item>
+      <item quantity="one">Hasło musi zawierać co najmniej jeden symbol specjalny.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="few">Hasło musi zawierać co najmniej %d znaki niebędące literą.</item>
+      <item quantity="many">Hasło musi zawierać co najmniej %d znaków niebędących literą.</item>
+      <item quantity="other">Hasło musi zawierać co najmniej %d znaku niebędącego literą.</item>
+      <item quantity="one">Hasło musi zawierać co najmniej jeden znak niebędący literą.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Administrator urządzenia nie zezwala na ustawianie niedawno używanego hasła."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Ciąg cyfr rosnących, malejących lub powtarzających się jest niedozwolony"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +506,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Aby sparować z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Upewnij się, że jest na nim wyświetlony następujący klucz:&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">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sparować z tym urządzeniem?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Aby sparować z urządzeniem <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>, wpisz na nim klucz <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>, a następnie naciśnij klawisz zatwierdzania."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Powiąż"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SPARUJ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Anuluj"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Parowanie spowoduje przyznanie dostępu do historii połączeń i Twoich kontaktów w trakcie połączenia."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nie można sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nie można sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ze względu na błędny kod PIN lub klucz."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nie można skomunikować się z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Powiązanie odrzucone przez urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Nie udało się nawiązać połączenia z <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Wyszukaj urządzenia"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Odśwież"</string>
@@ -503,7 +522,7 @@
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Udostępnić książkę telefoniczną?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> chce uzyskać dostęp do Twoich kontaktów i historii połączeń."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> chce się sparować z Bluetoothem. Po połączeniu uzyska dostęp do Twoich kontaktów i historii połączeń."</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Powiązane urządzenia"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Sparowane urządzenia"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Dostępne urządzenia"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Brak dostępnych urządzeń"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Połącz"</string>
@@ -514,17 +533,9 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcje…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Zaawansowane"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth – zaawansowane"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Po włączeniu Bluetootha urządzenie może komunikować się z urządzeniami Bluetooth w pobliżu."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Po włączeniu Bluetootha urządzenie może komunikować się z innymi urządzeniami Bluetooth w pobliżu."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Aby poprawić dokładność lokalizacji, aplikacje i usługi będą szukać urządzeń Bluetooth, nawet gdy Bluetooth jest wyłączony. Możesz to zmienić w <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ustawieniach skanowania<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Połącz z siecią…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Dźwięk multimediów"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Dźwięk telefonu"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Przesyłanie pliku"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Urządzenie wejściowe"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Dostęp do internetu"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Udostępnianie kontaktów"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Używaj do udostępniania kontaktów"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Udostępnianie połączenia internetowego"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Dostęp do wiadomości"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od funkcji audio multimediów."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od zestawu głośnomówiącego."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączony od urządzenia wejściowego."</string>
@@ -534,31 +545,18 @@
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Sparowane urządzenie Bluetooth"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Połącz"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Połącz z urządzeniem Bluetooth"</string>
-    <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Używaj do"</string>
+    <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Używaj do:"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Zmień nazwę"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Zezwalaj na odbieranie plików"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Połączono z funkcją audio multimediów"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Połączono z funkcją audio telefonu"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Połączono z serwerem transferu plików"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Połączono z mapą"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Brak połączenia z serwerem transferu plików"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Podłączono do urządzenia wejściowego"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Połączone w celu dostępu do internetu"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Udostępnianie połączenia internetowego"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Użyj dla funkcji audio multimediów"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Użyj dla funkcji audio telefonu"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Użyj do transferu plików"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Użyj do wprowadzania"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Użyj na potrzeby dostępu do internetu"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Używaj dla mapy"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Ustawienia podstawki"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Używaj podstawki na potrzeby dźwięku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon w trybie głośnika"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Dla muzyki i multimediów"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamiętaj ustawienia"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asystent Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Połączono przez Asystenta Wi‑Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Ekran Cast"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Przesyłanie"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Wyświetlacz bezprzewodowy"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Brak urządzeń w pobliżu."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Łączenie"</string>
@@ -570,15 +568,17 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Zapomnij"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Gotowe"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nazwa"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"Komunikacja NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Zezwalaj na wymianę danych, gdy tablet dotyka innego urządzenia"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Zezwalaj na wymianę danych, gdy telefon dotyka innego urządzenia."</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Zezwalaj na wymianę danych, gdy telefon dotyka innego urządzenia"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Gotowy do przesyłania danych między aplikacjami przez NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Wyłączona"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Niedostępne przy wyłączonym NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Po włączeniu tej funkcji możesz przesyłać dane między urządzeniami z funkcją NFC, zbliżając oba aparaty do siebie. Możliwe jest na przykład przesłanie stron z przeglądarki, filmów z YouTube, kontaktów z telefonu itp.\n\nWystarczy zetknąć urządzenia ze sobą i dotknąć ekranu. Aplikacja automatycznie określi, jakie dane chcesz przesłać."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Po włączeniu tej funkcji możesz przesyłać dane między urządzeniami z funkcją NFC, zbliżając oba aparaty do siebie. Możliwe jest na przykład przesłanie stron z przeglądarki, filmów z YouTube, kontaktów z telefonu itp.\n\nWystarczy zetknąć urządzenia ze sobą (najlepiej tyłem) i dotknąć ekranu. Aplikacja automatycznie określi, jakie dane chcesz przesłać."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Wykrywanie usług sieciowych"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Zezwól aplikacjom z innych urządzeń wykrywać aplikacje na tym urządzeniu"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -593,21 +593,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wyłączam Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Błąd"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"W trybie samolotowym"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nie można wyszukać sieci."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Powiadomienie o sieci"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Powiadamiaj o dostępnej sieci publicznej"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Unikaj słabych połączeń"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Nie używaj sieci Wi-Fi, jeśli połączenie jest słabe"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Używaj tylko sieci z dobrym połączeniem internetowym"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skanowanie zawsze dostępne"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Zawsze zezwalaj na skanowanie"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Zezwalaj usłudze lokalizacyjnej Google i innym aplikacjom na skanowanie w poszukiwaniu sieci, nawet przy wyłączonej sieci Wi‑Fi"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Używaj otwartych sieci Wi‑Fi automatycznie"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Pozwól asystentowi Wi‑Fi automatycznie łączyć się z otwartymi sieciami wysokiej jakości"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Wybierz asystenta"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaluj certyfikaty"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Aby poprawić dokładność lokalizacji (i w innych celach), aplikacje Google i inne mogą skanować sieci w pobliżu, nawet gdy Wi-Fi jest wyłączone. Jeśli nie chcesz, aby tak się działo, wybierz Zaawansowane &gt; Skanowanie zawsze dostępne."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacje mogą wyszukiwać sieci w pobliżu, nawet gdy Wi-Fi jest wyłączone. Jeśli nie chcesz, aby tak się działo, wybierz Zaawansowane &gt; Skanowanie zawsze dostępne."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Aby zwiększyć dokładność lokalizacji, aplikacje i usługi będą skanować sieci Wi-Fi, nawet gdy Wi-Fi jest wyłączone. Możesz to zmienić w <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ustawieniach skanowania<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nie pokazuj ponownie"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi włączone w trybie uśpienia"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi działa po uśpieniu"</string>
@@ -635,11 +630,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Dodaj inną sieć"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Więcej"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autokonfiguracja (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Aby zakończyć konfigurację, tablet potrzebuje dostępu do Wi‑Fi. Później będzie można przełączać się między transmisją danych przez sieć komórkową i Wi‑Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Opcje zaawansowane"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Uruchamianie WPS..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Naciśnij przycisk WPS (Wi‑Fi Protected Setup) na routerze. Może on mieć nazwę „WPS” lub ten symbol:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Naciśnij przycisk WPS (Wi‑Fi Protected Setup) na routerze. Może on mieć nazwę „WPS” lub ten symbol:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Wpisz PIN <xliff:g id="NUMBER">%1$s</xliff:g> na routerze Wi-Fi. Konfiguracja może potrwać do dwóch minut."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"Konfiguracja WPS powiodła się. Łączenie z siecią..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Połączono z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +659,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Tożsamość anonimowa"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Hasło"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Pokaż hasło"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Skonfiguruj pasmo punktu dostępu"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Pasmo 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Pasmo 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Ustawienia IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nie zmieniono)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nie określono)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Zapisana"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Wyłączona"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Błąd konfiguracji IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Błąd połączenia Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem z uwierzytelnianiem"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Poza zasięgiem"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Nie wykryto dostępu do internetu. Nie można automatycznie przywrócić połączenia."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Protokół WPS jest dostępny"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (protokół WPS dostępny)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Podaj hasło do sieci"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Brak"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aby poprawić 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>
@@ -686,6 +675,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Zalogować się, by połączyć?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> przed połączeniem z siecią wymaga zalogowania się online."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"POŁĄCZ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Ta sieć nie ma dostępu do internetu. Użyć jej mimo to?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Nie pytaj ponownie o tę sieć"</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>
@@ -700,12 +691,12 @@
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"OSTRZEŻENIE: jeśli nie dodasz sieci Wi‑Fi, telefon będzie pobierać oprogramowanie i aktualizację tylko przez sieć komórkową. Aby uniknąć opłat za przesył danych, połącz się z Wi-Fi."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Jeśli pominiesz Wi‑Fi:\n\nTablet nie będzie mieć połączenia z internetem.\n\nNie będzie można pobrać aktualizacji oprogramowania, dopóki nie połączysz się z internetem.\n\nNie możesz obecnie włączyć funkcji ochrony urządzenia."</string>
     <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Jeśli pominiesz Wi‑Fi:\n\nUrządzenie nie będzie mieć połączenia z internetem.\n\nNie będzie można pobrać aktualizacji oprogramowania, dopóki nie połączysz się z internetem.\n\nNie możesz obecnie włączyć funkcji ochrony urządzenia."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jeśli pominiesz Wi‑Fi:\n\nTelefon nie będzie mieć połączenia z internetem.\n\nNie będzie można pobrać aktualizacji oprogramowania, dopóki nie połączysz się z internetem.\n\nNie możesz obecnie włączyć funkcji ochrony urządzenia."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jeśli nie wybierzesz sieci Wi‑Fi:\n\nTelefon nie będzie mieć połączenia z internetem.\n\nNie będzie można pobrać aktualizacji oprogramowania, dopóki nie połączysz się z internetem.\n\nNie będzie można włączyć funkcji ochrony urządzenia."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Urządzenie nie może połączyć się z tą siecią Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Zapisane sieci"</string>
-    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Zaawansowane ustawienia Wi-Fi"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Zaawansowane"</string>
     <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Pasmo częstotliwości Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Określ używany zakres częstotliwości"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Wystąpił problem podczas ustawiania częstotliwości."</string>
@@ -751,7 +742,19 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Przenośny hotspot Wi‑Fi AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Przenośny hotspot 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">"Punkt dostępu Android"</string>
-    <string name="home_settings" msgid="212375129455718176">"Strona główna"</string>
+    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Połączenia przez Wi-Fi"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Ustawienia połączeń"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Tryb połączeń przez Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Preferuj sieć Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Preferuj sieć komórkową"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Ekran główny"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
@@ -814,6 +817,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Dostosuj jasność ekranu"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Automatyczna jasność"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Dostosuj poziom jasności do oświetlenia"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Motyw"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Jasny"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Ciemny"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatycznie"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uśpienie"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Wyłączenie ekranu"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
@@ -865,10 +873,12 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Zmienić preferowaną kartę SIM?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> to jedyna karta SIM w urządzeniu. Czy chcesz ją wykorzystywać do transmisji danych komórkowych, połączeń i SMS-ów?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Nieprawidłowy kod PIN karty SIM. Musisz teraz skontaktować się z operatorem, by odblokował Twoje urządzenie."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Nieprawidłowy kod PIN karty SIM. Masz jeszcze <xliff:g id="NUMBER">%d</xliff:g> próbę, zanim będziesz musiał skontaktować się z operatorem, by odblokował Twoje urządzenie."</item>
-    <item quantity="other" msgid="77103619544346451">"Nieprawidłowy kod PIN karty SIM. Masz jeszcze <xliff:g id="NUMBER">%d</xliff:g> prób(y)."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="few">Nieprawidłowy kod PIN karty SIM. Masz jeszcze <xliff:g id="NUMBER_1">%d</xliff:g> próby.</item>
+      <item quantity="many">Nieprawidłowy kod PIN karty SIM. Masz jeszcze <xliff:g id="NUMBER_1">%d</xliff:g> prób.</item>
+      <item quantity="other">Nieprawidłowy kod PIN karty SIM. Masz jeszcze <xliff:g id="NUMBER_1">%d</xliff:g> próby.</item>
+      <item quantity="one">Nieprawidłowy kod PIN karty SIM. Masz jeszcze <xliff:g id="NUMBER_0">%d</xliff:g> próbę, zanim będziesz musiał skontaktować się z operatorem, by odblokować swoje urządzenie.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operacja z kodem PIN karty SIM nie udała się."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stan tabletu"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Stan telefonu"</string>
@@ -917,12 +927,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Dostępne (tylko do odczytu)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Całkowita pojemność"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Obliczanie..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikacje (dane aplikacji i multimedia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikacje i ich dane"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Pobrane"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Zdjęcia, filmy"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Dźwięk (muzyka, dzwonki, podcasty itp.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Różne"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Inne pliki"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dane w pamięci podręcznej"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odłącz pamięć współdzieloną"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odłącz kartę SD"</string>
@@ -955,19 +965,64 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Odinstalowywanie w toku"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Kończy się miejsce"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Niektóre funkcje systemu (np. synchronizacja) mogą nie działać poprawnie. Zwolnij miejsce, usuwając lub odpinając takie elementy jak aplikacje i multimedia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Zmień nazwę"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Podłącz"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Odłącz"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Wykasuj i sformatuj"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Wykasuj i sformatuj jako pamięć wew."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Połączenie USB z komputerem"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Połączenie USB z komputerem"</string>
-    <string name="usb_connection_category" msgid="7805945595165422882">"Połącz jako"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Połącz jako:"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Urządzenie multimedialne (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"Umożliwia przesyłanie plików multimedialnych w Windows lub przy użyciu aplikacji Android File Transfer (dostępny na www.android.com/filetransfer) dla Mac OS X."</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Umożliwia przesyłanie plików multimedialnych w Windows lub przy użyciu aplikacji Android File Transfer (dostępna na www.android.com/filetransfer) w Mac OS."</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Aparat (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Umożliwia przesyłanie zdjęć za pomocą oprogramowania aparatu, a także przesyłanie dowolnych plików na komputerach, które nie obsługują urządzeń MTP."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instaluj narzędzia do transferu plików"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Pozwala aplikacjom obsługującym MIDI na współpracę przez USB z oprogramowaniem MIDI na komputerze."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Inni użytkownicy"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Pamięć urządzenia"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Pamięć wymienna"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> wolne (łącznie <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Podłączono: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Nie udało się podłączyć: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Bezpiecznie odłączono: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Nie udało się bezpiecznie odłączyć: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Sformatowano: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Nie udało się sformatować: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Zmień nazwę pamięci"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Po sformatowaniu możesz używać tego nośnika (<xliff:g id="NAME_0">^1</xliff:g>) na innych urządzeniach. \n\nWszystkie dane, które zawiera <xliff:g id="NAME_1">^1</xliff:g>, zostaną wykasowane. Pamiętaj o wykonaniu kopii zapasowej. \n\n"<b>"Zrób kopię zapasową zdjęć i innych multimediów"</b>" \nPrzenieś pliki multimedialne w inne miejsce na tym urządzeniu lub prześlij je na komputer, używając kabla USB. \n\n"<b>"Zrób kopię zapasową aplikacji"</b>" \nWszystkie aplikacje, które zawiera <xliff:g id="NAME_6">^1</xliff:g>, zostaną odinstalowane, a ich dane zostaną wykasowane. Aby zachować te aplikacje, przenieś je w inne miejsce na urządzeniu."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Jeśli odłączysz ten nośnik (<xliff:g id="NAME_0">^1</xliff:g>), zapisane na nim aplikacje przestaną działać, a przechowywane pliki multimedialne będą niedostępne do momentu ponownego włożenia tego nośnika."</b>" \n\nTen nośnik (<xliff:g id="NAME_1">^1</xliff:g>) został sformatowany w taki sposób, że będzie działać tylko na tym urządzeniu. Nie będzie można z niego korzystać na żadnych innych urządzeniach."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Skonfiguruj: <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Użyj jako pamięci przenośnej"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Do przenoszenia zdjęć i innych multimediów z jednego urządzenia na drugie."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Użyj jako pamięci wewnętrznej"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Do zapisywania dowolnych danych (w tym aplikacji i zdjęć) tylko na tym urządzeniu. Wymaga sformatowania, które uniemożliwi korzystanie z tego nośnika na innych urządzeniach."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Sformatuj jako pamięć wewnętrzną"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Aby ten nośnik (<xliff:g id="NAME_0">^1</xliff:g>) był bezpieczny, musi zostać sformatowany. \n\nPo sformatowaniu <xliff:g id="NAME_1">^1</xliff:g> będzie działać tylko na tym urządzeniu. \n\n"<b>"Sformatowanie spowoduje wykasowanie wszystkich danych, które zawiera <xliff:g id="NAME_2">^1</xliff:g>."</b>" Aby uniknąć utraty danych, wykonaj ich kopię zapasową."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Wykasuj i sformatuj"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatuję: <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Nie wyjmuj tego nośnika (<xliff:g id="NAME">^1</xliff:g>) w trakcie formatowania."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Przenieś dane w nowe miejsce"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Na ten nowy nośnik (<xliff:g id="NAME">^1</xliff:g>) możesz przenieść swoje zdjęcia, pliki i dane aplikacji. \n\nPotrwa to około <xliff:g id="TIME">^2</xliff:g> i zwolni <xliff:g id="SIZE">^3</xliff:g> w pamięci wewnętrznej. W trakcie przenoszenia niektóre aplikacje nie będą działać."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Przenieś teraz"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Przenieś później"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Przenieś dane teraz"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Przenoszenie potrwa około <xliff:g id="TIME">^1</xliff:g> i zwolni <xliff:g id="SIZE">^2</xliff:g> w pamięci wewnętrznej."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Przenieś"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Przenoszę dane…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"W trakcie przenoszenia: \n• Nie wyjmuj nośnika (<xliff:g id="NAME">^1</xliff:g>). \n• Niektóre aplikacje nie będą działać prawidłowo. \n• Urządzenie musi być naładowane."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> już działa"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Nośnik <xliff:g id="NAME">^1</xliff:g> jest gotowy do przechowywania zdjęć i innych multimediów."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Twój nowy nośnik (<xliff:g id="NAME">^1</xliff:g>) już działa. \n\nAby przenieść zdjęcia, pliki i dane aplikacji na to urządzenie, kliknij Ustawienia &gt; Pamięć."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Przenieś aplikację <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Przeniesienie aplikacji <xliff:g id="APP">^1</xliff:g> i jej danych na ten nośnik (<xliff:g id="NAME_0">^2</xliff:g>) potrwa tylko chwilę. Do jego zakończenia nie będzie można korzystać z aplikacji. \n\nNie wyjmuj nośnika (<xliff:g id="NAME_1">^2</xliff:g>) w trakcie przenoszenia danych."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Przenoszę aplikację <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Nie wyjmuj nośnika (<xliff:g id="NAME">^1</xliff:g>) w trakcie przenoszenia danych. \n\nAplikacja <xliff:g id="APP">^2</xliff:g> na tym urządzeniu będzie niedostępna, dopóki przenoszenie się nie zakończy."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Anuluj przenoszenie"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stan baterii"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Poziom naładowania baterii"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Nazwy APN"</string>
-    <string name="apn_edit" msgid="1354715499708424718">"Edytuj punkt dostępowy"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"Edytuj punkt dostępu"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Nie ustawiono"</string>
     <string name="apn_name" msgid="4115580098369824123">"Nazwa"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
@@ -990,7 +1045,7 @@
     <string name="apn_protocol" msgid="3272222921649348640">"Protokół APN"</string>
     <string name="apn_roaming_protocol" msgid="3386954381510788422">"Protokół APN podczas roamingu"</string>
     <string name="carrier_enabled" msgid="407655861175280806">"Włącz/wyłącz APN"</string>
-    <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN włączona"</string>
+    <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN włączono"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN wyłączona"</string>
     <string name="bearer" msgid="594270280031923558">"Nośnik"</string>
     <string name="mvno_type" msgid="2543253857818336421">"Typ MVNO"</string>
@@ -1007,12 +1062,17 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Przywracanie domyślnych ustawień APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Resetuj ustawienia"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Przywracanie domyślnych ustawień APN zostało ukończone."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Ustawienia sieciowe zostały zresetowane"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"To spowoduje zresetowanie wszystkich ustawień sieciowych, takich jak:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dane komórkowe"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Zresetuj ustawienia"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Zresetować wszystkie ustawienia sieciowe? Nie można tego cofnąć."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Zresetuj ustawienia"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Zresetować?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Ustawienia sieciowe zostały zresetowane"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Resetuj urządzenie"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ustawienia fabryczne"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Wymazuje wszystkie dane z tabletu"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Wymazuje wszystkie dane w telefonie"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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_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>
@@ -1024,9 +1084,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Wymaż wszystkie dane z karty SD, np. pliki muzyczne i zdjęcia."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetuj tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetuj telefon"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Wymazać wszystkie Twoje informacje osobiste i pobrane aplikacje? Tej czynności nie można cofnąć."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Wymazać wszystkie Twoje informacje osobiste i pobrane aplikacje? Nie można tego cofnąć."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Wymaż wszystko"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Aby potwierdzić przywrócenie danych fabrycznych, musisz narysować wzór odblokowania."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nie wykonano resetowania, ponieważ usługa czyszczenia systemu jest niedostępna."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Zresetować?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Przywracanie ustawień fabrycznych nie jest dostępne dla tego użytkownika"</string>
@@ -1043,8 +1102,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Wymazać nośnik USB, usuwając wszystkie zapisane na nim pliki? Tej czynności nie można cofnąć."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Wymazać kartę SD, usuwając wszystkie zapisane na niej pliki? Tej czynności nie można cofnąć."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Wymaż wszystko"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Aby potwierdzić zamiar wyczyszczenia nośnika USB, musisz narysować wzór odblokowania."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Aby potwierdzić zamiar wyczyszczenia karty SD, musisz narysować wzór odblokowania."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ustawienia połączeń"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Poczta głosowa, przekierowanie połączeń, poł. oczekujące, ID rozmówcy"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering przez USB"</string>
@@ -1076,7 +1133,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Sieci komórkowe"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Taryfa komórkowa"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Domyślna aplikacja do SMS-ów"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikacja do SMS-ów"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Zmienić aplikację do SMS-ów?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Chcesz używać aplikacji <xliff:g id="NEW_APP">%1$s</xliff:g> zamiast <xliff:g id="CURRENT_APP">%2$s</xliff:g> do wysłania i otrzymywania SMS-ów?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Użyć <xliff:g id="NEW_APP">%s</xliff:g> jako aplikacji do SMS-ów?"</string>
@@ -1102,9 +1159,15 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Wysokie użycie baterii"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Niskie użycie baterii"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Tryb lokalizacji"</string>
-    <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Określaj lokalizację według GPS-u, sieci komórkowej i Wi‑Fi"</string>
-    <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Określaj lokalizację według sieci komórkowej i Wi‑Fi"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Określaj lokalizację przez GPS"</string>
+    <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Określaj lokalizację przez GPS, Wi-Fi i sieci komórkowe"</string>
+    <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Określaj lokalizację przez Wi-Fi i sieci komórkowe"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Określaj lokalizację przez GPS"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skanowanie"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skanowanie"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Skanowanie Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Popraw lokalizację, zezwalając aplikacjom i usługom na szukanie sieci Wi-Fi, nawet gdy Wi-Fi jest wyłączone"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Skanowanie Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Popraw lokalizację, zezwalając usługom systemowym na szukanie urządzeń Bluetooth, nawet gdy Bluetooth jest wyłączony"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Sieć komórkowa i Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Zezwalaj aplikacjom na używanie usługi lokalizacji Google do szybszego określania Twojego położenia. Anonimowe dane o lokalizacji będą zbierane i przesyłane do Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokalizacja określona na podstawie Wi-Fi"</string>
@@ -1150,11 +1213,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Hasło zostało ustawione"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Kod PIN został ustawiony"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Wzór został ustawiony"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Zabezpieczenie ekranu"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Podaj wzór używany na urządzeniu, by kontynuować."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Podaj kod PIN używany na urządzeniu, by kontynuować."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Podaj hasło używane na urządzeniu, by kontynuować."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Zabezpieczenia urządzenia"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Zmień wzór odblokowania"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Zmień kod PIN odblokowania"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potwierdź zapisany wzór"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Spróbuj ponownie:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Narysuj wzór odblokowania"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Naciśnij Menu, aby uzyskać pomoc."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Odsuń palec, gdy skończysz"</string>
@@ -1176,8 +1243,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ustaw wzór odblokowania"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Zmień wzór odblokowania"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Jak narysować wzór odblokowania"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Zbyt wiele nieudanych prób!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Spróbuj ponownie za <xliff:g id="NUMBER">%d</xliff:g> sekund."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Zbyt wiele nieudanych prób. Spróbuj ponownie za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikacja nie jest zainstalowana na telefonie."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Zarządzaj aplikacjami"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Zarządzaj zainstalowanymi aplikacjami i usuwaj je."</string>
@@ -1188,8 +1254,8 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Zezwalaj na wszystkie źródła"</string>
     <string name="install_unknown_applications_title" msgid="663831043139080992">"Umożliwia instalowanie aplikacji ze źródeł innych niż Google Play"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"Zezwalaj na instalowanie aplikacji z nieznanych źródeł"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Twój tablet i dane osobiste są bardziej narażone na ataki aplikacji z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie możliwe szkody w tablecie i utratę danych w wyniku korzystania z tych aplikacji."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Twój telefon i dane osobiste są bardziej narażone na ataki aplikacji z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie możliwe szkody w telefonie i utratę danych w wyniku korzystania z tych aplikacji."</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Twój tablet i dane osobiste są bardziej narażone na ataki aplikacji z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie możliwe szkody w tablecie i utratę danych w wyniku korzystania z tych aplikacji."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Twój telefon i dane osobiste są bardziej narażone na ataki aplikacji z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie możliwe szkody w telefonie i utratę danych w wyniku korzystania z tych aplikacji."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ustawienia zaawansowane"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Włącz więcej opcji ustawień."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informacje o aplikacji"</string>
@@ -1228,9 +1294,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sortuj według rozmiaru"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Pokaż działające usługi"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaż procesy z pamięci podręcznej"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacja alarmowa"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Resetuj opcje aplikacji"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Zresetować opcje aplikacji?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Zresetuje to wszystkie ustawienia:\n\n "<li>"wyłączonych aplikacji,"</li>\n" "<li>"powiadomień wyłączonych aplikacji,"</li>\n" "<li>"domyślnych aplikacji dla wybranych czynności,"</li>\n" "<li>"ograniczeń danych w tle dla aplikacji,"</li>\n" "<li>"wszystkich ograniczeń uprawnień."</li>\n\n" Nie utracisz żadnych danych aplikacji."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"To działanie zresetuje wszystkie ustawienia:\n\n "<li>"wyłączonych aplikacji,"</li>\n" "<li>"powiadomień wyłączonych aplikacji,"</li>\n" "<li>"domyślnych aplikacji dla wybranych czynności,"</li>\n" "<li>"ograniczeń danych w tle dla aplikacji,"</li>\n" "<li>"wszystkich ograniczeń uprawnień."</li>\n\n" Nie utracisz żadnych danych aplikacji."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetuj aplikacje"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj miejscem"</string>
     <string name="filter" msgid="2018011724373033887">"Filtr"</string>
@@ -1299,6 +1366,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Działania aplikacji"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Trwa"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nieużywana)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Brak domyślnych aplikacji."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Użycie pamięci"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Wyświetl pamięć używaną przez aplikacje"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Uruchomione usługi"</string>
@@ -1344,8 +1412,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Czy zatrzymać usługę systemową?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Jeśli zatrzymasz tę usługę, niektóre funkcje tabletu mogą przestać poprawnie działać do chwili jego wyłączenia i ponownego włączenia."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jeśli zatrzymasz tę usługę, niektóre funkcje telefonu mogą przestać poprawnie działać do chwili jego wyłączenia i ponownego włączenia."</string>
-    <string name="language_settings" msgid="5292716747264442359">"Język, klawiatura, głos"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Język, klawiatura, głos"</string>
+    <string name="language_settings" msgid="5292716747264442359">"Język i wprowadzanie tekstu"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Język i wprowadzanie tekstu"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Ustawienia języka"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klawiatura i wprowadzanie tekstu"</string>
     <string name="phone_language" msgid="8870144109924299673">"Język"</string>
@@ -1358,7 +1426,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Ustawienia klawiatury fizycznej"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Naciśnij dwukrotnie klawisz spacji, aby wstawić kropkę"</string>
     <string name="show_password" msgid="3001113966880559611">"Hasła są widoczne"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Ta metoda wprowadzania może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Pochodzi ona z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Użyć jej?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Ta metoda wprowadzania tekstu może gromadzić cały wpisywany tekst, w tym dane osobowe takie jak hasła czy numery kart kredytowych. Pochodzi ona z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Użyć jej?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ten moduł sprawdzania pisowni może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Pochodzi on z aplikacji <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Użyć go?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Ustawienia"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Język"</string>
@@ -1396,17 +1464,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informacje o tablecie"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informacje o telefonie"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informacje o baterii"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Szybkie uruchamianie"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Ustaw skróty klawiszowe, aby uruchamiać aplikacje."</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Przypisz aplikację"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Brak skrótu"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Szukaj + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Wyczyść"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Skrót do <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) zostanie usunięty."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Anuluj"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplikacje"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Skróty"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Wprowadzanie tekstu"</string>
     <string name="input_method" msgid="5434026103176856164">"Sposób wprowadzania tekstu"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Obecna klawiatura"</string>
@@ -1437,27 +1494,35 @@
     <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Pokaż w menu zasilania przycisk zgłaszania błędu"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Pozostaw ekran włączony"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran nie będzie gaszony podczas ładowania telefonu"</string>
-    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Włącz dziennik analizatora snoop Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Włącz dziennik snoop Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Przechwyć wszystkie pakiety Bluetooth HCI do pliku"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Zdjęcie blokady OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Umożliwia odblokowanie programu rozruchowego"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Wpisz kod PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Aby włączyć zdjęcie blokady OEM, wpisz kod PIN urządzenia"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Zezwolić na zdjęcie blokady OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UWAGA: gdy to ustawienie jest włączone, na urządzeniu nie będą działać funkcje ochrony."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Rozmiary bufora Rejestratora"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Wybierz rozmiary Rejestratora/bufor dziennika"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie lokalizacji"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Zezwalaj na pozorowanie lokalizacji"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Włącz inspekcję wyśw. atrybutu"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Sieci"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wyświetlacz bezprzewodowy"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Włącz szczegółowe rejestrowanie Wi-Fi"</string>
-    <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresywne przeł. Wi‑Fi na sieć komórkową"</string>
+    <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresywne przeł. Wi‑Fi na sieć kom."</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Zawsze zezwalaj na skanowanie w celu roamingu Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Użyj starszego klienta DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaż opcje certyfikacji wyświetlacza bezprzewodowego"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Zwiększ poziom rejestrowania Wi‑Fi, pokaż według RSSI SSID w selektorze Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Po włączeniu połączenie danych będzie bardziej agresywnie przełączać się z Wi-Fi na sieć komórkową przy słabym sygnale Wi-Fi"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"W zależności od ruchu danych w interfejsie zezwól/nie zezwalaj na skanowanie w celu roamingu Wi-Fi"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Rozmiary bufora Rejestratora"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Wybierz rozmiary Rejestratora/bufor dziennika"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Wybierz konfigurację USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Wybierz konfigurację USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie lokalizacji"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Zezwalaj na pozorowanie lokalizacji"</string>
-    <string name="debug_view_attributes" msgid="6485448367803310384">"Włącz inspekcję wyświetlania atrybutu"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Włącz inspekcję wyśw. atrybutu"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Użyj klienta DHCP z Lollipop zamiast nowego klienta DHCP Androida."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Czy zezwalać na debugowanie USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Debugowanie USB jest przeznaczone wyłącznie do celów programistycznych. Może służyć do kopiowania danych między komputerem a urządzeniem, instalowania aplikacji na urządzeniu bez powiadamiania, a także odczytu danych dziennika."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Odwołać dostęp wszystkich poprzednio autoryzowanych komputerów do debugowania USB?"</string>
@@ -1500,7 +1565,7 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"Ekran"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Napisy"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesty powiększania"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kiedy ta funkcja jest włączona, możesz powiększyć i pomniejszyć obraz, trzykrotnie klikając ekran.\n\nW trybie powiększenia możesz:\n"<ul><li>"Przesuwać: przeciągnij palcami po ekranie."</li>\n<li>"Regulować powiększenie: ściągnij lub rozsuń palce."</li></ul>\n\n"Możesz też tymczasowo powiększyć miejsce pod palcem, klikając trzykrotnie i przytrzymując palec na ekranie. W takim widoku „lupy” możesz przesuwać palcem po ekranie i powiększać różne miejsca. Podniesienie palca spowoduje powrót do poprzedniego widoku.\n\nUwaga: trzykrotne kliknięcie powiększające działa wszędzie poza klawiaturą i paskiem nawigacji."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kiedy ta funkcja jest włączona, możesz powiększyć i pomniejszyć obraz, trzykrotnie klikając ekran.\n\nW trybie powiększenia możesz:\n"<ul><li>"Przesuwać: przeciągnij palcami po ekranie."</li>\n<li>"Regulować powiększenie: ściągnij lub rozsuń palce."</li></ul>\n\n"Możesz też tymczasowo powiększyć miejsce pod palcem, klikając trzykrotnie i przytrzymując palec na ekranie. W takim widoku „lupy” możesz przesuwać palcem po ekranie i powiększać różne miejsca. Podniesienie palca spowoduje powrót do poprzedniego widoku.\n\nUwaga: trzykrotne kliknięcie powiększające działa wszędzie poza klawiaturą i paskiem nawigacji."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skrót ułatwień dostępu"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Wł."</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Wył."</string>
@@ -1515,7 +1580,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Czas dotknięcia i przytrzymania"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inwersja kolorów"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="8658240868230680912">"(Eksperymentalna) Może wpływać na wydajność"</string>
-    <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Korekta kolorów"</string>
+    <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Korekcja kolorów"</string>
     <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"To jest funkcja eksperymentalna i może wpływać na wydajność."</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Pokaż w szybkich ustawieniach"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Tryb korekcji"</string>
@@ -1561,12 +1626,13 @@
     <string name="color_magenta" msgid="5059212823607815549">"Amarantowy"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Używać usługi <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Wymagania usługi <xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikacja Ustawienia nie może zweryfikować Twojej odpowiedzi, ponieważ inna aplikacja zasłania prośbę o udzielenie uprawnień."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jeśli włączysz usługę <xliff:g id="SERVICE">%1$s</xliff:g>, Twoje urządzenie nie będzie korzystać z blokady ekranu, by usprawnić szyfrowanie danych."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Włączyłeś usługę ułatwień dostępu, więc Twoje urządzenie nie będzie korzystać z blokady ekranu, by usprawnić szyfrowanie danych."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Ponieważ włączenie <xliff:g id="SERVICE">%1$s</xliff:g> wpływa na szyfrowanie danych, musisz potwierdzić swój wzór."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Ponieważ włączenie <xliff:g id="SERVICE">%1$s</xliff:g> wpływa na szyfrowanie danych, musisz potwierdzić swój PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Ponieważ włączenie <xliff:g id="SERVICE">%1$s</xliff:g> wpływa na szyfrowanie danych, musisz potwierdzić swoje hasło."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Obserwuj swoje działania"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Obserwowanie Twoich działań"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Otrzymywanie powiadomień podczas Twojej pracy z aplikacją."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Zatrzymać <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Dotknięcie OK spowoduje zatrzymanie usługi <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
@@ -1659,8 +1725,8 @@
     <string name="usage_type_on_time" msgid="3351200096173733159">"Czas włączenia"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Czas braku sygnału"</string>
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Całkowita pojemność baterii"</string>
-    <string name="usage_type_computed_power" msgid="5862792259009981479">"Obliczone zużycie energii"</string>
-    <string name="usage_type_actual_power" msgid="7047814738685578335">"Zaobserwowane zużycie energii"</string>
+    <string name="usage_type_computed_power" msgid="5862792259009981479">"Obliczone zużycie"</string>
+    <string name="usage_type_actual_power" msgid="7047814738685578335">"Zaobserwowane zużycie"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Wymuś zatrzymanie"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informacje o aplikacji"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Ustawienia aplikacji"</string>
@@ -1681,19 +1747,19 @@
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Wyłącz moduł Bluetooth, gdy nie jest używany."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Spróbuj połączyć się z innym urządzeniem Bluetooth."</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"Użycie baterii przez aplikację"</string>
-    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Zatrzymaj lub odinstaluj aplikację."</string>
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Zatrzymaj lub odinstaluj aplikację"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Wybierz tryb oszczędzania baterii"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikacja może oferować ustawienia pozwalające zmniejszyć użycie baterii."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Użycie baterii przez użytkownika"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"Użycie energii – pozostałe"</string>
-    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Użycie baterii oznacza przybliżone zużycie energii i nie uwzględnia wszystkich źródeł zasilanych z baterii. „Pozostałe” to różnica między obliczonym w przybliżeniu zużyciem energii a faktycznym wyczerpaniem baterii."</string>
+    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Użycie baterii oznacza przybliżone zużycie energii i nie uwzględnia wszystkich źródeł zasilanych z baterii. „Inne” to różnica między obliczonym w przybliżeniu zużyciem energii a faktycznym wyczerpaniem baterii."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zużycie energii obliczone z nadmiarem"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odłączenia"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ostatnio odłączony na <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Łączne użycie"</string>
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Odśwież"</string>
-    <string name="process_kernel_label" msgid="3916858646836739323">"System Android"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"System operacyjny Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Serwer mediów"</string>
     <string name="battery_saver" msgid="1426682272004907982">"Oszczędzanie baterii"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Włącz automatycznie"</string>
@@ -1702,14 +1768,20 @@
     <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>
     <string name="app_memory_use" msgid="7849258480392171939">"Użycie pamięci"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplikacje <xliff:g id="TYPE">%1$s</xliff:g> przez <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> z <xliff:g id="TOTALRAM">%2$s</xliff:g> wykorzystane w czasie <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"w tle"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"na pierwszym planie"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"w pamięci podręcznej"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Aktualny stan pamięci: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Średnie użycie pamięci RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksymalne użycie pamięci RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"System operacyjny Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Proces natywny"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Jądro"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Pamięci podręczne"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Wykorzystanie pamięci RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Wykorzystanie pamięci RAM (w tle)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Czas pracy"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Procesy"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Usługi"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Czas trwania"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Informacje dotyczące pamięci"</string>
@@ -1726,6 +1798,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 godzin"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dzień"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Pokaż systemowe"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ukryj systemowe"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Użyj USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ statystyk"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Tło"</string>
@@ -1743,12 +1816,12 @@
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Prosta zamiana mowy na tekst"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ta usługa głosowego wprowadzania tekstu będzie mogła nieustannie monitorować aktywność głosową i sterować aplikacjami z włączoną obsługą głosową w Twoim imieniu. Pochodzi z aplikacji <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Włączyć jej używanie?"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Przetwarzanie tekstu na mowę"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Przetwarzanie tekstu na mowę"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Zamiana tekstu na mowę"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Używaj moich ustawień"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Poniższe ustawienia domyślne zastępują ustawienia aplikacji."</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Ustawienia domyślne"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Mechanizm domyślny"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Konfiguruje mechanizm syntezy mowy używany do odczytywania tekstu"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Ustaw mechanizm syntezy mowy do obsługi tekstu mówionego"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Szybkość mowy"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Szybkość czytania tekstu"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tony"</string>
@@ -1822,7 +1895,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Wspomagana sprzętowo"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Tylko programowa"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Ten użytkownik nie ma dostępu do poświadczeń"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Aby potwierdzić instalację danych logowania, musisz narysować wzór odblokowania."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1919,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Utwórz kopię zapasową"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Zapisuj na serwerach Google kopie zapasowe danych aplikacji, haseł Wi-Fi i innych ustawień."</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Konto kopii zapasowej"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Żadne z kont nie przechowuje obecnie kopii zapasowej danych"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Dołącz dane aplikacji"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Autoprzywracanie"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"Przy ponownej instalacji aplikacji przywróć ustawienia i dane z kopii zapasowej."</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"Przy ponownej instalacji aplikacji przywróć ustawienia i dane z kopii zapasowej"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Usługa kopii zapasowych jest nieaktywna."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Jest to określone przez zasady dotyczące urządzeń."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Hasło kopii zapasowych"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Pełne kopie zapasowe na komputerze nie są obecnie chronione"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Wybierz, aby zmienić lub usunąć hasło pełnych kopii zapasowych na komputerze stacjonarnym."</string>
@@ -1860,7 +1930,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nowe hasło i jego potwierdzenie nie zgadzają się"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Ustawienie hasła kopii zapasowej nie powiodło się"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Zatrzymać tworzenie kopii zapasowych haseł Wi-Fi, zakładek, innych ustawień i danych aplikacji, a także usunąć wszystkie kopie z serwerów Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Zatrzymać tworzenie kopii zapasowych haseł Wi-Fi, zakładek, innych ustawień i danych aplikacji, a także usunąć wszystkie kopie z serwerów Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ustawienia administracji"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator urządzenia"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Dezaktywuj"</string>
@@ -2003,11 +2073,11 @@
     <string name="disable_overlays" msgid="2074488440505934665">"Wyłącz nakładki HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Zawsze używaj GPU do komponowania ekranu"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Symuluj przestrzeń kolorów"</string>
-    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Włącz śledzenia OpenGL"</string>
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Włącz śledzenie OpenGL"</string>
     <string name="use_awesomeplayer" msgid="1583337008516364226">"Używaj AwesomePlayera (wycofane)"</string>
     <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Używaj AwesomePlayera zamiast NuPlayera do odtwarzania większości multimediów"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Wyłącz kierowanie dźwiękowe USB"</string>
-    <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Wyłącz auto kierowanie do urządzeń per. audio USB"</string>
+    <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Wyłącz auto kierowanie do urządzeń peryferyjnych audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Pokaż granice układu"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Pokaż granice przycięcia, marginesy itd."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Wymuś układ od prawej do lewej"</string>
@@ -2024,6 +2094,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animacji przejścia"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala długości animacji"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Symuluj ekrany dodatkowe"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Tryb wielu okien"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Wiele czynności na ekranie jednocześnie."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Włączyć tryb wielu okien?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"UWAGA: to wysoce eksperymentalna funkcja, która za pośrednictwem interfejsu Ostatnie aplikacje umożliwia obsługę na ekranie wielu czynności jednocześnie. W przypadku jej użycia niektóre aplikacje mogą ulec awarii lub funkcjonować nieprawidłowo."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikacje"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nie zachowuj działań"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Przerwij każde działanie, gdy użytkownik je porzuci"</string>
@@ -2147,10 +2221,10 @@
     <string name="vpn_menu_edit" msgid="408275284159243490">"Edytuj profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Usuń profil"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Zawsze włączona sieć VPN"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Wybierz profil VPN, który będzie zawsze podłączony. Ruch w sieci będzie dopuszczalny tylko podczas połączenia z tą siecią VPN."</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Wybierz stały profil VPN. Ruch w sieci będzie możliwy tylko po połączeniu z tą siecią VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Brak"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"W przypadku zawsze włączonej sieci VPN wymagany jest adres IP zarówno dla serwera, jak i dla DNS."</string>
-    <string name="vpn_no_network" msgid="3050233675132726155">"Brak połączenia sieciowego. Spróbuj ponownie później."</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Brak połączenia z siecią. Spróbuj ponownie później."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Brak certyfikatu. Edytuj profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Własne"</string>
@@ -2195,7 +2269,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Użytkownik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil ograniczony"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Dodać nowego użytkownika?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Możesz udostępnić to urządzenie innym osobom, dodając do niego dodatkowych użytkowników. Każdy użytkownik ma własną przestrzeń, na której może mieć swoje aplikacje, tapety itd. Może również zmieniać ustawienia urządzenia wpływające na wszystkich użytkowników, takie jak Wi‑Fi.\n\nGdy dodasz nowego użytkownika, musi on skonfigurować swoją przestrzeń.\n\nKażdy użytkownik może uaktualniać aplikacje wszystkich innych użytkowników."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Z tego urządzenia możesz korzystać wraz z innymi osobami, dodając na nim konta użytkowników. Każdy użytkownik ma własne miejsce na swoje aplikacje, tapety i inne dane. Może też zmieniać ustawienia, które wpływają na wszystkich użytkowników urządzenia (np. Wi‑Fi).\n\nGdy dodasz nowego użytkownika, musi on skonfigurować swoje miejsce na dane.\n\nKażdy użytkownik może aktualizować aplikacje w imieniu wszystkich pozostałych użytkowników."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Gdy dodasz nowego użytkownika, musi on skonfigurować swoją przestrzeń.\n\nKażdy użytkownik może aktualizować aplikacje wszystkich innych użytkowników."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Skonfigurować ustawienia dla użytkownika?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Upewnij się, że ta osoba jest w pobliżu i może skonfigurować swój profil."</string>
@@ -2226,13 +2300,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Usunąć gościa?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Wszystkie aplikacje i dane w tej sesji zostaną usunięte."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Usuń"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Zezwalaj na połączenia telefoniczne"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Zezwalaj na połączenia telefoniczne i SMS-y"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Włącz rozmowy telefoniczne"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Włącz rozmowy telefoniczne i SMS-y"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Usuń użytkownika"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Zezwolić na połączenia telefoniczne?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Włączyć rozmowy telefoniczne?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Historia połączeń będzie dostępna dla tego użytkownika."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Zezwolić na połączenia telefoniczne i SMS-y?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Historia połączeń i SMS-ów będzie dostępna dla tego użytkownika."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Włączyć rozmowy telefoniczne i SMS-y?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Historia połączeń i SMS-ów będzie dostępna dla tego użytkownika."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Zezwól na aplikacje i zawartość"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacje z ograniczeniami"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozwiń ustawienia aplikacji"</string>
@@ -2255,7 +2329,7 @@
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ograniczenia"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Usuń ograniczenia"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Zmień PIN"</string>
-    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokaż powiadomienia"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokazuj powiadomienia"</string>
     <string name="help_label" msgid="6886837949306318591">"Pomoc i opinie"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konto na materiały"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Identyfikator zdjęcia"</string>
@@ -2283,8 +2357,8 @@
     <string name="user_rename" msgid="8523499513614655279">"ZMIEŃ NAZWĘ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Ustaw ograniczenia aplikacji"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrolowane przez <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ta aplikacja nie jest obsługiwana w profilach z ograniczeniami"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ta aplikacja może uzyskać dostęp do Twoich kont"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Ta aplikacja ma dostęp do Twoich kont. Kontrolowane przez: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Sieć Wi‑Fi i komórkowa"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Zezwalaj na modyfikowanie ustawień sieci Wi‑Fi i komórkowej"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2311,8 +2385,8 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Kliknij, by wybrać kartę SIM do transmisji danych"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Zawsze używaj do połączeń"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Wybierz kartę SIM do transmisji danych"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"Przełączanie karty SIM do danych, to może potrwać maksymalnie minutę..."</string>
-    <string name="select_sim_for_calls" msgid="3503094771801109334">"Zadzwoń, używając"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Przełączanie karty SIM do transmisji danych. Może to potrwać do minuty..."</string>
+    <string name="select_sim_for_calls" msgid="3503094771801109334">"Zadzwoń, używając karty:"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Wybierz kartę SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"Karta SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Karta SIM pusta"</string>
@@ -2339,7 +2413,7 @@
     <string name="sim_notification_summary" msgid="5024470200658902406">"Kliknij, by skonfigurować"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Karta SIM preferowana dla:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pytaj za każdym razem"</string>
-    <string name="sim_selection_required_pref" msgid="3446721423206414652">"Dokonaj wyboru"</string>
+    <string name="sim_selection_required_pref" msgid="3446721423206414652">"Wymagany wybór"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ustawienia"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ustawienia"</string>
     <string name="search_menu" msgid="7053532283559077164">"Szukaj"</string>
@@ -2349,13 +2423,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi połączenie internet"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS pisanie SMS-ów wiadomości SMS-owanie"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"komórkowy komórka operator bezprzewodowe dane 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi dzwonić połączenie rozmowa"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekran dotykowy"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"przyciemnij ekran ekran dotykowy bateria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"przyciemnij ekran ekran dotykowy bateria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"tło personalizuj dostosuj wyświetlacz"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ciemny motyw tryb nocny przyciemnij ekran odwróć jasność"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"tło personalizuj dostosuj wyświetlacz"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"rozmiar tekstu"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekcja"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"przesyłanie projektu"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"miejsce dysk dysk twardy urządzenie użycie"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"zasilanie zużycie ładuj"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"pisownia słownik sprawdzanie pisowni autokorekta"</string>
@@ -2372,6 +2448,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ograniczenie ogranicz ograniczony"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekst poprawianie popraw dźwięk wibracje automatyczne język gest sugeruj sugestia motyw obraźliwe słowo typ emoji międzynarodowe"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"resetuj ustawienia domyślne"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"domyślna aplikacja awaryjna do używania w nagłych przypadkach"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplikacje pobrane systemowe"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"zabezpieczenia uprawnień aplikacji"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"wartość domyślna aplikacji"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"przesuwanie hasło wzór pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Skonfiguruj tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapisz"</string>
@@ -2386,18 +2467,19 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Głośność alarmu"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Głośność dzwonka"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Głośność powiadomień"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Dozwolone dźwięki"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Gdy ktoś dzwoni lub przychodzi powiadomienie"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Zezwalaj na wszystkie dźwięki"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Zezwalaj na dźwięki priorytetowe"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nie zezwalaj na żadne dźwięki"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tylko priorytetowe"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatyczne reguły"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Tylko priorytetowe"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tylko alarmy"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Bez przeszkadzania"</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="ringtone_title" msgid="5379026328015343686">"Dzwonek telefonu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Domyślny dzwonek powiadomień"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Wibracja podczas połączeń"</string>
-    <string name="notification_section_header" msgid="95661783916799134">"Powiadomienie"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Wibracja przy połączeniach"</string>
+    <string name="notification_section_header" msgid="95661783916799134">"Powiadomienia"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsująca dioda"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Gdy urządzenie jest zablokowane"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaż wszystkie informacje w powiadomieniach"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokazuj wszystkie powiadomienia"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ukryj poufne informacje w powiadomieniach"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Nie pokazuj żadnych powiadomień"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Jak mają pokazywać się powiadomienia, gdy urządzenie jest zablokowane?"</string>
@@ -2416,62 +2498,133 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Wibracje"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Dostęp do powiadomień"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacje nie mogą odczytywać powiadomień"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplikacja może odczytywać powiadomienia"</item>
-    <item quantity="other" msgid="980049191810249052">"Aplikacje, które mogą odczytywać powiadomienia: %d"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="few">%d aplikacje mogą odczytywać powiadomienia</item>
+      <item quantity="many">%d aplikacji może odczytywać powiadomienia</item>
+      <item quantity="other">%d aplikacji może odczytywać powiadomienia</item>
+      <item quantity="one">%d aplikacja może odczytywać powiadomienia</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Brak zainstalowanych odbiorników powiadomień."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Włączyć usługę <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Usługa <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> będzie w stanie odczytywać wszystkie wysyłane przez system lub dowolną zainstalowaną aplikację powiadomienia, które mogą zawierać informacje osobiste, takie jak nazwy kontaktów oraz tekst wiadomości wysłanych do Ciebie. Usługa będzie również mogła odrzucać te powiadomienia lub używać przycisków czynności w ich obrębie."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Dostawcy warunków"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Żadne aplikacje nie dostarczają warunków"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"Warunki dostarcza %d aplikacja"</item>
-    <item quantity="other" msgid="358057362115673258">"Warunki dostarcza kilka aplikacji (%d)"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Brak zainstalowanych dostawców warunków."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Włączyć usługę <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> będzie mieć możliwość dodania warunków zamknięcia do trybu Nie przeszkadzać."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Zablokuj"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuj wszystkie"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nigdy nie pokazuj powiadomień z tej aplikacji"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Priorytet"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Pokaż powiadomienia na górze listy i zezwól na ich pojawianie się, gdy urządzenie działa w trybie pokazywania tylko priorytetowych powiadomień"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Poufne"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Gdy urządzenie jest zablokowane, ukryj poufne informacje w powiadomieniach z tej aplikacji"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Traktuj jako priorytetowe"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Zezwól na powiadomienia dźwiękowe z tej aplikacji, gdy opcja Nie przeszkadzać jest ustawiona na Tylko priorytetowe"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Zezwalaj na wysuwanie"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Pozwól tej aplikacji na eksponowanie niektórych powiadomień przez krótkie wysunięcie ich na bieżącym ekranie"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ukryj poufne treści"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Gdy urządzenie jest zablokowane, w powiadomieniach z tej aplikacji ukrywaj treści, które mogłyby ujawniać prywatne informacje"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Zablokowane"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorytet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Poufne"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotowe"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Dopóki nie wyłączysz"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Dźwięki priorytetowe"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Powiadomienia wyłączone"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dni"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Brak"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Dozwolone powiadomienia"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Tylko priorytetowe"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Brak"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatyzacja"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Włącz automatycznie"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nazwa reguły"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Dodaj regułę"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Usuń regułę"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Usunąć regułę „<xliff:g id="RULE">%1$s</xliff:g>”?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Usuń"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Typ reguły"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Nieznany"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Skonfiguruj regułę"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Reguła harmonogramu"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Reguły nie znaleziono."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dni"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Brak"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Codziennie"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nigdy"</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>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Połączenia"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Wiadomości"</string>
-    <string name="zen_mode_from" msgid="1033337300289871697">"Połączenia lub wiadomości od"</string>
+    <string name="zen_mode_from" msgid="1033337300289871697">"Połączenia lub wiadomości od:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Każdy"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Tylko kontakty"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Tylko kontakty z gwiazdką"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Wydarzenia i przypomnienia"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmy mają zawsze priorytet."</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmy"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Przypomnienia"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Wydarzenia"</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">"Jeśli ta sama osoba dzwoni po raz drugi w ciągu <xliff:g id="MINUTES">%d</xliff:g> minut, zezwól"</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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noce poza weekendem"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Godzina rozpoczęcia"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Godzina zakończenia"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> następnego dnia"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> lub wcześniej w przypadku alarmu"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> następnego dnia lub wcześniej w przypadku alarmu"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> następnego dnia"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Przerwy"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Gdy ktoś dzwoni i przychodzą powiadomienia"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kiedy chcesz otrzymywać powiadomienia?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Na jak długo?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Zawsze zezwalaj na przerwy"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"wyłączone,wszystkie,wszystko"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Zezwalaj tylko na przerwy priorytetowe"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Zezwalaj tylko na alarmy"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Nie zezwalaj na żadne przerwy"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Na czas nieokreślony"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minuty</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> minut</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuty</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuta</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> godziny</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> godzin</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> godziny</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> godzina</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Zmień na same powiadomienia priorytetowe na czas nieokreślony"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="few">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> minut, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na same powiadomienia priorytetowe przez minutę, do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="few">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> godzin, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na same powiadomienia priorytetowe przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na same powiadomienia priorytetowe przez godzinę, do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Zmień na same alarmy na czas nieokreślony"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="few">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> minut, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na same alarmy przez minutę, do <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="few">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> godzin, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na same alarmy przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na same alarmy przez godzinę, do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Zmień na brak powiadomień na czas nieokreślony"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="few">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> minut, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> minuty, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na brak powiadomień przez minutę, do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="few">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> godzin, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmień na brak powiadomień przez <xliff:g id="DURATION">%1$d</xliff:g> godziny, do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmień na brak powiadomień przez godzinę, do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zmień na ciągle powiadamianie"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"bez końca"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Powiadom. aplikacji"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Prześlij opinię o tym urządzeniu"</string>
@@ -2512,4 +2665,69 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Informacje o IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Informacje związane z IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Gniazdo <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Uruchom domyślnie"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> wykorzystane w: <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Linki domeny"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Otwieraj URL-e domeny"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Zezwalaj aplikacji na bezpośrednie otwieranie URL-i domeny"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Obsługiwane URL-e domeny"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Inne ustawienia domyślne"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> wykorzystane w: <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"pamięć wewnętrzna"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"pamięć zewnętrzna"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Pamięć wewnętrzna"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Pamięć zewnętrzna"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Użycie danych przez aplikację"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> od <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Wykorzystanie pamięci"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Wł."</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Zablokuj"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Poufne"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Priorytetowe"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Priorytetowe i poufne"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="few">Przyznano <xliff:g id="COUNT_1">%d</xliff:g> uprawnienia</item>
+      <item quantity="many">Przyznano <xliff:g id="COUNT_1">%d</xliff:g> uprawnień</item>
+      <item quantity="other">Przyznano <xliff:g id="COUNT_1">%d</xliff:g> uprawnienia</item>
+      <item quantity="one">Przyznano <xliff:g id="COUNT_0">%d</xliff:g> uprawnienie</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="few">Przyznane uprawnienia: <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many">Przyznane uprawnienia: <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Przyznane uprawnienia: <xliff:g id="COUNT_2">%d</xliff:g> z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one">Przyznane uprawnienia: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Część ustawień domyślnych"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Brak ustawień domyślnych"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Wszystkie aplikacje"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Włączone"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Osobiste"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Do pracy"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Zablokowane"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priorytetowe"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Poufne"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Z URL-ami domeny"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Wyłączone przez administratora"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Zaawansowane"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Nieznana aplikacja"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Wybierz profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Uprawnienia aplikacji"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Dodatkowy dostęp dozwolony dla <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikacji"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Dozwolone: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikacji"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL-e domeny"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Nie otwieraj URL-i żadnej domeny"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Otwórz „<xliff:g id="DOMAIN">%s</xliff:g>”"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Otwórz „<xliff:g id="DOMAIN">%s</xliff:g>” i powiązane URL-e"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacje mogą otwierać URL-e swojej domeny</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> aplikacji może otwierać URL-e swojej domeny</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacji może otwierać URL-e swojej domeny</item>
+      <item quantity="one">Jedna aplikacja może otwierać URL-e swojej domeny</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nie rozpoznano"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Domyślne aplikacje"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Przeglądarka"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Brak domyślnej przeglądarki"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Domyślna)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Magazyn aplikacji"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index da8f603..726e407 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Premir botão"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"desativar/reativar o som do microfone"</item>
     <item msgid="1148142988678569310">"projetar multimédia"</item>
     <item msgid="9130014005474445273">"ativar VPN"</item>
+    <item msgid="1165192162975045562">"gravar imagem de fundo"</item>
+    <item msgid="7129487923652967258">"assistir estrutura"</item>
+    <item msgid="1069023208100114540">"assistir captura de ecrã"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Localização"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Desativar/reativar o som do microfone"</item>
     <item msgid="5906017727368097853">"Projetar multimédia"</item>
     <item msgid="2486614710846178542">"Ativar VPN"</item>
+    <item msgid="5586547561693629602">"Gravar imagem de fundo"</item>
+    <item msgid="32794179825485062">"Assistir estrutura"</item>
+    <item msgid="7872852746938272552">"Assistir captura de ecrã"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curta"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"baixa"</item>
     <item msgid="4212263919458209842">"crítica"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desativado"</item>
-    <item msgid="5656544177755411222">"Interrupções limitadas"</item>
-    <item msgid="8735337502532332056">"Sem interrupções"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderada"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Cor-de-rosa"</item>
     <item msgid="6131821495505931173">"Vermelho"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Protocolo de transferência de multimédia)"</item>
+    <item msgid="8856820259201251036">"PTP (Protocolo de transferência de imagens)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet USB)"</item>
+    <item msgid="2686051673589572111">"Fonte de áudio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index dd5fd1a..38bcb0b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Permitir"</string>
     <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Está agora a <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos de se tornar um programador"</item>
-    <item quantity="other" msgid="6722953419953594148">"Está agora a <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos de se tornar um programador."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Está agora a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos de se tornar um programador.</item>
+      <item quantity="one">Está agora a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passo de se tornar um programador.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Agora é um programador!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário, já é um programador."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Redes sem fios e outras"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Desativar SMS via IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Ativar registo IMS obrigatório"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Desativar registo IMS obrigatório"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Ativar sinalizador fornecido VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Desativar sinalizador fornecido VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Ativar descarga da RAM LTE"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Desativar descarga da RAM LTE"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ver livro de endereços do SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Difusão"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Isto desativará:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Do:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Ligado"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ligado (sem telefone)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ligado (sem multimédia)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Ligado (sem acesso a mensagens)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ligado (sem telefone ou multimédia)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desligado"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"A desligar..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"A ligar..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"A emparelhar..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Aparelho Bluetooth sem nome"</string>
     <string name="progress_scanning" msgid="192587958424295789">"A pesquisar"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nenhum aparelho Bluetooth nas proximid."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar ficheiros recebidos"</string>
     <string name="device_picker" msgid="4978696506172252813">"Escolher dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Pedido de emparelhamento de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Uma aplicação pretende ativar o Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Uma aplicação pretende LIGAR o Bluetooth para este dispositivo."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Uma aplicação pretende tornar o seu tablet visível para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Uma aplicação pretende tornar o seu telemóvel visível para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Uma aplicação pretende tornar o seu tablet visível para outros dispositivos Bluetooth. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Cartão SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Definições de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCELAR"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAR"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SIM"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NÃO"</string>
-    <string name="forget" msgid="7267115980248732932">"ESQUECER"</string>
+    <string name="forget" msgid="1400428660472591263">"Esquecer"</string>
+    <string name="save" msgid="879993180139353333">"Guardar"</string>
+    <string name="done" msgid="6942539184162713160">"Concluído"</string>
     <string name="settings_label" msgid="1626402585530130914">"Definições"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Definições"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atalho das definições"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por fuso horário"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Melhorar correspondência de rosto"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Confirmação de presença de vida"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Solicitar piscar de olhos ao desbloquear"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após suspensão"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após a suspensão, exceto quando mantido bloqueado por <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Palavras-passe"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gerir impressões dig."</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar impr. dig. para"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Adicionar"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueio de ecrã"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais inscritas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impressão digital inscrita</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Conf. impres. digital"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Para utilizar a sua impressão digital para desbloquear o ecrã ou para confirmar compras, é necessário: \n\n✓ Configurar o seu método de bloqueio de ecrã de segurança \n\n✓ Adicionar a sua impressão digital"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localizar o sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localize o sensor de impressões digitais na parte de trás do seu telemóvel."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Vamos começar!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Coloque o seu dedo no sensor de impressão digital. Levante-o depois de sentir uma vibração."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Ótimo! Agora repita."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Coloque o mesmo dedo no sensor de impressão digital e levante-o depois de sentir uma vibração."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Impres. digital adic.!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando vir este ícone, pode utilizar a sua impressão digital para identificação ou para autorizar uma compra."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Adicionar"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptação"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar telefone"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Ligue o carregador e tente novamente."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Sem PIN nem palavra-passe de bloqueio de ecrã"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"É necessário configurar um PIN ou palavra-passe de bloqueio de ecrã antes de iniciar a encriptação."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Tem de desenhar a sua sequência de desbloqueio para confirmar a encriptação do seu dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encriptar?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"A operação de encriptação é irreversível e, se a interromper, perderá dados. A encriptação demora uma hora ou mais, durante a qual o tablet reiniciará várias vezes."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"A operação de encriptação é irreversível e, se a interromper, perderá dados. A encriptação demora uma hora ou mais, durante a qual o telemóvel reiniciará várias vezes."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Deslizar rapidamente"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Sem segurança"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Desbloqueio Através do Rosto"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Segurança reduzida; experimental"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Padrão"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Segurança média"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurança média a elevada"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Palavra-passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Segurança elevada"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueio de ecrã atual"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"As funcionalidades de proteção do dispositivo deixarão de funcionar."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desativado p/ admin., política de encript. ou armazen. de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nenhum"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar rapidamente"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueio Através do Rosto"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Sequência"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Palavra-passe"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Assim que configurar um bloqueio de ecrã, também pode configurar a sua impressão digital em Definições &gt; Segurança."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desativar bloqueio do ecrã"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"A palavra-passe tem de incluir, pelo menos, uma letra."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"A palavra-passe tem de incluir, pelo menos, um dígito."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"A palavra-passe tem de incluir, pelo menos, um símbolo."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"A palavra-passe tem de incluir, pelo menos, 1 letra."</item>
-    <item quantity="other" msgid="8186027808415585970">"A palavra-passe tem de incluir, pelo menos, %d letras."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"A palavra-passe tem de incluir, pelo menos, 1 letra minúscula."</item>
-    <item quantity="other" msgid="2693910942679679225">"A palavra-passe tem de incluir, pelo menos, %d letras minúsculas."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"A palavra-passe tem de incluir, pelo menos, 1 letra maiúscula."</item>
-    <item quantity="other" msgid="3030801209112209245">"A palavra-passe tem de incluir, pelo menos, %d letras maiúsculas."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"A palavra-passe tem de incluir, pelo menos, 1 dígito numérico."</item>
-    <item quantity="other" msgid="4703982391407595924">"A palavra-passe tem de incluir, pelo menos, %d dígitos numéricos."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"A palavra-passe tem de incluir, pelo menos, 1 símbolo especial."</item>
-    <item quantity="other" msgid="1221290525051187757">"A palavra-passe tem de incluir, pelo menos, %d símbolos especiais."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"A palavra-passe tem de incluir, pelo menos, 1 carácter que não seja uma letra."</item>
-    <item quantity="other" msgid="3952508584649046404">"A palavra-passe tem de incluir, pelo menos, %d caracteres que não sejam letras."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">A palavra-passe tem de incluir, pelo menos, %d letras.</item>
+      <item quantity="one">A palavra-passe tem de incluir, pelo menos, 1 letra.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">A palavra-passe tem de incluir, pelo menos, %d letras minúsculas.</item>
+      <item quantity="one">A palavra-passe tem de incluir, pelo menos, 1 letra minúscula.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">A palavra-passe tem de incluir, pelo menos, %d letras maiúsculas.</item>
+      <item quantity="one">A palavra-passe tem de incluir, pelo menos, 1 letra maiúscula.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">A palavra-passe tem de incluir, pelo menos, %d dígitos numéricos.</item>
+      <item quantity="one">A palavra-passe tem de incluir, pelo menos, 1 dígito numérico.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">A palavra-passe tem de incluir, pelo menos, %d símbolos especiais.</item>
+      <item quantity="one">A palavra-passe tem de incluir, pelo menos, 1 símbolo especial.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">A palavra-passe tem de incluir, pelo menos, %d carateres que não sejam uma letra.</item>
+      <item quantity="one">A palavra-passe tem de incluir, pelo menos, 1 caráter que não seja uma letra.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"O administrador do dispositivo não permite a utilização de uma palavra-passe recente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"É proibida uma sequência ascendente, descendente ou repetida de dígitos"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Para sincronizar com: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Verifique se apresenta esta chave de acesso: &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">"De: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Sincronizar com este aparelho?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Para sincronizar com:<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>Introduza no mesmo:<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> e, em seguida, prima Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Par"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SINCRONIZAR"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"A sincronização concede acesso aos seus contactos e ao histórico de chamadas quando tem uma ligação estabelecida."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Não foi possível sincronizar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Não foi possível sincronizar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> devido a PIN ou chave de acesso incorreto."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Não é possível comunicar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparelhamento rejeitado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Não foi possível ligar a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Procurar dispositivos"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Atualizar"</string>
@@ -515,16 +518,8 @@
     <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="ble_scan_notify_text" msgid="3719383048635344071">"Para melhorar a precisão da localização, as aplicações e os serviços procuram dispositivos Bluetooth mesmo quando o Bluetooth está desativado. 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_specific_profiles_title" msgid="6952214406025825164">"Ligar a..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Áudio de multimédia"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Áudio do telemóvel"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferência do ficheiro"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acesso à internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Partilha de contactos"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utilizar para a partilha de contactos"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partilha da ligação à internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acesso a mensagens"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do áudio multimédia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do áudio mãos-livres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do aparelho de entrada."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Utilizar para"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Mudar o nome"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permitir ent. transf. de fich."</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ligado ao áudio de multimédia"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ligado ao áudio do telefone"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ligado ao servidor de transferência de ficheiros"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Ligado ao mapa"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não ligado ao servidor de transferência de ficheiros"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ligado a um dispositivo de entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ligado ao aparelho para acesso à internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"A partilhar a ligação à internet local com o aparelho"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para áudio de multimédia"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para áudio do telefone"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizar para transferência de ficheiros"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizar para entrada"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizar para acesso à internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utilizar para o mapa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Definições da Estação de ancoragem"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizar estação de ancoragem para áudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como telefone com altifalante"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorizar definições"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistente Wi-Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Ligado através do Assistente de Wi‑Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Transmitir ecrã"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmitir"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar display sem fios"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo nas proximidades."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"A ligar"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Esquecer"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Concluído"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir a troca de dados quando o tablet toca noutro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir a troca de dados quando o telefone toca outro aparelho"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"A desligar Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Erro"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"No Modo de avião"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Não é possível verificar redes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificação de rede"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Notificar sempre que uma rede pública estiver disponível"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar más ligações"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Não utilizar uma rede Wi-Fi exceto se tiver uma boa ligação à Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilize apenas redes com uma boa ligação à Internet"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Procura de redes sempre disponível"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permitir sempre procura"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permitir que o serviço de localização da Google e outras aplicações procurem redes, mesmo quando o Wi-Fi está desativado"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utilizar automat. redes Wi-Fi abertas"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permitir que um Assistente de Wi-Fi ligue automaticamente a redes abertas de alta qualidade"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Escolher assistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para melhorar a precisão de localização e para outros fins, a Google e outras aplicações poderão procurar redes nas proximidades, mesmo com o Wi-Fi desligado. Se não pretender que isto aconteça, aceda a Avançadas &gt; Procura de redes sempre disponível."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"As aplicações poderão procurar redes nas proximidades, mesmo com o Wi-Fi desligado. Se não pretender que isto aconteça, aceda a Avançadas &gt; Procura sempre disponível."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Para melhorar a precisão da localização, as aplicações e os serviços procuram redes Wi-Fi mesmo quando o Wi-Fi está desativado. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de procura<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Não mostrar de novo"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi ligada durante suspensão"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi ligado durante suspensão"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Adicionar outra rede"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Para concluir a configuração, o tablet necessita de acesso ao Wi-Fi. Após a configuração, poderá alternar entre dados móveis e Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Opções avançadas"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Configuração Wi-Fi Protegida"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"A iniciar WPS..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Prima o botão de Configuração Protegida de Wi-Fi no router. Pode denominar-se \"WPS\" ou conter o seguinte símbolo:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Prima o botão de Configuração protegida de Wi-Fi no router. Pode denominar-se \"WPS\" ou estar marcado com o símbolo seguinte:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Introduza o <xliff:g id="NUMBER">%1$s</xliff:g> do router Wi-Fi. A configuração pode demorar até dois minutos a ser concluída."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS iniciado com êxito. A estabelecer a ligação à rede..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Ligado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anónima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Palavra-passe"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar palavra-passe"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Configurar banda AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Definições de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(não alterado)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(não especificado)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Falha de configuração de IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Falha de ligação Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Nenhum acesso à Internet detetado; não será efetuada uma nova ligação automaticamente."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduzir a palavra-passe da rede"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Iniciar sessão para ligar?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> necessita que inicie sessão online antes de se ligar à rede."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"LIGAR"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Esta rede não tem acesso à Internet. Pretende utilizar esta rede mesmo assim?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Não perguntar novamente para esta rede"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Zona Wi‑Fi portátil AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi-Fi portátil <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_mode_title" msgid="2164073796253284289">"Preferências das chamadas"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de chamada Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Rede Wi-Fi preferida"</item>
+    <item msgid="5267397515594230396">"Rede móvel preferida"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Página Inicial"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Visor"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho do ecrã"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosidade adaptável"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Otimizar o nível de luminosidade de acordo com a luz disponível"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Claro"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Escuro"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"O ecrã desliga-se"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Atualizar o cartão SIM pref.?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> é o único SIM no seu dispositivo. Pretende utilizar este SIM para dados de telemóvel, chamadas e 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">
-    <item quantity="one" msgid="4840607930166101114">"Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER">%d</xliff:g> tentativa antes de necessitar de contactar o seu operador para desbloquear o dispositivo."</item>
-    <item quantity="other" msgid="77103619544346451">"Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER">%d</xliff:g> tentativas."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas.</item>
+      <item quantity="one">Cód. PIN cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de contactar operador p/ desbloquear disp.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Falha ao introduzir o PIN do cartão SIM!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado do tablet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Estado do telefone"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponível (só de leitura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espaço total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"A calcular..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicações (dados das aplic. e cont. multimédia)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicações e respetivos dados"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimédia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Transferências"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imagens, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Áudio (música, toques, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Outros ficheiros"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dados em cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desmont. arm. partilhado"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontagem em curso"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Está quase sem espaço de armaz."</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Algumas funções do sistema, como a sincronização, poderão não funcionar corretamente. Tente libertar espaço eliminando ou soltando itens, nomeadamente aplicações ou conteúdos multimédia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Mudar o nome"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Montar"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Ejetar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Apagar e formatar"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Apagar e formatar como armaz. interno"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Ligação USB do computador"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Ligação USB do computador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Ligado como"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Permite transferir ficheiros multimédia no Windows ou através da Transferência de Ficheiros Android no Mac (consulte www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Câmara (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Permite transferir fotografias utilizando o software da câmara e quaisquer ficheiros em computadores que não suportem MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar ferramentas de transferência de ficheiros"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Deixe as aplicações compatíveis com MIDI serem executadas através de USB com software MIDI no seu computador."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Outros utilizadores"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Armazenamento do dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Armazenamento amovível"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> livre(s) (Total de <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> está montado"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Não foi possível montar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> foi ejetado com segurança"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Não foi possível ejetar com segurança <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> está formatado"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Não foi possível formatar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Mudar o nome do armazenamento"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Após a formatação, pode utilizar este <xliff:g id="NAME_0">^1</xliff:g> noutros dispositivos. \n\nTodos os dados de <xliff:g id="NAME_1">^1</xliff:g> são apagados. Considere fazer uma cópia de segurança primeiro. \n\n"<b>"Fazer uma cópia de segurança das fotos e de outros conteúdos multimédia"</b>" \nMova os seus ficheiros multimédia para um armazenamento alternativo neste dispositivo ou transfira-os para um computador com um cabo USB. \n\n"<b>"Fazer uma cópia de segurança das aplicações"</b>" \nTodas as aplicações armazenadas neste <xliff:g id="NAME_6">^1</xliff:g> são desinstaladas e os respetivos dados são apagados. Para manter estas aplicações, mova-as para um armazenamento alternativo neste dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Quando ejetar este <xliff:g id="NAME_0">^1</xliff:g>, as aplicações armazenadas no mesmo deixam de funcionar e os ficheiros multimédia armazenados deixam de estar disponíveis até voltar a inseri-lo."</b>" \n\nEste <xliff:g id="NAME_1">^1</xliff:g> está formatado para funcionar apenas neste dispositivo. Não funciona em mais nenhum."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar o <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizar como armazenamento portátil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para mover fotos e outros conteúdos multimédia entre dispositivos."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Utilizar como memória de armazenamento interno"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para armazenar algo apenas neste dispositivo, incluindo aplicações e fotos. Requer formatação, o que impede o funcionamento com outros dispositivos."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format. como mem. armaz. interno"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Isto requer que o <xliff:g id="NAME_0">^1</xliff:g> seja formatado para o tornar seguro. \n\nApós a formatação, este <xliff:g id="NAME_1">^1</xliff:g> apenas funciona neste dispositivo. \n\n"<b>"A formatação apaga todos os dados atualmente armazenados no <xliff:g id="NAME_2">^1</xliff:g>."</b>" Para evitar perder os dados, considere fazer uma cópia de segurança."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Apagar e formatar"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"A formatar <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Não remova o <xliff:g id="NAME">^1</xliff:g> enquanto estiver a decorrer a formatação."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mover dados p/ novo armazenamen."</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Pode mover as fotos, os ficheiros e os dados das aplicações para o novo <xliff:g id="NAME">^1</xliff:g>. \n\nA transferência demora cerca de <xliff:g id="TIME">^2</xliff:g> e liberta <xliff:g id="SIZE">^3</xliff:g> na memória de armazenamento interno. Algumas aplicações não funcionam enquanto estiver a decorrer."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mover agora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Mover mais tarde"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Mover dados agora"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"A transferência demora cerca de <xliff:g id="TIME">^1</xliff:g>. Liberta <xliff:g id="SIZE">^2</xliff:g> na memória de armazenamento interno."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Mover"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"A mover dados…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Ao mover: \n• Não remova o <xliff:g id="NAME">^1</xliff:g>. \n• Algumas aplicações não funcionam corretamente. \n• Mantenha o dispositivo carregado."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> está pronto"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"O seu <xliff:g id="NAME">^1</xliff:g> está configurado para a utilização com fotos e outros conteúdos multimédia."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"O seu novo <xliff:g id="NAME">^1</xliff:g> está a funcionar. \n\nPara mover fotos, ficheiros e dados das aplicações para este dispositivo, aceda a Definições &gt; Armazenamento."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"A transferência da aplicação <xliff:g id="APP">^1</xliff:g> e dos respetivos dados para <xliff:g id="NAME_0">^2</xliff:g> demora apenas alguns minutos. Não é possível utilizar a aplicação até a ação terminar. \n\nNão remova o <xliff:g id="NAME_1">^2</xliff:g> no decorrer da mesma."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"A mover <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Não remova o <xliff:g id="NAME">^1</xliff:g> durante a transferência. \n\nA aplicação <xliff:g id="APP">^2</xliff:g> neste dispositivo não está disponível até terminar a transferência."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferência"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado da bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"A restaurar predefinições de APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Repor predefinição"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reposição de predefinições de APN concluída."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Reposição das definições de rede"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"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>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Pretende repor todas as definições de rede? Não é possível anular esta ação!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Repor definições"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Pretende repor?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"As definições de rede foram repostas"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Repor dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Reposição dos dados de fábrica"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Apaga todos os dados do tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Apaga todos os dados do telefone"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Apagar todos os dados do cartão SD, como músicas ou fotografias"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Repor o tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Repor telefone"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Apagar todas as informações pessoais e aplicações transferidas? Não é possível reverter esta ação!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Pretende apagar todas as informações pessoais e as aplicações transferidas? Não é possível anular esta ação!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"É necessário desenhar a sequência de desbloqueio para confirmar uma reposição de dados de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Não foi efetuada nenhuma reposição porque o serviço System Clear não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Repor?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"A reposição de fábrica não está disponível para este utilizador"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Apagar a memória de armazenamento USB, eliminando todos os ficheiros armazenados? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Apagar o cartão SD, eliminando todos os ficheiros armazenados? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Apagar tudo"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"É necessário desenhar a sequência de desbloqueio para confirmar que pretende apagar a memória de armazenamento USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"É necessário desenhar a sequência de desbloqueio para confirmar que pretende apagar o cartão SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Definições de chamadas"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio de voz, reencaminhamento de chamadas, chamada em espera, ID do autor da chamada"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ligação USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Redes móveis"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plano de telemóvel"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicação de SMS predefinida"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicação de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Alterar aplicação de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizar <xliff:g id="NEW_APP">%1$s</xliff:g> em vez de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como a aplicação de SMS predefinida?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizar <xliff:g id="NEW_APP">%s</xliff:g> como a aplicação de SMS predefinida?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utilizar redes móveis, Wi-Fi e GPS para determinar localização"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utilizar redes móveis e Wi-Fi para determinar localização"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utilizar GPS para determinar a sua localização"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilizar o GPS para determinar a localização"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"A analisar"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"A analisar"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Procurar por Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Melhorar a localização ao permitir que as aplicações e os serviços procurem redes Wi-Fi mesmo quando o Wi-Fi está desativado"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Procurar por Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Melhorar a localização ao permitir que os serviços do sistema procurem dispositivos Bluetooth mesmo quando o Bluetooth está desativado"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi e localiz. de rede móvel"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplic. usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A palavra-passe 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>
-    <string name="lock_settings_title" msgid="335025124489630932">"Segurança do ecrã"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Utilize a sequência do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Introduza o PIN do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Introduza a palavra-passe do dispositivo para continuar."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Segurança do dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Mudar padrão de desbloqueio"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Alterar PIN de desbloqueio"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão guardado"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tente novamente:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenhar um padrão de desbloqueio"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Prima Menu para obter ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Retirar dedo quando concluído"</string>
@@ -1176,8 +1225,7 @@
     <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>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como desenhar um padrão de desbloqueio"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Demasiadas tentativas incorrectas!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Tente novamente dentro de <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Demasiadas tentativas incorretas. Tente novamente dentro de <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"A aplicação não está instalada no telemóvel."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerir aplicações"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerir e remover aplicações instaladas"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamanho"</string>
     <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_title" msgid="6093179367325336662">"Repor pref. de aplic.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isto irá repor 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 autorização"</li>\n\n" Não irá perder quaisquer dados das aplicações."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Utilizações da aplicação"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Em execução"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nunca utilizado)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Sem Aplicações predefin."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilização do armazenam."</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ver armazenamento utilizado pelas aplicações"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informações do tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informações do telefone"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informação da bateria"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Iniciação rápida"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Definir atalhos de teclado para iniciar aplicações"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Atribuir aplicação"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Nenhum atalho"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Pesquisar + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Limpar"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"O seu atalho para <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) será limpo."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Cancelar"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplicações"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Atalhos"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Entrada de texto"</string>
     <string name="input_method" msgid="5434026103176856164">"Método de entrada"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Teclado atual"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI num ficheiro"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueio de OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir o desbloqueio do carregador de arranque"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introduza o seu PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduza o PIN do dispositivo para ativar o desbloqueio do OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Pretende permitir o desbloqueio de OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVISO: as funcionalidades de proteção do dispositivo não funcionam neste dispositivo enquanto esta definição estiver ativada."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tamanhos da memória intermédia do registo"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Selec. tam. reg. p/ mem. int. reg."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Ativar a inspeção do atributo de visualização"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Redes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificação de display sem fios"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ativar o registo verboso de Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transm. agressiva de Wi-Fi p/ rede móvel"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Permitir sempre a deteção de Wi-Fi em roaming"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Utilizar cliente DHCP antigo"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opções da certificação de display sem fios"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumentar o nível de reg. de Wi-Fi, mostrar por RSSI de SSID no Selec. de Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Se estiver ativado, o Wi-Fi será mais agressivo ao transmitir a lig. de dados p/ a rede móvel quando o sinal Wi-Fi estiver fraco"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Permitir/impedir a deteção de Wi-Fi em roaming com base na quantidade de tráfego de dados presente na interface"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Tamanhos da memória intermédia do registo"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Selec. tam. reg. p/ mem. int. reg."</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Selecionar configuração USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Selecionar configuração USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Ativar a inspeção do atributo de visualização"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utilizar o cliente DHCP do Lollipop em vez do novo cliente DHCP do Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permitir depuração USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"A depuração USB é utilizada apenas para fins de programação. Utilize-a para copiar dados entre o computador e o aparelho, instalar aplicações no aparelho sem notificação e ler dados de registo."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revogar acesso à depuração USB de todos os computadores anteriormente autorizados?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita de:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Uma vez que uma aplicação está a ocultar um pedido de autorização, as Definições não conseguem validar a sua resposta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se ativar o <xliff:g id="SERVICE">%1$s</xliff:g>, o dispositivo não utilizará o bloqueio de ecrã para otimizar a encriptação de dados."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Uma vez que ativou um serviço de acessibilidade, o dispositivo não utilizará o bloqueio de ecrã para otimizar a encriptação de dados."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Uma vez que ligar <xliff:g id="SERVICE">%1$s</xliff:g> afeta a encriptação de dados, o utilizador tem de confirmar o seu padrão."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estatísticas do Processo"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estatísticas de peritos acerca dos processos em execução"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Utilização da memória"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> aplicações durante <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> de <xliff:g id="TOTALRAM">%2$s</xliff:g> utilizado(s) durante <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Em segundo plano"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Em primeiro plano"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Em cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"A memória do dispositivo é de <xliff:g id="MEMSTATE">%1$s</xliff:g> atualmente"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Utilização média da RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Utilização máxima da RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"SO Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Nativos"</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">"Utilização de RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Utilização de RAM (em segundo plano)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tempo de execução"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Processos"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Serviços"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duração"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Detalhes da memória"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ocultar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utilizar Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estatísticas"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Em segundo plano"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"As predefinições abaixo substituem as definições da aplicação"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Predefinições"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor predefinido"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Define o motor de síntese de discurso para ser utilizado para texto falado"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Definir o motor de síntese de voz a utilizar para o texto falado"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Taxa de voz"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidade a que o texto é falado"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonalidade"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Suportado por hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Apenas software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"As credenciais não estão disponíveis para este utilizador"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário desenhar a sequência de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Fazer uma cópia de segurança dos meus dados"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Fazer cópia de segurança de dados da aplicação, palavras-passe Wi-Fi e outras definições para os servidores da Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Cópia segurança de conta"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Actualmente, nenhuma conta está a armazenar dados com cópia de segurança"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir dados de aplicações"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauro automático"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar uma aplicação, restaurar definições e dados da cópia de segurança"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"O serviço de cópia de segurança está inativo."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Isto é definido pela sua política do dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Palavra-passe cópia do comp."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"As cópias de segurança completas no ambiente de trabalho não estão atualmente protegidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toque para alterar ou remover a palavra-passe para cópias de segurança completas no ambiente de trabalho"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala de anim. de trans."</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Esc. de duração do anim."</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simular apresentações secundárias"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Modo multijanelas"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Várias atividades no ecrã ao mesmo tempo."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Ativar o modo multijanelas?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"AVISO: esta é uma funcionalidade altamente experimental que permite múltiplas atividades no ecrã ao mesmo tempo através da IU de Aplicações recentes. Algumas aplicações podem falhar ou não funcionar corretamente quando utilizadas com esta funcionalidade."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicações"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Não manter atividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir atividades assim que o utilizador sair"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilizador"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrito"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Adicionar novo utilizador?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Pode partilhar este dispositivo com outras pessoas ao criar utilizadores adicionais. Cada utilizador possui o seu próprio espaço, que pode ser personalizado com as suas próprias aplicações, imagem de fundo, etc. Os utilizadores também podem ajustar as definições do dispositivo, como o Wi‑Fi, que afetam os restantes utilizadores.\n\nAo adicionar um novo utilizador, essa pessoa tem de configurar o respetivo espaço.\n\nQualquer utilizador pode atualizar aplicações para todos os outros utilizadores."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Pode partilhar este dispositivo com outras pessoas ao criar utilizadores adicionais. Cada utilizador possui o seu próprio espaço, que pode ser personalizado com aplicações, imagem de fundo, etc. Os utilizadores também podem ajustar as definições do dispositivo, como o Wi‑Fi, que afetam os restantes utilizadores.\n\nAo adicionar um novo utilizador, essa pessoa tem de configurar o respetivo espaço.\n\nQualquer utilizador pode atualizar aplicações para todos os outros utilizadores."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Ao adicionar um novo utilizador, essa pessoa tem de configurar o respetivo espaço.\n\nQualquer utilizador pode atualizar aplicações para todos os outros utilizadores."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o utilizador agora?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Certifique-se de que a pessoa está disponível para levar o dispositivo e configurar o seu espaço"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Pretende remover o convidado?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Todas as aplicações e dados desta sessão serão eliminados."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Remover"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Permitir chamadas telefónicas"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Permitir chamadas telefónicas e SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Ativar chamadas telefónicas"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Ativar chamadas telefónicas e SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Remover utilizador"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Permitir chamadas telefónicas?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Ativar chamadas telefónicas?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"O histórico de chamadas será partilhado com este utilizador."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Permitir chamadas telefónicas e SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"O histórico de chamadas e SMS será partilhado com este utilizador."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ativar chamadas telefónicas e SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O histórico de chamadas e SMS será partilhado com este utilizador."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicações e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicações com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir defin. da aplicação"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"MUDAR NOME"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Definir restrições da aplicação"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlado por <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Esta aplicação não é suportada nos perfis restritos"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Esta aplicação pode aceder às suas contas"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Esta aplicação pode aceder às suas contas. Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi e Rede de Telemóvel"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permitir a modificação de definições de Wi-Fi e de Rede de Telemóvel"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"ligação a rede Wi-Fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensagem de texto mensagens de texto mensagens"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"telemóvel operador de telemóvel dados sem fios 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi telefonar chamadas"</string>
     <string name="keywords_home" msgid="3626170808219458848">"iniciador"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ecrã tátil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"esbater ecrã ecrã tátil bateria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"esbater ecrã ecrã tátil bateria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fundo personalizar visor"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tema escuro modo noturno escurecer o ecrã inverter o brilho"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"fundo personalizar visualização"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamanho do texto"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projeto"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"transmitir projeto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espaço disco disco rígido dispositivo utilização"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"carregar utilização energia"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografia dicionário verificação ortográfica correção automática"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restrição restringir restrito"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correção de texto corrigir som vibração idioma automático toque sugerir sugestão tema palavra ofensiva escrever emoji internacional"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"repor preferências predefinição"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"aplicação predefinida para casos de emergência"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplicações transferência sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplicações autorizações segurança"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplicações predefinidas"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar lentamente palavra-passe sequência pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Config. etiqueta NFC p/ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escrever"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume do alarme"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume do toque"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume de notificações"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupções"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Ao receber chamadas e notificações"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Interromper sempre"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permitir apenas interrupções com prioridade"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Não interromper"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade permite apenas"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Apenas prioridade"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Apenas alarmes"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Sem interrupções"</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="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Toque de notificação predefinido"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar também para chamadas"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</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">
-    <item quantity="one" msgid="8344183614159211585">"%d aplicação consegue ler notificações"</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplicações conseguem ler notificações"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d aplicações conseguem ler notificações</item>
+      <item quantity="one">%d aplicação consegue ler notificações</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nenhum ouvinte de notificações instalado."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> conseguirá ler todas as notificações publicadas pelo sistema ou qualquer aplicação instalada, e poderão incluir informações pessoais, como nomes de contactos e o texto de mensagens que lhe foram enviadas. Conseguirá ainda ignorar estas notificações ou tocar nos respetivos botões de ação."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fornecedores de condições"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nenhuma aplicação fornece condições"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"A aplicação %d fornece condições"</item>
-    <item quantity="other" msgid="358057362115673258">"As aplicações %d fornecem condições"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Não estão instalados fornecedores de condições."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Será possível a <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> adicionar condições de saída do modo não incomodar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Bloquear"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nunca mostrar notificações desta aplicação"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioridade"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Mostrar notificações na parte superior da lista e continuar a recebê-las se o dispositivo estiver definido para interrupções prioritárias apenas"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensível"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Quando o dispositivo está bloqueado, ocultar qualquer conteúdo sensível das notificações desta aplicação"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratar como prioridade"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Permitir que as notificações desta aplicação sejam ouvidas quando Não incomodar estiver definido como Apenas prioridade"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permitir espreitar"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permitir que esta aplicação dê ênfase a determinadas notificações ao deslizá-las brevemente de forma a serem apresentadas no ecrã atual"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ocultar conteúdo sensível"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Quando o dispositivo está bloqueado, ocultar o conteúdo nas notificações desta aplicação que possam revelar informações privadas"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueado"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensível"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Até que o utilizador desative"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupções com prioridade"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Período de inatividade"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dias"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nenhum"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interrupções permitidas"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Apenas prioridade"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nenhum"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatização"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ligar automaticamente."</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nome da regra"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Adicionar regra"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Eliminar regra"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Pretende eliminar a regra \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Eliminar"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de regra"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Desconhecido"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurar regra"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Programar regra"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regra não encontrada."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dias"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nenhum"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Todos os dias"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</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">"De <xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Chamadas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Chamadas/mensagens de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Apenas contactos"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Apenas contactos com estrela"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Eventos e lembretes"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Os alarmes são sempre interrupções com prioridade"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Autores das chamadas selecionados"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Autores de chamadas repetentes"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Se a mesma pessoa telefonar uma segunda vez num período de <xliff:g id="MINUTES">%d</xliff:g> minutos, permitir"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ligar autom."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas as noites"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noites de dias úteis"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de início"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de fim"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou qualquer alarme antes"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte ou qualquer alarme antes"</string>
+    <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_interruptions_voice_title" msgid="855256211259132964">"Interrupções"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Ao receber chamadas e notificações"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quando gostaria de ser interrompido?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Durante quanto tempo?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Interromper sempre"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"desligado,todos,tudo"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Permitir apenas interrupções prioritárias"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Permitir apenas alarmes"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Não interromper"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidamente"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Alterar para notificações prioritárias apenas, indefinidamente"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Alterar para notificações prioritárias 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 notificações prioritárias apenas durante um minuto, até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Alterar para notificações prioritárias 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 notificações prioritárias apenas durante uma hora, até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Alterar para alarmes apenas, indefinidamente"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Alterar para não interromper indefinidamente"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Alterar para não interromper 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 não interromper durante um minuto, até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Alterar para não interromper 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 não interromper durante uma hora, até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para interromper sempre"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"para sempre"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Not. da aplicação"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentários do dispositivo"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Informações do IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Informações relativas do 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="2184141780491382435">"Iniciar por predefinição"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> utilizados em <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Links de domínio"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Abrir URLs de domínio"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Permitir à aplicação abrir diretamente URLs de domínio"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URLs de domínio compatíveis"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Outras predefinições"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> utilizados em <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"memória interna"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"memória externa"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Armazenamento interno"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Armazenamento externo"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Utilização dados da aplic."</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> util. desde <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Armazenamento utilizado"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Ativado"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloquear"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensível"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioridade"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritárias e sensíveis"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizações concedidas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorização concedida</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> autorizações concedidas</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>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Algumas predefinições definidas"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Nenhuma predefinição definida"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Todas as aplicações"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Ativadas"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"De trabalho"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritárias"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensíveis"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Com URLs de domínio"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desativado pelo administrador"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Aplicação desconhecida"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Autorizações da aplicação"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicações autorizadas com acesso adic."</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicações autorizadas"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URLs de domínio"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Não abre qualquer URL de domínio"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Abre \"<xliff:g id="DOMAIN">%s</xliff:g>\""</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Abre \"<xliff:g id="DOMAIN">%s</xliff:g>\" e URLs relacionados"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações podem abrir os seus URLs de domínio</item>
+      <item quantity="one">Uma aplicação pode abrir os seus URLs de domínio</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Não reconhecido"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicações predefinidas"</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_app" msgid="6864503001385843060">"(Predefinição)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Armazenamento de aplicações"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index d440a1d..61a136e 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Pressione o botão"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"ativar/desativar o som do microfone"</item>
     <item msgid="1148142988678569310">"projeção de mídia"</item>
     <item msgid="9130014005474445273">"ativar VPN"</item>
+    <item msgid="1165192162975045562">"escrever plano de fundo"</item>
+    <item msgid="7129487923652967258">"estrutura de assistência"</item>
+    <item msgid="1069023208100114540">"captura de tela de assistência"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Local"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Ativar/desativar o som do microfone"</item>
     <item msgid="5906017727368097853">"Projeção de mídia"</item>
     <item msgid="2486614710846178542">"Ativar VPN"</item>
+    <item msgid="5586547561693629602">"Escrever plano de fundo"</item>
+    <item msgid="32794179825485062">"Estrutura de assistência"</item>
+    <item msgid="7872852746938272552">"Captura de tela de assistência"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curto"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"baixo"</item>
     <item msgid="4212263919458209842">"crítico"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Desativado"</item>
-    <item msgid="5656544177755411222">"Interrupções limitadas"</item>
-    <item msgid="8735337502532332056">"Sem interrupções"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderado"</item>
@@ -530,9 +534,16 @@
   <string-array name="color_picker">
     <item msgid="7631642672260600032">"Azul-petróleo"</item>
     <item msgid="8332294763632946560">"Azul"</item>
-    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="2023216417616991392">"Índigo"</item>
     <item msgid="3170497246594232819">"Roxo"</item>
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Vermelho"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (protocolo de transferência de mídia)"</item>
+    <item msgid="8856820259201251036">"PTP (protocolo de transferência de imagens)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet USB)"</item>
+    <item msgid="2686051673589572111">"Fonte de áudio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5cd0ce5..ad80955 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Permitir"</string>
     <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Falta <xliff:g id="STEP_COUNT">%1$d</xliff:g> etapa para você se tornar um desenvolvedor."</item>
-    <item quantity="other" msgid="6722953419953594148">"Faltam <xliff:g id="STEP_COUNT">%1$d</xliff:g> etapas para você se tornar um desenvolvedor."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
+      <item quantity="other">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Você agora é um desenvolvedor!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário. Você já é um desenvolvedor."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Redes sem fio e outras"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Desligar SMS sobre IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"É obrigatório ligar o registro IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"É obrigatório desligar o registro IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Ativar sinalizador provisionado VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Desativar sinalizador provisionado VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Ativar descarga de ram do lte"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Desativar descarga de ram do lte"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visualizar o catálogo de endereços do SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmissão"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Essa ação desativará o <xliff:g id="PROFILE_NAME">%1$s</xliff:g> do <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sem telefone)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sem mídia)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectado (sem acesso a mensagens)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sem telefone ou mídia)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Conectando..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pareando…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sem nome"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Pesquisar"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nenhum dispositivo Bluetooth encontrado."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar arquivos recebidos"</string>
     <string name="device_picker" msgid="4978696506172252813">"Escolher dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitação de permissão para Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Um app quer ativar o Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Um app quer ativar o Bluetooth neste dispositivo."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Um app quer tornar seu tablet visível para outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Um app quer tornar seu telefone visível para outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Um app quer tornar seu tablet visível para outros dispositivos Bluetooth. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Cartão SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configurações de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"CANCELAR"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAR"</string>
     <string name="okay" msgid="1997666393121016642">"Ok"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"SIM"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NÃO"</string>
-    <string name="forget" msgid="7267115980248732932">"ESQUECER"</string>
+    <string name="forget" msgid="1400428660472591263">"Ignorar"</string>
+    <string name="save" msgid="879993180139353333">"Salvar"</string>
+    <string name="done" msgid="6942539184162713160">"Concluída"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configurar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atalho para as configurações"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Classificar por fuso horário"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Melhorar a correspondência de rosto"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Verificação de presença viva"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Exigir piscar de olhos ao desbloquear"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após modo de espera"</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>
@@ -348,19 +336,42 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gerenciar impressões digitais"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar impressão digital para"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Adicionar"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueio de tela"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais cadastradas</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais cadastradas</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Config. de imp digital"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Para usar sua impressão digital para desbloquear sua tela ou confirmar compras, precisaremos: \n\n✓ Configurar o método de bloqueio da sua tela de backup \n\n✓ Adicionar sua impressão digital"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localizar o sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localize o sensor de impressão digital na parte de trás do smartphone."</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="1063375657071124812">"Vamos começar!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Coloque seu dedo no sensor de impressão digital. Retire-o após sentir uma vibração."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Repita o processo."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Coloque o mesmo dedo no sensor de impressão digital e retire-o após sentir uma vibração."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Adicionada"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sempre que esse ícone é exibido, você pode usar sua impressão digital para fins de identificação ou para autorizar uma compra."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Adicionar"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Próximo"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptografar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptografar telefone"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptografado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"Você pode criptografar suas contas, configurações, apps transferidos e seus dados, mídia e outros arquivos. Após criptografar seu tablet, supondo que um bloqueio de tela tenha sido configurado (ou seja, um padrão, PIN numérico ou senha), será necessário desbloquear a tela para descriptografar o smartphone sempre que você ligá-lo. A única outra maneira de descriptografar é por meio de uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"Você pode criptografar suas contas, configurações, apps transferidos e seus dados, mídia e outros arquivos. Após criptografar seu smartphone, supondo que um bloqueio de tela tenha sido configurado (ou seja, um padrão, PIN numérico ou senha), será necessário desbloquear a tela para descriptografar o smartphone sempre que você ligá-lo. A única outra maneira de descriptografar é por meio de uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu smartphone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"Você pode criptografar suas contas, configurações, apps transferidos e seus dados, mídia e outros arquivos. Após criptografar seu tablet, supondo que um bloqueio de tela tenha sido configurado (ou seja, um padrão, PIN numérico ou senha), será necessário desbloquear a tela para descriptografar o smartphone sempre que você ligá-lo. A única outra maneira de descriptografar é por meio de uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva uma hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"Você pode criptografar suas contas, configurações, apps transferidos e seus dados, mídia e outros arquivos. Após criptografar seu smartphone, supondo que um bloqueio de tela tenha sido configurado (ou seja, um padrão, PIN numérico ou senha), será necessário desbloquear a tela para descriptografar o smartphone sempre que você ligá-lo. A única outra maneira de descriptografar é por meio de uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva uma hora ou mais. Você deve iniciar com a bateria carregada e manter seu smartphone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptografar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptografar telefone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carregue sua bateria e tente novamente."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conecte seu carregador e tente novamente."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Não há PIN ou senha da tela de bloqueio"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"É necessário definir um PIN ou uma senha para a tela de bloqueio antes de iniciar a criptografia."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Você precisa desenhar o seu padrão de desbloqueio para confirmar a criptografia do dispositivo."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Criptografar?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"A operação de criptografia é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva cerca de uma hora ou mais, e nesse período o tablet será reiniciado várias vezes."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"A operação de criptografia é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva uma hora ou mais, e nesse período o telefone será reiniciado várias vezes."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Deslizar"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Sem segurança"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Desbloqueio facial"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"De baixa segurança, experimental"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Padrão"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Segurança média"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurança média a alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Senha"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta segurança"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueio de tela atual"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Os recursos de proteção de dispositivos não funcionarão mais."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Des. pelo adm., pol. de cript. ou armaz. de cred."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nenhuma"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueio facial"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Padrão"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Senha"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Depois que você configura um bloqueio de tela, pode configurar sua impressão digital em Config. &gt; Segurança."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desativar bloqueio da tela"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"A senha deve conter no mínimo uma letra."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"A senha deve conter no mínimo um dígito."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"A senha deve conter no mínimo um símbolo."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"A senha deve conter pelo menos uma letra."</item>
-    <item quantity="other" msgid="8186027808415585970">"A senha deve conter pelo menos %d letras."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"A senha deve conter pelo menos uma letra minúscula."</item>
-    <item quantity="other" msgid="2693910942679679225">"A senha deve conter pelo menos %d letras minúsculas."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"A senha deve conter pelo menos uma letra maiúscula."</item>
-    <item quantity="other" msgid="3030801209112209245">"A senha deve conter pelo menos %d letras maiúsculas."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"A senha deve conter pelo menos um dígito numérico."</item>
-    <item quantity="other" msgid="4703982391407595924">"A senha deve conter pelo menos %d dígitos numéricos."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"A senha deve conter pelo menos um símbolo especial."</item>
-    <item quantity="other" msgid="1221290525051187757">"A senha deve conter pelo menos %d símbolos especiais."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"A senha deve conter pelo menos um caractere que não seja letra."</item>
-    <item quantity="other" msgid="3952508584649046404">"A senha deve conter pelo menos %d caracteres que não sejam letras."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">A senha deve conter pelo menos %d letras.</item>
+      <item quantity="other">A senha deve conter pelo menos %d letras.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">A senha deve conter pelo menos %d letras minúsculas.</item>
+      <item quantity="other">A senha deve conter pelo menos %d letras minúsculas.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">A senha deve conter pelo menos %d letras maiúsculas.</item>
+      <item quantity="other">A senha deve conter pelo menos %d letras maiúsculas.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">A senha deve conter pelo menos %d dígitos numéricos.</item>
+      <item quantity="other">A senha deve conter pelo menos %d dígitos numéricos.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">A senha deve conter pelo menos %d símbolos especiais.</item>
+      <item quantity="other">A senha deve conter pelo menos %d símbolos especiais.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">A senha deve conter pelo menos %d caracteres que não sejam letras.</item>
+      <item quantity="other">A senha deve conter pelo menos %d caracteres que não sejam letras.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"O administrador do dispositivo não permite usar uma senha recente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"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>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Para parear com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Verifique se ele está mostrando a seguinte senha:&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">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Parear com este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Para parear com:<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>Digite no dispositivo:<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>. Em seguida, pressione Voltar ou Entrar."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Parear"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PAREAR"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"O pareamento dá acesso a seus contatos e ao histórico de chamadas quando estiver conectado."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Não foi possível parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Não foi possível parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> por causa de um PIN ou senha incorretos."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Não é possível se comunicar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparelhamento rejeitado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Não foi possível conectar ao <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Procurar dispositivos"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Atualizar"</string>
@@ -515,16 +518,8 @@
     <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">"Dispositivo pode se comunicar c/ Bluetooth ativado"</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Para aumentar a precisão da localização, apps e serviços verificam dispositivos Bluetooth, mesmo quando o Bluetooth está desativado. Essa opção pode ser alterada 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_specific_profiles_title" msgid="6952214406025825164">"Conectar-se a..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Áudio da mídia"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Áudio do telefone"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferência de arquivo"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acesso à Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Compartilhamento de contatos"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Usar para compartilhamento de contatos"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartilhamento de conexão à Internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acesso a mensagens"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio da mídia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio do viva-voz."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do dispositivo de entrada."</string>
@@ -537,29 +532,16 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Usar para"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Renomear"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permitir transfer. de arquivo"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao áudio da mídia"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao áudio do telefone"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferência de arquivo"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectado ao mapa"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não está conectado ao servidor de transferência de arquivo"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado ao dispositivo de entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado ao dispositivo para acesso à Internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Compart. conexão local de Intern. com disp."</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Usar para áudio de mídia"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Usar para áudio do telefone"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usado para transferência de arquivo"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para entrada"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usar para acesso à Internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Usar para mapa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configurações de dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Usar dock para áudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e mídia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistente de Wi-Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado via assistente de Wi‑Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Transmitir tela"</string>
-    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar Display sem fio"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmitir"</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar tela sem fio"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo próximo encontrado."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectado"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Esquecer"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Concluído"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir troca de dados quando o tablet tocar em outro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir troca de dados quando o telefone tocar em  outro dispositivo"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Desativando Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Erro"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"No modo avião"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Não é possível verificar a existência de redes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificação de rede"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Notificar sempre que houver uma rede pública disponível"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar conexões ruins"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Não usar uma rede Wi-Fi a menos que tenha uma boa conexão com a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Use somente redes que têm uma boa conexão com a Internet"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Verificação sempre disponível"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Sempre permitir verificação"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permitir que o serviço de localização do Google e outros apps verifiquem redes, mesmo que o Wi-Fi esteja desligado"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Usar Wi-F aberto automaticamente"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Deixar um assistente Wi-Fi conectar-se automaticamente a redes abertas de alta qualidade"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Escolher assistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para aumentar a precisão da localização e para outras finalidades, o Google e outros apps podem verificar redes próximas, mesmo que o Wi-Fi esteja desligado. Para impedir, vá para \"Avançado &gt; Verificação sempre disponível\"."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Os apps podem verificar redes Wi-Fi próximas, mesmo que o Wi-Fi esteja desligado. Para impedir, vá para \"Avançado &gt; Verificação sempre disponível\"."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Para melhorar a precisão da localização, apps e serviços verificam redes Wi‑Fi, mesmo quando o Wi‑Fi está desativado. É possível alterar essas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Não mostrar novamente"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi durante inatividade"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi ativ. durante suspensão"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Adicionar outra rede"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuração automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Para concluir a configuração, o tablet precisa de acesso à rede Wi-Fi. Após a instalação, você poderá alternar entre os dados da rede celular e o Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Opções avançadas"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Configuração protegida do Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Pressione o botão \"Wi-Fi Protected Setup\" do roteador. Ele também pode ser chamado de \"WPS\" ou conter este símbolo:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Pressione o botão \"Wi-Fi Protected Setup\" do roteador. Ele também pode ser chamado de \"WPS\" ou ser marcado com este símbolo:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Insira o PIN <xliff:g id="NUMBER">%1$s</xliff:g> em seu roteador Wi-Fi. A configuração pode levar até dois minutos."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS realizada. Conectando-se à rede…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Conectado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anônima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Senha"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar senha"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Configurar banda de AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Configurações de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(não alterado)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(não especificado)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Salva"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Falha de configuração de IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Falha de conexão Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Nenhum acesso à Internet detectado. O dispositivo não conectará automaticamente."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Fazer login para conectar?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requer login on-line antes de conectar à rede."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Esta rede não tem acesso à Internet. Usar a rede assim mesmo?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Não perguntar novamente para esta rede"</string>
     <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>
@@ -700,7 +675,7 @@
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVISO: se você ignorar a configuração de Wi-Fi, o smartphone usará somente dados da rede celular para fazer os downloads iniciais e as atualizações. Para evitar possíveis cobranças de dados, conecte-se ao Wi-Fi."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Se pular Wi‑Fi:\n\nSeu tablet não terá conexão com a Internet.\n\nVocê não receberá atualizações de software enquanto não se conectar com a Internet.\n\nNão é possível ativar recursos de proteção de dispositivos no momento."</string>
     <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Se pular Wi‑Fi:\n\nseu dispositivo não terá uma conexão com a Internet.\n\nVocê não receberá atualizações de software enquanto não se conectar com a Internet.\nNão é possível ativar recursos de proteção de dispositivos\n no momento."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Se pular Wi‑Fi:\n\nseu smartphone não terá conexão com a Internet.\n\nVocê não receberá atualizações de software enquanto não se conectar com a Internet.\n\nNão é possível ativar recursos de proteção de dispositivos no momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Se ignorar o Wi‑Fi:\n\nSeu smartphone não terá conexão com a Internet.\n\nVocê não receberá atualizações de software enquanto não se conectar com a Internet.\n\nNão é possível ativar recursos de proteção de dispositivos no momento."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"O tablet não foi capaz de conectar à rede Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Não foi possível conectar o dispositivo a essa rede Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"O telefone não foi capaz de conectar à rede Wi-Fi."</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Pt ac. Wi-Fi portátil AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Ponto de acesso Wi-Fi portátil <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_mode_title" msgid="2164073796253284289">"Preferência de chamadas"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de chamada por Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi preferido"</item>
+    <item msgid="5267397515594230396">"Celular preferido"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Início"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho da tela"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brilho adaptável"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Otimizar nível de brilho de acordo com a luz disponível"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Leve"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Escuro"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -826,7 +818,7 @@
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando encaixado"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desativado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Para controlar o que acontece quando o telefone está encaixado e/ou suspenso, ative o Daydream."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando iniciar Daydreams"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando iniciar o Daydream"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Começar agora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configurações"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Atualiz. cartão SIM preferido?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> é o único cartão SIM no seu dispositivo. Deseja usar este cartão SIM para dados, chamadas e mensagens SMS do telefone celular?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN do SIM incorreto. Entre em contato com a operadora para desbloquear o dispositivo."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Código PIN do SIM incorreto. Tentativas restantes: <xliff:g id="NUMBER">%d</xliff:g>. Caso o código correto não seja digitado, será necessário entrar em contato com a operadora para desbloquear o dispositivo."</item>
-    <item quantity="other" msgid="77103619544346451">"Código PIN do SIM incorreto. Tentativas restantes: <xliff:g id="NUMBER">%d</xliff:g>."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Código PIN do SIM incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
+      <item quantity="other">Código PIN do SIM incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Falha na operação de PIN do SIM."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status do tablet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Status do telefone"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponível (somente leitura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espaço total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Dados de apps e conteúdo de mídia"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Apps e dados de apps"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Mídia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imagens, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Áudio (música, toques, podcasts)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Outros arquivos"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dados em cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desconectar armaz. comp."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desconexão em andamento"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Pouco espaço de armazenamento"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Algumas funções do sistema, como a sincronização, podem não funcionar corretamente. Tente liberar espaço excluindo ou desmarcando itens como apps ou conteúdo de mídia."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Renomear"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Ativar"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Ejetar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Limpar e formatar"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Limpar e formatar como armazenamento interno"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Conexão USB do computador"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conexão USB do computador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectar-se como"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Permite a transferência de arquivos de mídia no Windows ou por meio do Android File Transfer no Mac. Consulte www.android.com/filetransfer."</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Câmera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Permite a transferência de fotos usando o software da câmera e transfere todos os arquivos em computadores que não suportam MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar ferramentas de transferência de arquivos"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Permite que apps com MIDI ativado funcionem por meio de USB com o software MIDI no computador."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Outros usuários"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Armazenamento do dispositivo"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Armazenamento removível"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> livre(s). Total de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Ativação de <xliff:g id="NAME">%1$s</xliff:g> concluída"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Falha ao ativar <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> ejetado com segurança"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Não foi possível ejetar <xliff:g id="NAME">%1$s</xliff:g> com segurança"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Formatação de <xliff:g id="NAME">%1$s</xliff:g> concluída"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Não foi possível concluir a formatação de <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Renomear armazenamento"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Após a formatação, você pode usar este <xliff:g id="NAME_0">^1</xliff:g> em outros dispositivos. \n\nTodos os dados deste <xliff:g id="NAME_1">^1</xliff:g> serão apagados. Faça backup primeiro. \n\n"<b>"Backup de fotos e outras mídias"</b>" \nMova seus arquivos de mídia para um local de armazenamento alternativo neste dispositivo ou transfira-os para um computador usando um cabo USB. \n\n"<b>"Backup de apps"</b>" \nTodos os apps armazenados neste <xliff:g id="NAME_6">^1</xliff:g> serão desinstalados, e os dados deles serão apagados. Para manter esses apps, mova-os para um local de armazenamento alternativo neste dispositivo."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Quando você ejetar este <xliff:g id="NAME_0">^1</xliff:g>, os apps armazenados nele deixarão de funcionar, e os arquivos de mídia não ficarão disponíveis até que ele seja inserido novamente."</b>" \n\nEste <xliff:g id="NAME_1">^1</xliff:g> é formatado para funcionar apenas neste dispositivo. Não funcionará em nenhum outro."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar seu <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como armazenamento portátil"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para mover fotos e outras mídias entre dispositivos."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Usar como armazenamento interno"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para armazenar qualquer coisa somente neste dispositivo, incluindo apps e fotos. Requer formatação, que o impede de funcionar com outros dispositivos."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatar como armazenam. interno"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"É necessário que <xliff:g id="NAME_0">^1</xliff:g> seja formatado para torná-lo seguro. \n\nDepois da formatação, este <xliff:g id="NAME_1">^1</xliff:g> funcionará somente neste dispositivo. \n\n"<b>"A formatação limpa todos os dados armazenados no <xliff:g id="NAME_2">^1</xliff:g>."</b>" Para evitar perder os dados, faça backup deles."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Limpar e formatar"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatando <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Não remova o <xliff:g id="NAME">^1</xliff:g> enquanto ele estiver sendo formatado."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mover dados para novo armazenamento"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"É possível mover suas fotos, arquivos e dados de apps para este novo <xliff:g id="NAME">^1</xliff:g>. \n\nA transferência demora aproximadamente <xliff:g id="TIME">^2</xliff:g> e liberará <xliff:g id="SIZE">^3</xliff:g> no armazenamento interno. Alguns apps não funcionarão enquanto ela estiver em andamento."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mover agora"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Mover mais tarde"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Mover dados agora"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"A transferência demora aproximadamente <xliff:g id="TIME">^1</xliff:g>. Ela liberará <xliff:g id="SIZE">^2</xliff:g> de armazenamento interno."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Mover"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Movendo dados..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Durante a transferência: \n• Não remova o <xliff:g id="NAME">^1</xliff:g>. \n• Alguns apps não funcionarão corretamente. \n• Mantenha o dispositivo carregado."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> está pronto"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Seu <xliff:g id="NAME">^1</xliff:g> está pronto para ser usado com fotos e outras mídias."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Seu novo <xliff:g id="NAME">^1</xliff:g> está funcionando. \n\nPara mover fotos, arquivos e dados de apps para este dispositivo, vá para \"Config.\" &gt; \"Armazenamento\"."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"A transferência de <xliff:g id="APP">^1</xliff:g> e seus dados para <xliff:g id="NAME_0">^2</xliff:g> levará apenas alguns momentos. Você não conseguirá usar o app até que a transferência seja concluída. \n\nNão remova o <xliff:g id="NAME_1">^2</xliff:g> durante a transferência."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Movendo <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Não remova o <xliff:g id="NAME">^1</xliff:g> durante a transferência. \n\nO app <xliff:g id="APP">^2</xliff:g> deste dispositivo não ficará disponível até a conclusão da transferência."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferência"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status da bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando as configurações APN padrão."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Redefinir para o padrão"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Redefinição das configurações padrão do APN concluída."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Configurações de rede redefinidas"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Isso redefinirá todas as configurações de rede, incluindo:\n\n"<li>"Wi‑Fi"</li>\n<li>"dados da rede celular"</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="4874737348054213767">"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="reset_network_complete_toast" msgid="787829973559541880">"As configurações de rede foram redefinidas"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Redefinir dispositivo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Configuração original"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Apaga todos os dados no tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Apaga todos os dados no telefone"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu telefone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps baixados"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Apagar todos os dados do cartão SD, como músicas e fotos"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Redefinir tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Redefinir telefone"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Apagar todas as suas informações pessoais e os apps transferidos? Não é possível reverter esta ação!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Limpar todas as suas informações pessoais e apps baixados por download? Não é possível desfazer esta ação."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"É necessário que você desenhe seu padrão de desbloqueio para confirmar uma redefinição para configuração original."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"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>
     <string name="master_clear_not_available" msgid="1000370707967468909">"A configuração original não está disponível para esse usuário"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Apagar o armazenamento USB, excluindo todos os arquivos armazenados nele? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Apagar o cartão SD, excluindo todos os arquivos armazenados nele? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Apagar tudo"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"É necessário que você desenhe seu padrão de desbloqueio para confirmar que deseja apagar o armazenamento USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"É necessário que você desenhe seu padrão de desbloqueio para confirmar que deseja apagar o cartão SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Conf. de chamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio voz, encaminhamento, espera etc."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Redes celulares"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plano de celular"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"App de SMS padrão"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"App de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Alterar app de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Usar o <xliff:g id="NEW_APP">%1$s</xliff:g> em vez do <xliff:g id="CURRENT_APP">%2$s</xliff:g> como app de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Usar o <xliff:g id="NEW_APP">%s</xliff:g> como app de SMS?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Usar GPS, Wi‑Fi e redes celulares para determinar a localização"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Usar Wi-Fi e redes celulares para determinar a localização"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Usar GPS para determinar a localização"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar local"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Verificação"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Verificação"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Verificação de Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Melhore a localização permitindo que os serviços do sistema verifiquem redes Wi-Fi, mesmo quando o Wi-Fi está desligado"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Verificação de Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Melhore a localização permitindo que os serviços do sistema verifiquem dispositivos Bluetooth, mesmo quando o Bluetooth está desligado"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localiz. por Wi-Fi e rede cel."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que apps usem o serviço de localização do Google para determinar seu local mais rapidamente. Dados de localização anônimos serão coletados e enviados ao Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <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>
-    <string name="lock_settings_title" msgid="335025124489630932">"Tela de segurança"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Use o padrão do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Digite o PIN do dispositivo para continuar."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Digite a senha do dispositivo para continuar."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Segurança do dispositivo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Mudar padrão de desbloqueio"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Mudar PIN de desbloqueio"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão salvo"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tente novamente:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenhe um padrão de desbloqueio"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pressione Menu para obter ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Levante o dedo ao terminar"</string>
@@ -1176,8 +1225,7 @@
     <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>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como desenhar um padrão de desbloqueio"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Muitas tentativas incorretas!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Tente novamente em <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Excesso de tentativas incorretas. Tente novamente em <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"O app não está instalado no telefone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerenciar apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerenciar e remover apps instalados"</string>
@@ -1228,9 +1276,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Classificar por tamanho"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar serviços em exec."</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar processo em cache"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"App de emergência"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir preferências"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir preferências?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para: \n \n "<li>"apps desabilitados "</li>" \n "<li>" notificações de apps desabilitados "</li>" \n "<li>" apps padrão para ações "</li>" \n "<li>" restrições de dados em plano de fundo para apps "</li>" \n "<li>" quaisquer restrições de permissão "</li>" \n \n você não perderá dados de apps."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para: \n \n "<li>"apps desabilitados "</li>" \n "<li>" notificações de apps desabilitados "</li>" \n "<li>" apps padrão para ações "</li>" \n "<li>" restrições de dados em plano de fundo para apps "</li>" \n "<li>" quaisquer restrições de permissão "</li>" \n \n Você não perderá dados de apps."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Redefinir apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -1285,12 +1334,12 @@
     <string name="invalid_location" msgid="2786030127356312746">"O local de instalação não é válido."</string>
     <string name="system_package" msgid="6222593098063037137">"As atualizações do sistema não podem ser instaladas em mídia externa."</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Forçar parada?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Se você forçar a interrupção de um app, ele pode apresentar mau funcionamento."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Se você forçar a parada de um app, ele pode apresentar mau funcionamento."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"Não foi possível mover o app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Local de instalação preferido"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Alterar o local de instalação preferido para novos apps"</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Desativar aplicat. integrado?"</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Desativar app integrado?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Se você desativar um app integrado, outros apps podem apresentar mau funcionamento."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Excluir os dados e desativar o app?"</string>
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Se você desativar um app integrado, outros apps poderão apresentar problemas. Seus dados também serão excluídos."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Operações de apps"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Em execução"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nunca usado)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Nenhum app padrão."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso do armazenamento"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Visualizar armazenamento usado pelos apps"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informações do tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informações do telefone"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informações da bateria"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Início rápido"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Define atalhos de teclado para iniciar apps"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Atribuir app"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Sem atalho"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Pesquisar + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Limpar"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"O seu atalho para <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) será apagado."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Cancelar"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apps"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Atalhos"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Entrada de texto"</string>
     <string name="input_method" msgid="5434026103176856164">"Método de entrada"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Teclado atual"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI em um arquivo"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueio de OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir que o bootloader seja desbloqueado"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Digite seu PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Digite o PIN do dispositivo para ativar o desbloqueio de OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Permitir desbloqueio de OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVISO: os recursos de proteção do dispositivo não funcionarão neste dispositivo enquanto esta configuração estiver desativada."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tamanhos de buffer de logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. tam. de logger/buffer de log"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Ativar visualiz. insp. atributo"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Redes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificação de Display sem fio"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ativar registro extenso de Wi-Fi"</string>
-    <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transferência agressiva de Wi-Fi para celular"</string>
-    <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Sempre permitir verificações de roaming de Wi-Fi"</string>
+    <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transf. agressiva de Wi-Fi para celular"</string>
+    <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Sempre permitir verif. de roaming de Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Usar cliente DHCP legado"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opções de certificação de Display sem fio"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumentar o nível de registro do Wi-Fi; mostrar conforme o RSSI de SSID na Seleção de Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Quando ativada, o Wi-Fi será mais agressivo em transferir a conexão de dados para celular, quando o sinal de Wi-Fi estiver fraco"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Permitir/proibir verificações de roaming de Wi-Fi com base no volume do tráfego de dados presente na interface"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Tamanhos de buffer de logger"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. tam. de logger/buffer de log"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Selecionar configuração USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Selecionar configuração USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
-    <string name="debug_view_attributes" msgid="6485448367803310384">"Ativar visualização de inspeção de atributo"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Ativar visualiz. insp. atributo"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Use o cliente DHCP do Lollipop, em vez do novo cliente DHCP do Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permitir a depuração USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"A depuração USB serve apenas para fins de desenvolvimento. Use-a para copiar dados entre o computador e o dispositivo, instalar apps no seu aparelho sem notificação e ler dados de registro."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revogar o acesso à depuração USB para todos os computadores autorizados?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Como um app está ocultando uma solicitação de permissão, as configurações não podem confirmar sua resposta."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se <xliff:g id="SERVICE">%1$s</xliff:g> for ativado, o dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Uma vez que o serviço de acessibilidade foi ativado, seu dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme seu padrão."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estatísticas de processo"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estatísticas detalhadas sobre os processos em execução"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso da memória"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apps em <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> de <xliff:g id="TOTALRAM">%2$s</xliff:g> usados durante <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Segundo plano"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Primeiro plano"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Em cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"A memória do dispositivo está <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Uso médio de RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso máximo de RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Sistema operacional Android"</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">"Uso de RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Uso de RAM (segundo plano)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tempo de execução"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Processos"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Serviços"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duração"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Detalhes da memória"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ocultar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Usar Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estatísticas"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Segundo plano"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"As configurações padrão abaixo substituem as configurações do app"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configurações padrão"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Mecanismo padrão"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Define o mecanismo de síntese de fala a ser usado para texto falado"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Definir o mecanismo de síntese de fala a ser usado para texto falado"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Taxa de fala"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidade em que o texto é falado"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Frequência do som"</string>
@@ -1772,7 +1827,7 @@
     <string name="tts_status_title" msgid="7268566550242584413">"Status de idioma padrão"</string>
     <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> é totalmente suportada"</string>
     <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> requer conexão de rede"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> não é suportada"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> não é suportado"</string>
     <string name="tts_status_checking" msgid="4983413982985913047">"Verificando…"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mecanismos"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configurações de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Suportado por hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Somente software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"As credenciais não estão disponíveis para este usuário"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário que você desenhe seu padrão de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Fazer backup"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Fazer backup de dados de apps, senhas de redes Wi-Fi e outras configurações nos servidores do Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Conta de backup"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Nenhuma conta está armazenando o backup dos dados"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir dados de apps"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauração automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar um app, restaura as configurações de backup e dados"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"O serviço de backup não está ativo."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Isto é definido pela política do seu dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Senha do backup local"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Os backups completos do computador não estão protegidos no momento"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toque para alterar ou remover a senha de backups completos do desktop"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala anim. de transição"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala de duração do Animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simular displays secund."</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Modo de várias janelas"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Várias atividades na tela ao mesmo tempo."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Ativar o modo de várias janelas?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"AVISO: este é um recurso altamente experimental que permite a realização de várias atividades na tela ao mesmo tempo por meio da interface do usuário dos \"Apps recentes\". Alguns apps podem falhar ou não funcionar corretamente quando usados com esse recurso."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Não manter atividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir todas as atividades quando o usuário sair"</string>
@@ -2077,7 +2133,7 @@
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Dados 4G"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Primeiro plano:"</string>
     <string name="data_usage_background_label" msgid="2722008379947694926">"Segundo plano:"</string>
-    <string name="data_usage_app_settings" msgid="2279171379771253165">"Configurações do app"</string>
+    <string name="data_usage_app_settings" msgid="2279171379771253165">"Configurar app"</string>
     <string name="data_usage_app_restrict_background" msgid="7510046552380574925">"Restr. dados de 2º plano de apps"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="3720075732277934106">"Desabilitar dados de segundo plano em redes celulares."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="1446565717342917727">"P/ restringir dados de 2º plano, defina limite da rede celular."</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuário"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrito"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Adicionar novo usuário?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Você pode compartilhar este dispositivo com outras pessoas por meio da criação de usuários adicionais. Cada usuário tem seu próprio espaço, o qual pode ser personalizado com os próprios apps, plano 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_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>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Remover convidado?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Todos os apps e dados nesta sessão serão excluídos."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Remover"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Permitir chamadas telefônicas"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Permitir chamadas telefônicas e SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Ativar chamadas telefônicas"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Ativar chamadas telefônicas e SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Remover usuário"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Permitir chamadas telefônicas?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Ativar chamadas telefônicas?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"O histórico de chamadas será compartilhado com este usuário."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Permitir cham. telefônicas e SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"O histórico de chamadas e SMS será compartilhado com este usuário."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ativar chamadas telefônicas e SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O histórico de chamadas e SMS será compartilhado com este usuário."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir apps e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir configuração para app"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"RENOMEAR"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Definir restrições do app"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlado por <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Este app não é compatível com perfis restritos"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Este app pode acessar suas contas"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Este app pode acessar suas contas. Controlado por <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi e redes móveis"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permitir modificação das configurações de Wi-Fi e redes móveis"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2310,7 +2366,7 @@
     <string name="sim_cellular_data_unavailable" msgid="9018555543451203035">"Dados de rede celular indisponíveis"</string>
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Toque para selecionar um SIM de dados"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Sempre usar esta opção para chamadas"</string>
-    <string name="select_sim_for_data" msgid="2366081042162853044">"Selecionar um SIM para dados"</string>
+    <string name="select_sim_for_data" msgid="2366081042162853044">"Selecionar um SIM de dados"</string>
     <string name="data_switch_started" msgid="2040761479817166311">"Trocando SIM de dados. Isso pode demorar um pouco..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Ligar com"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Selecionar um cartão SIM"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi rede conexão"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensagem de texto enviar mensagens de texto mensagens mensagens"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular operadora de celular dados sem fio 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi chamada chamando"</string>
     <string name="keywords_home" msgid="3626170808219458848">"tela de início"</string>
     <string name="keywords_display" msgid="6709007669501628320">"tela touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"escurecer tela touchscreen bateria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"escurecer tela touchscreen bateria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano personalizar personalizar exibir"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tema escuro modo noturno diminuir brilho inverter brilho"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"segundo plano personalizar exibir"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamanho do texto"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projeto"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"transmissão do projeto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espaço em disco disco rígido uso do dispositivo"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"energia uso carregar"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografia dicionário verificação ortográfica correção automática"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restrição restringir restrito"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correção de texto corrigir som vibrar idioma automático gesto sugerir tema palavra ofensiva digitar emoji internacional"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"redefinir preferências padrão"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"app ICE padrão para casos de emergência"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"apps download aplicativos sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"segurança das permissões de apps"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"apps padrão"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar senha padrão pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume do alarme"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume do toque"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume das notificações"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupções"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Ao receber chamadas e notificações"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Sempre interromper"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permitir apenas interrupções prioritárias"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Não interromper"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade: só permite"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Somente prioridade"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Somente alarmes"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Sem interrupções"</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="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Toque de notificação padrão"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Também vibrar para chamadas"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibração"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Os apps não podem ler notificações"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app pode ler notificações"</item>
-    <item quantity="other" msgid="980049191810249052">"%d apps podem ler notificações"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d apps podem ler notificações</item>
+      <item quantity="other">%d apps podem ler notificações</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nenhum ouvinte de notificações instalado."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> poderá ler todas as notificações postadas pelo sistema ou por qualquer app instalado, que poderão incluir informações pessoais como nomes de contatos e textos de mensagens enviadas para você. Também poderá dispensar essas notificações ou tocar em botões de ação incluídos nelas."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fornecedores de condições"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nenhum app fornece condições"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app fornece condições"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apps fornecem condições"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nenhum fornecedor de condições instalado."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> poderá adicionar condições de saída ao modo Não perturbe."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Bloquear"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nunca mostrar notificações deste app"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioridade"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Mostrar notificações no topo da lista e recebê-las quando o dispositivo estiver configurado para apenas interrupções prioritárias"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Confidenciais"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Quando o dispositivo estiver bloqueado, ocultar todo o conteúdo confidencial das notificações deste app"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratar como prioridade"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Permitir que as notificações deste app sejam ouvidas quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permitir exibição"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permitir que este app enfatize determinadas notificações, deslizando-as brevemente para visualização na tela atual"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ocultar conteúdo confidencial"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Quando o dispositivo estiver bloqueado, ocultar conteúdo das notificações deste app que possa revelar informações particulares"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueadas"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidenciais"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Até você desativar"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupções prioritárias"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Tempo de inatividade"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dias"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nenhum"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interrupções permitidas"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Só prioridade"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nenhum"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automação"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ativar automaticamente"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nome da regra"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Adicionar regras"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Excluir regra"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Excluir a regra \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Excluir"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de regra"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Desconhecido"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurar regra"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Programar regra"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regra não encontrada."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dias"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nenhum"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Todos os dias"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</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> a <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Chamadas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Chamadas/mensagens de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Somente contatos"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Somente contatos com estrela"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Eventos e lembretes"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmes são sempre interrupções prioritárias"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Autores de chamadas selecionados"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Autores de chamadas repetidas"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Permitir que a mesma pessoa ligue uma segunda vez em um período de <xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ativação automática"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas as noites"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noites em dias úteis"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Horário de início"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Horário de término"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou qualquer alarme anterior"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte ou qualquer alarme anterior"</string>
+    <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_interruptions_voice_title" msgid="855256211259132964">"Interrupções"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Ao receber chamadas e notificações"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Quando você gostaria de ser interrompido?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Por quanto tempo?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Sempre interromper"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"desativadas,todas,tudo"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Permitir apenas interrupções prioritárias"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Permitir apenas alarmes"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Nunca interromper"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Indefinidamente"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Alterar para \"Somente notificações prioritárias\" indefinidamente"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Alterar para \"Somente notificações prioritárias\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Alterar para \"Somente notificações prioritárias\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Alterar para \"Somente notificações prioritárias\" por <xliff:g id="DURATION">%1$d</xliff:g> horas (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Alterar para \"Somente notificações prioritárias\" por <xliff:g id="DURATION">%1$d</xliff:g> horas (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Alterar para \"Somente alarmes\" indefinidamente"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Alterar para \"Somente alarmes\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Alterar para \"Somente alarmes\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Alterar para \"Somente alarmes\" por <xliff:g id="DURATION">%1$d</xliff:g> horas, até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Alterar para \"Somente alarmes\" por <xliff:g id="DURATION">%1$d</xliff:g> horas, até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Alterar para \"Não interromper\" indefinidamente"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Alterar para \"Não interromper\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Alterar para \"Não interromper\" por <xliff:g id="DURATION">%1$d</xliff:g> minutos (até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Alterar para \"Não interromper\" por <xliff:g id="DURATION">%1$d</xliff:g> horas, até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Alterar para \"Não interromper\" por <xliff:g id="DURATION">%1$d</xliff:g> horas, até <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para \"Sempre interromper\""</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"sempre"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificações de apps"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Informações de IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Informações relativas de 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="2184141780491382435">"Iniciar por padrão"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> usados em <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Links de domínio"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Abrir URLs de domínio"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Permitir que o app abra URLs de domínio diretamente"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URLs de domínio compatíveis"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Outros padrões"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> usados em <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"memória interna"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"memória externa"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Armazenamento interno"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Armazenamento externo"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Uso de dados de apps"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> usados desde <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Armazenamento usado"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Ativado"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloquear"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Confidenciais"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioridade"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioridade e confidenciais"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> permissões concedidas</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permissões concedidas</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> permissões concedidas</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> permissões concedidas</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Alguns padrões definidos"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Nenhum padrão definido"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Todos os apps"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Ativados"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Trabalho"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueados"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritárias"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidenciais"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Com URLs de domínio"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desativado pelo administrador"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"App desconhecido"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Permissões do app"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps receberam acesso adicional"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps permitidos"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URLs de domínio"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Não abrir nenhum URL de domínio"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Abrem \"<xliff:g id="DOMAIN">%s</xliff:g>\""</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Abrem \"<xliff:g id="DOMAIN">%s</xliff:g>\" e URLs relacionados"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps podem abrir os respectivos URLs de domínio</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem abrir os respectivos URLs de domínio</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Não reconhecido"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Apps padrão"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"App de navegador"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nenhum navegador padrão"</string>
+    <string name="default_app" msgid="6864503001385843060">"Padrão"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Armazenamento de apps"</string>
 </resources>
diff --git a/res/values-ro-nokeys/strings.xml b/res/values-ro-nokeys/strings.xml
index b30125b..fdbff5f 100644
--- a/res/values-ro-nokeys/strings.xml
+++ b/res/values-ro-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">"Gestionaţi aplicaţiile"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Gestionaţi aplicațiile"</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 76188ee..ce0ff4b 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Buton WPS"</item>
@@ -172,7 +175,7 @@
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Durată de utilizare"</item>
     <item msgid="4796160515314745154">"Ultima utilizare"</item>
-    <item msgid="2502754479975776899">"Numele aplicaţiei"</item>
+    <item msgid="2502754479975776899">"Numele aplicației"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"activați/dezactivați microfonul"</item>
     <item msgid="1148142988678569310">"proiectați conținutul media"</item>
     <item msgid="9130014005474445273">"activați serviciul VPN"</item>
+    <item msgid="1165192162975045562">"scrie imaginea de fundal"</item>
+    <item msgid="7129487923652967258">"structură de asistență"</item>
+    <item msgid="1069023208100114540">"captură de ecran de asistență"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Locație"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Activați/dezactivați microfonul"</item>
     <item msgid="5906017727368097853">"Proiectați conținutul media"</item>
     <item msgid="2486614710846178542">"Activați serviciul VPN"</item>
+    <item msgid="5586547561693629602">"Scrie imaginea de fundal"</item>
+    <item msgid="32794179825485062">"Structură de asistență"</item>
+    <item msgid="7872852746938272552">"Captură de ecran de asistență"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Scurtă"</item>
@@ -442,7 +451,7 @@
     <item msgid="2920655562462493148">"1280x720 tvdpi (securizat)"</item>
     <item msgid="8910371271391940941">"1920x1080 xhdpi"</item>
     <item msgid="4171600481380800455">"1920x1080 xhdpi (securizat)"</item>
-    <item msgid="1937752114395156918">"1280x720 tvdpi şi 1920x1080 xhdpi"</item>
+    <item msgid="1937752114395156918">"1280x720 tvdpi și 1920x1080 xhdpi"</item>
   </string-array>
   <string-array name="enable_opengl_traces_entries">
     <item msgid="3191973083884253830">"Niciuna"</item>
@@ -477,9 +486,9 @@
     <item msgid="2732002039459078847">"PPTP VPN"</item>
     <item msgid="3799752201662127867">"L2TP/IPSec VPN cu chei predistribuite"</item>
     <item msgid="4725504331295252103">"L2TP/IPSec VPN cu certificate"</item>
-    <item msgid="7526551163264034377">"IPSec VPN cu chei predistribuite şi autentificare Xauth"</item>
-    <item msgid="8064740940687465039">"IPSec VPN cu certificate şi autentificare Xauth"</item>
-    <item msgid="4946199982372391490">"IPSec VPN cu certificate şi autentificare hibridă"</item>
+    <item msgid="7526551163264034377">"IPSec VPN cu chei predistribuite și autentificare Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN cu certificate și autentificare Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN cu certificate și autentificare hibridă"</item>
   </string-array>
   <string-array name="vpn_states">
     <item msgid="8621078286418985762">"Deconectată"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"redusă"</item>
     <item msgid="4212263919458209842">"critică"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Dezactivat"</item>
-    <item msgid="5656544177755411222">"Întreruperi limitate"</item>
-    <item msgid="8735337502532332056">"Zero întreruperi"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normală"</item>
     <item msgid="866544120205026771">"Moderată"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Roz"</item>
     <item msgid="6131821495505931173">"Roșu"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Sursă audio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3448547..d71edf8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -22,10 +22,11 @@
     <string name="allow" msgid="3349662621170855910">"Permiteți"</string>
     <string name="deny" msgid="6947806159746484865">"Refuzați"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Necunoscut"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Mai aveți de parcurs <xliff:g id="STEP_COUNT">%1$d</xliff:g> pas pentru a deveni dezvoltator."</item>
-    <item quantity="other" msgid="6722953419953594148">"Mai aveți de parcurs <xliff:g id="STEP_COUNT">%1$d</xliff:g> pași pentru a deveni dezvoltator."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="few">Mai aveți <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pași pentru a deveni dezvoltator.</item>
+      <item quantity="other">Mai aveți <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> de pași pentru a deveni dezvoltator.</item>
+      <item quantity="one">Mai aveți <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> pas pentru a deveni dezvoltator.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Aţi devenit dezvoltator!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nu mai este nevoie, sunteţi deja dezvoltator."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Reţele wireless"</string>
@@ -40,6 +41,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Opriţi SMS prin IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Este necesară activarea înregistrării IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Este necesară dezactivarea înregistrării IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Activați semnalizatorul oferit de VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Dezactivați semnalizatorul oferit de VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Activaţi imaginea de memorie RAM LTE"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Dezactivaţi imaginea de memorie RAM LTE"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Afişaţi agenda de pe SIM"</string>
@@ -135,16 +138,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmitere"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dezactivaţi profilul?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Această acţiune va dezactiva:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;de pe:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Conectat"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectat (fără telefon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectat (fără conţinut media)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectat (fără acces la mesaje)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectat (fără telefon sau conţ. media)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Deconectat"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"În curs de deconectare..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Se conectează..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Se conectează…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Dispozitiv Bluetooth nedenumit"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Se caută dispozitive"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nu există disp. Bluetooth în apropiere."</string>
@@ -154,7 +148,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afişaţi fişierele primite"</string>
     <string name="device_picker" msgid="4978696506172252813">"Alegeți dispozitivul Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitare de permisiune Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"O aplicație încearcă să activeze Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"O aplicație vrea sa activeze Bluetooth pentru acest dispozitiv."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"O aplicație încearcă să facă tableta vizibilă pentru alte gadgeturi Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"O aplicație încearcă să facă telefonul vizibil pentru alte gadgeturi Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"O aplicație încearcă să facă tableta vizibilă pentru alte gadgeturi Bluetooth. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
@@ -173,12 +167,12 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Atingeţi pentru a vă conecta la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Doriţi să vă conectaţi la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Solicitarea accesului la agendă"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s doreşte să acceseze Agenda dvs. şi istoricul apelurilor. Permiteţi accesul pentru %2$s?"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s doreşte să acceseze Agenda dvs. și istoricul apelurilor. Permiteţi accesul pentru %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nu doresc să fiu întrebat(ă) din nou"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nu doresc să fiu întrebat(ă) din nou"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"Solicitarea accesului la mesaje"</string>
     <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="date_and_time" msgid="9062980487860757694">"Data şi ora"</string>
+    <string name="date_and_time" msgid="9062980487860757694">"Data și ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selectaţi fusul orar"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Previzualizaţi:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Dimensiune font:"</string>
@@ -205,7 +199,7 @@
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"Trebuie să completaţi câmpul pentru port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Câmpul pentru port trebuie să fie necompletat în situaţia în care câmpul pentru gazdă este necompletat."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Portul introdus nu este valid."</string>
-    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy-ul HTTP este utilizat de browser, dar nu poate fi utilizat de alte aplicaţii."</string>
+    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy-ul HTTP este utilizat de browser, dar nu poate fi utilizat de alte aplicații."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"Adresă URL fișier PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locaţie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vecin:"</string>
@@ -274,19 +268,17 @@
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Stocare USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Card SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Setări proxy"</string>
-    <string name="cancel" msgid="6859253417269739139">"Anulaţi"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ANULAȚI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"CONTINUAȚI"</string>
+    <string name="cancel" msgid="6859253417269739139">"Anulați"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"DA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NU"</string>
-    <string name="forget" msgid="7267115980248732932">"ELIMINĂ"</string>
+    <string name="forget" msgid="1400428660472591263">"Ștergeți"</string>
+    <string name="save" msgid="879993180139353333">"Salvați"</string>
+    <string name="done" msgid="6942539184162713160">"Terminat"</string>
     <string name="settings_label" msgid="1626402585530130914">"Setări"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Setări"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Comandă rapidă pentru setări"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mod Avion"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Mai multe"</string>
-    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless şi reţele"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless și reţele"</string>
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gestionați Wi-Fi, funcția Bluetooth, modul Avion, rețelele mobile și VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Date mobile"</string>
     <string name="calls_title" msgid="3544471959217176768">"Apeluri"</string>
@@ -304,10 +296,10 @@
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Permiteţi roamingul de date?"</string>
     <string name="networks" msgid="6333316876545927039">"Selectarea operatorului"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Alegeţi un operator de reţea"</string>
-    <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data şi ora"</string>
-    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Setaţi data şi ora"</string>
-    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Setaţi data, ora, fusul orar şi formatele."</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"Dată şi oră automate"</string>
+    <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data și ora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Setaţi data și ora"</string>
+    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Setaţi data, ora, fusul orar și formatele."</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Dată și oră automate"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilizaţi ora furnizată de reţea"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilizaţi ora furnizată de reţea"</string>
     <string name="zone_auto" msgid="334783869352026648">"Fus orar automat"</string>
@@ -325,9 +317,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortaţi după fusul orar"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Îmbunătățiți recunoașterea chipului"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Verificare mișcare"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Se solicită clipirea la deblocare"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Blocare automată"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> după inactivitate"</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>
@@ -348,6 +337,31 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setaţi Locaţia mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setaţi Locaţia mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parole"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Amprentă"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gestionați amprentele"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Folosiți amprenta la"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Adăugați"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"blocarea ecranului"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> amprente înregistrate</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> de amprente înregistrate</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> amprentă înregistrată</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Configurarea amprentei"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Pentru a debloca ecranul sau a confirma achiziții folosind amprenta, va trebui: \n\n✓ să configurați metoda de rezervă de blocare a ecranului; \n\n✓ să adăugați amprenta."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Găsiți senzorul"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Găsiți senzorul de amprentă pe partea din spate a telefonului."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Denumiți"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ștergeți"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Să începem!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Puneți degetul pe senzorul pentru amprentă. Ridicați-l după ce simțiți o vibrație."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Excelent! Încă o dată."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Puneți același deget pe senzorul pentru amprentă și ridicați-l după ce simțiți o vibrație."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Amprentă adăugată!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"De fiecare dată când vedeți această pictogramă vă puteți folosi amprenta pentru autentificare sau pentru a autoriza o achiziție."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Adăugați"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Înainte"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptare"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptaţi tableta"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptaţi telefonul"</string>
@@ -356,14 +370,13 @@
     <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"Puteți să vă criptați conturile, setările, aplicațiile descărcate și datele acestora, conținutul media și alte fișiere. După criptarea telefonului, presupunând că ați setat blocarea ecranului (un șablon sau un PIN numeric ori o parolă), va trebui să deblocați ecranul pentru a decripta telefonul de fiecare dată când îl porniți. Singura alternativă de decriptare constă în a reveni la setările din fabrică, ceea ce vă șterge toate datele\n\nCriptarea durează cel puțin o oră. Trebuie să începeți cu o baterie încărcată și să țineți telefonul conectat pe tot parcursul procesului. Dacă îl întrerupeți, veți pierde o parte din date sau chiar toate datele."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptaţi tableta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptaţi telefonul"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcaţi bateria şi încercaţi din nou."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conectaţi încărcătorul şi încercaţi din nou."</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcaţi bateria și încercaţi din nou."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conectaţi încărcătorul și încercaţi din nou."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nu există un cod PIN sau o parolă pentru blocarea ecranului"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Trebuie să setaţi un cod PIN sau o parolă pentru blocarea ecranului înainte de a începe criptarea."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Trebuie să desenați modelul de deblocare pentru a confirma criptarea dispozitivului."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Criptaţi?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operaţia de criptare este ireversibilă şi întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care tableta se va reporni de mai multe ori."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operaţia de criptare este ireversibilă şi întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care telefonul se va reporni de mai multe ori."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operaţia de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care tableta se va reporni de mai multe ori."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operaţia de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care telefonul se va reporni de mai multe ori."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Criptare"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Aşteptaţi criptarea tabletei. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Aşteptaţi criptarea telefonului. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string>
@@ -374,8 +387,8 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Avertisment: datele de pe dispozitiv vor fi șterse după încă <xliff:g id="COUNT">^1</xliff:g> încercări nereușite de deblocare!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduceţi parola"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Criptare nereuşită"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea tabletei, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea telefonului, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea tabletei, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea telefonului, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Decriptarea nu a reușit"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="3775740783651700375">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea tabletei, trebuie să restabiliți setările din fabrică. Când vă configurați tableta după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="6898436151871328007">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea telefonului, trebuie să restabiliți setările din fabrică. Când vă configurați telefonul după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string>
@@ -391,22 +404,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Glisare"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Fără securitate"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Deblocare facială"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Securitate minimă, experimental"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Model"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Securitate medie"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivel de securitate mediu spre ridicat"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parolă"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Securitate ridicată"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Blocarea actuală a ecranului"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funcțiile de protecție a dispozitivului nu vor mai putea fi folosite."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dezactivată de admin./politică de criptare/acreditări stocate"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Fără"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Glisare"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Deblocare facială"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Model"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parolă"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"După ce ați configurat o blocare a ecranului, puteți să configurați amprenta din Setări &gt; Securitate."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Activaţi blocarea ecranului"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminaţi modelul pentru deblocare"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminaţi codul PIN de deblocare"</string>
@@ -427,35 +439,41 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Parola trebuie să conţină cel puţin o literă."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Parola trebuie să conţină minimum o cifră."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Parola trebuie să conţină cel puţin un simbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Parola trebuie să conţină cel puţin 1 literă."</item>
-    <item quantity="other" msgid="8186027808415585970">"Parola trebuie să conţină cel puţin %d litere."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Parola trebuie să conţină cel puţin 1 minusculă."</item>
-    <item quantity="other" msgid="2693910942679679225">"Parola trebuie să conţină cel puţin %d minuscule."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Parola trebuie să conţină cel puţin 1 majusculă."</item>
-    <item quantity="other" msgid="3030801209112209245">"Parola trebuie să conţină cel puţin %d majuscule."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Parola trebuie să conţină cel puţin 1 cifră."</item>
-    <item quantity="other" msgid="4703982391407595924">"Parola trebuie să conţină cel puţin %d cifre."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Parola trebuie să conţină cel puţin 1 simbol special."</item>
-    <item quantity="other" msgid="1221290525051187757">"Parola trebuie să conţină cel puţin %d simboluri speciale."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Parola trebuie să conţină cel puţin 1 caracter care să nu fie o literă."</item>
-    <item quantity="other" msgid="3952508584649046404">"Parola trebuie să conţină cel puţin %d caractere care să nu fie litere."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="few">Parola trebuie să conțină cel puțin %d litere.</item>
+      <item quantity="other">Parola trebuie să conțină cel puțin %d de litere.</item>
+      <item quantity="one">Parola trebuie să conțină cel puțin o literă.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="few">Parola trebuie să conțină cel puțin %d minuscule.</item>
+      <item quantity="other">Parola trebuie să conțină cel puțin %d de minuscule.</item>
+      <item quantity="one">Parola trebuie să conțină cel puțin o minusculă.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="few">Parola trebuie să conțină cel puțin %d majuscule.</item>
+      <item quantity="other">Parola trebuie să conțină cel puțin %d de majuscule.</item>
+      <item quantity="one">Parola trebuie să conțină cel puțin o majusculă.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="few">Parola trebuie să conțină cel puțin %d cifre.</item>
+      <item quantity="other">Parola trebuie să conțină cel puțin %d de cifre.</item>
+      <item quantity="one">Parola trebuie să conțină cel puțin o cifră.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="few">Parola trebuie să conțină cel puțin %d simboluri speciale.</item>
+      <item quantity="other">Parola trebuie să conțină cel puțin %d de simboluri speciale.</item>
+      <item quantity="one">Parola trebuie să conțină cel puțin un simbol special.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="few">Parola trebuie să conțină cel puțin %d caractere care să nu fie litere.</item>
+      <item quantity="other">Parola trebuie să conțină cel puțin %d de caractere care să nu fie litere.</item>
+      <item quantity="one">Parola trebuie să conțină cel puțin un caracter care să nu fie o literă.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Administrator dispozitiv nu permite parolă recentă."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Șirurile de cifre ascendente, descendente sau repetate sunt interzise"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anulaţi"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Anulaţi"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anulaț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>
     <string name="device_admin_title" msgid="3562216873644263804">"Administrarea dispozitivelor"</string>
@@ -468,7 +486,7 @@
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activaţi funcţia 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">"Gestionaţi conexiunile, setaţi numele dispozitivului şi detectabilitatea acestuia"</string>
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gestionaţi conexiunile, setaţi numele dispozitivului și detectabilitatea acestuia"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitare de împerechere prin Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="4954085254142996877">"Dispozitiv"</string>
     <string name="bluetooth_pairing_key_msg" msgid="333005542843637754">"Cod de conectare"</string>
@@ -480,15 +498,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Pentru asocierea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;asiguraţi-vă că se afişează această cheie de acces:&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">"De la:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Asociaţi cu acest dispozitiv?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Pentru împerecherea cu:<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>Introduceţi pe acesta:<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>, apoi apăsaţi tasta Return sau Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Asociaţi"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"CONECTAȚI"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Anulaţi"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Asocierea dispozitivelor vă permite accesul la persoanele de contact și la istoricul apelurilor când dispozitivul este conectat."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nu s-a putut împerechea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nu s-a putut împerechea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> din cauza unui cod PIN sau al unei chei de acces incorecte."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nu se poate comunica cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Împerechere respinsă de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Nu s-a putut conecta la <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Scanaţi pentru a detecta dispozitive"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Actualizați"</string>
@@ -508,23 +519,15 @@
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Niciun dispozitiv disponibil"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Conectaţi-vă"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Deconectaţi"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Asociaţi şi conectaţi"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Anulaţi împerecherea"</string>
-    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Deconectaţi şi anulaţi împerecherea"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Asociaţi și conectaţi"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Anulați împerecherea"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Deconectaţi și anulaţi împerecherea"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opţiuni…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avansate"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Setări Bluetooth avansate"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Activarea Bluetooth permite comunicarea cu alte dispozitive Bluetooth din apropiere."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Pentru a îmbunătăți precizia locației, aplicațiile și serviciile vor căuta dispozitive Bluetooth, chiar și atunci când conexiunea Bluetooth este dezactivată. Puteți să schimbați acest aspect din <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setările de scanare<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectaţi-vă la..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Conţinut media audio"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Componenta audio a telefonului"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfer de fişiere"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispozitiv de intrare"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acces internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Acces la Agendă"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utilizați pentru a permite accesul la Agendă"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Distribuirea conexiunii la internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acces la mesaje"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la componenta audio mâini libere."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la dispozitivul de intrare."</string>
@@ -537,28 +540,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Utilizați pentru"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Redenumiţi"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permiteţi transfer fişiere"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectat la profilul pentru conţinut media audio"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectat la componenta audio a telefonului"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectat la serverul de transfer de fişiere"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectat la hartă"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neconectat la serverul de transfer de fişiere"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectat la dispozitivul de intrare"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectat la dispoz. pt. acces internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Se permite dispoz. acces la internet local"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizaţi pentru profilul pentru conţinut media audio"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizaţi pentru componenta audio a telefonului"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizaţi pentru transferul de fişiere"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizaţi pentru introducere date"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizaţi pentru acces internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utilizați pentru hartă"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Setări de andocare"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizaţi dispozitivul de andocare pentru componenta audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ca difuzor"</string>
-    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pentru muzică şi fişiere media"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pentru muzică și fișiere media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Reţineţi setările"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistent Wi-Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Conexiune realizată printr-un asistent Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Proiectați ecranul"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Proiectați"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activați ecranul wireless"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nu s-au găsit dispozitive în apropiere."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Se conectează"</string>
@@ -570,44 +560,41 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Eliminaţi"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Terminat"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nume"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permiteţi schimbul de date atunci când tableta atinge alt dispozitiv"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permiteţi schimbul de date atunci când telefonul atinge alt dispozitiv"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Pregătit să transmită conţinut din aplicaţii prin NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Pregătit să transmită conţinut din aplicații prin NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Dezactivată"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponibilă, deoarece NFC este oprit"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"După activarea acestei funcţii, puteţi transmite conţinutul aplicaţiilor către un alt dispozitiv compatibil NFC, ţinând cele două dispozitive apropiate unul de celălalt. De exemplu, puteţi să transmiteţi pagini din browser, videoclipuri YouTube, persoane din agendă şi multe altele.\n\nNu trebuie decât să apropiaţi cele două dispozitive (de obicei, aşezându-le unul în spatele celuilalt) şi să atingeţi ecranul. Aplicaţia determină apoi ce poate fi transmis."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"După activarea acestei funcţii, puteţi transmite conţinutul aplicațiilor către un alt dispozitiv compatibil NFC, ţinând cele două dispozitive apropiate unul de celălalt. De exemplu, puteţi să transmiteţi pagini din browser, videoclipuri YouTube, persoane din agendă și multe altele.\n\nNu trebuie decât să apropiaţi cele două dispozitive (de obicei, aşezându-le unul în spatele celuilalt) și să atingeţi ecranul. Aplicaţia determină apoi ce poate fi transmis."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Descoperire serviciu de reţea"</string>
-    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permite aplicaţiilor de pe alte dispozitive să descopere aplicaţii pe acest dispozitiv"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permite aplicațiilor de pe alte dispozitive să descopere aplicații pe acest dispozitiv"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activați conexiunea Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Setări Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
-    <string name="wifi_settings_summary" msgid="668767638556052820">"Configuraţi şi gestionaţi punctele de acces wireless"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"Configuraţi și gestionaţi punctele de acces wireless"</string>
     <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Selectați rețeaua Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Selectați o rețea Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Se activează Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Se dezactivează Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Eroare"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"În modul Avion"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nu se poate scana pentru reţele"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificare de reţea"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Notifică-mă când este disponibilă o rețea publică"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitaţi conexiunile slabe"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Nu utilizați o reţea Wi-Fi, cu excepția cazului în care aceasta are o conexiune la internet adecvată"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilizați numai rețelele care au conexiune bună la internet"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanare mereu disponibilă"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permiteți întotdeauna scanarea"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permiteți serviciului de localizare Google și altor aplicații să caute rețele, chiar dacă funcția Wi-Fi este dezactivată."</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Folosiți automat rețelele Wi‑Fi deschise"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permiteți ca un asistent Wi‑Fi să conecteze automat dispozitivul la rețele de calitate deschise"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Alegeți asistentul"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalați certificate"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pentru a îmbunătăți precizia locației, dar și în alte scopuri, Google și alte aplicații pot căuta rețele în apropiere, chiar dacă rețeaua Wi-Fi este dezactivată. Dacă nu doriți acest lucru, accesați Avansate &gt; Scanare mereu disponibilă."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplicațiile pot căuta rețele în apropiere, chiar dacă rețeaua Wi-Fi este dezactivată. Dacă nu doriți acest lucru, accesați Avansate &gt; Scanare mereu disponibilă."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Pentru a îmbunătăți precizia locației, aplicațiile și serviciile vor căuta rețele Wi‑Fi, chiar și atunci când conexiunea Wi-Fi este dezactivată. 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_remember_choice" msgid="5340097010842405981">"Nu mai afișa"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Mențineți Wi-Fi activat în modul inactiv"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi pornit în modul inactiv"</string>
@@ -635,11 +622,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Adăugați altă rețea"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mai multe"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automată (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Pentru a finaliza configurarea, este necesar ca tableta să aibă acces la Wi-Fi. După configurare, puteți comuta între datele mobile și Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Opțiuni avansate"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Configurare protejată Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Se porneşte WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Apăsați butonul Configurare protejată Wi-Fi de pe router. Acesta poate apărea ca „WPS” sau poate conține acest simbol:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Apăsați pe butonul Configurare protejată Wi‑Fi de pe router. Se poate numi „WPS” sau poate fi marcat cu acest simbol:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Introduceți codul PIN <xliff:g id="NUMBER">%1$s</xliff:g> pe routerul Wi-Fi. Finalizarea configurării poate dura până la două minute."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS finalizată. Se conectează la reţea…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Conectat la rețeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +651,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitate anonimă"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Parolă"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Afişaţi parola"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Configurați banda AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Setări IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(neschimbate)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(neindicat)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Salvată"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Dezactivată"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Eroare de configurație IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Eroare de conexiune Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problemă la autentificare"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"În afara ariei de acoperire"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Nu s-a detectat acces la internet, nu se va efectua reconectarea automată."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibil"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibil)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduceți parola de rețea"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Niciuna"</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>
@@ -686,13 +667,15 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Intrați în cont pentru a vă conecta?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> vă solicită conectarea la cont înainte de a vă conecta la rețea."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAȚI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Rețeaua nu are acces la internet. Folosiți această rețea oricum?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Nu mai întreba pentru această rețea"</string>
     <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_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>
-    <string name="wifi_cancel" msgid="6763568902542968964">"Anulaţi"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"Anulați"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Ignoraţi oricum"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Nu ignoraţi"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, tableta dvs. va utiliza numai datele mobile pentru descărcările sau actualizările inițiale. Pentru a evita eventualele costuri pentru date, conectați-vă la Wi-Fi."</string>
@@ -714,7 +697,7 @@
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Rețele salvate"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Setări IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Salvaţi"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Anulaţi"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Anulați"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"Introduceţi o adresă IP validă."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"Introduceţi o adresă gateway validă."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"Introduceţi o adresă DNS validă."</string>
@@ -735,8 +718,8 @@
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Dispozitivul nu a fost redenumit."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Deconectaţi?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Dacă vă deconectaţi, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> se va încheia."</string>
-    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Dacă vă deconectaţi, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> şi cu alte <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispozitive se va încheia."</string>
-    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulaţi invitaţia?"</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Dacă vă deconectaţi, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> și cu alte <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispozitive se va încheia."</string>
+    <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>
@@ -751,6 +734,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Hotspot portabil Wi‑Fi AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Hotspot Wi-Fi portabil <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_mode_title" msgid="2164073796253284289">"Preferință pentru apelare"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modul Apelare prin Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Se preferă conexiunea Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Se preferă conexiunea mobilă"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Ecran de pornire"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Afișaj"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
@@ -766,7 +761,7 @@
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"Nu acceptă profiluri de serviciu"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Sunet de notificare prestabilit"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
-    <string name="media_volume_summary" msgid="5363248930648849974">"Setaţi volumul pentru muzică şi videoclipuri"</string>
+    <string name="media_volume_summary" msgid="5363248930648849974">"Setaţi volumul pentru muzică și videoclipuri"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarmă"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Setări audio pentru dispozitivul de andocare ataşat"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tonuri atingere taste"</string>
@@ -774,12 +769,12 @@
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sunet de blocare a ecranului"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrare la atingere"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Anulare zgomot"</string>
-    <string name="volume_media_description" msgid="7949355934788807863">"Muzică, videoclipuri, jocuri şi alt conţinut media"</string>
-    <string name="volume_ring_description" msgid="5936851631698298989">"Ton de sonerie şi notificări"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"Muzică, videoclipuri, jocuri și alt conţinut media"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Ton de sonerie și notificări"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Notificări"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Alarme"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"Dezactivaţi sunetul pentru tonul de sonerie şi notificări"</string>
-    <string name="volume_media_mute" msgid="3399059928695998166">"Dezactivaţi sunetul muzicii şi al altui conţinut media"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Dezactivaţi sunetul pentru tonul de sonerie și notificări"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Dezactivaţi sunetul muzicii și al altui conţinut media"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Dezactivaţi sunetul notificărilor"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Dezactivaţi sunetul alarmelor"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Andocare"</string>
@@ -797,12 +792,12 @@
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Doresc să se redea sunet la inserarea sau scoaterea tabletei din dispozitivul de andocare"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Redaţi sunet la introducerea sau la scoaterea telefonului din dispozitivul de andocare"</string>
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Nu doresc să se redea sunet la inserarea sau scoaterea tabletei din dispozitivul de andocare"</string>
-    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Nu redaţi sunetul la introducerea şi la scoaterea telefonului din dispozitivul de andocare"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Nu redaţi sunetul la introducerea și la scoaterea telefonului din dispozitivul de andocare"</string>
     <string name="account_settings" msgid="6403589284618783461">"Conturi"</string>
     <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
     <string name="category_work" msgid="8699184680584175622">"Serviciu"</string>
     <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_summary" msgid="9205656546570654169">"Gestionaţi setările și istoricul căutărilor"</string>
     <string name="display_settings" msgid="7965901687241669598">"Afișaj"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotire automată a ecranului"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Doresc comutarea automată a orientării atunci când se roteşte tableta"</string>
@@ -814,18 +809,23 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustaţi luminozitatea ecranului"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminozitate adaptivă"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizați nivelul de luminozitate pentru lumina disponibilă"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Temă"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Deschisă"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Închisă"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automat"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Inactivitate"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ecranul se dezactivează"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagine de fundal"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Alege o imagine din"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Când dispozitivul este andocat sau în modul inactiv şi se realizează încărcarea"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Când dispozitivul este andocat sau în modul inactiv și se realizează încărcarea"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"În ambele situații"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"În timpul încărcării"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Când dispozitivul este andocat"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Dezactivat"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Pentru a controla ceea ce se întâmplă când telefonul este andocat şi/sau în modul inactiv, activaţi Daydream."</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Pentru a controla ceea ce se întâmplă când telefonul este andocat și/sau în modul inactiv, activaţi Daydream."</string>
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Când porneşte Daydreams"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Începe acum"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Setări"</string>
@@ -857,7 +857,7 @@
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Codul PIN pentru SIM a fost modificat"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"Nu se poate modifica starea de blocare a cardului SIM.\nCodul PIN poate fi incorect."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
-    <string name="sim_enter_cancel" msgid="6240422158517208036">"Anulaţi"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"Anulați"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Mai multe carduri SIM găsite"</string>
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Alegeți cardul SIM pe care îl preferați pentru date mobile."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Schimbați cartela SIM de date?"</string>
@@ -865,10 +865,11 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Actualizați card SIM preferat?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> este singurul card SIM de pe dispozitiv. Doriți să folosiți acest card SIM pentru date mobile, pentru apeluri și pentru mesaje SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Codul PIN pentru cardul SIM este incorect. Contactați operatorul pentru a vă debloca dispozitivul."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Codul PIN pentru cardul SIM este incorect. V-a mai rămas <xliff:g id="NUMBER">%d</xliff:g> încercare, după care va trebui să contactați operatorul pentru a vă debloca dispozitivul."</item>
-    <item quantity="other" msgid="77103619544346451">"Codul PIN pentru cardul SIM este incorect. V-au mai rămas <xliff:g id="NUMBER">%d</xliff:g> încercări."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="few">Codul PIN pentru cardul SIM este incorect. V-au mai rămas <xliff:g id="NUMBER_1">%d</xliff:g> încercări.</item>
+      <item quantity="other">Codul PIN pentru cardul SIM este incorect. V-au mai rămas <xliff:g id="NUMBER_1">%d</xliff:g> de încercări.</item>
+      <item quantity="one">Cod PIN incorect pt. card SIM. <xliff:g id="NUMBER_0">%d</xliff:g> încercare rămasă, apoi deblocați dispozitivul contactând operatorul.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Deblocarea cu ajutorul codului PIN pentru cardul SIM nu a reușit!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stare tabletă"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Stare telefon"</string>
@@ -884,7 +885,7 @@
     <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>
-    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Starea bateriei, reţeaua şi alte informaţii"</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Starea bateriei, reţeaua și alte informaţii"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Număr de telefon, semnal etc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Stocare"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Setări de stocare"</string>
@@ -917,12 +918,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponibil (numai în citire)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Spaţiu total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Se calculează..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicații (date și conținut media)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplicațiile și datele aplicațiilor"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descărcări"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imagini, videoclipuri"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzică, tonuri de sonerie, podcasturi etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Alte fișiere"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datele memorate în cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demontaţi stocare distribuită"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demontaţi cardul SD"</string>
@@ -936,15 +937,15 @@
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Ștergeţi stocarea USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Ștergeţi cardul SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Șterge toate datele din stocarea USB internă, cum ar fi muzica şi fotografiile"</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Șterge toate datele de pe cardul SD, cum ar fi muzica şi fotografiile"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Șterge toate datele din stocarea USB internă, cum ar fi muzica și fotografiile"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Șterge toate datele de pe cardul SD, cum ar fi muzica și fotografiile"</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"Ștergeţi datele memorate în cache?"</string>
-    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Datele din cache ale aplicaţiilor vor fi şterse."</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Datele din cache ale aplicațiilor vor fi şterse."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funcţia MTP sau PTP este activă"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Demontaţi stocarea USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Demontaţi cardul SD?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Dacă demontaţi stocarea USB, unele aplicaţii pe care le utilizaţi se vor opri şi ar putea fi nedisponibile până la remontarea stocării USB."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"Dacă demontaţi cardul SD, unele aplicaţii utilizate în acel moment se vor opri şi pot fi indisponibile până la remontarea cardului SD."</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Dacă demontaţi stocarea USB, unele aplicații pe care le utilizaţi se vor opri și ar putea fi nedisponibile până la remontarea stocării USB."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"Dacă demontaţi cardul SD, unele aplicații utilizate în acel moment se vor opri și pot fi indisponibile până la remontarea cardului 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="4346280469528260684">"Stocarea USB nu a putut fi demontată. Încercaţi din nou mai târziu."</string>
@@ -954,16 +955,61 @@
     <string name="sd_ejecting_title" msgid="8824572198034365468">"În curs de demontare"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontare în curs"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Spaţiu de stocare aproape ocupat"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"Este posibil ca unele funcţii de sistem, cum ar fi sincronizarea, să nu funcţioneze corect. Încercaţi să eliberaţi spaţiu, ştergând elemente sau anulând fixarea acestora (de ex., aplicaţii sau conţinut media)."</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"Este posibil ca unele funcţii de sistem, cum ar fi sincronizarea, să nu funcţioneze corect. Încercaţi să eliberaţi spaţiu, ştergând elemente sau anulând fixarea acestora (de ex., aplicații sau conţinut media)."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Redenumiți"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Montați"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Scoateți"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Ștergeți și formatați"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Ștergeți și formatați ca memorie internă"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Conectare la computer prin USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conectare la computer prin USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectaţi-vă ca"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispozitiv media (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"Vă permite să transferaţi fişiere media pe Windows sau utilizând aplicaţia Transfer de fişiere Android pe Mac (disponibil la www.android.com/filetransfer)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Vă permite să transferaţi fişiere media pe Windows sau utilizând aplicația Transfer de fişiere Android pe Mac (disponibil la www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Cameră foto (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="7673397474756664929">"Vă permite să transferaţi fotografii utilizând software-ul camerei foto şi să transferaţi fişiere de pe computere care nu acceptă MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalaţi instrumentul de transfer al fişierelor"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Vă permite să transferaţi fotografii utilizând software-ul camerei foto și să transferaţi fișiere de pe computere care nu acceptă MTP"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Permite aplicațiilor compatibile cu standardul MIDI să funcționeze prin USB cu software-ul MIDI de pe computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Alţi utilizatori"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Stocare dispozitiv"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Stocare amovibilă"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> liberi (în total <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> este montată"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> nu a putut fi montată"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> este scoasă în siguranță"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> nu a putut fi scoasă în siguranță"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> este formatată"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> nu a putut fi formatată"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Redenumiți stocarea"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"După formatare, puteți folosi <xliff:g id="NAME_0">^1</xliff:g> în alte dispozitive. \n\nToate datele de pe <xliff:g id="NAME_1">^1</xliff:g> vor fi șterse. Mai întâi, faceți backup. \n\n"<b>"Faceți backup la fotografii și la alte fișiere media"</b>" \nMutați fișierele media în altă stocare de pe acest dispozitiv sau transferați-le pe un computer folosind un cablu USB. \n\n"<b>"Faceți backup la aplicații"</b>" \nToate aplicațiile stocate pe <xliff:g id="NAME_6">^1</xliff:g> vor fi dezinstalate, iar datele acestora vor fi șterse. Pentru a păstra aceste aplicații, mutați-le în altă stocare de pe acest dispozitiv."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Când scoateți <xliff:g id="NAME_0">^1</xliff:g>, aplicațiile stocate pe acesta nu vor mai funcționa, iar fișierele media stocate pe acesta nu vor mai fi disponibile până când nu este introdus din nou."</b>" \n\n Acest <xliff:g id="NAME_1">^1</xliff:g> este formatat pentru a funcționa numai pe acest dispozitiv. Nu va funcționa pe alte dispozitive."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurați <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Folosiți ca stocare portabilă"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Pentru a muta fotografiile și alte fișiere media de pe un dispozitiv pe altul."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Folosiți ca memorie internă"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Pentru a stoca orice doar pe acest dispozitiv, inclusiv aplicații și fotografii. Este necesar să îl formatați pentru a-l împiedica să funcționeze cu alte dispozitive."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatați ca memorie internă"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Este necesar ca <xliff:g id="NAME_0">^1</xliff:g> să fie formatat pentru a fi securizat. \n\nDupă formatare, acest <xliff:g id="NAME_1">^1</xliff:g> va funcționa doar în acest dispozitiv. \n\n"<b>"Dacă îl formatați, toate datele stocate pe <xliff:g id="NAME_2">^1</xliff:g> vor fi șterse."</b>" Pentru a nu pierde datele, faceți backup."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ștergeți și formatați"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Se formatează <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Nu scoateți <xliff:g id="NAME">^1</xliff:g> în timp ce se formatează."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mutați datele în noua stocare"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Puteți muta fotografiile, fișierele și datele aplicațiilor pe acest nou <xliff:g id="NAME">^1</xliff:g>. \n\nAceastă acțiune va dura aproximativ <xliff:g id="TIME">^2</xliff:g> și va elibera <xliff:g id="SIZE">^3</xliff:g> din memoria internă. Unele aplicații nu vor funcționa în timpul procesului de mutare."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mutați acum"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Mutați mai târziu"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Mutați datele acum"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Această acțiune va dura aproximativ <xliff:g id="TIME">^1</xliff:g>. Va elibera <xliff:g id="SIZE">^2</xliff:g> din memoria internă."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Mutați"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Se mută datele..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"În timpul procesului de mutare: \n• nu scoateți <xliff:g id="NAME">^1</xliff:g>; \n• unele aplicații nu vor funcționa corect; \n• păstrați dispozitivul încărcat."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> este gata"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> este gata pentru a se folosi cu fotografii și alte fișiere media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Noul <xliff:g id="NAME">^1</xliff:g> funcționează. \n\nPentru a muta fotografii, fișiere și datele aplicațiilor pe acest dispozitiv, accesați Setări &gt; Stocare."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mutați <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Va dura doar câteva momente să mutați <xliff:g id="APP">^1</xliff:g> și datele acesteia pe <xliff:g id="NAME_0">^2</xliff:g>. Nu veți putea folosi aplicația până când mutarea nu este finalizată. \n\nNu scoateți <xliff:g id="NAME_1">^2</xliff:g> în timpul procesului de mutare."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Se mută <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Nu scoateți <xliff:g id="NAME">^1</xliff:g> în timpul procesului de mutare. \n\nAplicația <xliff:g id="APP">^2</xliff:g> de pe acest dispozitiv nu va fi disponibilă până când mutarea nu este finalizată."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Anulați mutarea"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stare baterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivelul bateriei"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Nume APN"</string>
@@ -1007,26 +1053,30 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Se restabilesc setările APN prestabilite."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Resetaţi la valorile prestabilite"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Resetarea setărilor APN prestabilite a fost finalizată."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Resetarea setărilor de rețea"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"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>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Reinițializați toate setările pentru rețea? Nu puteți anula această acțiune!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Resetați setările"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetați?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Setările pentru rețea au fost reinițializate"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Resetați dispozitivul"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Resetarea configurării din fabrică"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Șterge toate datele de pe tabletă"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Șterge toate datele de pe telefon"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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_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="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pentru a şterge muzică, imagini și alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ştearsă."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pentru a şterge muzică, imagini și alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie şters."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ștergeţi stocarea USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ștergeţi cardul SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ștergeţi toate datele din stocarea USB internă, cum ar fi muzica sau fotografiile"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ștergeţi toate datele de pe cardul SD, cum ar fi muzica sau fotografiile"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetaţi tableta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetaţi telefonul"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Ștergeţi toate informaţiile personale şi aplicaţiile descărcate? Nu puteţi anula această acţiune!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Ștergeți toate datele personale și aplicațiile descărcate? Nu puteți anula această acțiune!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ștergeţi tot"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Trebuie să desenaţi modelul de deblocare pentru a confirma resetarea configurării din fabrică."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nu a fost efectuată nicio resetare, deoarece serviciul Golire sistem nu este disponibil."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Resetaţi?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Revenirea la setările din fabrică nu este disponibilă pentru acest utilizator"</string>
@@ -1040,18 +1090,16 @@
     <string name="media_format_desc" product="default" msgid="8764037252319942415">"Ștergeţi cardul SD? Veţi pierde "<b>"toate"</b>" datele de pe card!"</string>
     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Ștergeţi stocarea USB"</string>
     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Ștergeţi cardul SD"</string>
-    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ștergeţi stocarea USB şi toate fişierele stocate pe aceasta? Nu puteţi anula această acţiune!"</string>
-    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ștergeţi cardul SD şi toate fişierele stocate pe acesta? Acţiunea nu poate fi anulată!"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ștergeţi stocarea USB și toate fișierele stocate pe aceasta? Nu puteţi anula această acţiune!"</string>
+    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ștergeţi cardul SD și toate fișierele stocate pe acesta? Acţiunea nu poate fi anulată!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ștergeţi tot"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Trebuie să desenaţi modelul de deblocare pentru a confirma că doriţi să ştergeţi stocarea USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Trebuie să desenaţi modelul de deblocare pentru a confirma că doriţi să ştergeţi cardul SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Setări apel"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Activaţi mesageria vocală, redirecţionarea apelurilor, apelul în aşteptare, ID apelant"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering prin USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portabil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering prin Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering şi hotspot portabil"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering și hotspot portabil"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering prin USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectat, verificaţi pentru distribuirea de internet"</string>
@@ -1076,7 +1124,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajutor"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Rețele mobile"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan de date mobile"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Aplicație SMS prestabilită"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicația SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Schimbați aplicația SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizați <xliff:g id="NEW_APP">%1$s</xliff:g> în loc de <xliff:g id="CURRENT_APP">%2$s</xliff:g> ca aplicație SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizați <xliff:g id="NEW_APP">%s</xliff:g> ca aplicație SMS?"</string>
@@ -1104,30 +1152,36 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mod de localizare"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utilizează GPS, Wi-Fi și rețelele mobile pentru determinarea locației"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utilizează rețelele Wi-Fi și mobile pentru determinarea locației"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utilizează GPS-ul pentru determinarea locației"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Folosiți GPS-ul pentru a stabili locația"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scanare"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanare"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Căutare rețele Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Îmbunătățiți localizarea permițând aplicațiilor și serviciilor să caute rețele Wi-Fi, chiar și atunci când conexiunea Wi‑Fi este dezactivată"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Căutare dispozitive Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Îmbunătățiți localizarea permițând serviciilor de sistem să caute dispozitive Bluetooth, chiar și atunci când conexiunea Bluetooth este dezactivată"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localizare prin Wi-Fi și mobil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Aplicaţiile estimează mai rapid locaţia cu serviciul de localizare Google. Se colectează/trimit la Google date anonime de localizare."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locație stabilită prin Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Sateliţi GPS"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permiteţi aplicaţiilor să utilizeze GPS de pe tabletă pentru a indica locaţia dvs."</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"Permiteţi aplicaţiilor să utilizeze GPS de pe telefon pentru a indica locaţia dvs."</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permiteţi aplicațiilor să utilizeze GPS de pe tabletă pentru a indica locaţia dvs."</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"Permiteţi aplicațiilor să utilizeze GPS de pe telefon pentru a indica locaţia dvs."</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizaţi GPS asistat"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizaţi serverul pentru a asista funcţia GPS (debifaţi pentru a reduce utilizarea reţelei)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizaţi serverul pentru a asista funcţia GPS (debifaţi pentru a îmbunătăţi performanţa GPS)"</string>
-    <string name="use_location_title" msgid="5206937465504979977">"Locaţie şi căutare Google"</string>
-    <string name="use_location_summary" msgid="3978805802386162520">"Permiteţi Google să utilizeze locaţia dvs. pt. îmbunătățirea rezultatelor căutării şi a serviciilor"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Locaţie și căutare Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Permiteţi Google să utilizeze locaţia dvs. pt. îmbunătățirea rezultatelor căutării și a serviciilor"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Acces la locaţia dvs."</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Acordaţi aplicaţiilor care v-au solicitat, permisiunea să utilizeze informaţiile dvs. de localizare"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Acordaţi aplicațiilor care v-au solicitat, permisiunea să utilizeze informaţiile dvs. de localizare"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Surse de locaţii"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Despre tabletă"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Despre telefon"</string>
-    <string name="about_settings_summary" msgid="3371517697156165959">"Afişaţi informaţii legale, starea şi versiunea programului software"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Afişaţi informaţii legale, starea și versiunea programului software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informaţii de ordin juridic"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboratori"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Informaţii reglementare"</string>
     <string name="copyright_title" msgid="865906688917260647">"Drept de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenţă"</string>
-    <string name="terms_title" msgid="7697580845616764642">"Termeni şi condiţii"</string>
+    <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>
@@ -1150,11 +1204,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parola a fost setată"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Codul PIN a fost setat"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Modelul a fost setat"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Siguranţa ecranului"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Pentru a continua, folosiți modelul dispozitivului."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Pentru a continua, introduceți codul PIN al dispozitivului."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Pentru a continua, introduceți parola dispozitivului."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Securitatea dispozitivului"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Schimbaţi modelul pentru deblocare"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Schimbaţi codul PIN de deblocare"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmaţi modelul salvat"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Încercaţi din nou:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenaţi un model pentru deblocare"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Apăsaţi pe Meniu pentru ajutor."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Ridicaţi degetul când aţi terminat"</string>
@@ -1176,23 +1234,22 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Setaţi modelul pentru deblocare"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Schimbaţi modelul pentru deblocare"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Modul de desenare a unui model de deblocare"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Prea multe încercări incorecte!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Încercaţi din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Prea multe încercări incorecte. Încercați din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplicaţia nu este instalată pe telefonul dvs."</string>
-    <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestionaţi aplicaţii"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestionaţi şi eliminaţi aplicaţiile instalate"</string>
+    <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestionaţi aplicații"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestionaţi și eliminaţi aplicațiile instalate"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicaţii"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"Gestionaţi aplicaţii, creaţi comenzi rapide pentru lansare rapidă"</string>
-    <string name="applications_settings_header" msgid="1014813055054356646">"Setări aplicaţii"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"Gestionaţi aplicații, creaţi comenzi rapide pentru lansare rapidă"</string>
+    <string name="applications_settings_header" msgid="1014813055054356646">"Setări aplicații"</string>
     <string name="install_applications" msgid="4872012136210802181">"Surse necunoscute"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permite aplic. din orice surse"</string>
     <string name="install_unknown_applications_title" msgid="663831043139080992">"Permite instalarea de aplicații din alte surse decât Google Play"</string>
-    <string name="install_unknown_applications" msgid="176855644862942064">"Permiteţi instalarea aplicaţiilor din surse necunoscute"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tableta şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Sunteţi de acord că sunteţi singura persoană responsabilă pentru deteriorarea tabletei sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicaţii."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonul şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Sunteţi de acord că sunteţi singura persoană responsabilă pentru deteriorarea telefonului sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicaţii."</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Permiteţi instalarea aplicațiilor din surse necunoscute"</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tableta și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor ce provin din surse necunoscute. Sunteţi de acord că sunteţi singura persoană responsabilă pentru deteriorarea tabletei sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicații."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonul și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor ce provin din surse necunoscute. Sunteţi de acord că sunteţi singura persoană responsabilă pentru deteriorarea telefonului sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicații."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setări avansate"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activaţi mai multe opţiuni pentru setări"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Informaţii despre aplicaţie"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"Informaţii despre aplicație"</string>
     <string name="storage_label" msgid="8700867073480107253">"Stocare"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Lansaţi în mod prestabilit"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Prestabilite"</string>
@@ -1205,7 +1262,7 @@
     <string name="force_stop" msgid="7435006169872876756">"Opriţi forţat"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="8494609207373874267">"Aplicaţie"</string>
-    <string name="external_code_size_label" msgid="3459343140355961335">"Stocare aplicaţie pe USB"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Stocare aplicație pe USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Date"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Stocare date pe USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Card SD"</string>
@@ -1216,22 +1273,23 @@
     <string name="enable_text" msgid="9217362512327828987">"Activaţi"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ștergeţi datele"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Dezinstalaţi actualizările"</string>
-    <string name="auto_launch_enable_text" msgid="2652825923953591251">"Aţi ales să lansaţi această aplicaţie în mod prestabilit pentru anumite acţiuni."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Aţi ales să permiteţi acestei aplicaţii să creeze widgeturi şi să acceseze datele acestora."</string>
+    <string name="auto_launch_enable_text" msgid="2652825923953591251">"Aţi ales să lansaţi această aplicație în mod prestabilit pentru anumite acţiuni."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Aţi ales să permiteţi acestei aplicații să creeze widgeturi și să acceseze datele acestora."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nu este setată nicio valoare standard."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Ștergeţi valorile standard"</string>
-    <string name="screen_compatibility_text" msgid="1616155457673106022">"Este posibil ca această aplicaţie să nu fie proiectată pentru ecranul dvs. Aici puteţi stabili modul în care aceasta se adaptează ecranului dvs."</string>
+    <string name="screen_compatibility_text" msgid="1616155457673106022">"Este posibil ca această aplicație să nu fie proiectată pentru ecranul dvs. Aici puteţi stabili modul în care aceasta se adaptează ecranului dvs."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Se stabileşte la lansare"</string>
-    <string name="enable_compatibility" msgid="5806819252068617811">"Scalaţi aplicaţia"</string>
+    <string name="enable_compatibility" msgid="5806819252068617811">"Scalaţi aplicația"</string>
     <string name="unknown" msgid="1592123443519355854">"Necunoscut"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sortaţi după nume"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sortaţi după dimensiune"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Serviciile care rulează"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Procese memorie cache"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicația de urgență"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Resetați preferințe aplicații"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Resetați preferințele pentru aplicații?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Aceasta va reseta toate preferințele pentru:\n\n "<li>"aplicații dezactivate;"</li>\n" "<li>"notificări de aplicații dezactivate;"</li>\n" "<li>"aplicații prestabilite pentru acțiuni;"</li>\n" "<li>"restricții privind datele de fundal pentru aplicații;"</li>\n" "<li>"orice restricții de permisiuni."</li>\n\n" Nu veți pierde datele aplicațiilor."</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetaţi aplicaţiile"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetaţi aplicațiile"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestionaţi spaţiul"</string>
     <string name="filter" msgid="2018011724373033887">"Filtraţi"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Alegeţi opţiunile de filtrare"</string>
@@ -1243,35 +1301,35 @@
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pe cardul SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Dezactivată"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nu este instal. pt. utilizator"</string>
-    <string name="no_applications" msgid="7336588977497084921">"Nu există aplicaţii."</string>
+    <string name="no_applications" msgid="7336588977497084921">"Nu există aplicații."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Stocare internă"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Stocare USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Stocare card SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Se recalculează dimensiunea..."</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Ștergeţi datele aplicaţiei?"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"Toate datele acestei aplicaţii vor fi şterse definitiv. Aici sunt incluse toate fişierele, setările, conturile, bazele de date etc."</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Ștergeţi datele aplicației?"</string>
+    <string name="clear_data_dlg_text" msgid="8847257251846779938">"Toate datele acestei aplicații vor fi şterse definitiv. Aici sunt incluse toate fişierele, setările, conturile, bazele de date etc."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"Anulaţi"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"Anulați"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
-    <string name="app_not_found_dlg_text" msgid="8333723538280257243">"Aplicaţia nu a fost găsită în lista de aplicaţii instalate."</string>
-    <string name="clear_data_failed" msgid="1907582169616856698">"Nu s-au putut şterge datele aplicaţiei."</string>
+    <string name="app_not_found_dlg_text" msgid="8333723538280257243">"Aplicaţia nu a fost găsită în lista de aplicații instalate."</string>
+    <string name="clear_data_failed" msgid="1907582169616856698">"Nu s-au putut şterge datele aplicației."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Dezinstalaţi actualizările?"</string>
-    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Toate actualizările aduse acestei aplicaţii de sistem Android vor fi dezinstalate."</string>
+    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Toate actualizările aduse acestei aplicații de sistem Android vor fi dezinstalate."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ștergeţi datele"</string>
-    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Nu s-au putut şterge datele aplicaţiei."</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Această aplicaţie poate accesa pe tabletă următoarele:"</string>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"Această aplicaţie poate accesa următoarele elemente de pe telefonul dvs.:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Această aplicaţie poate accesa următoarele elemente pe tableta dvs. Pentru a îmbunătăţi performanţa şi a reduce consumul de memorie, unele dintre aceste permisiuni sunt disponibile pentru <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, deoarece aceasta rulează în acelaşi proces ca şi <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Această aplicaţie poate accesa următoarele elemente pe telefonul dvs. Pentru a îmbunătăţi performanţa şi a reduce consumul de memorie, unele dintre aceste permisiuni sunt disponibile pentru <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, deoarece aceasta rulează în acelaşi proces ca şi <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
-    <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> şi <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
-    <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> şi <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
+    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Nu s-au putut şterge datele aplicației."</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Această aplicație poate accesa pe tabletă următoarele:"</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"Această aplicație poate accesa următoarele elemente de pe telefonul dvs.:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Această aplicație poate accesa următoarele elemente pe tableta dvs. Pentru a îmbunătăţi performanţa și a reduce consumul de memorie, unele dintre aceste permisiuni sunt disponibile pentru <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, deoarece aceasta rulează în același proces ca și <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Această aplicație poate accesa următoarele elemente pe telefonul dvs. Pentru a îmbunătăţi performanţa și a reduce consumul de memorie, unele dintre aceste permisiuni sunt disponibile pentru <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, deoarece aceasta rulează în același proces ca și <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> și <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
+    <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> și <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <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">"Această aplicaţie poate să genereze costuri:"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Această aplicație poate să genereze costuri:"</string>
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Trimiteţi SMS premium"</string>
     <string name="computing_size" msgid="1599186977475211186">"În curs de calculare..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Nu s-a putut calcula mărimea pachetului."</string>
-    <string name="empty_list_msg" msgid="5993162337235907160">"Nu aveţi instalată nicio aplicaţie terţă parte."</string>
+    <string name="empty_list_msg" msgid="5993162337235907160">"Nu aveţi instalată nicio aplicație terţă parte."</string>
     <string name="version_text" msgid="9189073826278676425">"versiunea <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mutaţi"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mutaţi pe tabletă"</string>
@@ -1285,28 +1343,29 @@
     <string name="invalid_location" msgid="2786030127356312746">"Locaţia de instalare nu este validă."</string>
     <string name="system_package" msgid="6222593098063037137">"Actualizările de sistem nu pot fi instalate pe suportul extern."</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Opriţi forţat?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Dacă forţaţi oprirea unei aplicaţii, aceasta se poate comporta necorespunzător."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Dacă forţaţi oprirea unei aplicații, aceasta se poate comporta necorespunzător."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"Aplicaţia nu a putut fi mutată. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Locaţie preferată de instalare"</string>
-    <string name="app_install_location_summary" msgid="5155453752692959098">"Schimbaţi locaţia preferată de instalare pentru noile aplicaţii"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"Schimbaţi locaţia preferată de instalare pentru noile aplicații"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Dezactiv. aplic. încorporată?"</string>
-    <string name="app_disable_dlg_text" msgid="3562567756362627323">"Dacă dezactivaţi o aplicaţie încorporată, este posibil ca alte aplicaţii să se comporte necorespunzător."</string>
-    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ștergeţi datele şi dezactivaţi aplicaţia?"</string>
-    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Dacă dezactivaţi o aplicaţie încorporată, este posibil ca alte aplicaţii să funcţioneze incorect. Datele dvs. vor fi, de asemenea, şterse."</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"Dacă dezactivaţi o aplicație încorporată, este posibil ca alte aplicații să se comporte necorespunzător."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ștergeţi datele și dezactivaţi aplicația?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Dacă dezactivaţi o aplicație încorporată, este posibil ca alte aplicații să funcţioneze incorect. Datele dvs. vor fi, de asemenea, şterse."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Dezactivaţi notificările?"</string>
-    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Dacă dezactivaţi notificările pentru această aplicaţie, puteţi pierde alerte şi actualizări importante."</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Dacă dezactivaţi notificările pentru această aplicație, puteţi pierde alerte și actualizări importante."</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operații ale aplicației"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Rulează"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nu este utilizată niciodată)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Nicio aplicație prestabilită."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilizare stocare"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"Afişaţi stocarea utilizată de aplicaţii"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"Afişaţi stocarea utilizată de aplicații"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicii în curs de funcţionare"</string>
-    <string name="runningservices_settings_summary" msgid="854608995821032748">"Vedeţi şi controlaţi serviciile care funcţionează în prezent"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Vedeţi și controlaţi serviciile care funcţionează în prezent"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Reporneşte"</string>
     <string name="cached" msgid="1059590879740175019">"Proces de fundal în memoria cache"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Nu rulează niciun serv."</string>
-    <string name="service_started_by_app" msgid="818675099014723551">"Iniţiat de aplicaţie"</string>
+    <string name="service_started_by_app" msgid="818675099014723551">"Iniţiat de aplicație"</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> liberi"</string>
@@ -1316,10 +1375,10 @@
     <skip />
     <string name="running_process_item_user_label" msgid="3129887865552025943">"Utilizator: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Utilizator eliminat"</string>
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces şi <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviciu"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces şi <xliff:g id="NUMSERVICES">%2$d</xliff:g> (de) servicii"</string>
-    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (de) procese şi <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviciu"</string>
-    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (de) procese şi <xliff:g id="NUMSERVICES">%2$d</xliff:g> (de) servicii"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces și <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviciu"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces și <xliff:g id="NUMSERVICES">%2$d</xliff:g> (de) servicii"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (de) procese și <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviciu"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (de) procese și <xliff:g id="NUMSERVICES">%2$d</xliff:g> (de) servicii"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"Memoria dispozitivului"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"Utilizarea memoriei RAM de către aplicații"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Sistem"</string>
@@ -1334,20 +1393,20 @@
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Procese"</string>
     <string name="service_stop" msgid="6369807553277527248">"Opriţi"</string>
     <string name="service_manage" msgid="1876642087421959194">"Setări"</string>
-    <string name="service_stop_description" msgid="9146619928198961643">"Acest serviciu a fost pornit de propria aplicaţie. Oprirea serviciului poate duce la eşuarea aplicaţiei."</string>
-    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"Această aplicaţie nu poate fi oprită în siguranţă. Oprirea aplicaţiei ar putea duce la pierderea datelor curente."</string>
-    <string name="background_process_stop_description" msgid="5034773197139654588">"Acesta este un proces al unei aplicaţii mai vechi, care rulează în continuare, pentru cazul în care este necesar din nou. De obicei nu există niciun motiv să îl opriţi."</string>
+    <string name="service_stop_description" msgid="9146619928198961643">"Acest serviciu a fost pornit de propria aplicație. Oprirea serviciului poate duce la eşuarea aplicației."</string>
+    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"Această aplicație nu poate fi oprită în siguranţă. Oprirea aplicației ar putea duce la pierderea datelor curente."</string>
+    <string name="background_process_stop_description" msgid="5034773197139654588">"Acesta este un proces al unei aplicații mai vechi, care rulează în continuare, pentru cazul în care este necesar din nou. De obicei nu există niciun motiv să îl opriţi."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: se află în prezent în utilizare. Atingeţi Setări pentru a controla serviciul."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Procesul principal în uz."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Serviciul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Furnizorul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Opriţi serviciul de sistem?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale tabletei să nu mai funcţioneze corect decât după ce o veţi închide şi redeschide."</string>
-    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale telefonului să nu mai funcţioneze corect decât după ce îl veţi închide şi redeschide."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale tabletei să nu mai funcţioneze corect decât după ce o veţi închide și redeschide."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale telefonului să nu mai funcţioneze corect decât după ce îl veţi închide și redeschide."</string>
     <string name="language_settings" msgid="5292716747264442359">"Limbă și introducere de text"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Limbă și introducere de text"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Setări de limbă"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatură şi introducere de text"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatură și introducere de text"</string>
     <string name="phone_language" msgid="8870144109924299673">"Limba"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Înlocuire automată"</string>
@@ -1358,8 +1417,8 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Setări pentru tastatura fizică"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Apăsaţi de două ori pe tasta de spaţiu pentru a insera „.”"</string>
     <string name="show_password" msgid="3001113966880559611">"Faceţi parolele vizibile"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Această metodă de introducere de text poate culege în întregime textul introdus, inclusiv datele personale, cum ar fi parolele şi numerele cardurilor de credit. Metoda provine de la aplicaţia <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizaţi această metodă de introducere de text?"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"Acest instrument de verificare a ortografiei poate, de asemenea, să culeagă în întregime textul pe care îl introduceţi, inclusiv datele personale, cum ar fi parolele şi numerele cardurilor de credit. Instrumentul provine de la aplicaţia <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utilizaţi acest instrument de verificare ortografică?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Această metodă de introducere de text poate culege în întregime textul introdus, inclusiv datele personale, cum ar fi parolele și numerele cardurilor de credit. Metoda provine de la aplicația <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizaţi această metodă de introducere de text?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"Acest instrument de verificare a ortografiei poate, de asemenea, să culeagă în întregime textul pe care îl introduceţi, inclusiv datele personale, cum ar fi parolele și numerele cardurilor de credit. Instrumentul provine de la aplicația <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utilizaţi acest instrument de verificare ortografică?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Setări"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Limbă"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Deschiderea setărilor pentru <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> a eşuat"</string>
@@ -1397,17 +1456,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informaţii tabletă"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informaţii telefon"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informaţii baterie"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Lansare rapidă"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Setaţi comenzi rapide de la tastatură pentru a lansa aplicaţii"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Atribuiţi o aplicaţie"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Fără comandă rapidă"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Căutaţi + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Ștergeţi"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Comanda dvs. rapidă pentru <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) va fi ştearsă."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Anulaţi"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplicaţii"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Comenzi rapide"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Introducere text"</string>
     <string name="input_method" msgid="5434026103176856164">"Metodă de intrare"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Tastatura actuală"</string>
@@ -1426,7 +1474,7 @@
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Tastatură fizică"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Setări pentru tastatura fizică"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opţiuni dezvoltator"</string>
-    <string name="development_settings_summary" msgid="1815795401632854041">"Setaţi opţiuni pentru dezvoltarea aplicaţiei"</string>
+    <string name="development_settings_summary" msgid="1815795401632854041">"Setaţi opţiuni pentru dezvoltarea aplicației"</string>
     <string name="development_settings_not_available" msgid="4308569041701535607">"Opțiunile de dezvoltator nu sunt disponibile pentru acest utilizator"</string>
     <string name="vpn_settings_not_available" msgid="956841430176985598">"Setările VPN nu sunt disponibile pentru acest utilizator"</string>
     <string name="tethering_settings_not_available" msgid="6765770438438291012">"Setările pentru tethering nu sunt disponibile pentru acest utilizator"</string>
@@ -1442,45 +1490,53 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Înregistrați toate pachetele HCI Bluetooth într-un fișier"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Deblocarea OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permiteți deblocarea bootloaderului"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introduceți codul PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduceți codul PIN al dispozitivului pentru a activa deblocarea OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Permiteți deblocarea OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISMENT: funcțiile de protecție a dispozitivului nu vor funcționa pe acest dispozitiv cât timp setarea este activată."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Dimensiunile tamponului Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. dimens. Logger/tampon jurnal"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Permiteţi locaţiile fictive"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permiteţi locaţiile fictive"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Activați inspectarea atributelor de vizualizare"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Conectare la rețele"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificare Ecran wireless"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Act. înr. prin Wi-Fi a vol. mari de date"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Înlocuire Wi-Fi cu mobil agresivă"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Se permite întotdeauna scanarea traficului Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Folosiți vechiul client DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afișați opțiunile pentru certificarea Ecran wireless"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Măriți niv. de înr. prin Wi‑Fi, afișați în fcț. de SSID RSSI în Selectorul Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Când este activată, funcția Wi-Fi va fi mai agresivă la predarea conexiunii de date către mobil când semnalul Wi-Fi este slab"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Permiteți/Nu permiteți scanarea traficului Wi-Fi în funcție de traficul de date din interfață"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Dimensiunile tamponului Logger"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. dimens. Logger/tampon jurnal"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Selectați configurația USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Selectați configurația USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permiteţi locaţiile fictive"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permiteţi locaţiile fictive"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Activați inspectarea atributelor de vizualizare"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Folosiți clientul DHCP din Lollipop în locul noului client Android DHCP."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permiteţi depanarea USB?"</string>
-    <string name="adb_warning_message" msgid="7316799925425402244">"Depanarea USB are exclusiv scopuri de dezvoltare. Utilizaţi-o pentru a copia date de pe computer pe dispozitiv, pentru a instala aplicaţii pe dispozitiv fără notificare şi pentru a citi datele din jurnale."</string>
+    <string name="adb_warning_message" msgid="7316799925425402244">"Depanarea USB are exclusiv scopuri de dezvoltare. Utilizaţi-o pentru a copia date de pe computer pe dispozitiv, pentru a instala aplicații pe dispozitiv fără notificare și pentru a citi datele din jurnale."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revocați accesul la remedierea erorilor prin USB de pe toate computerele pe care le-ați autorizat anterior?"</string>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Permiteţi setările pentru dezvoltare?"</string>
-    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Aceste setări sunt destinate exclusiv utilizării pentru dezvoltare. Din cauza lor, este posibil ca dispozitivul dvs. şi aplicaţiile de pe acesta să nu mai funcţioneze sau să funcţioneze necorespunzător."</string>
-    <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificaţi aplicaţiile prin USB"</string>
-    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Verificaţi aplicaţiile instalate utilizând ADB/ADT, pentru a detecta un comportament dăunător."</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Aceste setări sunt destinate exclusiv utilizării pentru dezvoltare. Din cauza lor, este posibil ca dispozitivul dvs. și aplicațiile de pe acesta să nu mai funcţioneze sau să funcţioneze necorespunzător."</string>
+    <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificaţi aplicațiile prin USB"</string>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Verificaţi aplicațiile instalate utilizând ADB/ADT, pentru a detecta un comportament dăunător."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protejaţi stocarea USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplicaţiile trebuie să ceară permisiunea de a citi stocarea USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protejaţi stocarea USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Când stocarea USB este protejată, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă.\n\nEste posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Când stocarea USB este protejată, aplicațiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă.\n\nEste posibil ca unele aplicații să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protejaţi cardul SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplicaţiile trebuie să ceară permisiunea de a citi cardul SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protejaţi cardul SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Când cardul SD este protejat, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă.\n\nEste posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Când cardul SD este protejat, aplicațiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă.\n\nEste posibil ca unele aplicații să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
     <string name="enable_terminal_title" msgid="95572094356054120">"Aplicație terminal locală"</string>
     <string name="enable_terminal_summary" msgid="67667852659359206">"Activați aplicația terminal care oferă acces la shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Alegeţi obiectul gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Alegeţi obiectul widget"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creaţi widgetul şi permiteţi accesul?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creaţi widgetul și permiteţi accesul?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"După ce creaţi widgetul, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> poate accesa toate datele pe care acesta le afişează."</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permiteţi întotdeauna ca <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> să creeze widgeturi şi să acceseze datele acestora"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permiteţi întotdeauna ca <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> să creeze widgeturi și să acceseze datele acestora"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> z <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
@@ -1501,11 +1557,11 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"Afișaj"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtitrări"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesturi pentru mărire"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"După activarea acestei funcţii, puteţi mări şi micşora atingând de trei ori ecranul.\n\nÎn timp ce măriţi, puteţi:\n"<ul><li>"să deplasaţi: deplasaţi două sau mai multe degete pe ecran;"</li>\n<li>"să ajustaţi nivelul de zoom: ciupiţi cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriţi temporar ce se află sub degetul dvs. atingând ecranul de trei ori şi menţinând degetul pe ecran. În imaginea mărită, puteţi să glisaţi degetul pentru a explora diferite părţi ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară.\n\nNotă: atingerea triplă pentru mărire funcţionează peste tot, cu excepţia tastaturii şi a barei de navigare."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"După activarea acestei funcţii, puteţi mări și micşora atingând de trei ori ecranul.\n\nÎn timp ce măriţi, puteţi:\n"<ul><li>"să deplasaţi: deplasaţi două sau mai multe degete pe ecran;"</li>\n<li>"să ajustaţi nivelul de zoom: ciupiţi cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriţi temporar ce se află sub degetul dvs. atingând ecranul de trei ori și menţinând degetul pe ecran. În imaginea mărită, puteţi să glisaţi degetul pentru a explora diferite părţi ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară.\n\nNotă: atingerea triplă pentru mărire funcţionează peste tot, cu excepţia tastaturii și a barei de navigare."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă de accesibilitate"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activat"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Dezactivată"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"După activarea acestei funcţii, puteţi să activaţi rapid funcţiile de accesibilitate în doi paşi:\n\nPasul 1: apăsaţi şi menţineţi apăsat butonul de pornire până când auziţi un sunet sau simţiţi o vibraţie.\n\nPasul 2: atingeţi ecranul cu două degete şi menţineţi degetele pe ecran până când auziţi o confirmare audio.\n\nDacă gadgetul are mai mulţi utilizatori, folosirea acestei comenzi rapide pe ecranul de blocare activează temporar accesibilitatea până când gadgetul este deblocat."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"După activarea acestei funcţii, puteţi să activaţi rapid funcţiile de accesibilitate în doi pași:\n\nPasul 1: apăsaţi și menţineţi apăsat butonul de pornire până când auziţi un sunet sau simţiţi o vibraţie.\n\nPasul 2: atingeţi ecranul cu două degete și menţineţi degetele pe ecran până când auziţi o confirmare audio.\n\nDacă gadgetul are mai mulţi utilizatori, folosirea acestei comenzi rapide pe ecranul de blocare activează temporar accesibilitatea până când gadgetul este deblocat."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Text mare"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text cu contrast ridicat"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Mărirea ecranului"</string>
@@ -1562,6 +1618,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Utilizați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> are funcțiile:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Deoarece o aplicație acoperă o solicitare de permisiune, Setările nu vă pot verifica răspunsul."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Dacă activați <xliff:g id="SERVICE">%1$s</xliff:g>, dispozitivul nu va utiliza blocarea ecranului pentru a îmbunătăți criptarea datelor."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Pentru că ați activat un serviciu de accesibilitate, dispozitivul nu va utiliza blocarea ecranului pentru a îmbunătăți criptarea datelor."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Deoarece activarea serviciului <xliff:g id="SERVICE">%1$s</xliff:g> afectează criptarea datelor, trebuie să confirmați modelul."</string>
@@ -1663,8 +1720,8 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Consum de energie calculat"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Consum de energie observat"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Opriţi forţat"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Informaţii despre aplicaţie"</string>
-    <string name="battery_action_app_settings" msgid="4570481408106287454">"Setări aplicaţii"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"Informaţii despre aplicație"</string>
+    <string name="battery_action_app_settings" msgid="4570481408106287454">"Setări aplicații"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Setări ecran"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Setări Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Setări Bluetooth"</string>
@@ -1675,14 +1732,14 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Comutaţi la modul Avion pentru a economisi energia în zonele fără acoperire celulară"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"Baterie utilizată de lanternă"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Baterie utilizată de ecran și de iluminarea din spate"</string>
-    <string name="battery_sugg_display" msgid="3370202402045141760">"Reduceţi luminozitatea şi/sau durata până la dezactivarea ecranului"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Reduceţi luminozitatea și/sau durata până la dezactivarea ecranului"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"Baterie utilizată de Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="3355461362094706957">"Dezactivați rețeaua Wi-Fi atunci când nu o utilizați sau când nu este disponibilă"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Baterie utilizată de Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Dezactivaţi funcţia Bluetooth atunci când nu o utilizaţi"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Încercaţi să vă conectaţi la un alt dispozitiv Bluetooth"</string>
-    <string name="battery_desc_apps" msgid="8530418792605735226">"Baterie utilizată de aplicaţii"</string>
-    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Opriţi sau dezinstalaţi aplicaţia"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"Baterie utilizată de aplicații"</string>
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Opriţi sau dezinstalaţi aplicația"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selectați modul de economisire a bateriei"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplicaţia poate oferi setări pentru reducerea utilizării bateriei"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterie utilizată de utilizator"</string>
@@ -1703,14 +1760,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistici de proces"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistici inteligente despre procesele care rulează"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Utilizarea memoriei"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplicații de tip <xliff:g id="TYPE">%1$s</xliff:g> în <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> din <xliff:g id="TOTALRAM">%2$s</xliff:g> folosiți în <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"În fundal"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"În prim-plan"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"În cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memoria dispozitivului este în prezent <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Utilizare medie RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Utilizare maximă RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Sistem de operare Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Native"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Nucleu"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Procese din cache"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Utilizare RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Utilizare RAM (fundal)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Durată de rulare"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Procese"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servicii"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durată"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Detalii despre memorie"</string>
@@ -1727,13 +1790,14 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ore"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"O zi"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Afișați sistemul"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ascunde procesele de sistem"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utilizați Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipul de statistici"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"În fundal"</string>
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"În prim-plan"</string>
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"În cache"</string>
-    <string name="voice_input_output_settings" msgid="1336135218350444783">"Intrare şi ieşire voce"</string>
-    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Setări de intrare şi de ieşire a vocii"</string>
+    <string name="voice_input_output_settings" msgid="1336135218350444783">"Intrare și ieșire voce"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Setări de intrare și de ieșire a vocii"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Căutare vocală"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Tastatură Android"</string>
     <string name="voice_category" msgid="1430370497125803904">"Voce"</string>
@@ -1746,10 +1810,10 @@
     <string name="tts_settings" msgid="8186971894801348327">"Setări text în vorbire"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"Transformare text în vorbire"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Doresc să se utilizeze întotdeauna setările mele"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setările prestabilite de mai jos înlocuiesc setările aplicaţiei"</string>
+    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setările prestabilite de mai jos înlocuiesc setările aplicației"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Setări standard"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor prestabilit"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Setează utilizarea motorului de sintetizare a vorbirii pentru textul vorbit"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Setează motorul de sinteză vocală de utilizat pentru textul vorbit"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Ritmul vorbirii"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Viteza cu care este vorbit textul"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Înălţime"</string>
@@ -1767,7 +1831,7 @@
     <string name="tts_engine_error" msgid="3305141107104670703">"Motorul pe care l-aţi ales nu poate rula."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configuraţi"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Alegeţi alt motor"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Acest motor de sintetizare a vorbirii poate culege în întregime textul vorbit, inclusiv datele personale cum ar fi parolele şi numerele cărţilor de credit. Metoda provine de la motorul <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Permiteţi utilizarea acestui motor de sintetizare a vorbirii?"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Acest motor de sintetizare a vorbirii poate culege în întregime textul vorbit, inclusiv datele personale cum ar fi parolele și numerele cărţilor de credit. Metoda provine de la motorul <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Permiteţi utilizarea acestui motor de sintetizare a vorbirii?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Pentru rezultatul transformării textului în vorbire pentru această limbă este necesară o conexiune de reţea care să funcţioneze."</string>
     <string name="tts_default_sample_string" msgid="4040835213373086322">"Acesta este un exemplu de sintetizare a vorbirii"</string>
     <string name="tts_status_title" msgid="7268566550242584413">"Starea limbii prestabilite"</string>
@@ -1781,7 +1845,7 @@
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> este dezactivat"</string>
     <string name="tts_engine_settings_section" msgid="2346105138448751893">"Setările motorului"</string>
     <string name="tts_engine_settings_title" msgid="3499112142425680334">"Setări pentru <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Limbi şi voci"</string>
+    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Limbi și voci"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Instalată"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Neinstalată"</string>
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Feminină"</string>
@@ -1823,7 +1887,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Stocare hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Stocare software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Datele de conectare nu sunt disponibile pentru acest utilizator"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma instalarea acreditării."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1848,17 +1911,15 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Backup pentru date"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Creați o copie de rezervă pentru datele aplicației, parolele Wi-Fi și pentru alte setări pe serverele Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Cont de backup"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"În prezent, niciun cont nu stochează datele cu copii de rezervă"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Includeți datele aplicației"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restabilire automată"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"La reinstalarea unei aplicaţii, restabiliţi setările şi datele pentru care aţi creat o copie de rezervă"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"La reinstalarea unei aplicații, restabiliţi setările și datele pentru care aţi creat o copie de rezervă"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Serviciul de backup este inactiv."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Acest serviciu este configurat de politica privind dispozitivele."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Parolă copie rez. desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"În prezent, copiile de rezervă complete pe desktop nu sunt protejate"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Atingeţi pentru a modifica sau pentru a elimina parola pentru copiile de rezervă complete pe desktop"</string>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"A fost setată o parolă de rezervă nouă"</string>
-    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Parola nouă şi confirmarea acesteia nu se potrivesc."</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Parola nouă și confirmarea acesteia nu se potrivesc."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Setarea parolei de rezervă a eşuat"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Doriți să opriți crearea copiei de rezervă pentru parolele Wi-Fi, marcaje, alte setări, datele aplicațiilor și să ștergeți toate copiile aflate pe serverele Google?"</string>
@@ -1874,14 +1935,14 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Activaţi administratorul de dispozitive?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Activaţi"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrator de dispozitive"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Activarea acestui administrator va permite aplicaţiei <xliff:g id="APP_NAME">%1$s</xliff:g> să efectueze următoarele operaţiuni:"</string>
-    <string name="device_admin_status" msgid="4252975713178851910">"Acest administrator este activ şi permite aplicaţiei <xliff:g id="APP_NAME">%1$s</xliff:g> să efectueze următoarele operaţii:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"Activarea acestui administrator va permite aplicației <xliff:g id="APP_NAME">%1$s</xliff:g> să efectueze următoarele operaţiuni:"</string>
+    <string name="device_admin_status" msgid="4252975713178851910">"Acest administrator este activ și permite aplicației <xliff:g id="APP_NAME">%1$s</xliff:g> să efectueze următoarele operaţii:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"Activați Administratorul de profil?"</string>
     <string name="adding_profile_owner_warning" msgid="6469780138110334180">"În cazul în care continuați, Utilizatorul va fi gestionat de Administrator, care ar putea să stocheze, pe lângă datele personale, și date asociate.\n\nAdministratorul are posibilitatea de a monitoriza și a gestiona setările, accesul, aplicațiile și datele asociate cu acest Utilizator, inclusiv activitatea în rețea și informațiile despre locația dispozitivului."</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Fără titlu"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"Jurnal de notificări"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ton de sonerie şi vibraţii"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ton de sonerie și vibraţii"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistem"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"Configurare Wi-Fi"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Conectați-vă la rețeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -1898,7 +1959,7 @@
     <string name="wifi_setup_connect" msgid="7954456989590237049">"Conect."</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"Ștergeţi"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Salvaţi"</string>
-    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Anulaţi"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Anulați"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Se scanează reţelele..."</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Atingeţi o reţea pentru a vă conecta la aceasta"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conectaţi-vă la reţeaua existentă"</string>
@@ -1923,10 +1984,10 @@
     <string name="managed_profile_not_available_label" msgid="3489771164851107822">"Profilul de serviciu nu este încă disponibil"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"Eliminați profilul de serviciu"</string>
     <string name="background_data" msgid="5779592891375473817">"Date de fundal"</string>
-    <string name="background_data_summary" msgid="8328521479872763452">"Aplicaţiile pot oricând sincroniza, trimite şi primi date"</string>
+    <string name="background_data_summary" msgid="8328521479872763452">"Aplicaţiile pot oricând sincroniza, trimite și primi date"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Dez. dat. de fundal?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"Dezactivarea datelor de fundal creşte durata de viaţă a bateriei şi reduce nivelul de utilizare a datelor. Anumite aplicaţii pot utiliza în continuare conexiunea de date de fundal."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"Sinc. automată a datelor aplicaţiei"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"Dezactivarea datelor de fundal creşte durata de viaţă a bateriei și reduce nivelul de utilizare a datelor. Anumite aplicații pot utiliza în continuare conexiunea de date de fundal."</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"Sinc. automată a datelor aplicației"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronizarea e ACTIVATĂ"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sincroniz. e DEZACTIVATĂ"</string>
     <string name="sync_error" msgid="5060969083117872149">"Eroare de sincronizare"</string>
@@ -1935,29 +1996,29 @@
     <string name="settings_backup" msgid="2274732978260797031">"Setări copie de rezervă"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Creaţi o copie de rezervă a setărilor dvs."</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizaţi acum"</string>
-    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Anulaţi sincronizarea"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Anulați sincronizarea"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Atingeţi pentru a sincroniza acum<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">"Agendă"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bun venit la Sincronizarea Google!"</font>" \nO abordare Google asupra sincronizării datelor, care vă permite accesul la agenda dvs., la întâlniri şi la multe alte informaţii, oriunde v-aţi afla."</string>
-    <string name="header_application_sync_settings" msgid="6205903695598000286">"Setări privind sincronizarea aplicaţiei"</string>
-    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Datele şi sincronizarea"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bun venit la Sincronizarea Google!"</font>" \nO abordare Google asupra sincronizării datelor, care vă permite accesul la agenda dvs., la întâlniri și la multe alte informaţii, oriunde v-aţi afla."</string>
+    <string name="header_application_sync_settings" msgid="6205903695598000286">"Setări privind sincronizarea aplicației"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Datele și sincronizarea"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Schimbaţi parola"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"Setări cont"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"Eliminaţi contul"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"Adăugaţi un cont"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Finalizaţi"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Eliminaţi contul?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Eliminarea acestui cont va şterge toate mesajele şi persoanele din agendă pe care le cuprinde, precum şi alte date de pe tabletă!"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Eliminarea acestui cont va şterge toate mesajele şi persoanele din agendă pe care le cuprinde, precum şi alte date de pe telefon!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Eliminarea acestui cont va şterge toate mesajele și persoanele din agendă pe care le cuprinde, precum și alte date de pe tabletă!"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Eliminarea acestui cont va şterge toate mesajele și persoanele din agendă pe care le cuprinde, precum și alte date de pe telefon!"</string>
     <string name="remove_account_failed" msgid="4010643669489606536">"Această modificare nu este permisă de administratorul dvs."</string>
     <string name="provider_label" msgid="7724593781904508866">"Abonamente de tip push"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"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="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>
@@ -1976,13 +2037,13 @@
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Verificare HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Configurați verific. HDCP"</string>
     <string name="debug_debugging_category" msgid="6781250159513471316">"Depanare"</string>
-    <string name="debug_app" msgid="8349591734751384446">"Selectaţi aplicaţia de depanare"</string>
-    <string name="debug_app_not_set" msgid="718752499586403499">"Nu aţi setat o aplicaţie de depanare"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Selectaţi aplicația de depanare"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Nu aţi setat o aplicație de depanare"</string>
     <string name="debug_app_set" msgid="2063077997870280017">"Aplicaţie de depanare: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="select_application" msgid="5156029161289091703">"Selectaţi o aplicaţie"</string>
+    <string name="select_application" msgid="5156029161289091703">"Selectaţi o aplicație"</string>
     <string name="no_application" msgid="2813387563129153880">"Niciuna"</string>
     <string name="wait_for_debugger" msgid="1202370874528893091">"Aşteptaţi depanatorul"</string>
-    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Înaintea executării, aplicaţia aşteaptă ataşarea depanatorului"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Înaintea executării, aplicația aşteaptă ataşarea depanatorului"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Intrare"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Desen"</string>
     <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Redare accelerată hardware"</string>
@@ -2018,13 +2079,17 @@
     <string name="force_hw_ui" msgid="6426383462520888732">"Forţaţi redarea cu GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forţaţi utilizarea GPU pentru desen în 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Forţaţi MSAA 4x"</string>
-    <string name="force_msaa_summary" msgid="9123553203895817537">"Activaţi MSAA 4x în aplicaţiile OpenGL ES 2.0"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Activaţi MSAA 4x în aplicațiile OpenGL ES 2.0"</string>
     <string name="show_non_rect_clip" msgid="505954950474595172">"Remediați decupări nerectangulare"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profil redare cu GPU"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Scară animație fereastră"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Scară tranziție animații"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scară durată Animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulaţi afişaje secundare"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Mod cu ferestre multiple"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Mai multe activități simultane pe ecran."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Activați modul cu ferestre multiple?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"AVERTISMENT: aceasta este o funcție aflată la începutul perioadei de experimentare, care permite mai multe activități simultane pe ecran prin intermediul interfeței de utilizare Aplicații recente. Este posibil ca anumite aplicații să se blocheze sau să nu funcționeze corect când sunt folosite cu această funcție."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicaţii"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nu păstraţi activităţile"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Elimină activitățile imediat ce utilizatorul le închide"</string>
@@ -2078,7 +2143,7 @@
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Date 4G"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"În prim-plan:"</string>
     <string name="data_usage_background_label" msgid="2722008379947694926">"În fundal:"</string>
-    <string name="data_usage_app_settings" msgid="2279171379771253165">"Setări aplicaţii"</string>
+    <string name="data_usage_app_settings" msgid="2279171379771253165">"Setări aplicații"</string>
     <string name="data_usage_app_restrict_background" msgid="7510046552380574925">"Restr. datele de fundal ale apl."</string>
     <string name="data_usage_app_restrict_background_summary" msgid="3720075732277934106">"Dezactivați datele de fundal în rețelele mobile."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="1446565717342917727">"Restrângeți traficul de fundal al aplicației după ce setați limita pt. date mobile."</string>
@@ -2089,7 +2154,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Modificările conturilor dvs. pe web vor fi copiate automat pe tabletă.\n\nDe asemenea, unele conturi pot să copieze automat pe web toate modificările pe care le efectuați pe tabletă. Așa funcționează un Cont Google."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Modificările conturilor pe care le efectuați pe web vor fi copiate automat pe telefon.\n\nDe asemenea, unele conturi pot să copieze automat pe web toate modificările pe care le efectuați pe telefon. Așa funcționează un Cont Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Dezact. sinc. autom. a datelor?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Această acţiune va economisi date şi durata bateriei, dar va trebui să sincronizaţi fiecare cont manual pentru a culege informaţiile recente. În plus, nu veţi primi notificări atunci când apar actualizări."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Această acţiune va economisi date și durata bateriei, dar va trebui să sincronizaţi fiecare cont manual pentru a culege informaţiile recente. În plus, nu veţi primi notificări atunci când apar actualizări."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de resetare a ciclului de utilizare"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data din fiecare lună:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Setaţi"</string>
@@ -2105,7 +2170,7 @@
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avertisment"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<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">"Aplicaţii eliminate"</string>
-    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplicaţii şi utilizatori eliminaţi"</string>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplicaţii și utilizatori eliminaţi"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> primiţi, <xliff:g id="SENT">%2$s</xliff:g> trimişi"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: aproximativ <xliff:g id="TOTAL">%1$s</xliff:g> utilizaţi."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: aprox. <xliff:g id="TOTAL">%1$s</xliff:g> utilizaţi, conform tabletei. Contabilizarea operatorului poate diferi."</string>
@@ -2138,7 +2203,7 @@
     <string name="vpn_not_used" msgid="9094191054524660891">"(neutilizat)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(nu verificaţi serverul)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(primit de la server)"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"Anulaţi"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Anulați"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Salvaţi"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Conectaţi"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"Editaţi profilul VPN"</string>
@@ -2150,7 +2215,7 @@
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Reţea VPN activată permanent"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selectaţi un profil VPN pentru a rămâne conectat întotdeauna la reţea. Traficul de reţea va fi permis numai atunci când sunteţi conectat(ă) la această reţea VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Niciuna"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Activarea permanentă a reţelei VPN necesită o adresă IP, atât pentru server, cât şi pentru DNS."</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Activarea permanentă a reţelei VPN necesită o adresă IP, atât pentru server, cât și pentru DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nu există nicio conexiune la reţea. Încercaţi din nou mai târziu."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Lipseşte un certificat. Editaţi profilul."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
@@ -2166,7 +2231,7 @@
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Introduceţi aici o parolă nouă pentru copiile de rezervă complete"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Reintroduceţi aici noua parolă pentru copia de rezervă completă"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Setaţi parola pentru copia de rezervă"</string>
-    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Anulaţi"</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>
@@ -2196,7 +2261,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilizator"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limitat"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Adăugați utilizator nou?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Puteți să permiteți accesul la acest dispozitiv altor persoane creând utilizatori suplimentari. Fiecare utilizator are propriul spațiu, pe care îl poate personaliza cu propriile aplicații, imagini de fundal etc. De asemenea, utilizatorii pot ajusta setările tabletei, cum ar fi setările pentru Wi-Fi, care afectează pe toți ceilalți utilizatori.\n\nDupă ce creați un utilizator nou, acesta trebuie să-și configureze spațiul.\n\nOrice utilizator poate actualiza aplicațiile pentru toți ceilalți utilizatori."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Puteți să permiteți accesul la acest dispozitiv altor persoane creând utilizatori suplimentari. Fiecare utilizator are propriul spațiu, pe care îl poate personaliza cu aplicații, imagini de fundal etc. De asemenea, utilizatorii pot ajusta setările dispozitivului, cum ar fi setările pentru Wi-Fi, care îi afectează pe toți ceilalți utilizatori.\n\nDupă ce creați un utilizator nou, acesta trebuie să-și configureze spațiul.\n\nOricare dintre utilizatori poate actualiza aplicațiile pentru toți ceilalți utilizatori."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Când adăugați un utilizator nou, acesta trebuie să-și configureze spațiul.\n\nOrice utilizator poate actualiza aplicațiile pentru toți ceilalți utilizatori."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configuraţi utilizatorul acum?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asigurați-vă că utilizatorul are posibilitatea de a prelua dispozitivul și de a-și configura spațiul"</string>
@@ -2206,7 +2271,7 @@
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Numai proprietarul tabletei poate gestiona utilizatorii."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Numai proprietarul telefonului poate gestiona utilizatorii."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profilurile cu permisiuni limitate nu pot adăuga conturi"</string>
-    <string name="user_remove_user_menu" msgid="6897150520686691355">"Ștergeţi <xliff:g id="USER_NAME">%1$s</xliff:g> de pe gadget"</string>
+    <string name="user_remove_user_menu" msgid="6897150520686691355">"Ștergeţi <xliff:g id="USER_NAME">%1$s</xliff:g> de pe dispoz."</string>
     <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"Adăug. utiliz. pe disp. blocat"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Utilizator nou"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Profil nou"</string>
@@ -2214,8 +2279,8 @@
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"Eliminați utilizatorul?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"Eliminați acest profil?"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"Elim. profilul serviciu?"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Veţi pierde spaţiul şi datele de pe această tabletă. Nu puteţi anula această acţiune."</string>
-    <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Veţi pierde spaţiul şi datele de pe acest telefon. Nu puteţi anula această acţiune."</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Veţi pierde spaţiul și datele de pe această tabletă. Nu puteţi anula această acţiune."</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Veţi pierde spaţiul și datele de pe acest telefon. Nu puteţi anula această acţiune."</string>
     <string name="user_confirm_remove_message" msgid="1020629390993095037">"Toate aplicațiile și datele vor fi șterse."</string>
     <string name="work_profile_confirm_remove_message" msgid="7593793549364168783">"Toate aplicațiile și datele din acest profil vor fi șterse."</string>
     <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"Toate aplicațiile și datele vor fi șterse."</string>
@@ -2227,13 +2292,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Ștergeți invitatul?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Toate aplicațiile și datele din această sesiune vor fi șterse."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Ștergeți"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Permiteți apeluri telefonice"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Permiteți apeluri telefonice și SMS-uri"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Activați apelurile telefonice"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Activați apelurile telefonice și SMS-urile"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Eliminați utilizatorul"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Permiteți apeluri telefonice?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Activați apelurile telefonice?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Acest utilizator va avea acces la istoricul apelurilor."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Permiteți apeluri telefonice și SMS-uri?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Acest utilizator va avea acces la istoricul apelurilor și al SMS-urilor."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activați apelurile telefonice și SMS-urile?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Acest utilizator va avea acces la istoricul apelurilor și al SMS-urilor."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permiteți aplicații și conținut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicații cu restricții"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Extindeți setările aplicației"</string>
@@ -2284,8 +2349,8 @@
     <string name="user_rename" msgid="8523499513614655279">"REDENUMIȚI"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Setați restricțiile aplicației"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlate de <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Această aplicație nu este acceptată pentru profilurile cu permisiuni limitate"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Această aplicație poate accesa conturile dvs."</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Această aplicație vă poate accesa conturile. Este controlată de <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Rețele Wi‑Fi și mobile"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permiteți modificarea setărilor pentru rețele Wi‑Fi și mobile"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2350,13 +2415,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi conexiune la rețea"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mesaj text trimitere de SMS-uri mesaje text trimitere de mesaje"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular furnizor de servicii celulare date wireless 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi apel apelare"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lansator"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ecran tactil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"reduceți luminozitatea ecranului ecran tactil baterie"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"reduceți luminozitatea ecranului ecran tactil baterie"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fundal personalizați afișare"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"temă întunecată mod noapte reduceți luminozitatea ecranului inversați luminozitatea"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"fundal personalizați afișare"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"dimensiunea textului"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proiect"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"proiect proiectat"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"spațiu pe disc hard disk utilizarea dispozitivului"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"sarcină electrică"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografie dicționar verificare ortografică corectare automată"</string>
@@ -2373,6 +2440,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"cont"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restricție restricționa restricționat"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"corectarea textului corectați sunet vibrații auto limbă gest sugera sugestie temă cuvânt ofensator introducere de text emoji internațional"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"resetați preferințe valori prestabilite"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"urgență aplicație prestabilită"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplicații descărcați sistem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplicații permisiuni securitate"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplicații prestabilite"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"glisare parolă model PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurarea etichetei NFC pentru Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Scrieți"</string>
@@ -2387,11 +2459,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volum alarmă"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volum sonerie"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumul notificărilor"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Întreruperi"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"La primirea apelurilor și notificărilor"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Întrerupeți întotdeauna"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permiteți numai întreruperi cu prioritate"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nu întrerupeți"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"„Numai cu prioritate” permite"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reguli automate"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Numai cu prioritate"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Numai alarme"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Fără întreruperi"</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="ringtone_title" msgid="5379026328015343686">"Ton de apel al telefonului"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ton de sonerie implicit pentru notificări"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrații și pentru apeluri"</string>
@@ -2417,62 +2490,124 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrează"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acces la notificări"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplicațiile nu pot citi notificările"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplicație poate citi notificările"</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplicații pot citi notificările"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="few">%d aplicații pot citi notificările</item>
+      <item quantity="other">%d de aplicații pot citi notificările</item>
+      <item quantity="one">%d aplicație poate citi notificările</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nu sunt instalate aplicații de citire a notificărilor."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> va putea să citească toate notificările postate de sistem sau de aplicațiile instalate, care ar putea include informații personale, cum ar fi numele persoanelor de contact și textul mesajelor care vă sunt trimise. De asemenea, va putea să închidă aceste notificări sau să atingă butoanele de acțiuni din cadrul acestora."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Furnizori de condiții"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nicio aplicație nu furnizează condiții"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplicație furnizează condiții"</item>
-    <item quantity="other" msgid="358057362115673258">"%d aplicații furnizează condiții"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nu sunt instalați furnizori de condiții."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> va putea să adauge condiții de ieșire la modul Nu deranja."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blocați"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blocați-le pe toate"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nu afișați notificări de la această aplicație"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritate"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Afișați notificările la începutul listei și primiți-le în continuare când dispozitivul este configurat numai pentru întreruperi cu prioritate"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Confidențial"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Când dispozitivul este blocat, nu afișați conținutul confidențial în notificările aplicației"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratați ca având prioritate"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Permiteți ca notificările acestei aplicații să se audă când opțiunea Nu deranja este setată la Numai cu prioritate"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permiteți afișarea de scurtă durată"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permiteți ca această aplicație să evidențieze anumite notificări glisându-le pentru scurt timp la vedere pe ecranul actual"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ascundeți conținutul confidențial"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Când dispozitivul este blocat, ascundeți conținutul din notificările acestei aplicații, care poate dezvălui informații private"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blocat"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritate"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidențial"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Terminat"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Până la dezactivare"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Întreruperi cu prioritate"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Inactivitate"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Zile"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Niciuna"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Întreruperile sunt permise"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Numai cu prioritate"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Niciunul"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizare"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activați automat"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Numele regulii"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Adăugați o regulă"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ștergeți regula"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Ștergeți regula „<xliff:g id="RULE">%1$s</xliff:g>”?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Ștergeți"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipul de regulă"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Necunoscut"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurați regula"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Regulă privind programul"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regula nu a fost găsită."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Zile"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Niciuna"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"În fiecare zi"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Niciodată"</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">"Între <xliff:g id="START">%1$s</xliff:g> și <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Apeluri"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesaje"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Apeluri/mesaje de la"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Oricine"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Numai din agendă"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Numai pers. de contact cu stea"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Evenimente și memento-uri"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmele sunt întotdeauna întreruperi cu prioritate"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarme"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Mementouri"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Evenimente"</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> (de) minute, permite apelul"</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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Serile zilelor lucr."</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ora de începere"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ora de încheiere"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"La <xliff:g id="FORMATTED_TIME">%s</xliff:g> a doua zi"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"La <xliff:g id="FORMATTED_TIME">%s</xliff:g> sau la oricare alarmă anterioară"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"La <xliff:g id="FORMATTED_TIME">%s</xliff:g> a doua zi sau la oricare alarmă anterioară"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"La <xliff:g id="FORMATTED_TIME">%s</xliff:g> a doua zi"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Întreruperi"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"La primirea apelurilor și a notificărilor"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Când doriți să fiți întrerupt(ă)?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Pentru cât timp?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Întrerupe întotdeauna"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"dezactivate,toate,totul"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Permiteți numai întreruperi cu prioritate"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Permiteți numai alarmele"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Nu întrerupe"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Nedefinită"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de minute</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> ore</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de ore</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> oră</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Schimbați la „Numai notificări cu prioritate” pe o perioadă nedefinită"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="few">Schimbați la „Numai notificări cu prioritate” pentru <xliff:g id="DURATION">%1$d</xliff:g> minute, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Schimbați la „Numai notificări cu prioritate” pentru <xliff:g id="DURATION">%1$d</xliff:g> de minute, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Schimbați la „Numai notificări cu prioritate” pentru un minut, până la <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="few">Schimbați la „Numai notificări cu prioritate” pentru <xliff:g id="DURATION">%1$d</xliff:g> ore (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Schimbați la „Numai notificări cu prioritate” pentru <xliff:g id="DURATION">%1$d</xliff:g> de ore (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Schimbați la „Numai notificări cu prioritate” pentru o oră, până la <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Schimbați la „Numai alarme” pe o perioadă nedefinită"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="few">Schimbați la „Numai alarme” pentru <xliff:g id="DURATION">%1$d</xliff:g> minute (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Schimbați la „Numai alarme” pentru <xliff:g id="DURATION">%1$d</xliff:g> de minute (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Schimbați la „Numai alarme” pentru un minut, până la <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="few">Schimbați la „Numai alarme” pentru <xliff:g id="DURATION">%1$d</xliff:g> ore, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Schimbați la „Numai alarme” pentru <xliff:g id="DURATION">%1$d</xliff:g> de ore, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Schimbați la „Numai alarme” pentru o oră, până la <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Schimbați la „Nu întrerupe” pe o perioadă nedefinită"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="few">Schimbați la „Nu întrerupe” pentru <xliff:g id="DURATION">%1$d</xliff:g> minute (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Schimbați la „Nu întrerupe” pentru <xliff:g id="DURATION">%1$d</xliff:g> de minute (până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Schimbați la „Nu întrerupe” pentru un minut, până la <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="few">Schimbați la „Nu întrerupe” pentru <xliff:g id="DURATION">%1$d</xliff:g> ore, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Schimbați la „Nu întrerupe” pentru <xliff:g id="DURATION">%1$d</xliff:g> de ore, până la <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Schimbați la „Nu întrerupe” pentru o oră, până la <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Schimbați la „Întrerupe întotdeauna”"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"întotdeauna"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificări aplicații"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Trimiteți feedback despre dispoz."</string>
@@ -2513,4 +2648,66 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Informații despre IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Informații referitoare la IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Slotul<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Lansați în mod prestabilit"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> utilizați din <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Linkuri de domeniu"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Deschide adresele URL de domeniu"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Permite aplicației să deschidă direct adresele URL de domeniu"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Adrese URL de domeniu acceptate"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Alte valori prestabilite"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> utilizați din <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"memoria internă"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"memoria externă"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Stocare internă"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Stocare externă"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Utilizarea datelor aplicației"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> folosiți din <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Spațiu de stocare utilizat"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Activate"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blocate"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Confidențiale"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritare"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritare și confidențiale"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> permisiuni acordate</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de permisiuni acordate</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permisiune acordată</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> din <xliff:g id="COUNT_3">%d</xliff:g> permisiuni acordate</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> din <xliff:g id="COUNT_3">%d</xliff:g> de permisiuni acordate</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> din <xliff:g id="COUNT_1">%d</xliff:g> permisiune acordată</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Unele valori prestabilite sunt configurate"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Nu este configurată nicio valoare prestabilită"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Toate aplicațiile"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Activate"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personale"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Serviciu"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocate"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritare"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidențiale"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Cu adrese URL de domeniu"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Setare dezactivată de administrator"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Avansate"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Aplicație necunoscută"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Alegeți un profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Permisiuni pentru aplicație"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> din <xliff:g id="COUNT_1">%d</xliff:g> (de) aplicații cu acces suplimentar"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> din <xliff:g id="COUNT_1">%d</xliff:g> (de) aplicații au această permisiune"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Adrese URL de domeniu"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Nu deschide nicio adresă URL de domeniu"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Deschid „<xliff:g id="DOMAIN">%s</xliff:g>”"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Deschid „<xliff:g id="DOMAIN">%s</xliff:g>” și adrese URL similare"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplicații își pot deschide adresele URL de domeniu</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> de aplicații își pot deschide adresele URL de domeniu</item>
+      <item quantity="one">O aplicație își poate deschide adresele URL de domeniu</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nu este recunoscută"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplicații prestabilite"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicația de navigare"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Niciun browser prestabilit"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Prestabilită)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Stocare aplicații"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 3830fda..9f73043 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -69,12 +69,12 @@
     <item msgid="6041212618892492920">"Очень медленная"</item>
     <item msgid="2361722960903353554">"Медленная"</item>
     <item msgid="1145554631248513562">"Обычная"</item>
-    <item msgid="7553665153391107454">"Быстрая"</item>
-    <item msgid="1370673569131070146">"Беглая"</item>
-    <item msgid="4648206845228970803">"Достаточно быстрая"</item>
-    <item msgid="4977949754169483251">"Быстрая"</item>
-    <item msgid="6106302964845503577">"Ещё быстрее"</item>
-    <item msgid="6800277205640837264">"Очень быстрая"</item>
+    <item msgid="7553665153391107454">"Умеренно быстрая"</item>
+    <item msgid="1370673569131070146">"Быстрая"</item>
+    <item msgid="4648206845228970803">"Очень быстрая"</item>
+    <item msgid="4977949754169483251">"Ускоренная"</item>
+    <item msgid="6106302964845503577">"Сильно ускоренная"</item>
+    <item msgid="6800277205640837264">"Максимальная"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Очень низкий"</item>
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push-кнопка"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"включить/отключить микрофон"</item>
     <item msgid="1148142988678569310">"трансляция контента"</item>
     <item msgid="9130014005474445273">"активация VPN"</item>
+    <item msgid="1165192162975045562">"сохранение обоев"</item>
+    <item msgid="7129487923652967258">"вспомогательная структура"</item>
+    <item msgid="1069023208100114540">"вспомогательный скриншот"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Местоположение"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Включить/отключить микрофон"</item>
     <item msgid="5906017727368097853">"Трансляция контента"</item>
     <item msgid="2486614710846178542">"Активация VPN"</item>
+    <item msgid="5586547561693629602">"Сохранение обоев"</item>
+    <item msgid="32794179825485062">"Вспомогательная структура"</item>
+    <item msgid="7872852746938272552">"Вспомогательный скриншот"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Небольшая"</item>
@@ -474,7 +483,7 @@
     <item msgid="7899496259191969307">"Не более 4 процессов"</item>
   </string-array>
   <string-array name="vpn_types_long">
-    <item msgid="2732002039459078847">"VPN-соединение по протоколу PPTP"</item>
+    <item msgid="2732002039459078847">"VPN-подключение по протоколу PPTP"</item>
     <item msgid="3799752201662127867">"VPN-соединение по протоколу L2TP/IPSec с общими ключами"</item>
     <item msgid="4725504331295252103">"VPN-подключение по протоколу L2TP/IPSec с использованием сертификатов"</item>
     <item msgid="7526551163264034377">"VPN-подключение IPSec с общими ключами и аутентификацией Xauth"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"низкий"</item>
     <item msgid="4212263919458209842">"очень низкий"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ВЫКЛ"</item>
-    <item msgid="5656544177755411222">"Ограниченное число прерываний"</item>
-    <item msgid="8735337502532332056">"Без прерываний"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Нормальное"</item>
     <item msgid="866544120205026771">"Умеренное"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Розовый"</item>
     <item msgid="6131821495505931173">"Красный"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP"</item>
+    <item msgid="8856820259201251036">"PTP"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Источник аудио"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 173ca06..8b034b2 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -22,10 +22,12 @@
     <string name="allow" msgid="3349662621170855910">"Разрешить"</string>
     <string name="deny" msgid="6947806159746484865">"Отклонить"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Вы почти у цели. Осталось несколько шагов (<xliff:g id="STEP_COUNT">%1$d</xliff:g>)."</item>
-    <item quantity="other" msgid="6722953419953594148">"Вы почти у цели. Осталось несколько шагов (<xliff:g id="STEP_COUNT">%1$d</xliff:g>)."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Вы почти у цели. Остался <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> шаг.</item>
+      <item quantity="few">Вы почти у цели. Осталось <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> шага.</item>
+      <item quantity="many">Вы почти у цели. Осталось <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="header_category_wireless_networks" msgid="5110914332313954940">"Беспроводные сети"</string>
@@ -40,6 +42,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Отключить SMS через IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Обязательная регистрация IMS включена"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Обязательная регистрация IMS отключена"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Включить синхронизацию VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Отключить синхронизацию VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Очищать ОЗУ"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Не очищать ОЗУ"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Просмотреть адресную книгу на SIM-карте"</string>
@@ -135,16 +139,7 @@
     <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_connected" msgid="6038755206916626419">"Подключено"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Подключено (кроме HSP/HFP)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Подключено (кроме A2DP)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Подключено (нет доступа к сообщениям)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Подключено (кроме HSP/HFP/A2DP)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Отключено"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Отключение..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Подключение..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Сопряжение..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Bluetooth-устройство без названия"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Поиск"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Устройства Bluetooth не найдены."</string>
@@ -154,7 +149,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Полученные файлы"</string>
     <string name="device_picker" msgid="4978696506172252813">"Выбрать устройство Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запрос разрешения на включение Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Приложение запрашивает разрешение включить Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Приложению требуется включить Bluetooth на устройстве."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Одному из приложений требуется, чтобы ваш планшетный ПК был доступен для поиска через Bluetooth на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Одному из приложений требуется, чтобы ваш телефон был доступен для поиска через Bluetooth на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Одному из приложений требуется сделать ваш планшетный ПК доступным для поиска через Bluetooth на других устройствах. Позже эти настройки можно будет изменить."</string>
@@ -275,12 +270,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ОТМЕНА"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ПРОДОЛЖИТЬ"</string>
     <string name="okay" msgid="1997666393121016642">"ОК"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ДА"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"НЕТ"</string>
-    <string name="forget" msgid="7267115980248732932">"УДАЛИТЬ"</string>
+    <string name="forget" msgid="1400428660472591263">"Удалить"</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>
@@ -325,9 +318,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Настройка распознавания"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Настоящий фейсконтроль"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Нужно моргнуть, чтобы разблокировать экран"</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_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>
@@ -348,6 +338,32 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</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="3453670509485083962">"Добавить"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"блокировка экрана"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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="many">Отсканировано <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_enroll_onboard_title" msgid="4735546436672054254">"Добавление отпечатка"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Чтобы разблокировать экран и подтверждать покупки с помощью сканера: \n\n✓ настройте дополнительный способ блокировки экрана; \n\n✓ сохраните отпечаток своего пальца."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Найдите сканер"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Найдите сканер отпечатков пальцев на задней поверхности телефона."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Начнем!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Приложите палец к сканеру и удерживайте, пока не почувствуете вибрацию."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Приложите палец снова"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Приложите палец к сканеру и удерживайте, пока не почувствуете вибрацию. Всегда используйте один и тот же палец."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отпечаток добавлен!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Этот значок сообщает, что вы можете подтверждать покупки и проходить индентификацию с помощью отпечатка пальца."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Добавить"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Далее"</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>
@@ -360,10 +376,9 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Подключите зарядное устройство и повторите попытку."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Не указан PIN-код или пароль блокировки экрана"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Перед шифрованием необходимо задать PIN-код или пароль блокировки экрана."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Чтобы зашифровать данные на устройстве, введите графический ключ."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Выполнить шифрование?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа, в течение которого устройство будет перезагружено несколько раз."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа, в течение которого устройство будет перезагружено несколько раз."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа. Устройство будет перезагружено несколько раз."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа. Устройство будет перезагружено несколько раз."</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>
@@ -391,22 +406,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Фейсконтроль"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Низкий уровень защиты (экспериментальная функция)"</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_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="current_screen_lock" msgid="4104091715420072219">"Текущий способ блокировки"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Защита устройства будет отключена."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Запрещено администратором, политикой шифрования или хранилищем учетных данных"</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_biometric_weak" msgid="3008473624490350142">"Фейсконтроль"</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_password" msgid="1203938057264146610">"Пароль"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Включив блокировку экрана, выберите \"Настройки &gt; Безопасность\", чтобы отсканировать и сохранить отпечаток пальца."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Отключить блокировку экрана"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Удалить графический ключ разблокировки"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Удалить ПИН-код разблокировки"</string>
@@ -427,30 +441,42 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Пароль должен содержать хотя бы одну букву."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Пароль должен содержать хотя бы одну цифру."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Пароль должен содержать хотя бы один символ."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Пароль должен содержать хотя бы одну букву."</item>
-    <item quantity="other" msgid="8186027808415585970">"Пароль должен содержать буквы (не менее %d)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Пароль должен содержать хотя бы одну строчную букву."</item>
-    <item quantity="other" msgid="2693910942679679225">"Пароль должен содержать строчные буквы (не менее %d)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Пароль должен содержать хотя бы одну заглавную букву."</item>
-    <item quantity="other" msgid="3030801209112209245">"Пароль должен содержать заглавные буквы (не менее %d)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Пароль должен содержать хотя бы одну цифру."</item>
-    <item quantity="other" msgid="4703982391407595924">"Пароль должен содержать цифры (не менее %d)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Пароль должен содержать хотя бы один специальный символ."</item>
-    <item quantity="other" msgid="1221290525051187757">"Пароль должен содержать специальные символы (не менее %d)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Пароль должен содержать хотя бы один небуквенный символ."</item>
-    <item quantity="other" msgid="3952508584649046404">"Пароль должен содержать небуквенные символы (не менее %d)."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Пароль должен содержать хотя бы %d букву.</item>
+      <item quantity="few">Пароль должен содержать хотя бы %d буквы.</item>
+      <item quantity="many">Пароль должен содержать хотя бы %d букв.</item>
+      <item quantity="other">Пароль должен содержать хотя бы %d букв.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Пароль должен содержать хотя бы %d строчную букву.</item>
+      <item quantity="few">Пароль должен содержать хотя бы %d строчные буквы.</item>
+      <item quantity="many">Пароль должен содержать хотя бы %d строчных букв.</item>
+      <item quantity="other">Пароль должен содержать хотя бы %d строчных букв.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Пароль должен содержать хотя бы %d заглавную букву.</item>
+      <item quantity="few">Пароль должен содержать хотя бы %d заглавные буквы.</item>
+      <item quantity="many">Пароль должен содержать хотя бы %d заглавных букв.</item>
+      <item quantity="other">Пароль должен содержать хотя бы %d заглавных букв.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Пароль должен содержать хотя бы %d цифру.</item>
+      <item quantity="few">Пароль должен содержать хотя бы %d цифры.</item>
+      <item quantity="many">Пароль должен содержать хотя бы %d цифр.</item>
+      <item quantity="other">Пароль должен содержать хотя бы %d цифр.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Пароль должен содержать хотя бы %d специальный символ.</item>
+      <item quantity="few">Пароль должен содержать хотя бы %d специальных символа.</item>
+      <item quantity="many">Пароль должен содержать хотя бы %d специальных символов.</item>
+      <item quantity="other">Пароль должен содержать хотя бы %d специальных символов.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Пароль должен содержать хотя бы %d небуквенный символ.</item>
+      <item quantity="few">Пароль должен содержать хотя бы %d небуквенных символа.</item>
+      <item quantity="many">Пароль должен содержать хотя бы %d небуквенных символов.</item>
+      <item quantity="other">Пароль должен содержать хотя бы %d небуквенных символов.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Использовать недавний пароль запрещено."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Нельзя использовать последовательность увеличивающихся, уменьшающихся или повторяющихся цифр"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ОК"</string>
@@ -460,7 +486,7 @@
     <string name="lock_setup" msgid="3355847066343753943">"Блокировка настроена."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Администрирование устройства"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Администраторы устройства"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Просмотрите или отключите администраторов устройств"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Просмотр/отключение администраторов"</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="6804319935640148441">"Посмотреть или отключить агенты доверия"</string>
@@ -480,15 +506,8 @@
     <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>"</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_accept" msgid="6163520056536604875">"Подключить"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ПОДКЛЮЧИТЬ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Отмена"</string>
-    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Подключение обеспечивает доступ к вашим контактам и истории звонков (при наличии связи)."</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Сопряжение обеспечивает доступ к вашим контактам и истории звонков при подключении."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Не удалось подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Не удалось подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", так как введен неверный PIN-код или пароль."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Не удается установить соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> не разрешает сопряжение."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Не удалось подключиться к <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>
@@ -515,16 +534,8 @@
     <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="3719383048635344071">"Чтобы точнее определять местоположение, приложения и сервисы будут искать находящиеся поблизости Bluetooth-устройства даже при выключенном Bluetooth. Вы можете отключить эту функцию в <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>настройках сканирования<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Подключить к..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Профиль A2DP"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Профиль HSP/HFP"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Профиль OPP"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Профиль HID"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Интернет-доступ"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Обмен контактами"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Использовать для обмена контактами"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Профиль PAN"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Доступ к сообщениям"</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>
@@ -534,31 +545,18 @@
     <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_profile_header_title" msgid="102745381968579605">"Использовать для"</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_a2dp_profile_summary_connected" msgid="963376081347721598">"Подключено к мультимедийному аудиоустройству"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Подключено к аудиоустройству телефона"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установлено подключение к серверу передачи файлов"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Доступ к сообщениям"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Нет подключения к серверу передачи файлов"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Подключено к устройству ввода"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Использовать для мультимедийного аудиоустройства"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Использовать для аудиоустройства телефона"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Используется для передачи файлов"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Использовать для ввода"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Использовать для доступа к Интернету"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Использовать для доступа к сообщениям"</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_assistant_title" msgid="2553267316621598101">"Ассистент Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Установлено подключение через Ассистента Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Беспроводной монитор"</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>
@@ -570,6 +568,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +593,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Отключение Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Ошибка"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Режим полета"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Не удалось начать поиск сетей."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Уведомления о сетях"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Сообщать о наличии общедоступных сетей"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Фильтр сетей Wi-Fi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не использовать сети Wi-Fi с плохим интернет-соединением"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Использовать только сети с сильным сигналом"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Всегда искать сети"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Всегда искать сети"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Разрешить службе геопозиционирования Google и другим приложениям искать сети, даже когда модуль Wi‑Fi отключен"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Подключаться к открытым сетям Wi-Fi"</string>
-    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Разрешить ассистенту Wi-Fi автоматически проверять открытые сети и подключаться к ним"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Разрешить ассистенту Wi-Fi автоматически подключаться к проверенным открытым сетям"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Выбор ассистента Wi-Fi"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Установка сертификатов"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Чтобы улучшить определение местоположения, а также для достижения других целей, Google и другие приложения могут выполнять поиск сетей поблизости, даже если сеть Wi-Fi отключена. Чтобы изменить эти настройки, перейдите в меню \"Дополнительно &gt; Всегда искать сети\"."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Приложения могут выполнять поиск сетей поблизости, даже если сеть Wi-Fi отключена. Чтобы изменить эти настройки, перейдите в меню \"Дополнительно &gt; Всегда искать сети\"."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Чтобы точнее определять местоположение, приложения и сервисы будут искать сети Wi-Fi даже при выключенном 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="5340097010842405981">"Больше не показывать"</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>
@@ -635,11 +630,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Добавить сеть"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Ещё"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Автонастройка (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Для завершения настройки необходимо подключение к сети Wi‑Fi. После этого можно будет переключаться между мобильной сетью и Wi‑Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Расширенные настройки"</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="5940801028985255304">"Нажмите кнопку \"Безопасная настройка Wi-Fi\" на маршрутизаторе. Она может называться WPS или быть обозначена следующим символом:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Нажмите кнопку \"Безопасная настройка Wi-Fi\" на маршрутизаторе. Она может называться WPS или быть отмечена этим символом:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Введите PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> на маршрутизаторе Wi-Fi. Для завершения настройки потребуется не более двух минут."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"Ошибок нет. Подключение к сети…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Установлено подключение к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +659,15 @@
     <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="219415018348922629">"Диапазон частот Wi-Fi"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 ГГц"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 ГГц"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Настройки IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(без изменений)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(не указано)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Сохранено"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Отключено"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Ошибка IP-конфигурации"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Ошибка подключения Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Ошибка аутентификации"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Недоступна"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Подключение к Интернету отсутствует и не будет восстановлено автоматически."</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_security_none" msgid="7985461072596594400">"Нет"</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>
@@ -686,6 +675,8 @@
     <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="1509171132175355674">"Сеть не подключена к Интернету. Использовать ее?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Больше не спрашивать для этой сети"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Подключить"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не удалось подключиться к сети."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Удалить"</string>
@@ -706,7 +697,7 @@
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Не удалось подключиться к сети Wi-Fi."</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Сохраненные сети"</string>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Дополнительные функции"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Полоса частот Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Диапазон частот Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Укажите рабочий диапазон частот"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"При настройке полосы частот возникла неполадка."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-адрес"</string>
@@ -751,6 +742,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Точка доступа AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Сеть: <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_mode_title" msgid="2164073796253284289">"Приоритет сети"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Звонки по Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Приоритет у Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Приоритет у моб. сети"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Когда функция \"Звонки по Wi-Fi\" включена, для исходящих вызовов может использоваться как Wi-Fi, так и мобильная сеть (в зависимости от ваших предпочтений и уровня сигнала). Прежде чем включить эту функцию, свяжитесь со своим оператором и уточните детали."</string>
     <string name="home_settings" msgid="212375129455718176">"Домашний экран"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -814,6 +817,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"Тема"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Светлый"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Темный"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Автоматическое переключение"</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>
@@ -825,7 +833,7 @@
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Во время зарядки"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"В док-станции"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Выкл."</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Чтобы знать, что происходит с телефоном, когда он подключен к док-станции или находится в спящем режиме, включите заставку."</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Чтобы настроить поведение телефона при подключении к док-станции и в спящем режиме, включите заставку."</string>
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Когда включать"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Включить"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Настройки"</string>
@@ -865,10 +873,12 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Изменить основную SIM-карту?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> – единственная SIM-карта в устройстве. Использовать ее для звонков, отправки SMS-сообщений и передачи мобильных данных?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Неверный PIN-код. Обратитесь к оператору связи, чтобы разблокировать SIM-карту."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Неверный PIN-код. Осталось попыток: <xliff:g id="NUMBER">%d</xliff:g>. После этого SIM-карта будет заблокирована и вам придется обратиться к оператору связи."</item>
-    <item quantity="other" msgid="77103619544346451">"Неверный PIN-код. Осталось попыток: <xliff:g id="NUMBER">%d</xliff:g>."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Неверный PIN-код. Осталась <xliff:g id="NUMBER_1">%d</xliff:g> попытка. После этого SIM-карта будет заблокирована и вам придется обратиться к оператору связи.</item>
+      <item quantity="few">Неверный PIN-код. Осталось <xliff:g id="NUMBER_1">%d</xliff:g> попытки. После этого SIM-карта будет заблокирована и вам придется обратиться к оператору связи.</item>
+      <item quantity="many">Неверный PIN-код. Осталось <xliff:g id="NUMBER_1">%d</xliff:g> попыток. После этого SIM-карта будет заблокирована и вам придется обратиться к оператору связи.</item>
+      <item quantity="other">Неверный PIN-код. Осталось <xliff:g id="NUMBER_1">%d</xliff:g> попыток. После этого SIM-карта будет заблокирована и вам придется обратиться к оператору связи.</item>
+    </plurals>
     <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>
@@ -917,12 +927,12 @@
     <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="2348501997988663688">"Данные приложений и файлы мультимедиа"</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_dcim_usage" msgid="558887013613822577">"Изображения и видео"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музыка, рингтоны, подкасты и т. п.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Прочее"</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="sd_eject" product="default" msgid="6915293408836853020">"Извлечь SD-карту"</string>
@@ -939,7 +949,7 @@
     <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="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>
@@ -955,6 +965,11 @@
     <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_mount" msgid="1014683672493425425">"Подключить"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Извлечь"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Стереть и форматировать"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Стереть и форматировать как внутреннюю память"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-подключение к компьютеру"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-подключение к компьютеру"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Подключить как"</string>
@@ -962,8 +977,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Позволяет передавать файлы мультимедиа в ОС Windows или Mac OS. Для Mac OS требуется приложение Android File Transfer: www.android.com/filetransfer"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Позволяет передавать фотографии с помощью программного обеспечения камеры, а также передавать любые файлы на компьютеры, которые не поддерживают MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Установить инструменты передачи файлов"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Обеспечивает взаимодействие 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="2723851748972673696">"Съемный накопитель"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Свободно <xliff:g id="FREE">%1$s</xliff:g> (всего <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Подключено: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Ошибка подключения: <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="4161722509712992231">"Не удалось безопасно извлечь устройство: <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="8343688274191391889">"Ошибка форматирования: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Переименование хранилища"</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="3677827796634199714"><b>"Если вы извлечете карту \"<xliff:g id="NAME_0">^1</xliff:g>\", хранящиеся на ней приложения и файлы станут недоступны до тех пор, пока вы снова не вставите карту в устройство."</b>\n\n"Карта \"<xliff:g id="NAME_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_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_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="1259216693690378749">"Не извлекайте карту \"<xliff:g id="NAME">^1</xliff:g>\", пока она форматируется."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Перенесите на новое устройство"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Вы можете перенести фотографии, файлы и данные приложений на новую карту \"<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="5035719146373359329"><b>"На это уйдет около <xliff:g id="TIME">^1</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="8641916179067596592">"Во время переноса:\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_move_confirm_title" msgid="292782012677890250">"Перенесите приложение \"<xliff:g id="APP">^1</xliff:g>\""</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Перенос приложения \"<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="4288580957960820740">"Не извлекайте карту \"<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="battery_status_title" msgid="9159414319574976203">"Состояние батареи"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Уровень заряда батареи"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Точки доступа (APN)"</string>
@@ -992,7 +1047,7 @@
     <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="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>
@@ -1000,17 +1055,22 @@
     <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="8418502878620394756">"Необходимо указать название."</string>
+    <string name="error_name_empty" msgid="8418502878620394756">"Необходимо указать имя."</string>
     <string name="error_apn_empty" msgid="6056233831214537267">"Необходимо указать APN."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Поле MCC должно содержать 3 цифры."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Поле MNC должно содержать 2 или 3 цифры."</string>
-    <string name="restore_default_apn" msgid="8178010218751639581">"Восстановление настроек APN по умолчанию."</string>
-    <string name="menu_restore" msgid="8260067415075573273">"Восстановить настройки по умолчанию"</string>
+    <string name="restore_default_apn" msgid="8178010218751639581">"Восстановление настроек APN по умолчанию..."</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Сбросить настройки"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Настройки по умолчанию восстановлены."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Сброс сетевых настроек"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"На устройстве будут сброшены все сетевые настройки, в том числе:\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="4874737348054213767">"Сброшенные настройки нельзя будет восстановить. Продолжить?"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Да"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Сбросить настройки?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Сетевые настройки сброшены"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Сбросить настройки"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Сброс настроек"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Возврат к заводским настройкам и удаление всех данных из памяти планшетного ПК"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Возврат к заводским настройкам и удаление всех данных из памяти телефона"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Будут удалены все данные из "<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>
@@ -1024,9 +1084,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Удалить с SD-карты все данные, в том числе музыку и фотографии"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Сбросить настройки планшета"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Сбросить настройки телефона"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Удалить всю личную информацию и загруженные приложения без возможности восстановления?"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Удалить всю личную информацию и скачанные приложения? Это действие нельзя отменить."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Стереть все"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Чтобы подтвердить сброс настроек, начертите графический ключ."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Сброс не выполнен, поскольку служба System Clear недоступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Выполнить сброс?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Этот пользователь не может выполнять сброс настроек"</string>
@@ -1043,8 +1102,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Очистить USB-накопитель, удалив с него все файлы без возможности восстановления?"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Удалить с SD-карты все файлы без возможности восстановления?"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Стереть все"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Чтобы подтвердить очистку USB-накопителя, начертите графический ключ."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Чтобы подтвердить очистку SD-карты, начертите графический ключ."</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>
@@ -1076,7 +1133,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Справка"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Мобильные сети"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифный план"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Приложение для обмена 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>
@@ -1104,7 +1161,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Определение местоположения"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Использовать GPS, Wi‑Fi и мобильные сети для определения местоположения"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Использовать Wi‑Fi и мобильные сети для определения местоположения"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Использовать GPS для определения местоположения"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Использовать GPS для определения местоположения"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Поиск"</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="2070686681074461301">"Чтобы точнее определять местоположение, разрешите системным сервисам искать сети Wi-Fi даже при отключенном Wi-Fi"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Поиск Bluetooth-устройств"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Чтобы точнее определять местоположение, разрешите системным сервисам искать находящиеся поблизости Bluetooth-устройства даже при отключенном Bluetooth"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi и мобильные сети"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Разрешить отправлять анонимные геоданные и позволить приложениям определять ваше местоположение с помощью Wi-Fi и мобильных сетей"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"С помощью Wi-Fi"</string>
@@ -1141,7 +1204,7 @@
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Выберите пароль"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Создайте графический ключ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Введите PIN-код"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Введите новый пароль"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Подтвердите пароль"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Подтвердите графический ключ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Подтвердите ПИН-код"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Пароли не совпадают"</string>
@@ -1150,11 +1213,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"Блокировка экрана"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Чтобы продолжить, введите графический ключ."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Чтобы продолжить, введите PIN-код устройства"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Чтобы продолжить, введите пароль устройства."</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_need_to_unlock" msgid="757935356911054465">"Начертите существующий ключ"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Повторите попытку"</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>
@@ -1176,8 +1243,7 @@
     <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_header" msgid="819903817323783498">"Слишком много неудачных попыток!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Повторите попытку через <xliff:g id="NUMBER">%d</xliff:g> с."</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="manageapplications_settings_title" msgid="7041951105633616745">"Управление приложениями"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление установленными приложениями и их удаление"</string>
@@ -1224,10 +1290,11 @@
     <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>
+    <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>
@@ -1299,6 +1366,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Использование памяти"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Объем памяти, занимаемый приложениями"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Работающие приложения"</string>
@@ -1358,7 +1426,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Настройки внешней клавиатуры"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Нажмите дважды клавишу \"Пробел\" для ввода точки"</string>
     <string name="show_password" msgid="3001113966880559611">"Показывать пароль при вводе"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"При использовании этого способа могут собираться все вводимые данные, в том числе пароли и номера кредитных карт. Способ ввода запрашиваетя приложением \"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>\". Использовать этот способ ввода?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"При использовании этого способа могут собираться все вводимые данные, в том числе пароли и номера кредитных карт. Запрос поступил от приложения \"<xliff:g id="IME_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>
@@ -1396,17 +1464,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информация о планшетном ПК"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информация о телефоне"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Информация о батарее"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Быстрый запуск"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Настройка быстрых клавиш для запуска приложений"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Назначить приложение"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Нет ярлыка"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Поиск в + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Очистить"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Ярлык для <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) будет удален."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ОК"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Отмена"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Приложения"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Ярлыки"</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>
@@ -1441,23 +1498,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сохранять все пакеты HCI Bluetooth в файле"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Заводская разблокировка"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Разрешить разблокировку загрузчика ОС"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Введите PIN-код"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Введите PIN-код устройства, чтобы разрешить заводскую разблокировку"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Разрешить заводскую разблокировку?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ВНИМАНИЕ! Функции защиты не будут работать на устройстве, пока включен этот параметр."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Размер буфера журнала"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Выберите размер буфера журнала"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Фиктивные местоположения"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить использование фиктивных местоположений"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Включить проверку атрибутов"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Сети"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Серт. беспроводн. мониторов"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Подробный журнал Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Переключаться на мобильную сеть"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Всегда включать поиск сетей Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Использовать устаревший DHCP-клиент"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показывать параметры сертификации беспроводных мониторов"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"При выборе Wi‑Fi указывать в журнале RSSI для каждого SSID"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Принудительно переключаться на мобильную сеть, если сигнал Wi-Fi слабый"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Включать или отключать поиск сетей Wi-Fi во время передачи данных в зависимости от объема трафика"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Размер буфера журнала"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Выберите размер буфера журнала"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Выберите конфигурацию USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Выберите конфигурацию USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Фиктивные местоположения"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить использование фиктивных местоположений"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Включить проверку атрибутов"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Использовать DHCP-клиент для Android 5.0, а не для новой версии."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Разрешить отладку USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Отладка по USB – это режим, который позволяет использовать ваше устройство как внешний накопитель: перемещать файлы (с компьютера и на компьютер), напрямую устанавливать приложения, а также просматривать системные журналы."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Запретить доступ для USB-отладки на всех компьютерах, на которых вы входили в аккаунт?"</string>
@@ -1561,6 +1626,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Пурпурный"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Включить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> будет:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Невозможно принять ваше согласие, поскольку запрос скрыт другим приложением."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Если включить службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\", блокировка экрана будет отключена и надежность защиты зашифрованных данных снизится."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Поскольку включена служба специальных возможностей, блокировка экрана будет отключена и надежность защиты зашифрованных данных может быть снижена."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Включение сервиса <xliff:g id="SERVICE">%1$s</xliff:g> затронет шифрование данных, поэтому необходимо ввести графический ключ."</string>
@@ -1631,7 +1697,7 @@
     <string name="details_title" msgid="3792801565213935385">"Расход батареи"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Расход батареи"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Режим энергопотребления"</string>
-    <string name="packages_subtitle" msgid="4736416171658062768">"Вложенные пакеты"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Пакеты"</string>
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Фонарик"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
@@ -1680,7 +1746,7 @@
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Использование батареи модулем Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Отключите канал Bluetooth, если он не используется"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Попробуйте подключиться к другому Bluetooth-устройству"</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>
@@ -1702,14 +1768,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> приложения за <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> из <xliff:g id="TOTALRAM">%2$s</xliff:g> (<xliff:g id="TIMEDURATION">%3$s</xliff:g>)"</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_memory_status" msgid="4251599550196193093">"Уровень свободной памяти: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Использование оперативной памяти (среднее значение)"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Использование оперативной памяти (максимальное значение)"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"ОС Android"</string>
+    <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_ram_use" msgid="976912589127397307">"Использование оперативной памяти"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Использование оперативной памяти (фоновый режим)"</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>
     <string name="mem_details_title" msgid="6548392825497290498">"Подробности"</string>
@@ -1726,6 +1798,7 @@
     <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_hide_system" msgid="4106826741703745733">"Скрыть системные процессы"</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>
@@ -1748,7 +1821,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Настройки по умолчанию переопределяют настройки приложений"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Настройки по умолчанию"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Система по умолчанию"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Выбор системы синтеза речи по умолчанию"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Выберите систему синтеза речи, которая будет использоваться для озвучивания текста"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Скорость речи"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Скорость чтения текста"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string>
@@ -1809,9 +1882,9 @@
     <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="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="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>
@@ -1822,11 +1895,10 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"Чтобы подтвердить установку учетных данных, начертите графический ключ."</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_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>
@@ -1847,12 +1919,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"Не найдены аккаунты с резервными копиями данных"</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="5355557151569037197">"Служба резервного копирования неактивна"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"В соответствии с политикой устройства."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль для резервного копирования"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Полные резервные копии в настоящее время не защищены"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Изменить или удалить пароль для резервного копирования"</string>
@@ -1929,7 +1999,7 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Синхронизация включена"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Синхронизация выключена"</string>
     <string name="sync_error" msgid="5060969083117872149">"Ошибка синхронизации"</string>
-    <string name="last_synced" msgid="4242919465367022234">"Последняя синхронизация: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="last_synced" msgid="4242919465367022234">"Синхронизировано <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Синхронизация…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Создать резервную копию настроек"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Резервная копия настроек."</string>
@@ -1969,7 +2039,7 @@
     <string name="starting_android" msgid="8581493237458496835">"Запуск 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" 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="hdcp_checking_title" msgid="8605478913544273282">"Проверка HDCP"</string>
@@ -2024,6 +2094,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Переход: масштаб"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Скорость анимации"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Эмуляция доп. экранов"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Многооконный режим"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Несколько приложений на одном экране."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Включить многооконный режим?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ВНИМАНИЕ! Это экспериментальная функция. Она позволяет одновременно показывать несколько активностей с помощью интерфейса недавно использованных приложений. Некоторые программы могут работать с этой функцией некорректно."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Приложения"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не сохранять действия"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Удалять сводку действий после их завершения"</string>
@@ -2141,7 +2215,7 @@
     <string name="vpn_save" msgid="4233484051644764510">"Сохранить"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Подключиться"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"Изменение профиля VPN"</string>
-    <string name="vpn_connect_to" msgid="5965299358485793260">"Подключение к профилю \"<xliff:g id="PROFILE">%s</xliff:g>\""</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Подключение к <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"Настройки VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Добавить профиль VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Изменить профиль"</string>
@@ -2150,7 +2224,7 @@
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Выберите постоянную сеть VPN: трафик будет разрешен только при подключении к этой сети."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Сеть не выбрана"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Укажите IP-адрес для сервера и DNS."</string>
-    <string name="vpn_no_network" msgid="3050233675132726155">"Отсутствует сетевое соединение. Повторите попытку позже."</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Нет подключения к сети. Повторите попытку позже."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Отсутствует сертификат. Измените профиль."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Система"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Пользователь"</string>
@@ -2195,7 +2269,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="718192651887726259">"Если вашим устройством пользуется кто-то ещё, создайте на нем дополнительные профили. Владелец профиля может настроить его по своему вкусу, в том числе выбрать обои и установить нужные приложения. Кроме того, пользователи могут изменять общие для всех параметры устройства, например включать или отключать 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>
@@ -2226,13 +2300,13 @@
     <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="8310589470979488255">"Разрешить звонки"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Разрешить звонки и SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Включение звонков"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Включение звонков и SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Удалить пользователя"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Разрешить звонки?"</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_sms_confirm_title" msgid="188164598768941316">"Разрешить звонки и SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Этот пользователь получит доступ к журналу звонков и SMS."</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="application_restrictions" msgid="8207332020898004394">"Разрешить приложения и контент"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничениями"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Развернуть настр. приложений"</string>
@@ -2283,8 +2357,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"Приложение не поддерживается в профилях с ограниченным доступом"</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>
@@ -2312,7 +2386,7 @@
     <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_calls" msgid="3503094771801109334">"SIM-карта для звонков"</string>
+    <string name="select_sim_for_calls" msgid="3503094771801109334">"Выберите SIM-карту"</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>
@@ -2337,7 +2411,7 @@
     <string name="sim_signal_strength" msgid="9144010043784767984">"<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-карты заменены"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Нажмите, чтобы настроить"</string>
-    <string name="sim_pref_divider" msgid="6778907671867621874">"Использовать SIM-карту для"</string>
+    <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">"Выберите SIM-карту"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Настройки"</string>
@@ -2349,13 +2423,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi сетевое подключение"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текст сообщение отправка текстовый SMS"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"мобильный сотовый беспроводной оператор 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi вызов звонок"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Google Старт"</string>
     <string name="keywords_display" msgid="6709007669501628320">"экран сенсорный экран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"яркость сенсорный экран батарея"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"яркость сенсорный экран батарея"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон настройка пользовательский"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"темное оформление ночной режим затемнение экрана инверсия"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"фон настройка пользовательский дисплей"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"размер шрифта"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"проект"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"трансляция экрана"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"пространство диск жесткий устройство использование"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"электропитание расход зарядка"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"правописание проверка словарь автозамена"</string>
@@ -2372,8 +2448,13 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"аккаунт"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ограничение ограничить ограничено"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст исправление автокоррекция звук вибрация авто язык жест подсказка тема неприемлемый слово ввод эмодзи смайлик интернациональный"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"сброс настройки по умолчанию"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"параметры приложения для экстренных случаев (по умолчанию)"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"приложения скачать установить система"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"Защита разрешений для приложений"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"приложения по умолчанию"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"провести пальцем по экрану пароль графический ключ PIN-код"</string>
-    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"NFC-метка для настройки Wi-Fi"</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>
@@ -2386,11 +2467,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Режимы оповещения"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Звонки и уведомления"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Оповещать всегда"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Только важные оповещения"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не беспокоить"</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_option_important_interruptions" msgid="3903928008177972500">"Только важные"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Только будильник"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Не беспокоить"</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="ringtone_title" msgid="5379026328015343686">"Рингтон"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Мелодия уведомлений по умолчанию"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрация при звонке"</string>
@@ -2416,62 +2498,133 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибросигнал"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ к уведомлениям"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Приложения не могут просматривать уведомления"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Приложений с доступом к уведомлениям: %d"</item>
-    <item quantity="other" msgid="980049191810249052">"Приложений с доступом к уведомлениям: %d"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d приложение с доступом к уведомлениям</item>
+      <item quantity="few">%d приложения с доступом к уведомлениям</item>
+      <item quantity="many">%d приложений с доступом к уведомлениям</item>
+      <item quantity="other">%d приложений с доступом к уведомлениям</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Службы просмотра уведомлений не установлены."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Включить службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Служба <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> сможет просматривать все уведомления, добавленные системой или любым из установленных приложений, включая личные данные (например, имена контактов и тексты сообщений), а также закрывать уведомления и нажимать на имеющиеся в них кнопки."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Источники условий"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Нет приложений, задающих условия"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d приложение задает условия"</item>
-    <item quantity="other" msgid="358057362115673258">"Несколько приложений (%d) задают условия"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Источники условий не установлены."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Включить службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> сможет добавлять условия выхода из режима \"Не беспокоить\"."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Заблокировать"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Блокировать все"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Не показывать уведомления из этого приложения"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Важные"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Показывать уведомления в верхней части списка, в том числе когда разрешено получение только приоритетных уведомлений"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Конфиденциальные"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Не показывать конфиденциальные данные в уведомлениях этого приложения, когда устройство заблокировано"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Считать уведомления важными"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Разрешить звуковые уведомления от этого приложения в режиме оповещения \"Важные\""</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Разрешить краткие уведомления"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Разрешить приложению ненадолго выводить некоторые уведомления на текущий экран"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Скрыть конфиденциальные данные"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Не показывать конфиденциальные данные в уведомлениях этого приложения, когда устройство заблокировано"</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="zen_mode_default_option" msgid="6940069025071935243">"Пока не будет отключено"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Важные оповещения"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Режим оповещения"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Дни"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"–"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Все оповещения"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Только важные оповещения"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Не оповещать"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматизация"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Включать автоматически"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Название правила"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Добавить правило"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Удалить правило"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Удалить правило \"<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="3201273040477861538">"Правило расписания"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Правило не найдено."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никогда"</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_from" msgid="1033337300289871697">"Звонки/сообщения от"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Все"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Все контакты"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Помеченные контакты"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Мероприятия и напоминания"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Сигнал будильника – важное оповещение"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Будильник"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Напоминания"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Мероприятия"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Выбранные абоненты"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повторные входящие вызовы"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Уведомить о вызове, если абонент звонит повторно в течение <xliff:g id="MINUTES">%d</xliff:g> мин."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Включать автоматически"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Никогда"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"На следующий день в <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"В <xliff:g id="FORMATTED_TIME">%s</xliff:g> или при первом срабатывании будильника"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"В <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_interruptions_voice_title" msgid="855256211259132964">"Оповещения"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Звонки и уведомления"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Когда можно оповещать?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"На какой срок?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Оповещать всегда"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"отключить, все, всё"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Только важные оповещения"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Только будильник и напоминания"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Не беспокоить"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Бессрочно"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> минута</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> минуты</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> минут</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минуты</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Важные уведомления активированы бессрочно."</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">В течение <xliff:g id="DURATION">%1$d</xliff:g> минуты до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+      <item quantity="few">В течение <xliff:g id="DURATION">%1$d</xliff:g> минут до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+      <item quantity="many">В течение <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>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">В течение <xliff:g id="DURATION">%1$d</xliff:g> часа до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+      <item quantity="few">В течение <xliff:g id="DURATION">%1$d</xliff:g> часов до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только важные уведомления.</item>
+      <item quantity="many">В течение <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>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Будильник и напоминания активированы бессрочно."</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="few">В течение <xliff:g id="DURATION">%1$d</xliff:g> минут до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только напоминания и будильник.</item>
+      <item quantity="many">В течение <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>
+    </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="few">В течение <xliff:g id="DURATION">%1$d</xliff:g> часов до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> активны только напоминания и будильник.</item>
+      <item quantity="many">В течение <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>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Режим \"Не беспокоить\" активирован бессрочно."</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> минуту до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+      <item quantity="few">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> минуты до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+      <item quantity="many">Режим \"Не беспокоить\" установлен на <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> час до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+      <item quantity="few">Режим \"Не беспокоить\" установлен на <xliff:g id="DURATION">%1$d</xliff:g> часа до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>.</item>
+      <item quantity="many">Режим \"Не беспокоить\" установлен на <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>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Режим \"Не беспокоить\" отключен."</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"всегда"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Приложения"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Отправить отзыв об устройстве"</string>
@@ -2486,9 +2639,9 @@
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Блокировать устройство при откл. блокировки в приложении"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Рабочий профиль"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(экспериментальная настройка)"</string>
-    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Поворот экрана"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Поворот экрана"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Зафиксировать в вертикальной ориентации"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"При повороте устройства"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Поворачивать изображение"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Сохранять вертикальную ориентацию"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Зафиксировать в горизонтальной ориентации"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Зафиксировать в текущей ориентации"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Данные IMEI-кода"</string>
@@ -2512,4 +2665,69 @@
     <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="2184141780491382435">"Запуск по умолчанию"</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="app_launch_domain_links_title" msgid="458956710410857777">"Доменные ссылки"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Открывать URL домена"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Разрешить приложению напрямую открывать доменные URL"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Поддерживаемые URL"</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="410824961149037234">"внутренняя память"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"внешняя память"</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="storage_used" msgid="7128074132917008743">"Использовано"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Включить"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Заблокировать"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Конфиденциальные"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Важные"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Важные и конфиденциальные"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one">Предоставлено <xliff:g id="COUNT_1">%d</xliff:g> разрешение</item>
+      <item quantity="few">Предоставлено <xliff:g id="COUNT_1">%d</xliff:g> разрешения</item>
+      <item quantity="many">Предоставлено <xliff:g id="COUNT_1">%d</xliff:g> разрешений</item>
+      <item quantity="other">Предоставлено <xliff:g id="COUNT_1">%d</xliff:g> разрешения</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Предоставлено <xliff:g id="COUNT_2">%d</xliff:g> разрешение из <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="few">Предоставлены <xliff:g id="COUNT_2">%d</xliff:g> разрешения из <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many">Предоставлено <xliff:g id="COUNT_2">%d</xliff:g> разрешений из <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Предоставлены <xliff:g id="COUNT_2">%d</xliff:g> разрешения из <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Установлены некоторые настройки по умолчанию"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Настройки по умолчанию не установлены"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Все приложения"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Активные"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Личные"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Рабочие"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблокированные"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Важные"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Конфиденциальные"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"С URL домена"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Отключено администратором"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Дополнительные настройки"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Неизвестное приложение"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Выберите профиль"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Разрешения для приложений"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Приложения с расширенным доступом: <xliff:g id="COUNT_0">%d</xliff:g> из <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Приложения с разрешением: <xliff:g id="COUNT_0">%d</xliff:g> из <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL домена"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Не открывать URL домена"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Только <xliff:g id="DOMAIN">%s</xliff:g>"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"<xliff:g id="DOMAIN">%s</xliff:g> и другие URL домена"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> приложение может открыть URL своего домена</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> приложения могут открыть URL своего домена</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> приложений могут открыть URL своего домена</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> приложения может открыть URL своего домена</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Отпечаток не опознан"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Приложения по умолчанию"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Браузер"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Браузер не выбран"</string>
+    <string name="default_app" msgid="6864503001385843060">"(по умолчанию)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Хранилище приложений"</string>
 </resources>
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si-rLK/arrays.xml
index ab5408e..7c826e6 100644
--- a/res/values-si-rLK/arrays.xml
+++ b/res/values-si-rLK/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ඔබන බොත්තම"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"මයික්‍රෝෆෝනය නිශ්ශබ්ද/නිශ්ශබ්ද නැති කරන්න"</item>
     <item msgid="1148142988678569310">"මාධ්‍ය ව්‍යාපෘතිය"</item>
     <item msgid="9130014005474445273">"VPN සක්‍රිය කරන්න"</item>
+    <item msgid="1165192162975045562">"වෝල්පේපරය ලියන්න"</item>
+    <item msgid="7129487923652967258">"ව්‍යුහයට සහාය"</item>
+    <item msgid="1069023208100114540">"තිර රුවට සහාය"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ස්ථානය"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"මයික්‍රෝෆෝනය නිශ්ශබ්ද/නිශ්ශබ්ද නැති කරන්න"</item>
     <item msgid="5906017727368097853">"මාධ්‍ය ව්‍යාපෘතිය"</item>
     <item msgid="2486614710846178542">"VPN සක්‍රිය කරන්න"</item>
+    <item msgid="5586547561693629602">"වෝල්පේපරය ලියන්න"</item>
+    <item msgid="32794179825485062">"ව්‍යුහයට සහාය"</item>
+    <item msgid="7872852746938272552">"තිර රුවට සහාය"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"කොට"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"පහළ"</item>
     <item msgid="4212263919458209842">"අවදානම්"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"අක්‍රියයි"</item>
-    <item msgid="5656544177755411222">"සීමා කළ අතුරු බිදුම්"</item>
-    <item msgid="8735337502532332056">"ශූන්‍ය අතුරු බිදුම්"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"සාමාන්‍ය"</item>
     <item msgid="866544120205026771">"මධ්‍යම"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"රෝස"</item>
     <item msgid="6131821495505931173">"රතු"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (මාධ්‍ය මාරු කිරීමේ ප්‍රොටෝකෝලය)"</item>
+    <item msgid="8856820259201251036">"PTP (පින්තූර මාරු කිරීමේ ප්‍රොටෝකෝලය)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB ඊතර නෙට්)"</item>
+    <item msgid="2686051673589572111">"ශ්‍රව්‍ය මූලය"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 77988bd..674101e 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"අවසර දෙන්න"</string>
     <string name="deny" msgid="6947806159746484865">"ප්‍රතික්ෂේප කරන්න"</string>
     <string name="device_info_default" msgid="7847265875578739287">"නොදනී"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"ඔබට දැන් වර්ධකයකු වීමට ඇත්තේ පියවර <xliff:g id="STEP_COUNT">%1$d</xliff:g> කි."</item>
-    <item quantity="other" msgid="6722953419953594148">"ඔබට දැන් වර්ධකයකු වීමට ඇත්තේ පියවර <xliff:g id="STEP_COUNT">%1$d</xliff:g> කි."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">ඔබට දැන් සංවර්ධකයකු වීමට ඇත්තේ පියවර <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> කි.</item>
+      <item quantity="other">ඔබට දැන් සංවර්ධකයකු වීමට ඇත්තේ පියවර <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> කි.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ඔබ දැන් වර්ධකයෙකි"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"අවශ්‍ය නැත, ඔබ දැනටමත් වර්ධකයෙකි."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"නොරැහැන් සහ ජාලා"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS හරහා SMS අක්‍රිය කරන්න"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"අවශ්‍ය IMS ලියාපදිංචිය සක්‍රිය කරන්න"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"නියමිත IMS ලියාපදිංචි අක්‍රිය කරන්න"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE ප්‍රරතිපාදන ධජය සක්‍රීය කරන්න"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE ප්‍රරතිපාදන සලකුණු අක්‍රීය කරන්න"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte රැම් නික්ෂේපය සක්‍රිය කරන්න"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"රැම් නික්ෂේපය අක්‍රිය කරන්න"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM ලිපින පොත බලන්න"</string>
@@ -135,16 +137,7 @@
     <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;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;&lt;br&gt;වෙතින්&lt;br&gt;අබල කරනු ඇත"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"සම්බන්ධිතයි"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"සම්බන්ධයි (දුරකථන නැත)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"සම්බන්ධිතයි (මාධ්‍යයක් නොමැත)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"සම්බන්ධිතයි (පණිවිඩ ප්‍රවේශ නොමැත)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"සම්බන්ධිතයි (දුරකතනයක් හෝ මාධ්‍යයක් නැත)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"විසන්ධි වුණි"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"විසන්ධි වෙමින්…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"සම්බන්ධ වෙමින්…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"යුගල කරමින්…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"නමක් නොමැති බ්ලූටූත් උපාංගය"</string>
     <string name="progress_scanning" msgid="192587958424295789">"සොයමින්"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"අවට බ්ලූටූත් උපාංග සොයාගත්තේ නැත."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ලැබුණු ගොනු පෙන්වන්න"</string>
     <string name="device_picker" msgid="4978696506172252813">"බ්ලූටූත් උපාංගය තෝරන්න"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"බ්ලූටූත් අවසර අයැදුම"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"යෙදුමකට බ්ලූටූත් සක්‍රිය කිරීමට අවශ්‍යව ඇත."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"මෙම උපාංගය සඳහා බ්ලූටූත් සක්‍රිය කිරීමට යෙදුමට අවශ්‍යය."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"යෙදුමක් ඔබගේ ටැබ්ලටය තත්පර <xliff:g id="TIMEOUT">%1$d</xliff:g> කට වෙනත් බ්ලූටූත් උපාංග වෙත දෘශ්‍ය වීමට අවශ්‍යව ඇත."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"යෙදුමකට, ඔබගේ දුරකථනය තත්පර <xliff:g id="TIMEOUT">%1$d</xliff:g> කට අනෙකුත් බ්ලූටූත් උපාංගවලට දෘශ්‍යමාන කිරීමට අවශ්‍යව ඇත."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"යෙදුමකට ඔබේ ටැබ්ලටය වෙනත් බ්ලූටූත් උපාංග වෙත දර්ශනය කරවීමට අවශ්‍යව ඇත. ඔබට මෙය පසුව බ්ලූටූත් සැකසුම් හරහා වෙනස් කළ හැක."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"අවලංගු කිරීම"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ඉදිරියට යන්න"</string>
     <string name="okay" msgid="1997666393121016642">"හරි"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ඔව්"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"නැත"</string>
-    <string name="forget" msgid="7267115980248732932">"අමතක කරන්න"</string>
+    <string name="forget" msgid="1400428660472591263">"අමතක කරන්න"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"මුහුණු ගැළපුම දියුණු කරන්න"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"පණ ඇති බව පරික්ෂාව"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"අගුළු අරින විට ඇසිපිය ගැසීම අවශ්‍යයි"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"මගේ ස්ථානය, තිර අගුළු ඇරීම, SIM පත් අගුල, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"මගේ ස්ථානය, තිර අගුළු ඇරීම, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"මුරපද"</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="3453670509485083962">"එකතු කරන්න"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"තිර අගුල"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"ඇඟිලි සලකුණු පිහිටුවීම"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"ඔබේ තිරය අගුළු හැරීමට හෝ මිලදී ගැනීම් තහවුරු කිරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට, අපට පහත ඒවා කිරීම අවශ්‍ය වේ: \n\n✓ ඔබේ උපස්ථ තිර අගුළු ක්‍රමය පිහිටුවීම \n\n✓ ඔබේ ඇඟිලි සලකුණ එක් කිරීම"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"සංවේදකය සොයන්න"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ඔබේ දුරකථනයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය ස්ථානගත කරන්න."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"පටන් ගනිමු!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"ඔබේ ඇඟිල්ල ඇඟිළි සළකුණු සංවේදකය මත තබන්න. සුලු කම්පනයක් දැනුණු පසු ඇඟිල්ල ඔසවන්න."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"හොඳයි! දැන් නැවත කරන්න."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"ඇඟිලි සලකුණු සංවේදකය මත එම ඇඟිල්ලම තබන්න. සුලු කම්පනයක් දැනුණු පසු ඇඟිල්ල ඔසවන්න."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ඇඟිලි සලකුණ එකතු කරන ලදි."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"මෙම නිරූපකය ඔබ දුටු විට, ඔබව හඳුනා ගැනීම සඳහා හෝ මිලදි ගැනීමක් සඳහා අනුමැතිය දීමට ඔබගේ ඇඟිලි සලකුණු යොදා ගත හැක."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"එකතු කරන්න"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"මීළඟ"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"ඔබගේ චාලකය පේනු ගත කර නැවත උත්සාහ කරන්න."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"අගුළු තිර PIN හෝ මුරපදයක් නොමැත"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"සංකේතනය ඇරඹීමට පෙර තිර අගුලු PIN හෝ මුරපදයක් සැකසීමට අවශ්‍යයි."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"ඔබගේ උපාංගය සංකේතනය කිරීම සහතික කිරීමට ඔබගේ අඟුළු හැරීමේ රටාව ඇඳිය යුතුවේ."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"සංකේතනය කරන්නද?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"මෙම සංකේතන මෙහෙයුම ප්‍රතිනම්‍ය නොවන අතර ඔබ එය බාධා කරොත් දත්ත නැති වනු ඇත. සංකේතනයට පැයක් හෝ ඊට වඩා කාලයක් ගත වන අතර, ඒ අතරතුරේදී ටැබ්ලටය කිහිප වතාවක් නැවත පටන් ගනු ඇත."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"මෙම සංකේතන මෙහෙයුම ප්‍රතිනම්‍ය නොවන අතර ඔබ එය බාධා කරොත් දත්ත නැති වනු ඇත. සංකේතනයට පැයක් හෝ ඊට වඩා කාලයක් ගත වන අතර, ඒ අතරතුරේදී දුරකථනය කිහිප වතාවක් නැවත පටන් ගනු ඇත."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"මුහුණ භාවිතයෙන් අඟුළු හැරීම"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"අඩු ආරක්ෂාව, පරීක්ෂණාත්මක"</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_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="current_screen_lock" msgid="4104091715420072219">"වත්මන් තිර අගුල"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"උපාංග ආරක්ෂණ විශේෂාංග තව දුරටත් ක්‍රියා නොකරනු ඇත."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"පරිපාලකයා, සංකේතන ප්‍රතිපත්තිය, හෝ අක්තපත්‍ර ආචයනය මඟින් අබල කර ඇත"</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_biometric_weak" msgid="3008473624490350142">"මුහුණ භාවිතයෙන් අඟුළු හැරීම"</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_password" msgid="1203938057264146610">"මුරපදය"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"තිර අගුලක් පිහිටවූ පසුව, ඔබට ඔබේ ඇඟිලි සලකුණ ද  සැකසීම් &gt; ආරක්ෂාව තුළ පිහිටුවිය හැකිය."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"තිර අගුල අක්‍රිය කිරීම"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"අගුළු ඇරීමේ රටාව ඉවත් කරන්න"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"අගුළු ඇරීමේ PIN එක ඉවත් කරන්න"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"මුරපදයෙහි අවම වශයෙන් අකුරු එකක් වත් තිබිය යුතුය."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"මුරපදයේ අඩුම ගණනේ එක සංඛ්‍යාංකයක්වත් අඩංගු විය යුතුය."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"මුරපදයෙහි අවම වශයෙන් සංකේත එකක් වත් තිබිය යුතුය."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"මුරපදයෙහි අවම වශයෙන් අකුරු 1 ක් වත් තිබිය යුතුය."</item>
-    <item quantity="other" msgid="8186027808415585970">"මුරපදයෙහි අවම වශයෙන් අකුරු %d ක් වත් තිබිය යුතුය."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"මුරපදයෙහි අවම වශයෙන් කුඩා අකුරු 1 ක් වත් තිබිය යුතුය."</item>
-    <item quantity="other" msgid="2693910942679679225">"මුරපදයෙහි අවම වශයෙන් කුඩා අකුරු %d ක් වත් තිබිය යුතුය."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"මුරපදයෙහි අවම වශයෙන් කැපිටල් අකුරු 1 ක් වත් තිබිය යුතුය."</item>
-    <item quantity="other" msgid="3030801209112209245">"මුරපදයෙහි අවම වශයෙන් කැපිටල් අකුරු %d ක් වත් තිබිය යුතුය."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"මුරපදයෙහි අවම වශයෙන් සංඛ්‍යාත්මක ඉලක්කම් 1 ක් වත් තිබිය යුතුය."</item>
-    <item quantity="other" msgid="4703982391407595924">"මුරපදයෙහි අවම වශයෙන් සංඛ්‍යාත්මක ඉලක්කම් %d ක් වත් තිබිය යුතුය."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"රහස්පදය සඳහා අඩුතරමේ එක් විශේෂ සලකුණක් වත් අඩංගු විය යුතුය."</item>
-    <item quantity="other" msgid="1221290525051187757">"මුරපදයෙහි අවම වශයෙන් විශේෂ සංකේත %d ක් වත් තිබිය යුතුය."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"මුරපදයෙහි අවම වශයෙන් අකුරක් නොවන අක්ෂර 1 ක් වත් තිබිය යුතුය."</item>
-    <item quantity="other" msgid="3952508584649046404">"මුරපදයෙහි අවම වශයෙන් අකුරක් නොවන අක්ෂර %d ක් වත් තිබිය යුතුය."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">මුරපදයෙහි අඩුම තරමේ අකුරු %d ක් වත් තිබිය යුතුය.</item>
+      <item quantity="other">මුරපදයෙහි අඩුම තරමේ අකුරු %d ක් වත් තිබිය යුතුය.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">මුරපදයෙහි අඩුම තරමේ කුඩා අකුරු %d ක් වත් තිබිය යුතුය.</item>
+      <item quantity="other">මුරපදයෙහි අඩුම තරමේ කුඩා අකුරු %d ක් වත් තිබිය යුතුය.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">මුරපදයෙහි අඩුම තරමේ ලොකු අකුරු %d ක් වත් තිබිය යුතුය.</item>
+      <item quantity="other">මුරපදයෙහි අඩුම තරමේ ලොකු අකුරු %d ක් වත් තිබිය යුතුය.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">මුරපදයෙහි අඩුම තරමේ ඉලක්කම් %d ක් වත් තිබිය යුතුය.</item>
+      <item quantity="other">මුරපදයෙහි අඩුම තරමේ ඉලක්කම් %d ක් වත් තිබිය යුතුය.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">මුරපදයෙහි අඩුම තරමේ විශේෂ සංකේත %d ක් වත් අඩංගු විය යුතුය.</item>
+      <item quantity="other">මුරපදයෙහි අඩුම තරමේ විශේෂ සංකේත %d ක් වත් අඩංගු විය යුතුය.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">මුරපදයෙහි අඩුම තරමේ අකුරක් නොවන අක්ෂර %d ක් වත් තිබිය යුතුය.</item>
+      <item quantity="other">මුරපදයෙහි අඩුම තරමේ අකුරක් නොවන අක්ෂර %d ක් වත් තිබිය යුතුය.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"උපාංග පරිපාලක මෑත මුරපදයක් භාවිතා කිරීමට අවසර නොදේ."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ආරෝහණ, අවරෝහණ හෝ ප්‍රනරාවර්ත අනුක්‍රමයේ අංක තහනම් කරන ලදි"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"හරි"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"යුගල කරන්න"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"යුගල කරන්න"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"අවලංගු කරන්න"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"සමබන්ධ වන විට ඔබගේ සම්බන්ධතා සහ ඇමතුම් ඉතිහාසයට යුගළ කිරීමට ප්‍රවේශය දෙන්න."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> සමඟ යුගල කළ නොහැකි විය."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"වැරදි PIN එකක් හෝ පාස් යතුරක් නිසා <xliff:g id="DEVICE_NAME">%1$s</xliff:g> සමඟ යුගල කිරීමට නොහැකිය."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> සමඟ සන්නිවේදනය කළ නොහැක."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> විසින් යුගල කිරීම ප්‍රතික්ෂේප කරන ලදි."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"ස්ථාන නිරවද්‍යතාව වැඩිදියුණු කිරීමට, බ්ලූටූත් ක්‍රියා විරහිත විට පවා, යෙදුම් සහ සේවා බ්ලූටූත් උපාංග සඳහා පරිලෝකනය කරනු ඇත. ඔබට මෙය <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_specific_profiles_title" msgid="6952214406025825164">"වෙත සම්බන්ධ වෙන්න…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"මාධ්‍ය ශ්‍රව්‍ය"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"දුරකථන ශ්‍රව්‍ය"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ගොනු හුවමාරුව"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ආදාන උපාංගය"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"අන්තර්ජාල ප්‍රවේශය"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"සම්බන්ධතා බෙදාගැනීම"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"සම්බන්ධතා බෙදාගැනීම සඳහා භාවිතා කිරීම"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"අන්තර්ජාල සම්බන්ධතා බෙදාගැනීම"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"පණිවිඩ ප්‍රවේශය"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"මාධ්‍ය ශ්‍රව්‍යට සම්බන්ධ විය"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"දුරකතනයේ ශ්‍රව්‍යට සම්බන්ධ විය"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ගොනු හුවමාරු සේවාදායකය සමග සම්බන්ධ විය"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"සිතියම වෙත සම්බන්ධිතයි"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ගොනු හුවමාරු සේවාදායකය වෙත සම්බන්ධ වී නොමැත"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ආදාන උපාංග වෙත සම්බන්ධිතයි"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"මාධ්‍ය ශ්‍රව්‍ය සඳහා භාවිතා කරන්න"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"දුරකථන ශ්‍රව්‍ය සඳහා භාවිතා කෙරේ"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ගොනු හුවමාරුව සඳහා භාවිතා කරන්න"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ආදානය සඳහා භාවිතා කරන්න"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"අන්තර්ජාල ප්‍රවේශය සඳහා භාවිතා කරන්න"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"සිතියම සඳහා භාවිතා කරන්න"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi සහායක"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi සහායක හරහා සම්බන්ධ කරන ලදි"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"රංගන තිරය"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi අක්‍රිය කරමින්..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"දෝෂය"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"අහස්යානා ආකාරය තුළ"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ජාල සඳහා පරිලෝකනය කළ නොහැක"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ජාල දැනුම්දීම"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"පොදු ජාල තිබෙන්නේ කොහේ දැයි දැනුම් දෙන්න"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"දුර්වල සම්බන්ධතා මඟහරින්න"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"හොඳ අන්තර්ජාල සම්බන්ධතාවයක් නොමැති නම් Wi‑Fi ජාල භාවිතා නොකරන්න"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"හොඳ අන්තර්ජාල සම්බන්ධතාවක් තිබෙන ජාල පමණක් භාවිතා කරන්න"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"පරිලෝකනය සැමවිට ලබාගත හැක"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"සැමවිටම පරිලෝකනය කිරීමට ඉඩ දෙන්න"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-Fi අක්‍රිය විටත් Google ගේ ස්ථාන සේවා සහ වෙනත් යෙදුම් ජාල සඳහා පරිලෝකනය කරන්න"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"විවෘත Wi‑Fi ස්වයංක්‍රියව භාවිතා කරන්න"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"විවෘත ජාල තත්ත්වයෙන් උසස් යැයි නිර්ණය කර ඒවාට ස්වයංක්‍රියව සම්බන්ධ වීමට Wi‑Fi සහායකට ඉඩ දෙන්න"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"සහායක තෝරන්න"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"සහතික ස්ථාපනය කරන්න"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"ස්ථාන නිරවද්‍යතාවය වැඩි කිරීමට සහ වෙනත් අරමුණු සඳහා Wi-Fi අක්‍රිය වුවද, Google සහ අනෙකුත් යෙදුම් ආසන්න ජාල සඳහා පරිලෝකනය කරයි. ඔබට මෙය සිදු වීමට අවශ්‍ය නොවේ නම්, උසස් &gt; පරිලෝකනය සැමවෙලේම පවතී."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi අක්‍රිය විටදී පවා යෙදුම් ආසන්න ජාල සඳහා පරිලෝකනය කරනු ඇත. ඔබ මෙය සිදුවනවාට අකමැති නම්, උසස් &gt; පරිලෝකනය සෑමවිටම පවතී වෙත යන්න."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"ස්ථාන නිරවද්‍යතාව වැඩිදියුණු කිරීමට, Wi‑Fi ක්‍රියා විරහිත විට පවා, යෙදුම් සහ සේවා 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="5340097010842405981">"නැවත නොපෙන්වන්න"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"වෙනත් ජාලයක් එකතු කරන්න"</string>
     <string name="wifi_more" msgid="3195296805089107950">"තව"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"ස්වයංක්‍රිය සැකසුම (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"සැකසීම අවසන් කිරීමට, ඔබගේ ටැබ්ලටයට Wi‑Fi ප්‍රවේශ කිරීමට අවශ්‍යය. සැකසීමෙන් පසු, ඔබට සෙලියුලර් දත්ත සහ Wi‑Fi අතර මාරු විය හැකිය."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"උසස් විකල්ප"</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="5940801028985255304">"ඔබගේ රවුටරයේ Wi-Fi ආරක්‍ෂිත පිහිටුම් බොත්තම ඔබන්න. එය \"WPS\" ලෙස හැඳින්විය හැකි අතර හෝ මෙම සංකේතය අඩංගු විය හැක:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"ඔබගේ රවුටරයේ Wi-Fi ආරක්ෂිත පිහිටුම් බොත්තම ඔබන්න. එය \"WPS\" ලෙස හඳුන්වා තිබීමට හෝ මෙම සංකේතය සමගින් සලකුණු කර තිබීමට හැකිය:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"ඔබගේ Wi-Fi රවුටරයේ <xliff:g id="NUMBER">%1$s</xliff:g> PIN එක ඇතුලත් කරන්න. පිහිටුම සම්පූර්ණ වීමට මිනිත්තු 2 ක් දක්වා ගත විය හැක."</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> Wi-Fi ජාලයට සම්බන්ධ වුණි"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"AP කලාපය සැකසීම"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(වෙනස් නොකළ)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(සඳහන් නොකළ)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"සුරකින ලදි"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"අබලයි"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP වින්‍යාස කිරීම අසාර්ථකයි"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi සම්බන්ධතාව අසාර්ථකයි"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"සත්‍යාපනයේ ගැටලුවකි"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"පරාසයේ නැත"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"අන්තර්ජාල ප්‍රවේශය අනාවරණය වුයේ නැත, ස්වයංක්‍රිය නැවත සම්බන්ධ වීම වූ නැත"</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_security_none" msgid="7985461072596594400">"කිසිවක් නැත"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"මෙම ජාලයට අන්තර්ජාල ප්‍රවේශය නැත, කෙසේ වුවත්, මෙම ජාලය භාවිත කරන්නද?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"මෙම ජාලය සඳහා නැවත නොඅසන්න"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"සම්බන්ධ කරන්න"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ජාලය වෙත සම්බන්ධ වීම අසාර්ථක විය"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"අමතක කරන්න"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK ජංගම Wi‑Fi හොට්ස්පොට්ය"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ජංගම Wi-Fi හොට්ස්පොට්"</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_mode_title" msgid="2164073796253284289">"ඇමතුම් මනාපය"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi ඇමතුම් මෝඩය"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi වඩා කැමතියි"</item>
+    <item msgid="5267397515594230396">"සෙලියුලර් වඩා කැමතියි"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi ඇමතීම ක්‍රියාත්මකයි, ඔබේ දුරකථනයට ඔබේ මනාපය සහ සංඥා ප්‍රබලතාව අනුව, Wi-Fi ජාල හරහා හෝ ඔබේ වාහකයේ ජාලය හරහා ඇමතුම් ගමන් කරවිය හැකිය. මෙම විශේෂාංගය ක්‍රියාත්මක කිරීමට පෙර, ගාස්තු සහ අනෙකුත් විස්තර පිළිබඳව ඔබේ වාහකය සමගින් පරීක්ෂා කර බලන්න."</string>
     <string name="home_settings" msgid="212375129455718176">"මුල් පිටුව"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"දර්ශනය"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ශබ්ද"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"තේමාව"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"එළිය"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"අඳුරු"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"ස්වයංක්‍රීය"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"යාවත්කාලීන වලට මනාප කළ SIM කාඩ්පත කුමක්ද?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"SIM එක <xliff:g id="NEW_SIM">%1$s</xliff:g> පමණක් ඔබගේ උපාංගය තුළ තිබේ. සෙල්‍යුලර් දත්ත, ඇමතුම්, සහ SMS පණිවිඩ සඳහා මෙම SIM එක භාවිතා කිරීමට ඔබට අවශ්‍යද?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"වැරදී SIM PIN කේතයකි, ඔබගේ දුරකතනයේ අඟුල හැරීමට ඔබගේ වාහකයා ඔබ දැන් සම්බන්ධ කරගත යුතුය."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"වැරදී SIM PIN කේතයකි, ඔබගේ දුරකතනයේ අඟුල හැරීමට ඔබගේ වාහකයා සම්බන්ධ කරගැනීමට පෙර ඔබ සතුව තවත් උත්සාහයන් <xliff:g id="NUMBER">%d</xliff:g> ඉතිරිව ඇත."</item>
-    <item quantity="other" msgid="77103619544346451">"වැරදී SIM PIN කේතයකි, ඔබ සතුව තවත් උත්සාහයන් <xliff:g id="NUMBER">%d</xliff:g> ඉතිරිව ඇත."</item>
-  </plurals>
+    <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>
+    </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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"යෙදුම් (යෙදුම් දත්ත සහ මාධ්‍ය අන්තර්ගත)"</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_dcim_usage" msgid="558887013613822577">"පින්තුර, වීඩියෝ"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"ශ්‍රව්‍ය (සංගීතය, රිගින්ටෝන්, පොඩ්කාස්ට්, වැනිදේ.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"විවිධ"</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="default" msgid="6915293408836853020">"SD කාඩ් පත ගලවන්න"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"නංවන්න"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ගලවන්න"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"මැකීම සහ ෆෝමැට්"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"අභ්‍යන්තර ආචයනය ලෙස මැකීම සහ ෆෝමැට්"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB පරිගණක සම්බන්ධතාවය"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB පරිගණක සම්බන්ධය"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"ලෙස සම්බන්ධ වෙන්න"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"කැමරා මෘදුකාංගයක් භාවිතා කර පරිශීලකයාට ඡායාරූප හුවමාරු කිරීමට ඉඩදෙන්න, ඊට අමතරව MTP සහාය නොදක්වන ඕනෑම ගොනුවක් හුවමාරු කිරීම දෙන්න"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ගොනු-හුවමාරු මෙවලම් ස්ථාපනය කරන්න"</string>
+    <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_external_title" msgid="2723851748972673696">"ඉවත් කළ හැකි ආචයනය"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> නිදහස් (මුළු <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> සවි කරන ලදි"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> ෆෝමැට් කිරීමට නොහැකි විය"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ආචයනය යළි නම් කරන්න"</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="3677827796634199714"><b>"ඔබ <xliff:g id="NAME_0">^1</xliff:g> ගලවන විට, එහි ගබඩා කළ යෙදුම් වැඩ නොකරන අතර, එහි ගබඩා කර ඇති මාධ්‍ය ගොනු එය යළි නැවත සවි කරන තුර ලබාගත නොහැක."</b>" \n\n<xliff:g id="NAME_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_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_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="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> ෆෝමැට් කරන අතරතුර එය ඉවත් නොකරන්න."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"නව ආචයනය වෙත දත්ත ගෙන යන්න"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"මෙම නව <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="5035719146373359329"><b>"මෙම පියවර වෙත <xliff:g id="TIME">^1</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="8641916179067596592">"ගෙන යාම අතරතුර: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ගෙන යාම"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"ගෙන යාම අතරතුර <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="battery_status_title" msgid="9159414319574976203">"බැටරි තත්වය"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"බැටරි මට්ටම"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"ජාල සැකසීම් යළි පිහිටුවන ලදි"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"මෙය සියලු ජාල සැකසීම් යළි පිහිටුවයි, පහත ඒවා ඇතුලත්ව:\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="4874737348054213767">"සියලු ජාල සැකසීම් යළි පිහිටුවන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැකිය!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"සැකසීම් යළි පිහිටුවන්න"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"යළි පිහිටුවන්නද?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"ජාල සැකසීම් යළි පිහිටුවන ලදි"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"උපාංගය යළි පිහිටුවන්න"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"කර්මාන්තශාලා දත්ත යළි පිහිටුම"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"ටැබ්ලටය මත සියලු දත්ත මකයි"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"දුරකථනය මත සියලු දත්ත මකයි"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ඔබගේ ටැබ්ලටයේ "<b>"අභ්‍යන්තර ආචනය"</b>", සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"මෙය ඔබගේ දුරකථනයේ "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"සංගීත හෝ ඡායාරූප ආදී SD කාඩ් පතේ සියලු දත්ත මකන්න"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ටැබ්ලටය යළි සකසන්න"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"දුරකථනය නැවත සකසන්න"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"ඔබගේ සියලු පෞද්ගලික තොරතුරු සහ බාගත කළ යෙදුම් මකන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැක!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"ඔබගේ සියලු පෞද්ගලික තොරතුරු සහ බාගත කළ යෙදුම් මකන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැක!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"සියලු දේම මකන්න"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"නිෂ්පාදන දත්ත යළි පිහිටුවීම තහවුරු කිරීමට ඔබගේ අගුළු ඇරීමේ රටාව ඔබට ඇඳීමට සිදුවේ."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"පද්ධති ඉවත් කෙරුම් සේවාව නොමැති නිසා නැවත සැකසුමක් සිදු නොකෙරුණි"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"යළි සකසන්නද?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"මෙම පරිශීලකයා වෙතට කර්මාන්තශාලා යළි පිහිටුවීම නොමැත"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"සියළුම ගොනු මකා දමමින් USB ආචයනය මකන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැක!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"ගබඩා කර ඇති සියලු ගොනු මකමින් SD කාඩ් පත මකා දමන්න ද? මෙම ක්‍රියාව ඔබට ප්‍රතිවර්ත කළ නොහැක!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"සියල්ල මකන්න"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"ඔබට USB ආචයනය මැකිය යුතු බව තහවුරු කිරීමට ඔබ ඔබගේ අඟුළු හැරීමේ රටාව ඇඳීමට අවශ්‍ය වේ."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"ඔබට SD කාඩ් පත මැකිය යුතු බව තහවුරු කිරීමට ඔබ ඔබගේ අඟුළු හැරීමේ රටාව ඇඳීමට අවශ්‍ය වේ."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"උදවු"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"සෙලියුලර් ජාල"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ජංගම සැලසුම"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"සුපුරුදු SMS යෙදුම"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"කෙටි පණිවුඩ යෙදුම"</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>
@@ -1106,7 +1145,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ස්ථාන ආකාරය"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ස්ථානය නිමානය කිරීමට GPS, Wi-Fi සහ සෙලියුලර් ජාල භාවිතා කරන්න"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ස්ථානය නිමානය කිරීමට Wi-Fi සහ සෙලියුලර් ජාල භාවිතා කරන්න"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ඔබේ ස්ථානය නිමානය කිරීමට GPS භාවිතා කරන්න"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ඔබේ ස්ථානය නිර්ණය කිරීමට GPS භාවිත කරන්න"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"පරිලෝකනය කිරීම"</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="2070686681074461301">"Wi‑Fi ක්‍රියා විරහිත විට පවා, යෙදුම් සහ සේවා වෙත Wi‑Fi ජාල සඳහා පරිලෝකනය කිරීමට අවසර දීමෙන්, ස්ථාන නිරවද්‍යතාව වැඩිදියුණු කරගන්න."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"බ්ලූටූත් පරිලෝකනය"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"බ්ලූටූත් ක්‍රියා විරහිත විට පවා, පද්ධති සේවා වෙත බ්ලූටූත් උපාංග සඳහා පරිලෝකනය කිරීමට අවසර දීමෙන්, ස්ථාන නිරවද්‍යතාව වැඩිදියුණු කරගන්න."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi සහ සෙලියුලර් ජාල ස්ථාන"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ඔබගේ ස්ථානය ඉක්මනින් තීරණය කිරීමට යෙදුම් හට Google හි ස්ථාන සේවා භාවිතා කිරීමට ඉඩ දෙන්න. නිර්නාමික ස්ථාන දත්ත එකතු කර Google වෙත යැවෙනු ඇත."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi මඟින් ස්ථානය හඳුනාගන්නා ලදි"</string>
@@ -1152,11 +1197,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"තිර ආරක්ෂාව"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ඉදිරියට යාමට ඔබගේ උපාංග රටාව භාවිතා කරන්න."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ඉදිරියට යාමට ඔබගේ උපාංග PIN එක ඇතුළු කරන්න."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ඉදිරියට යාමට ඔබගේ උපාංග මුරපදය ඇතුළු කරන්න."</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_need_to_unlock" msgid="757935356911054465">"සුරැකි රටාව තහවුරු කරන්න"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"නැවත උත්සාහ කරන්න:"</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>
@@ -1178,8 +1227,7 @@
     <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_header" msgid="819903817323783498">"වැරදි උත්සාහ කිරීම් ගණන වැඩියි!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"තත්පර <xliff:g id="NUMBER">%d</xliff:g> කින් නැවත උත්සහ කරන්න."</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="manageapplications_settings_title" msgid="7041951105633616745">"යෙදුම් කළමනාකරණය කරන්න"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ස්ථාපිත යෙදුම් කළමනාකරණය කරන්න සහ ඉවත් කරන්න"</string>
@@ -1230,6 +1278,7 @@
     <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>
@@ -1301,6 +1350,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"ආචයනය භාවිතය"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"යෙදුම් මඟින් භාවිතා කරන ලද ආචයනය බලන්න"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"ධාවනය වන සේවා"</string>
@@ -1398,17 +1448,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ටැබ්ලට් තොරතුරු"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"දුරකථන තොරතුරු"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"බැටරි තොරතුරු"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"ක්ෂණික දියත් කිරීම"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"යෙදුම් ආරම්භයට යතුරු පුවරු කෙටිමං සකසන්න"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"යෙදුම යොමුකරන්න"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"කෙටිමගක් නොමැත"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"සෙවීම + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"හිස් කරන්න"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) සඳහා ඔබගේ කෙටිමඟ ඉවත්වනු ඇත."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"හරි"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"අවලංගු කරන්න"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"යෙදුම්"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"කෙටිමං"</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>
@@ -1443,23 +1482,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ගොනුවක් තුළ ඇති බ්ලූටූත් HCI පැකට්ටු සියල්ලම ග්‍රහණය කරගන්න"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM අඟුල ඇරීම"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"බුට්ලොඩරයට අගුළු ඇර තිබීමට ඉඩ දෙන්න"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"ඔබගේ PIN එක ඇතුළු කරන්න"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM අගුළු ඇරීම සබල කිරීම ඔබගේ උපාංගයේ PIN එක ඇතුළු කරන්න"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM අඟුල ඇරීමට ඉඩ දෙන්න?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"අවවාදයයි: මෙම සැකසීම සක්‍රිය විට මෙම උපාංගයේ උපාංගය ආරක්ෂා කිරීමේ විශේෂාංගය වැඩනොකරයි."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ලෝගයේ අන්තරාවක ප්‍රමාණය"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ලොග අන්තරාවකට ලෝගයේ ප්‍රමාණය තෝරන්න"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ව්‍යාජ ස්ථානයන්ට අවසර දෙන්න"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"ව්‍යාජ ස්ථාන අනුමත කරන්න"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"උපලක්ෂණ පරික්ෂාව බැලීම සබල කරන්න"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ජාලකරණය"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"නොරැහැන් සංදර්ශක සහතිකය"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"විස්තරාත්මක Wi‑Fi ලොග් කිරීම සබල කරන්න"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ආක්‍රමණික Wi‑Fi සිට සෙලියුලර් බාර දීම"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi රෝම් පරිලෝකන වෙතට සැමවිට අවසර දෙන්න"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"ලෙගසි DHCP සේවාලාභියා භාවිත කරන්න"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"නොරැහැන් සංදර්ශක සහතිකය සඳහා විකල්ප පෙන්වන්න"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi ලොග් මට්ටම වැඩි කරන්න, Wi‑Fi තෝරනයෙහි SSID RSSI අනුව පෙන්වන්න"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"සබල විට Wi‑Fi සිග්නලය අඩු විට Wi‑Fi දත්ත සම්බන්ධතාවය සෙලියුලර් වෙත භාර දීමට වඩා ආක්‍රමණික වේ"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"අතුරු මුහුණතෙහි ඇති දත්ත තදබදය අනුව Wi‑Fi රෝම් පරිලෝකන වෙත ඉඩ දෙන්න/නොදෙන්න"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"ලෝගයේ අන්තරාවක ප්‍රමාණය"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ලොග අන්තරාවකට ලෝගයේ ප්‍රමාණය තෝරන්න"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB වින්‍යාස දත්ත තෝරන්න"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB වින්‍යාස දත්ත තෝරන්න"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"ව්‍යාජ ස්ථානයන්ට අවසර දෙන්න"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ව්‍යාජ ස්ථාන අනුමත කරන්න"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"උපලක්ෂණ පරික්ෂාව බැලීම සබල කරන්න"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"නව Android DHCP සේවාලාභියා වෙනුවට Lollipop වෙතින් DHCP සේවාලාභියා භාවිත කරන්න."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB දෝශාවේක්ෂණයට ඉඩ දෙන්නද?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB දෝශාවේක්ෂණය සංවර්ධන කටයුතු සඳහා පමණක් යොදාගැනේ. එය ඔබගේ පරිගණකය සහ ඔබගේ උපාංගය අතර දත්ත පිටපත් කිරීමට පමණක් භාවිතා කරන්න, ඔබගේ උපාංගය මත දැනුම්දීම් රහිතව යෙදුම් ස්ථාපනය කරන්න, සහ ලොග් දත්ත කියවන්න."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"ඔබ මින්පෙර අවසර ලබාදුන් සියළුම පරිගණක වෙතින් USB නිදොස්කරණට ප්‍රවේශය අහෝසි කරන්නද?"</string>
@@ -1563,6 +1610,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"දම්පාට තද රතු"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> භාවිත කරන්න ද?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> හට අවශ්‍යයි:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"යෙදුම අවසර ඉල්ලීමක් කරන නිසා, සැකසීම් හට ඔබගේ ප්‍රතිචාරය සත්‍යාපනය කළ නොහැක."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ඔබ <xliff:g id="SERVICE">%1$s</xliff:g> සක්‍රිය කළේ නම්, දත්ත සංකේතනය වැඩි කිරීමට ඔබගේ උපාංගයට අගුළු තීරයක් භාවිතා කිරීමට අවශ්‍ය නැත."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"ඔබ ප්‍රවේශතා සේවාව සක්‍රිය කළ නිසා, දත්ත සංකේතනය වැඩි කිරීමට ඔබගේ උපාංගයට අගුළු තීරයක් භාවිතා කිරීමට අවශ්‍ය නැත."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> බලපාන දත්ත සංකේතනය ක්‍රියාත්මක කරන නිසා, ඔබගේ රටාව ඔබට සහතික කිරීමට අවශ්‍යය."</string>
@@ -1704,14 +1752,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> යෙදුම් <xliff:g id="TIME">%2$s</xliff:g> වැඩියි"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<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_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_memory_status" msgid="4251599550196193093">"වර්තමානයේදී උපාංග මතකය <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"සාමාන්‍ය RAM භාවිතය"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"උපරිම RAM භාවිතය"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"ක්‍රියාවලි"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"සේවා"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"කාල සීමාව"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"මතක විස්තර"</string>
@@ -1728,6 +1782,7 @@
     <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_hide_system" msgid="4106826741703745733">"පද්ධතිය සඟවන්න"</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>
@@ -1750,7 +1805,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"වැඩිකොට දක්වන යෙදුම් සැකසීම් යටින් සුපුරුදු සැකසීම්"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"සුපුරුදු සැකසුම්"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"සුපුරුදු යන්ත්‍රය"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"කථන පෙළ සඳහා භාවිතයට කථන සංකලන එන්ජිම සකසයි"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"කථා කරන පෙළ සඳහා භාවිතා කිරීමට කථන සංකලන යන්ත්‍රයක් සකස් කරන්න"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"කථන ශීඝ්‍රතාව"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"පෙළ කථා කරනා වේගය"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"තාරතාව"</string>
@@ -1824,7 +1879,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"අක්තපත්‍ර ස්ථාපනය තහවුරු කිරීමට ඔබ ඔබගේ අඟුළු හැරීමේ රටාව ඇඳිය යුතුවේ."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"සහතික ආචයනය සඳහා මුරපදය ටයිප් කරන්න."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"වර්තමාන මුරපදය:"</string>
@@ -1849,12 +1903,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"දැනට කිසිම ගිණුමක් උපස්ථ දත්ත ගබඩා නොකරයි."</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="5355557151569037197">"උපස්ථ සේවය අක්‍රිය වේ."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"මෙය ඔබගේ උපාංග ප්‍රතිපත්තිය සමග සකසා ඇත."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ඩෙස්ක්ටොප් උපස්ථ මුරපදය"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ඩෙස්ක්ටොප් සම්පූර්ණ උපස්ථ දැනට ආරක්ෂා කර නොමැත"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ඩෙස්ක්ටොප් සම්පූර්ණ උපස්ථ සඳහා මුරපදය වෙනස් කිරීමට හෝ ඉවත් කිරීමට ස්පර්ශ කරන්න"</string>
@@ -2026,6 +2078,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"සංක්‍රමණ සජීවන පරිමාණය"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"සජීවක කාල පරාස පරිමාණය"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"ද්විතියික දර්ශනය අඟවන්න"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"බහු-කවුළු මාදිලිය"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"තිරය මත එකම අවස්ථාවක ක්‍රියාකාරකම් කිහිපයක්"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"බහු-කවුළු මාදිලිය සක්‍රීය කරන්න ද?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"අවවාදයයි: මෙය මෑතකාලීන යෙදුම් UI හරහා එකම අවස්ථාවක තිරය මත ක්‍රියාකාරකම් කිහිපයක් කිරීමට ඉඩ සලස්වන ඉතා පර්යේෂණාත්මක ලක්ෂණයකි. මෙම ලක්ෂණය භාවිතා කිරීමේදී ඇතැම් යෙදුම් බිඳ වැටීමට හෝ නිවැරදිව කියාත්මක නොවීමට ඉඩ ඇත."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"යෙදුම්"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"ක්‍රියාකාරකම් තබාගන්න එපා"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"පරිශීලකයා ඉවත් වුන විගසම සෑම ක්‍රියාකාරකමක්ම විනාශ කරන්න"</string>
@@ -2197,7 +2253,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="718192651887726259">"අමතර පරිශීලකයින් නිර්මාණය කිරීම මඟින් වෙනත් පුද්ගලයන් සමඟ මෙම උපාංගය ඔබට බෙදා ගත හැක. සෑම පරිශිලකයෙක්ටම ඔවුන්ගේ යෙදුම්, බිතුපත, සහ වෙනත් ඒවා අභිරුචි කළ හැකි තමන්ට අයිති ඉඩක් ඇත. පරිශීලකයින්ට 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>
@@ -2228,13 +2284,13 @@
     <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="8310589470979488255">"දුරකථන ඇමතුම් වලට ඉඩදෙන්න"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"ඇමතුම් සහ SMS වලට ඉඩ දෙන්න"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"දුරකථන ඇමතුම් ක්‍රියාත්මක කරන්න"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"දුරකථන ඇමතුම් සහ SMS ක්‍රියාත්මක කරන්න?"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"පරිශීලකයා ඉවත් කරන්න"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"දුරකථන ඇමතුම් වලට ඉඩ දෙන්නද?"</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_sms_confirm_title" msgid="188164598768941316">"ඇමතුම් සහ SMS වලට ඉඩ දෙන්නද?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"මෙම පරිශීලකයා සමඟ ඇමතුම් සහ SMS ඉතිහාසය බෙදාගන්නා ලදි."</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="application_restrictions" msgid="8207332020898004394">"යෙදුම්වලට හා අන්තර්ගතයන්ට ඉඩ දෙන්න"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"සීමා කිරීම් සහිත යෙදුම්"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"යෙදුම සඳහා සැකසීම් දිගහරින්න"</string>
@@ -2275,7 +2331,7 @@
     <skip />
     <string name="cell_broadcast_settings" msgid="2451014351355183338">"හදිසි විකාශන"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ජාල ක්‍රියාකරුවන්"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"ප්‍රවේශ ලක්ෂ්‍ය නම්"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"ප්‍රවේශ ලක්ෂ්‍ය වල නම්"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"දියුණු කරන ලද 4G LTE ආකාරය"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"හඬ සහ සන්නිවේදනය දියුණු කිරීමට LTE දත්ත භාවිතා කරන්න (නිර්දේශිතයි)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"ප්‍රියකරන ජාල වර්ගය"</string>
@@ -2285,8 +2341,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"සීමකරනලද පැතිකඩ සඳහා මෙම යෙදුම සහය නොදක්වනු ඇත"</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>
@@ -2351,13 +2407,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ජාලයේ  සම්බන්ධතාවය"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"කෙටි පණිවිඩ කෙටි පණිවිඩ යැවීම පණිවිඩ යැවීම"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"සෙල්‍යුලර් සෙල් වාහකයා රැහැන් රහිත දත්ත 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call ඇමතුම අමතමින්"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ආරම්භකය"</string>
     <string name="keywords_display" msgid="6709007669501628320">"තිරය ස්පර්ශ තිරයකි"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"අඳුරු තීරය ස්පර්ෂ තීරය බැටරිය"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"අඳුරු තීරය ස්පර්ෂ තීරය බැටරිය"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"පසුබිම පෞද්ගලීකරණය අභිරුචිකරණය දර්ශනය"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"අඳුරු තේමාව රාත්‍රී ආකාරය අඳුරු තිරය අපවර්තිත දීප්තිය"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"පසුබිම සුසර කරගැනීම තිරය රිසි ලෙස සකසා ගැනීම."</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"පෙළ ප්‍රමාණය"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ව්‍යාපෘතිය"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"ව්‍යාපෘති විකාශය"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ඩිස්කය ඉඩ දෘඨ තැටිය උපාංගයේ භාවිතය"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"බල භාවිතය වෙනස් කරන්න"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ශබ්දකෝෂයේ අක්ෂර වින්‍යාසය අක්ෂර වින්‍යාසය පරික්ෂා කරන්න ස්වයං-නිවැරදි කිරීම"</string>
@@ -2374,6 +2432,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"ගිණුම"</string>
     <string name="keywords_users" msgid="4673901601478559100">"සීමා කිරීම සීමා කරනවා සීමා කරන ලදි"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"පෙළ නිවැරදි කිරීම ශබ්ද නිවැරදි කරන්න කම්පනය වන්න ස්වයං භාෂා ඉංගිතය යෝජනා කරන්න යෝජනා කළ තේමා අහිතකර වචන ඉමොජි වර්ග අන්තර්ජාතික"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"සුපුරුදු මනාප යළි පිහිටුවන්න"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"හදිසි අවස්ථා ice යෙදුම පෙරනිමි"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"යෙදුම් බාගැනීම යෙදුම් පද්ධති"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"යෙදුම් අවසර ආරක්ෂාව"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"යෙදුම් පෙරනිමි"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"සර්පණය මුරපදය රටාව pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ටැගයක් ස්ථාපනය කරන්න"</string>
     <string name="write_tag" msgid="8571858602896222537">"ලියනවා"</string>
@@ -2388,11 +2451,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"අතුරු බිඳීම්"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"ඇමතුම් සහ දැනුම්දීම් පැමිණි විට"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"සැමවිටම අතුරු බිඳීම"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ප්‍රමුඛ අතුරු බිඳීම් වලට පමණක් අනුමත කරන්න"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"අතුරු බිඳීම නැත"</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_option_important_interruptions" msgid="3903928008177972500">"ප්‍රමුඛතාව පමණයි"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"එලාම පමණයි"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"බාධා කිරීම් නැත"</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="ringtone_title" msgid="5379026328015343686">"දුරකථන රිගින්ටෝනය"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"සුපුරුදු දැනුම්දීම් රිගින්ටෝනය"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ඇමතුම් සඳහා කම්පනයද කරන්න"</string>
@@ -2418,62 +2482,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"කම්පනය වන්න"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"දැනුම්දීම් ප්‍රවේශනය"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"යෙදුම්වලට දැනුම් දීම් කියවිය නොහැක"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"යෙදුම් %d කට දැනුම්දීම් කියවිය හැක"</item>
-    <item quantity="other" msgid="980049191810249052">"යෙදුම් %d කට දැනුම්දීම් කියවිය හැක"</item>
-  </plurals>
+    <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="2767405417723149879">"දැනුම් දීම් ශ්‍රාවකයන් ස්ථාපනය කර නොමැත."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> සබලද?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> වෙත සම්බන්ධතා නම් සහ ඔබට එවා ඇති පණිවිඩ වල පෙළ වැනි පෞද්ගලික තොරතුරු ඇතුළත්ව පද්ධතියෙන් හෝ ඕනෑම ස්ථාපනය කළ යෙදුමකින් පළ කළ සියලු දැනුම්දීම් කියවිය හැක. එය මෙම දැනුම්දීම් අස් කිරීම හෝ ඒවා තුළ ඇති ක්‍රියා බොත්තම් ස්පර්ශ කළ හැක."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"කොන්දේසි ප්‍රතිපාදකයින්"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"යෙදුම් ප්‍රතිපාදනය කරන කොන්දේසි නැත"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d යෙදුම ප්‍රතිපාදනය කරන කොන්දේසි"</item>
-    <item quantity="other" msgid="358057362115673258">"%d යෙදුම් ප්‍රතිපාදනය කරන කොන්දේසි"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"කොන්දේසි ප්‍රතිපාදකයින් ස්ථාපනය කර නැත."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> සබලද?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"බාධා නොකරන්න ආකාරයට පිටවීමේ කොන්දේසි එකතු කිරීමට <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> හැකිවේ."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"යෙදුම් පූරණය වේ..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"අවහිර කරන්න"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"සියල්ල අවහිර කරන්න"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"මෙම යෙදුමෙන් කවදාවත් දැනුම්දීම් පෙන්වන්න එපා"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"ප්‍රමුඛතාව"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"ලයිස්තුවේ ඉහළින් දැනුම්දීම් පෙන්වන්න සහ ප්‍රමුඛ අතුරු බිඳීම් පමණක් වන ලෙස උපාංගය සැකසු විට ඒවාට එන ලෙස තබන්න"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"සංවේදී"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"උපාංගය අගුළු දමා ඇති විට, මෙම යෙදුමේ දැනුම්දීම් වලින් ඕනෑම සංවේදී අන්තර්ගත සගවන්න"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"ප්‍රමුඛතාව ලෙස සලකන්න"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"බාධා නොකරන්න යන්න ප්‍රමුඛතාව පමණි වෙත සකසා ඇති විට මෙම යෙදුමේ දැනුම්දීම් ඇසීමට ඉඩ දෙන්න"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"හොරෙන් බැලීමට ඉඩ දෙන්න"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"වත්මන් තිරය මත බැලීමට ඒවා සැකෙවින් ස්ලයිඩ් කිරීම මගින් සමහර දැනුම්දීම් අවධාරණය කිරීමට මෙම යෙදුමට ඉඩ දෙන්න"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"සංවේදී අන්තර්ගතය සඟවන්න"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"උපාංගය අගුළු දමා ඇති විට, මෙම යෙදුමේ දැනුම්දීම්වල ඇති පෞද්ගලික තොරතුරු අනාවරණය කළ හැකි අන්තර්ගතය සඟවන්න"</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="zen_mode_default_option" msgid="6940069025071935243">"ඔබ මෙය අක්‍රිය කරන තුරු"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"ප්‍රමුඛ අතුරු බිඳීම්"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"බිදවැටුම් කාලය"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"දින"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"කිසිවක් නැත"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"අතුරු බිඳීම් වලට අවසර දෙන ලදි"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ප්‍රමුඛතාව පමණයි"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"කිසිවක් නැත"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"ස්වයන්ක්රියකරණය"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ස්වයන්ක්‍රියව සක්‍රිය කරන්න"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"රීති නම"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"රීතිය එක් කරන්න"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"රීතිය මකන්න"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<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="3201273040477861538">"කාල සටහන් රීතිය"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"රීතිය සොයාගැනීමට නොහැක."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"කවදාවත් නෑ"</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_from" msgid="1033337300289871697">"වෙතින් ඇමතුම්/පණිවිඩ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ඕනෑම කෙනෙක්"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"සම්බන්ධතා පමණයි"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"තරු ලකුණු කළ සම්බන්ධතා පමණයි"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"සිදුවීම් සහ මතක් කිරීම්"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"සීනු සැමවිටම ප්‍රමුඛ අතුරු බිඳීම්"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"ඇඟවීම්"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"සිහිකැඳවීම්"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"සිදුවීම්"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"තෝරාගත් අමතන්නන්"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"නැවත අමතන්නන්"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"එකම පුද්ගලයා විනාඩි <xliff:g id="MINUTES">%d</xliff:g> කාල සීමාවක් තුළ දෙවන වතාවටත් අමතයි නම්, එයට අවසර දෙන්න"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ස්වයන්ක්‍රියව සක්‍රිය කරන්න"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"කවදාවත් නෑ"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"මීලඟ දිනයේ <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> හෝ පෙර ඕනෑම සීනුවක්"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"ඊළඟ දින <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_interruptions_voice_title" msgid="855256211259132964">"බාධා කිරීම්"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"ඇමතුම් සහ දැනුම්දීම් පැමිණි විට"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"ඔබව බාධා කිරීමට කැමති කවදාද?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"කොපමණ කාලයකට ද?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"සැමවිටම බාධා කරන්න"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ක්‍රියාවිරහිත,සියල්ල,සියල්ල"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"ප්‍රමුඛ බාධා කිරීම් වලට පමණක් ඉඩ දෙන්න"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"සීනු වෙත පමණක් ඉඩ දෙන්න"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"බාධා නොකරන්න"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"දින නියමයක් නොමැතිව"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <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="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"දින නියමයක් නොමැතිව ප්‍රමුඛ දැනුම්දීම් පමණක් වෙත මාරු වෙන්න"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"දින නියමයක් නොමැතිව සීනු පමණක් වෙත මාරු වෙන්න"</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>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <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_no_interruptions_indefinite" msgid="5705225870569410806">"දින නියමයක් නොමැතිව බාධා නොකරන්න වෙත මාරු වෙන්න"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_always" msgid="6172985102689237703">"සෑම විටම බාධා කිරීම වෙත මාරු වෙන්න"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"සදහටම"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"යෙදුම් දැනුම්දීම්"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"දැනුම්දීම් සැකසීම්"</string>
     <string name="device_feedback" msgid="3238056036766293294">"මෙම උපාංගය පිළිබඳ ප්‍රතිපෝෂණ යවන්න"</string>
@@ -2514,4 +2631,63 @@
     <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="2184141780491382435">"පෙරනිමියෙන් දියත් කරන්න"</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="app_launch_domain_links_title" msgid="458956710410857777">"වසම් සබැඳි"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"වසම් URL විවෘත කරන්න"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"වසම් URL සෘජුවම විවෘත කිරීමට යෙදුමට ඉඩ දෙන්න"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"සහාය දක්වන ලද වසම් URL"</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="410824961149037234">"අභ්‍යන්තර මතකය"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"බාහිර මතකය"</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="notifications_enabled" msgid="6983396130566021385">"ක්‍රියාත්මකයි"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"අවහිර කරන්න"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"සංවේදී"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"ප්‍රමුඛතාවය"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"ප්‍රමුඛ සහ සංවේදී"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <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="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">අවසර <xliff:g id="COUNT_3">%d</xliff:g> න් <xliff:g id="COUNT_2">%d</xliff:g> ක් ලබා දෙන ලදී</item>
+      <item quantity="other">අවසර <xliff:g id="COUNT_3">%d</xliff:g> න් <xliff:g id="COUNT_2">%d</xliff:g> ක් ලබා දෙන ලදී</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"ඇතැම් පෙරනිමියන් සකස් කර ඇත"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"පෙරනිමියන් සකසා නොමැත"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"සියලු යෙදුම්"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"සබලයි"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"පුද්ගලික"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"කාර්යාලය"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"අවහිර කරන ලදි"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ප්‍රමුඛතාව"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"සංවේදී"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"වසම් URL සමග"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"පරිපාලක මඟින් අබල කරන ලදි"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"උසස්"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"නොදන්නා යෙදුම"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"පැතිකඩ තෝරන්න"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"යෙදුම් අවසර"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"යෙදුම් <xliff:g id="COUNT_1">%d</xliff:g> කින් <xliff:g id="COUNT_0">%d</xliff:g> කට අමතර ප්‍රවේශය ඉඩ දෙන ලදී"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"යෙදුම් <xliff:g id="COUNT_1">%d</xliff:g> න් <xliff:g id="COUNT_0">%d</xliff:g> කට ඉඩ දෙන ලදී"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"වසම් URL"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"කිසිදු වසම් URL එකක් විවෘත නොකරන්න"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"විවෘත \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"විවෘත \'<xliff:g id="DOMAIN">%s</xliff:g>\' හා සම්බන්ධිත URL"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one">යෙදුම් <xliff:g id="COUNT">%d</xliff:g> කට ඒවායේ වසම් URL විවෘත කළ හැකිය</item>
+      <item quantity="other">යෙදුම් <xliff:g id="COUNT">%d</xliff:g> කට ඒවායේ වසම් URL විවෘත කළ හැකිය</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"අඳුනාගත නොහැක"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"පෙරනිමි යෙදුම්"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"බ්‍රවුසර යෙදුම"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"පෙරනිමි වෙබ් බ්‍රවුසරයක් නැත"</string>
+    <string name="default_app" msgid="6864503001385843060">"(සුපුරුදු)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"යෙදුම් ආචයනය"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 68a2252..117d7ab 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Stlačenie tlačidla"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"stlmenie alebo zrušenie stlmenia mikrofónu"</item>
     <item msgid="1148142988678569310">"projekcia médií"</item>
     <item msgid="9130014005474445273">"aktivovať VPN"</item>
+    <item msgid="1165192162975045562">"zápis tapety"</item>
+    <item msgid="7129487923652967258">"asistujúca štruktúra"</item>
+    <item msgid="1069023208100114540">"asistujúca snímka obrazovky"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Poloha"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Stlmenie alebo zrušenie stlmenia mikrofónu"</item>
     <item msgid="5906017727368097853">"Projekcia médií"</item>
     <item msgid="2486614710846178542">"Aktivovať VPN"</item>
+    <item msgid="5586547561693629602">"Zápis tapety"</item>
+    <item msgid="32794179825485062">"Asistujúca štruktúra"</item>
+    <item msgid="7872852746938272552">"Asistujúca snímka obrazovky"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátka"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"nízke"</item>
     <item msgid="4212263919458209842">"kritické"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Vypnuté"</item>
-    <item msgid="5656544177755411222">"Obmedzený počet vyrušení"</item>
-    <item msgid="8735337502532332056">"Žiadne vyrušenia"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normálny"</item>
     <item msgid="866544120205026771">"Stredný"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Ružová"</item>
     <item msgid="6131821495505931173">"Červená"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol – protokol na prenos médií)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol – protokol na prenos obrázkov)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Zdroj zvukov"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 19c4120..222ec70 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -22,10 +22,12 @@
     <string name="allow" msgid="3349662621170855910">"Povoliť"</string>
     <string name="deny" msgid="6947806159746484865">"Odmietnuť"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznáme"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Počet krokov do získania stavu vývojára: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
-    <item quantity="other" msgid="6722953419953594148">"Počet krokov do získania stavu vývojára: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="few">Ešte <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> krok a bude z vás vývojár.</item>
+      <item quantity="many">Ešte <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroka a bude z vás vývojár.</item>
+      <item quantity="other">Ešte <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> krokov a bude z vás vývojár.</item>
+      <item quantity="one">Ešte <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> krok a bude z vás vývojár.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Teraz ste vývojár!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nie je to potrebné, už ste vývojár."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Bezdrôtové pripojenie a siete"</string>
@@ -40,6 +42,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Vypnúť správy SMS prostredníctvom IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Zapnúť požadovanie registrácie IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Vypnúť požadovanie registrácie IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Zapnite poskytovaný príznak VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Vypnite poskytovaný príznak VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Zapnúť výpis pamäte lte ram"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Vypnúť výpis pamäte lte ram"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Zobraziť adresár karty SIM"</string>
@@ -135,16 +139,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysielanie"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Zakázať profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Táto akcia zakáže profil <xliff:g id="PROFILE_NAME">%1$s</xliff:g> a zariadenie <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Pripojené"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Pripojené (bez telefónu)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Pripojené (bez média)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Pripojené (bez prístupu ku správam)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Pripojené (bez telefónu alebo média)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojený"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Prebieha odpájanie..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Prebieha pripájanie…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Párovanie..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Nepomenované zariadenie s rozhraním Bluetooth"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Vyhľadávanie"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"V blízk. nie sú žiadne zariad. Bluetooth."</string>
@@ -154,7 +149,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobraziť prijaté súbory"</string>
     <string name="device_picker" msgid="4978696506172252813">"Vybrať zariadenie Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Žiadosť o povolenie zariadenia Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikácia chce zapnúť rozhranie Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Aplikácia chce ZAPNÚŤ Bluetooth pre toto zariadenie."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s prepnúť váš tablet do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s prepnúť váš telefón do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikácia chce váš tablet prepnúť do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
@@ -275,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Karta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Nastavenia servera proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Zrušiť"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"ZRUŠIŤ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"POKRAČOVAŤ"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ÁNO"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NIE"</string>
-    <string name="forget" msgid="7267115980248732932">"ODSTRÁNIŤ"</string>
+    <string name="forget" msgid="1400428660472591263">"Zabudnúť"</string>
+    <string name="save" msgid="879993180139353333">"Uložiť"</string>
+    <string name="done" msgid="6942539184162713160">"Hotovo"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nastavenia"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavenia"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Odkaz na nastavenia"</string>
@@ -325,9 +318,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Zoradiť podľa časového pásma"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Dátum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Čas"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Zlepšiť priraďovanie tvárí"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Kontrola živosti"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Pri odomykaní vyžadovať žmurknutie okom"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Automaticky zamknúť"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po prechode do spánku"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po režime spánku, ak odomknutie nie je udržované funkciou <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,6 +338,32 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavenie funkcie Moje poloha, odomknutie obrazovky a zamknutie úložiska poverení"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Heslá"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Odtlačok prsta"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Správa odtlačkov"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Použiť odtlačok na"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Pridať"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"zámka obrazovky"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> zaregistrované odtlačky</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> zaregistrovaných odtlačkov</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> zaregistrovaných odtlačkov</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> zaregistrovaný odtlačok</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Nastavenie odtlačku"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Na to, aby ste mohli používať digitálny odtlačok na odomknutie obrazovky alebo potvrdenie nákupov, musíte: \n\n✓ Nastaviť záložný spôsob uzamknutia obrazovky \n\n✓ Pridať digitálny odtlačok"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Nájdenie snímača"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Nájdite snímač odtlačkov prstov na zadnej strane telefónu."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Začíname!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Priložte prst na snímač odtlačkov. Keď ucítite vibráciu, zdvihnite ho."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Skvelé! Ešte raz."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Priložte ten istý prst na snímač odtlačkov. Keď ucítite vibráciu, zdvihnite ho."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Odtlačok bol pridaný!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kedykoľvek uvidíte túto ikonu, môžete na identifikáciu alebo povolenie nákupu použiť odtlačok prsta."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Pridať"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Ďalej"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrovanie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovať tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrovať telefón"</string>
@@ -360,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Zapojte nabíjačku a skúste to znova."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Chýba heslo alebo kód PIN na odomknutie obrazovky"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Pred spustením šifrovania musíte nastaviť kód PIN alebo heslo zámky obrazovky."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Zašifrovanie zariadenia musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Šifrovať?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operácia šifrovania je nevratná a ak ju prerušíte, prídete o údaje. Šifrovanie môže trvať viac ako hodinu. Tablet sa počas tejto doby niekoľkokrát reštartuje."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operácia šifrovania je nevratná a ak ju prerušíte, prídete o údaje. Šifrovanie môže trvať viac ako hodinu. Telefón sa počas tejto doby niekoľkokrát reštartuje."</string>
@@ -391,22 +406,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Prejdenie prstom"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Bez zabezpečenia"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Odomknutie tvárou"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Nízka bezpečnosť, experimentálne"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Vzor"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Stredné zabezpečenie"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Stredné až vysoké zabezpečenie"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Vysoké zabezpečenie"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Aktuálna zámka obrazovky"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Bezpečnostné funkcie zariadenia nebudú ďalej fungovať"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Zakázané správcom, pravidlom šifrovania alebo úložiskom poverení"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Žiadne"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prejdenie prstom"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Odomknutie tvárou"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Vzor"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Heslo"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Po nastavení zámky obrazovky si môžete nastaviť aj svoj odtlačok prsta v časti Nastavenia &gt; Zabezpečenie."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Vypnúť zámku obrazovky"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odstrániť bezpečnostný vzor"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odstrániť bezpečnostný kód PIN"</string>
@@ -427,30 +441,42 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Heslo musí obsahovať najmenej jedno písmeno."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Heslo musí obsahovať najmenej jednu číslicu."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Heslo musí obsahovať najmenej jeden symbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Heslo musí obsahovať najmenej jedno písmeno."</item>
-    <item quantity="other" msgid="8186027808415585970">"Heslo musí obsahovať najmenej %d písmen."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Heslo musí obsahovať najmenej jedno malé písmeno."</item>
-    <item quantity="other" msgid="2693910942679679225">"Heslo musí obsahovať najmenej %d malých písmen."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Heslo musí obsahovať najmenej jedno veľké písmeno."</item>
-    <item quantity="other" msgid="3030801209112209245">"Heslo musí obsahovať najmenej %d veľkých písmen."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Heslo musí obsahovať najmenej jednu číslicu."</item>
-    <item quantity="other" msgid="4703982391407595924">"Heslo musí obsahovať najmenej %d číslic."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Heslo musí obsahovať najmenej jeden špeciálny symbol."</item>
-    <item quantity="other" msgid="1221290525051187757">"Heslo musí obsahovať najmenej %d špeciálnych znakov."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Heslo musí obsahovať najmenej jeden znak iný ako písmeno."</item>
-    <item quantity="other" msgid="3952508584649046404">"Heslo musí obsahovať najmenej %d znakov iných ako písmená."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="few">Heslo musí obsahovať najmenej %d písmená</item>
+      <item quantity="many">Heslo musí obsahovať najmenej %d písmena</item>
+      <item quantity="other">Heslo musí obsahovať najmenej %d písmen</item>
+      <item quantity="one">Heslo musí obsahovať najmenej 1 písmeno</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="few">Heslo musí obsahovať najmenej %d malé písmená</item>
+      <item quantity="many">Heslo musí obsahovať najmenej %d malého písmena</item>
+      <item quantity="other">Heslo musí obsahovať najmenej %d malých písmen</item>
+      <item quantity="one">Heslo musí obsahovať najmenej 1 malé písmeno</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="few">Heslo musí obsahovať najmenej %d veľké písmená</item>
+      <item quantity="many">Heslo musí obsahovať najmenej %d veľkého písmena</item>
+      <item quantity="other">Heslo musí obsahovať najmenej %d veľkých písmen</item>
+      <item quantity="one">Heslo musí obsahovať najmenej 1 veľké písmeno</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="few">Heslo musí obsahovať najmenej %d číslice</item>
+      <item quantity="many">Heslo musí obsahovať najmenej %d číslice</item>
+      <item quantity="other">Heslo musí obsahovať najmenej %d číslic</item>
+      <item quantity="one">Heslo musí obsahovať najmenej 1 číslicu</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="few">Heslo musí obsahovať najmenej %d špeciálne symboly</item>
+      <item quantity="many">Heslo musí obsahovať najmenej %d špeciálneho symbolu</item>
+      <item quantity="other">Heslo musí obsahovať najmenej %d špeciálnych symbolov</item>
+      <item quantity="one">Heslo musí obsahovať najmenej 1 špeciálny symbol</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="few">Heslo musí obsahovať najmenej %d znaky iné ako písmeno</item>
+      <item quantity="many">Heslo musí obsahovať najmenej %d znaku iného ako písmeno</item>
+      <item quantity="other">Heslo musí obsahovať najmenej %d znakov iných ako písmeno</item>
+      <item quantity="one">Heslo musí obsahovať najmenej 1 znak iný ako písmeno</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Správca zariadení neumožňuje používanie nedávneho hesla."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Vzostupná, zostupná alebo opakovaná sekvencia čísiel je zakázaná"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +506,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Párovanie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Uistite sa, že zobrazuje tento prístupový kľúč:&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">"Zo zariadenia:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Párovať s týmto zariadením?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Ak chcete svoje zariadenie spárovať so zariadením <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>, zadajte na ňom kód <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> a stlačte kláves Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párovať"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PÁROVAŤ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Zrušiť"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Párovaním udelíte zariadeniam po pripojení prístup k svojim kontaktom a histórii hovorov."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nepodarilo sa spárovať so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nepodarilo sa spárovať so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, pretože ste zadali nesprávny kód PIN alebo prístupový kľúč."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"So zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nie je možné komunikovať."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Párovanie odmietnuté zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Nepodarilo sa pripojiť k zariadeniu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Vyhľadať zariadenia"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Obnoviť"</string>
@@ -515,16 +534,8 @@
     <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á funkcia Bluetooth, zariadenie môže komunikovať s ostatnými zariadeniami Bluetooth v okolí."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Aplikácie a služby budú vyhľadávať zariadenia Bluetooth aj vtedy, keď je rozhranie Bluetooth vypnuté, aby tak zlepšovali presnosť pri určovaní polohy. Túto možnosť 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="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Pripojiť k…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Zvuk medií"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvuk telefónu"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Prenos súborov"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vstupné zariadenie"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Prístup na Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Zdieľanie kontaktov"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Použiť na zdieľanie kontaktov"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Zdieľanie pripojenia na Internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Prístup ku správam"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky média."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Profil <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojený od vstupného zariadenia."</string>
@@ -537,28 +548,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Použitie"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Premenovať"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Povoliť prichádzajúce prenosy súborov"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Pripojené ku zvukovému médiu"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Pripojené ku zvuku telefónu"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Pripojené na server pre prenos údajov"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Pripojené k mape"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nepripojené k serveru pre prenos súborov"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Pripojené na vstupné zariadenie"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Pripoj. k zariad. s príst. na Internet"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Zdieľa miestne internet. pripoj. so zariad"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Umožňuje pripojenie zvukového média"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Použiť pre zvuk telefónu"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Použiť na prenos súborov"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Použiť pre vstup"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Použiť na prístup k Internetu"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Použiť pre mapu"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Nastavenia doku"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Použiť zvuk doku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ako reproduktor telefónu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pre hudbu a médiá"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamätať nastavenia"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Pripojené pomocou Asistenta Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Prenos obrazovky"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Prenášanie"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Povoliť bezdrôtový displej"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V okolí sa nenašli žiadne zariadenia."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Prepája sa"</string>
@@ -570,6 +568,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Odstrániť"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Hotovo"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Názov"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povoliť výmenu údajov, ak sa tablet dotýka iného zariadenia"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povoliť výmenu údajov, ak sa telefón dotýka iného zariadenia"</string>
@@ -593,21 +593,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Prebieha vypínanie Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Chyba"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Režim v lietadle"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Siete sa nedajú vyhľadávať"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Upozornenie na sieť"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Upozorniť, keď bude dostupná verejná sieť"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vyhnúť sa nekvalitným pripojeniam"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"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="wifi_scan_always_available" msgid="3470564139944368030">"Vyhľadávanie vždy zapnuté"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Vyhľadávanie vždy zapnuté"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Povoliť službe určovania polohy Google a ostatným aplikáciám vyhľadávať siete aj v prípade, že je sieť Wi-Fi vypnutá"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automaticky používať otvor. siete Wi‑Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Umožniť asistentovi Wi‑Fi automaticky sa pripojiť k otvoreným sieťam, ktoré určí ako vysokokvalitné"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Výber asistenta"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Inštalácia certifikátov"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Služby Google a ďalšie aplikácie môžu s cieľom zvýšenia presnosti a inými cieľmi vyhľadávať siete v blízkosti aj v prípade, že je sieť Wi-Fi vypnutá. Ak chcete nastavenie zmeniť, prejdite do časti Rozšírené &gt; Vyhľadávanie vždy zapnuté"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikácie môžu vyhľadávať siete v blízkosti aj v prípade, že je sieť Wi-Fi vypnutá. Ak chcete nastavenie zmeniť, prejdite do časti Rozšírené &gt; Vyhľadávanie vždy zapnuté."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Aplikácie a služby budú vyhľadávať siete Wi-Fi aj vtedy, keď je sieť Wi-Fi vypnutá, aby tak zlepšovali presnosť pri určovaní polohy. Túto možnosť 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_remember_choice" msgid="5340097010842405981">"Túto správu znova nezobrazovať"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Ponechať Wi-Fi zapnuté 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>
@@ -635,11 +630,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Pridať ďalšiu sieť"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Viac"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatické nastavenie (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Tablet potrebuje na dokončenie nastavení prístup k sieti Wi-Fi. Po nastavení môžete prepínať medzi mobilným dátovým pripojením a sieťou Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Rozšírené možnosti"</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="5940801028985255304">"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_pbc" msgid="7464388959427032052">"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 siete 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>
@@ -665,20 +659,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymná identita"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Heslo"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Zobrazovať heslo"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfigurovať pásmo pre prístupový bod"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Pásmo 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Pásmo 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Nastavenia adresy IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nezmenené)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(neurčené)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Uložené"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Zakázané"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Zlyhanie konfigurácie adresy IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Zlyhanie pripojenia Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problém s overením totožnosti"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Nenašiel sa žiadny prístup k internetu, preto nedôjde k automatickému opätovnému pripojeniu"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozícii"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozícii)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadajte heslo siete"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Žiadne"</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 do rozbaľovacej ponuky Rozšírené."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povoliť"</string>
@@ -686,6 +675,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Chcete sa prihlásiť, aby ste sa mohli pripojiť?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> vyžaduje, aby ste sa pred pripoj. k sieti prihlásili online"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"PRIPOJIŤ"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Táto sieť nemá prístup k internetu. Chcete ju napriek tomu použiť?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Nabudúce sa na túto sieť nepýtať"</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>
@@ -751,6 +742,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Prenos. hotspot Wi‑Fi AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Prenosný hotspot siete 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">"Volanie cez 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-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Uprednostniť Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Uprednostniť mobilné pripojenie"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Domovská stránka"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zobraziť"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -814,6 +817,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Nastavenia jasu obrazovky"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prispôsobenie jasu"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimalizovať úroveň jasu podľa dostupného svetla"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Motív"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Svetlý"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Tmavý"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automaticky"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutie obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
@@ -865,10 +873,12 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Aktualizovať pref. SIM kartu?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> je jediná SIM karta vo vašom zariadení. Chcete použiť túto SIM kartu pre mobilné dáta, hovory a správy SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Nesprávny kód PIN karty SIM. Teraz musíte kontaktovať svojho operátora, aby vám odomkol zariadenie."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Nesprávny kód PIN karty SIM. Zostáva vám <xliff:g id="NUMBER">%d</xliff:g> pokus, inak budete musieť kontaktovať svojho operátora, aby vám odomkol zariadenie."</item>
-    <item quantity="other" msgid="77103619544346451">"Nesprávny kód PIN karty SIM. Počet zostávajúcich pokusov: <xliff:g id="NUMBER">%d</xliff:g>."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="few">Nesprávny kód PIN SIM karty. Zostávajú vám <xliff:g id="NUMBER_1">%d</xliff:g> pokusy.</item>
+      <item quantity="many">Nesprávny kód PIN SIM karty. Zostáva vám <xliff:g id="NUMBER_1">%d</xliff:g> pokusu.</item>
+      <item quantity="other">Nesprávny kód PIN SIM karty. Zostáva vám <xliff:g id="NUMBER_1">%d</xliff:g> pokusov.</item>
+      <item quantity="one">Nesprávny kód PIN SIM karty. Zostáva vám <xliff:g id="NUMBER_0">%d</xliff:g> pokus, potom budete musieť kontaktovať svojho operátora, aby vám odomkol zariadenie.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operácia kódu PIN karty SIM zlyhala!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stav tabletu"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Stav telefónu"</string>
@@ -917,12 +927,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"K dispozícii (len na čítanie)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Celková pamäť"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Prebieha výpočet..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikácie (údaje aplikácií a obsah médií)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikácie a údaje o aplikáciách"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Médiá"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Stiahnutia"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Obrázky, videá"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Zvuk (hudba, vyzváňacie tóny, podcasty atď.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Rôzne"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Ostatné súbory"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Údaje uložené vo vyrovnávacej pamäti"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojte zdieľaný ukl. priestor"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojiť kartu SD"</string>
@@ -955,6 +965,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Prebieha odpájanie"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Nedostatok ukladacieho priestoru"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Niektoré systémové funkcie, ako je synchronizácia, nemusia fungovať správne. Skúste získať ukladací priestor odstránením alebo uvoľnením položiek, ako sú aplikácie alebo obsah médií."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Premenovať"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Pripojiť"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Odpojiť"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Vymazať a formátovať"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Vymazať a formátovať ako interné úložisko"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Pripojenie USB k počítaču"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Pripojenie USB k počítaču"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Pripojiť ako"</string>
@@ -962,8 +977,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Umožňuje prenášať multimediálne súbory v systéme Windows alebo v systéme Mac pomocou aplikácie Android File Transfer (www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparát (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Umožňuje prenos fotografií pomocou softvéru fotoaparátu a prenos akýchkoľvek súborov do počítačov, ktoré nepodporujú protokol MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Inštalovať nástroje na prenos súborov"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Umožňuje aplikáciám s podporou rozhrania MIDI spolupracovať so softvérom MIDI na vašom počítači prostredníctvom kábla USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Ďalší používatelia"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Pamäťové zariadenie"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Vymeniteľné úložisko"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Zdarma <xliff:g id="FREE">%1$s</xliff:g> (celkove <xliff:g id="TOTAL">%2$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="8928389741212129060">"Ú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>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Úložisko (<xliff:g id="NAME">%1$s</xliff:g>) sa nepodarilo bezpečne odpojiť"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Úložisko <xliff:g id="NAME">%1$s</xliff:g> je naformátované"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Úložisko <xliff:g id="NAME">%1$s</xliff:g> sa nepodarilo naformátovať"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Premenujte úložisko"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Po naformátovaní budete môcť úložisko <xliff:g id="NAME_0">^1</xliff:g> používať s inými zariadeniami. \n\nVšetky údaje v úložisku <xliff:g id="NAME_1">^1</xliff:g> budú vymazané. Odporúčame ich najskôr zálohovať. \n\n"<b>"Zálohovanie fotiek a iných médií"</b>" \nMediálne súbory presuňte do iného úložiska v zariadení alebo ich pomocou kábla USB preneste do počítača. \n\n"<b>"Zálohovanie aplikácií"</b>" \nVšetky aplikácie v úložisku <xliff:g id="NAME_6">^1</xliff:g> sa odinštalujú a ich údaje sa vymažú. Ak si chcete tieto aplikácie ponechať, presuňte ich do iného úložiska v zariadení."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Keď toto úložisko <xliff:g id="NAME_0">^1</xliff:g> odpojíte, prestanú fungovať aplikácie, ktoré sú v ňom uložené. Mediálne súbory nebudú dostupné, kým ho opäť nepripojíte."</b>" \n\nToto úložisko <xliff:g id="NAME_1">^1</xliff:g> je naformátované tak, aby fungovalo iba v tomto zariadení. V iných zariadeniach fungovať nebude."</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>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Na prenášanie fotiek a ďalších médií medzi zariadeniami."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Použiť ako interné úložisko"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Na ukladanie ľubovoľných údajov vrátane aplikácií a fotiek iba v tomto zariadení. Vyžaduje sa formátovanie, ktoré spôsobí, že nebude fungovať v iných zariadeniach."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Naformátovať ako inter. úložisko"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Preto je nutné úložisko <xliff:g id="NAME_0">^1</xliff:g> zabezpečiť pomocou formátovania. \n\nPo naformátovaní bude úložisko <xliff:g id="NAME_1">^1</xliff:g> fungovať iba v tomto zariadení. \n\n"<b>"Formátovaním vymažete všetky údaje v úložisku <xliff:g id="NAME_2">^1</xliff:g>."</b>" Ak chcete zabrániť strate údajov, odporúčame ich zálohovať."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Vymazať a formátovať"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formátuje sa úložisko <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Počas formátovania úložisko <xliff:g id="NAME">^1</xliff:g> neodoberajte."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Presuňte údaje do nov. úložiska"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Do tohto nového úložiska <xliff:g id="NAME">^1</xliff:g> môžete presunúť fotky, súbory a údaje aplikácií. \n\nPresun bude trvať zhruba <xliff:g id="TIME">^2</xliff:g> a v internom úložisku sa uvoľní <xliff:g id="SIZE">^3</xliff:g>. Počas presunu nebudú niektoré aplikácie fungovať."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Presunúť"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Presunúť neskôr"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Presuňte údaje"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Presun bude trvať zhruba <xliff:g id="TIME">^1</xliff:g>. V internom úložisku sa uvoľní <xliff:g id="SIZE">^2</xliff:g>."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Presunúť"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Presúvajú sa údaje…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Počas presunu: \n• neodoberajte úložisko <xliff:g id="NAME">^1</xliff:g>; \n• niektoré aplikácie nebudú fungovať správne; \n• udržiavajte zariadenie nabité."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Úložisko <xliff:g id="NAME">^1</xliff:g> je pripravené"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Teraz môžete do úložiska <xliff:g id="NAME">^1</xliff:g> ukladať fotky a ďalšie médiá."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Vaše nové úložisko <xliff:g id="NAME">^1</xliff:g> už funguje. \n\nAk chcete do tohto zariadenia presunúť fotky, súbory a údaje aplikácií, prejdite do časti Nastavenia &gt; Úložisko."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Presuňte aplikáciu <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Presun aplikácie <xliff:g id="APP">^1</xliff:g> a jej údajov do úložiska <xliff:g id="NAME_0">^2</xliff:g> bude trvať iba chvíľu. Aplikáciu budete môcť použiť až po jej presune. \n\nÚložisko <xliff:g id="NAME_1">^2</xliff:g> počas presunu neodoberajte."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Presúva sa aplikácia <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Úložisko <xliff:g id="NAME">^1</xliff:g> počas presunu neodoberajte. \n\nAplikácia <xliff:g id="APP">^2</xliff:g> bude v tomto zariadení k dispozícii až po dokončení presunu."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Zrušiť presun"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stav batérie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Stav batérie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Názvy prístupových bodov (APN)"</string>
@@ -1007,10 +1062,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Prebieha obnovovanie predvolených nastavení názvu prístupového bodu (APN)."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Obnoviť predvolené"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Obnovenie predvolených nastavení názvu prístupového bodu (APN) bolo dokončené."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Obnovenie nastavení siete"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Týmto obnovíte všetky sieťové nastavenia vrátane:\n\n"<li>"siete Wi‑Fi,"</li>\n<li>"mobilného pripojenia,"</li>\n<li>"rozhrania Bluetooth."</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Obnoviť nastavenia"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Chcete obnoviť všetky sieťové nastavenia? Toto akciu nie je možné vrátiť späť."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Obnoviť nastavenia"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Obnoviť?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Sieťové nastavenia boli obnovené"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Obnoviť zariadenie"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovenie továrenských nastavení"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vymaže všetky údaje v tablete"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vymaže všetky údaje v telefóne"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" tabletu, vrátane:\n\n"<li>"účtu Google"</li>\n<li>"údajov a nastavení systému a aplikácií"</li>\n<li>"prevzatých aplikácií"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" telefónu, vrátane:\n\n"<li>"účtu Google"</li>\n<li>"údajov a nastavení systému a aplikácií"</li>\n<li>"prevzatý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>
@@ -1024,9 +1084,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Vymazať všetky údaje na karte SD (napr. hudbu alebo fotografie)"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Obnoviť tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Obnoviť telefón"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Chcete vymazať všetky osobné údaje a stiahnuté aplikácie? Túto akciu nebude možné vrátiť späť."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Chcete vymazať všetky osobné údaje a stiahnuté aplikácie? Túto akciu nebude možné vrátiť späť."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Vymazať všetko"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Obnovenie továrenských nastavení musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Pokus o obnovenie sa neuskutočnil, pretože služba System Clear nie je k dispozícii."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Obnoviť?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Obnovenie továrenských nastavení nie je dostupné pre tohto používateľa"</string>
@@ -1043,8 +1102,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Chcete úložisko USB vymazať a odstrániť tak všetky súbory, ktoré sú na ňom uložené? Túto akciu nebude možné vrátiť späť."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Chcete kartu SD vymazať a odstrániť tak všetky súbory, ktoré sú na nej uložené? Túto akciu nebude možné vrátiť späť."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Odstrániť všetko"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vymazanie úložiska USB musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Vymazanie karty SD musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavenia hovorov"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavenie hlasovej schránky, presmerovania hovorov, čakajúcich hovorov a identifikácie volajúceho"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering cez USB"</string>
@@ -1076,7 +1133,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomocník"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilné siete"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilný plán"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Predvolená aplikácia SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikácia pre SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Zmeniť aplikáciu na SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Použiť aplikáciu <xliff:g id="NEW_APP">%1$s</xliff:g> namiesto <xliff:g id="CURRENT_APP">%2$s</xliff:g> ako aplikáciu na SMS?"</string>
     <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>
@@ -1104,7 +1161,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim určovania polohy"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Na určenie polohy používať technológiu GPS, sieť Wi-Fi a mobilné siete"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Na určenie polohy používať sieť Wi-Fi a mobilné siete"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Určovať polohu pomocou GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Určovať polohu pomocou GPS"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Vyhľadávanie"</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ávanie sietí Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Vylepšite určovanie polohy tým, že aplikáciám a službám umožníte vyhľadávať siete Wi-Fi aj vtedy, keď je sieť Wi-Fi vypnutá."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Vyhľadávanie zariadení Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Vylepšite určovanie polohy tým, že systémovým službám umožníte vyhľadávať zariadenia Bluetooth aj vtedy, keď je rozhranie Bluetooth vypnuté."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Urč. polohy pomocou Wi-Fi a mobil. siete"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"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>
@@ -1150,11 +1213,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Heslo bolo nastavené"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Bol nastavený kód PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Vzor bol nastavený"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Zabezpečenie obrazovky"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Ak chcete pokračovať, použite bezpečnostný vzor zariadenia."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Ak chcete pokračovať, zadajte kód PIN zariadenia."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Ak chcete pokračovať, zadajte heslo zariadenia."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Zabezpečenie zariadenia"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Zmena bezpečnostného vzoru"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Zmena bezpečnostného kódu PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrďte uložený vzor"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Skúste to znova"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nakreslite bezpečnostný vzor"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pomocníka zobrazíte stlačením klávesy Menu."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Na záver zdvihnite prst z obrazovky"</string>
@@ -1176,8 +1243,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nastaviť bezpečnostný vzor"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Zmena bezpečnostného vzoru"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Bezpečnostný vzor obrazovky nakreslite takto"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Príliš veľa chybných pokusov."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Počet sekúnd zostávajúcich do ďalšieho pokusu: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Príliš veľa nesprávnych pokusov. Skúste to znova o <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikácia nie je v telefóne nainštalovaná."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovať aplikácie"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Správa a odstraňovanie nainštalovaných aplikácií"</string>
@@ -1228,6 +1294,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Zoradiť podľa veľkosti"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Ukázať spustené služby"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Procesy vo vyrov. pamäti"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikácia pre tiesňové volania"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Obnoviť predvoľby aplik."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnoviť predvoľby aplik.?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Táto akcia obnoví predvoľby pre:\n\n "<li>"zakázané aplikácie,"</li>\n" "<li>"upozornenia zakázaných aplikácií,"</li>\n" "<li>"predvolené aplikácie pre akcie,"</li>\n" "<li>"obmedzenia údajov v pozadí pre aplikácie,"</li>\n" "<li>"akékoľvek obmedzenia povolení."</li>\n\n" Nestratíte žiadne údaje aplikácií."</string>
@@ -1299,6 +1366,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Fungovanie aplikácií"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Spustené"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikdy nepoužité)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Žiadne predvol. aplikácie"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využitie ukl. priestoru"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Zobraziť úložisko používané aplikáciami"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spustené služby"</string>
@@ -1358,7 +1426,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Nastavenia fyzickej klávesnice"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Znak „.“ môžete vložiť dvojitým stlačením klávesu Medzerník."</string>
     <string name="show_password" msgid="3001113966880559611">"Zobrazovať heslá"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Pri metóde vstupu je možné zhromažďovať zadávaný text vrátane osobných údajov, ako sú napríklad heslá alebo čísla kreditných kariet. Tento spôsob je používaný aplikáciou <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete použiť túto metódu vstupu?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Pri tejto metóde vstupu sa môže zhromažďovať zadávaný text vrátane osobných údajov, ako sú heslá alebo čísla kreditných kariet. Táto metóda je poskytovaná aplikáciou <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete použiť túto metódu vstupu?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Táto kontrola pravopisu môže zhromažďovať zadávaný text vrátane osobných údajov, ako sú napríklad heslá alebo čísla kreditných kariet. Je používaná aplikáciou <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Chcete povoliť túto kontrolu pravopisu?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Nastavenia"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Jazyk"</string>
@@ -1396,17 +1464,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informácie o tablete"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informácie o telefóne"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informácie o batérii"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Rýchle spustenie"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Nastavenie klávesových skratiek na spúšťanie aplikácií"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Priradiť aplikáciu"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Žiadna klávesová skratka"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Hľadať + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Vymazať"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Klávesová skratka <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) bude vymazaná."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Zrušiť"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplikácie"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Odkazy"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Zadávanie textu"</string>
     <string name="input_method" msgid="5434026103176856164">"Metóda vstupu"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Aktuálna klávesnica"</string>
@@ -1418,7 +1475,7 @@
     <string name="input_method_settings" msgid="5801295625486269553">"Nastavenia"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Nastavenia"</string>
     <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktívne metódy vstupu"</string>
-    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Použiť jazyk systému"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Používať jazyk systému"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Nastavenia <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Zvoliť aktívne metódy vstupu"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavenia klávesnice na obrazovke"</string>
@@ -1441,23 +1498,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zaznamenať všetky pakety Bluetooth HCI do súboru"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Odblokovať OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Povoliť odblokovanie ponuky bootloader"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Zadajte svoj kód PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ak chcete aktivovať odomknutie OEM, zadajte kód PIN zariadenia"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Povoliť odblokovanie OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORNENIE: V prípade, že bude toto nastavenie zapnuté, funkcie ochrany zariadenia nebudú na tomto zariadení fungovať."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Veľkosti vyrovnávacej pamäte denníka"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Veľkosti den. na vyrov. pamäť den."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Povoliť simulované polohy"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Povoliť simulované polohy"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Povoliť kontrolu atribútov zobrazenia"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Možnosti siete"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikácia bezdrôtového displeja"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Povoliť prihlasovanie Wi-Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agres. odovzdávať Wi-Fi na mobilnú sieť"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Vždy povoliť funkciu Wi-Fi Roam Scans"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Použiť staršiu verziu klienta DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Zobraziť možnosti certifikácie bezdrôtového displeja"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Zvýšiť úroveň prihlasov. do Wi-Fi, zobraziť na SSID RSSI v nástroji Wi-Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Keď túto možnosť povolíte, Wi-Fi bude s väčšou intenzitou odovzdávať dát. pripoj. na mob. sieť vtedy, keď bude slabý signál Wi-Fi"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Povoliť alebo zakázať funkciu Wifi Roam Scans na základe objemu prenosu údajov v rozhraní"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Veľkosti vyrovnávacej pamäte denníka"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Veľkosti den. na vyrov. pamäť den."</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Vyberte konfiguráciu USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Vyberte konfiguráciu USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povoliť simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povoliť simulované polohy"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Povoliť kontrolu atribútov zobrazenia"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Použitie klienta DHCP z verzie Lollipop namiesto nového klienta Android DHCP."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Povoliť ladenie USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ladenie prostredníctvom USB je určené iba na účely vývoja. Použite ho na kopírovanie dát medzi počítačom a zariadením, inštaláciu aplikácií do zariadenia bez upozornenia a čítanie údajov denníka."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Odvolať prístup k ladeniu USB zo všetkých počítačov, ktoré ste predtým autorizovali?"</string>
@@ -1561,6 +1626,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Purpurová"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Použiť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Služba <xliff:g id="SERVICE">%1$s</xliff:g> vyžaduje nasledujúce funkcie:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Nastavenia nemôžu overiť vašu odpoveď, pretože určitá aplikácia blokuje žiadosť o povolenie."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ak zapnete službu <xliff:g id="SERVICE">%1$s</xliff:g>, vaše zariadenie nepoužije zámku obrazovky na zvýšenie miery šifrovania údajov."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Keďže ste zapli služby dostupnosti, vaše zariadenie nepoužije zámku obrazovky na zvýšenie miery šifrovania údajov."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Keďže zapnutie služby <xliff:g id="SERVICE">%1$s</xliff:g> ovplyvňuje šifrovanie údajov, musíte potvrdiť svoj vzor."</string>
@@ -1702,14 +1768,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Štatistiky procesov"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Podrobné štatistiky spustených procesov"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Využitie pamäte"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplikácie typu <xliff:g id="TYPE">%1$s</xliff:g> za obdobie <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> z <xliff:g id="TOTALRAM">%2$s</xliff:g> za <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Pozadie"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Popredie"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"V pamäti"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Aktuálny stav pamäte zariadenia: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Priemerné využitie pamäte RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximálne využitie pamäte RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"OS Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Natívne"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Jadro"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Vyrovnávacie pamäte"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Využitie RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Využitie RAM (pozadie)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Spustené"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Procesy"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Služby"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trvanie"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Podrobnosti o pamäti"</string>
@@ -1726,6 +1798,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hodín"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 deň"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Zobraziť systém"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Skrytie systému"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Použiť Uss (jedinečnú veľkosť súpravy)"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ štatistík"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Pozadie"</string>
@@ -1748,13 +1821,13 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Predvolené nastavenia nižšie prepíšu nastavenia aplikácií"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Predvolené nastavenia"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Predvolený nástroj"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Umožňuje nastaviť nástroj na syntézu reči použitý pre hovorený text"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Nastavenie použitia nástroja na syntézu reči pri vyslovení textu"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Rýchlosť reči"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Rýchlosť hovoreného textu"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Určuje zvuk hovoreného textu"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jazyk"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Použiť jazyk systému"</string>
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Používať jazyk systému"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nebol vybratý jazyk"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavenia jazyka hlasu pre hovorený text"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Vypočuť príklad"</string>
@@ -1822,12 +1895,11 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardvérové"</string>
     <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="credentials_install_gesture_explanation" msgid="7408921172253634829">"Inštaláciu poverení je potrebné potvrdiť nakreslením bezpečnostného vzoru."</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">"Odstrániť všetok obsah?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Heslo musí mať aspoň 8 znakov."</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>
@@ -1847,12 +1919,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohovať moje údaje"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Zálohovať údaje aplikácií, heslá sietí Wi-Fi a ďalšie nastavenia na serveroch Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Účet zálohy"</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="include_app_data_title" msgid="2829970132260278394">"Zahrnúť dáta aplikácií"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatické obnovenie"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri preinštalovaní aplikácie obnoviť zálohované údaje a nastavenia"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Služba zálohovania nie je aktívna."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Túto možnosť nastavujú pravidlá pre zariadenie."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo záloh v počítači"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Úplné zálohy na počítači nie sú momentálne chránené"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dotykom zmeníte alebo odstránite heslo pre úplné zálohy do počítača"</string>
@@ -2024,6 +2094,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Mierka animácie premeny"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Mierka dĺžky animácie"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulovať sekundárne displeje"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Režim viacerých okien"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Viacero súčasných aktivít na obrazovke"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Chcete povoliť režim viacerých okien?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"UPOZORNENIE: Ide o vysoko experimentálnu funkciu umožňujú vykonávať na obrazovke súčasne viacero aktivít prostredníctvom používateľského rozhrania Nedávne aplikácie. Niektoré aplikácie môžu pri použití tejto funkcie zlyhať alebo nemusia fungovať správne."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikácie"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Neuchovávať aktivity"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Zničiť každú aktivitu, hneď ako ju používateľ ukončí"</string>
@@ -2195,7 +2269,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="718192651887726259">"Vytvorením ďalších používateľov môžete toto zariadenie zdieľať s inými ľuďmi. Každý používateľ má svoje prostredie, ktoré si môže prispôsobiť vlastnými aplikáciami, tapetou atď. Používatelia tiež môžu upraviť nastavenia zariadenia (napr. 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\nAkýkoľvek 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>
@@ -2206,7 +2280,7 @@
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Používateľov môže spravovať iba vlastník telefónu."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profily s obmedzeniami nemôžu pridávať účty"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Odstrániť <xliff:g id="USER_NAME">%1$s</xliff:g> zo zariadenia"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"Pridať použív. počas uzamknutia"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"Pridávať použív. pri uzamknutí"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nový používateľ"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nový profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcete odstrániť svoj profil?"</string>
@@ -2226,13 +2300,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Odstrániť hosťa?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Všetky aplikácie a údaje v tejto relácii budú odstránené."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Odstrániť"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Povoliť telefonické hovory"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Povoliť telefonické hovory a SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Zapnúť telefonické hovory"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Zapnúť telefonické hovory a správy SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Odstrániť používateľa"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Povoliť telefonické hovory?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Zapnúť telefonické hovory?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"S týmto používateľom sa bude zdieľať história hovorov."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Povoliť telefonické hovory a správy SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"S týmto používateľom sa bude zdieľať história hovorov a správ SMS."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Zapnúť telefonické hovory a správy SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"S týmto používateľom sa bude zdieľať história hovorov a správ SMS."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Povoliť aplikácie a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikácie s obmedzením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbaliť nastavenia aplikácie"</string>
@@ -2283,8 +2357,8 @@
     <string name="user_rename" msgid="8523499513614655279">"PREMENOVAŤ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Nastaviť obmedzenia aplikácií"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Riadi: <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Profily s obmedzeniami nepodporujú túto aplikáciu"</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_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2423,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sieť pripojenie"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textová správa poslať správy SMS a MMS"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilný operátor mobilné dáta bezdrôtový prenos 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi hovor volanie"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"obrazovka dotyková obrazovka"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"stlmiť displej dotyková obrazovka batéria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"stlmiť displej dotyková obrazovka batéria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"pozadie personalizácia prispôsobenie displej"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tmavý motív nočný režim matná obrazovka invertovaný jas"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"pozadie personalizácia prispôsobenie displej"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"veľkosť textu"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"prenášanie projektov"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"miesto disk pevný disk zariadenie využitie"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"využitie energie nabitia"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"pravopis slovník kontrola pravopisu automatické opravy"</string>
@@ -2372,6 +2448,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"účet"</string>
     <string name="keywords_users" msgid="4673901601478559100">"obmedzenie obmedziť obmedzené"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"oprava textu opraviť zvuk vibrácie automatický výber jazyka návrh navrhovanie motív nevhodné slovo písanie emodži medzinárodné"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"obnoviť predvolené hodnoty"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"predvolená aplikácia pre núdzový stav (ice)"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplik. sťahovanie aplikácie systémové"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"zabezpečenie povolení aplikácií"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"predvolené aplikácie"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"prejsť prstom heslo vzor pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavenie značky NFC (Wi-Fi)"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapísať"</string>
@@ -2386,11 +2467,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hlasitosť budíkov"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Hlasitosť zvonenia"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hlasitosť upozornení"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Vyrušenia"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Pri prichádzajúcom hovore alebo upozornení"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Vždy prerušiť"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Povoliť iba prioritné vyrušenia"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Neprerušovať"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Povoliť iba prior. prerušenia"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatické pravidlá"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Iba prioritné"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Iba budíky"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Žiadne prerušenia"</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="ringtone_title" msgid="5379026328015343686">"Tón zvonenia telefónu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Predvolený tón upozornení"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrovať aj pri hovoroch"</string>
@@ -2416,62 +2498,133 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrovanie"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Prístup k upozorneniam"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikácie nesmú čítať upozornenia"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplikácia dokáže čítať upozornenia"</item>
-    <item quantity="other" msgid="980049191810249052">"Aplikácie, ktoré dokážu čítať upozornenia (celkom %d)"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="few">%d aplikácie dokážu čítať upozornenia</item>
+      <item quantity="many">%d aplikácie dokáže čítať upozornenia</item>
+      <item quantity="other">%d aplikácií dokáže čítať upozornenia</item>
+      <item quantity="one">%d aplikácia dokáže čítať upozornenia</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Nie sú nainštalované žiadne aplikácie na počúvanie upozornení."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Povoliť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> bude môcť čítať všetky upozornenia, ktoré uverejní systém alebo ktorákoľvek z nainštalovaných aplikácií. Upozornenia môžu obsahovať osobné informácie, ako sú napríklad mená kontaktov alebo texty vám poslaných správ. Aplikácia bude tiež môcť tieto upozornenia zatvoriť alebo sa dotknúť tlačidiel akcií v upozorneniach."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Poskytovatelia podmienok"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Žiadne aplikácie neposkytujú podmienky"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplikácia poskytuje podmienky"</item>
-    <item quantity="other" msgid="358057362115673258">"Počet aplikácií poskytujúcich podmienky: %d"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nie sú nainštalovaní žiadni poskytovatelia podmienok."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Povoliť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> bude môcť pridávať podmienky ukončenia do režimu Nerušiť."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítavajú sa aplikácie..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blokovať"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovať všetko"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikdy nezobrazovať upozornenia z tejto aplikácie"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritné"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Zobrazovať upozornenia v hornej časti zoznamu a povoliť ich aj v prípade, keď sú na zariadení nastavené iba prioritné vyrušenia"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Citlivé"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Skryť akýkoľvek citlivý obsah z upozornení tejto aplikácie v prípade, že je zariadenie uzamknuté"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Považovať za prioritné"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Povoľte zvukový signál upozornení tejto aplikácie, keď je možnosť Nerušiť nastavená na hodnotu Iba prioritné"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Povoliť nahliadnutie"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Umožnite tejto aplikácii zdôrazniť určité upozornenia ich krátkym posunutím do zobrazenia na aktuálnej obrazovke"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skryť citlivý obsah"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Keď je zariadenie uzamknuté, skryte obsah upozornení tejto aplikácie, ktorý by mohol odhaliť súkromné informácie"</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="zen_mode_default_option" msgid="6940069025071935243">"Dokým túto funkciu nevypnete"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritné vyrušenia"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Odstávka"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dni"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Žiadne"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Prerušenia sú povolené"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Iba prioritné"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Žiadna"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizácia"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automaticky zapnúť"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Názov pravidla"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Pridať pravidlo"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Odstrániť pravidlo"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Chcete odstrániť pravidlo <xliff:g id="RULE">%1$s</xliff:g>?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Odstrániť"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Typ pravidla"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Neznáme"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Pravidlo konfigurácie"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Pravidlo plánovania"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Pravidlo sa nenašlo"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dni"</string>
+    <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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikdy"</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>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Hovory"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Správy"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Hovory a správy od"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Ktokoľvek"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Iba kontakty"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kontakty s hviezdičkou"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Udalosti a pripomenutia"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Budíky sú vždy považované za prioritné vyrušenia"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Pripomenutia"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Udalosti"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Vybraní volajúci"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Volajúci, ktorí volajú opakovane"</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, povolíte hovor"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automaticky zapnúť"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Každú noc"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noci cez týždeň"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Čas začiatku"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Čas ukončenia"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nasledujúci deň"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> alebo ľubovoľný predchádzajúci budík"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nasledujúci deň alebo ľubovoľný predchádzajúci budík"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nasledujúci deň"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Prerušenia"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Pri prichádzajúcom hovore alebo upozornení"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kedy chcete byť prerušený/-á?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Na aký čas?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Vždy prerušiť"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"vypnuté, všetky, všetko"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Povoliť iba prioritné prerušenia"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Povoliť iba budíky"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Neprerušovať"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Natrvalo"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minúty</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> minúty</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minút</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minúta</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> hodiny</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> hodiny</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hodín</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hodina</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Zmena na možnosť Iba prioritné upozornenia platná natrvalo"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="few">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> minúty do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> minúty do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> minút do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmena na možnosť Iba prioritné upozornenia platná minútu do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="few">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Zmena na možnosť Iba prioritné upozornenia platná <xliff:g id="DURATION">%1$d</xliff:g> hodín (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Zmena na možnosť Iba prioritné upozornenia platná hodinu do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Zmena na možnosť Iba budíky platná natrvalo"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="few">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> minúty (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> minúty (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> minút (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Zmena na možnosť Iba budíky platná minútu do <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="few">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmena na možnosť Iba budíky platná <xliff:g id="DURATION">%1$d</xliff:g> hodín do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmena na možnosť Iba budíky platná hodinu do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Zmena na možnosť Neprerušovať platná natrvalo"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="few">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> minúty (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="many">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> minúty (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> minút (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Zmena na možnosť Neprerušovať platná minútu do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="few">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> hodiny do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Zmena na možnosť Neprerušovať platná <xliff:g id="DURATION">%1$d</xliff:g> hodín do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Zmena na možnosť Neprerušovať platná hodinu do <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zmena na možnosť Vždy prerušiť"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"navždy"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Upozornenia apl."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odoslať spätnú vazbu k tomuto zariadení"</string>
@@ -2512,4 +2665,69 @@
     <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="2184141780491382435">"Spúšťať ako predvolenú"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"V type úložiska <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> je využité miesto s kapacitou <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Odkazy na doménu"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Otvoriť webové adresy domény"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Povoliť aplikácii priamo otvárať webové adresy domény"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Podporované webové adresy domény"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Ďalšie predvolené"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"V type úložiska <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> je využité miesto s kapacitou <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"interná pamäť"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"externá pamäť"</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">"Využitie dát aplikáciou"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"Využité dáta od <xliff:g id="DATE">%2$s</xliff:g>: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Využité úložisko"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Zapnuté"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blokované"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Citlivé"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritné"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritné a citlivé"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="few">Boli udelené <xliff:g id="COUNT_1">%d</xliff:g> povolenia</item>
+      <item quantity="many">Bolo udeleného <xliff:g id="COUNT_1">%d</xliff:g> povolenia</item>
+      <item quantity="other">Bolo udelených <xliff:g id="COUNT_1">%d</xliff:g> povolení</item>
+      <item quantity="one">Bolo udelené <xliff:g id="COUNT_0">%d</xliff:g> povolenie</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> udelené povolenia z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> udeleného povolenia z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> udelených povolení z <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> udelené povolenie z <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Je predvolená pre niektoré akcie"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Nie je predvolená pre žiadne akcie"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Všetky aplikácie"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Povolené"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Osobné"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Pracovné"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokované"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritné"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Citlivé"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S webovými adresami domény"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Zakázané správcom"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Rozšírené"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Neznáma aplikácia"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Výber profilu"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Povolenia aplikácie"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Povolené aplikácie s dodat. prístupom: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Povolené aplikácie: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Webové adresy domény"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Neotvárať žiadnu webovú adresu domény"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Otvoriť doménu <xliff:g id="DOMAIN">%s</xliff:g>"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Otvoriť doménu <xliff:g id="DOMAIN">%s</xliff:g> a súvisiace webové adresy"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikácie môžu otvoriť webové adresy svojej domény</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> aplikácie môže otvoriť webovú adresu svojej domény</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikácií môže otvoriť webové adresy svojej domény</item>
+      <item quantity="one">Jedna aplikácia môže otvoriť webové adresy svojej domény</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nebol rozpoznaný"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Predvolené aplikácie"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Prehliadač"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Žiadny predvolený prehliadač"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Predvolené)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Úložisko aplikácií"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 471e2ed..1038c6a 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Pritisnite gumb"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"izklop/vklop mikrofona"</item>
     <item msgid="1148142988678569310">"predstavnost projektov"</item>
     <item msgid="9130014005474445273">"aktiviranje omrežja VPN"</item>
+    <item msgid="1165192162975045562">"ozadje pisanja"</item>
+    <item msgid="7129487923652967258">"struktura pomoči"</item>
+    <item msgid="1069023208100114540">"posnetek zaslona pomoči"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokacija"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Izklop/vklop mikrofona"</item>
     <item msgid="5906017727368097853">"Predstavnost projektov"</item>
     <item msgid="2486614710846178542">"Aktiviranje omrežja VPN"</item>
+    <item msgid="5586547561693629602">"Ozadje pisanja"</item>
+    <item msgid="32794179825485062">"Struktura pomoči"</item>
+    <item msgid="7872852746938272552">"Posnetek zaslona pomoči"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"nizko"</item>
     <item msgid="4212263919458209842">"kritično"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Izklopljeno"</item>
-    <item msgid="5656544177755411222">"Omejene prekinitve"</item>
-    <item msgid="8735337502532332056">"Nič prekinitev"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Običajno"</item>
     <item msgid="866544120205026771">"Zmerno"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rožnata"</item>
     <item msgid="6131821495505931173">"Rdeča"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet USB)"</item>
+    <item msgid="2686051673589572111">"Vir zvoka"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3fefacb..326a37c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -22,10 +22,12 @@
     <string name="allow" msgid="3349662621170855910">"Dovoli"</string>
     <string name="deny" msgid="6947806159746484865">"Zavrni"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznano"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Št. korakov, ki vas loči od tega, da postanete razvijalec: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
-    <item quantity="other" msgid="6722953419953594148">"Št. korakov, ki vas loči od tega, da postanete razvijalec: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak vas loči od tega, da postanete razvijalec.</item>
+      <item quantity="two"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka vas ločita od tega, da postanete razvijalec.</item>
+      <item quantity="few"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraki vas ločijo od tega, da postanete razvijalec.</item>
+      <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korakov vas loči od tega, da postanete razvijalec.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Zdaj ste razvijalec."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ni treba, ker ste že razvijalec."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Brezžična omrežja"</string>
@@ -40,6 +42,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Izklop SMS prek IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Vklop registracije IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Izklop registracije IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Vklop zastavice za omogočeno uporabo storitve VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Izklop zastavice za omogočeno uporabo storitve VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Vklopi izpis RAM-a za LTE"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Izklopi izpis RAM-a za LTE"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Prikaži imenik na kartici SIM"</string>
@@ -135,16 +139,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Oddajanje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Želite onemogočiti profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"S tem boste onemogočili:&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_connected" msgid="6038755206916626419">"Povezava je vzpostavljena"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Povezava vzpostavljena (brez telefona)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Povezava vzpostavljena (brez predstavnosti)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Povezava vzp. (ni dostopa do sporočil)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Povezava vzpostavljena (brez telefona ali predstavnosti)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Prekinjena povezava"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Prekinjanje povezave ..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Vzpostavljanje povezave ..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Seznanjanje ..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Neimenovana naprava Bluetooth"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Iskanje"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"V bližini ni naprav Bluetooth."</string>
@@ -154,7 +149,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaži prejete datoteke"</string>
     <string name="device_picker" msgid="4978696506172252813">"Izberite napravo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zahteva za dovoljenje za uporabo funkcije Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacija želi vklopiti Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Aplikacija želi vklopiti Bluetooth v tej napravi."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacija želi, da lahko druge naprave Bluetooth vidijo vaš tablični računalnik toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacija želi, da lahko druge naprave Bluetooth vidijo vaš telefon toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacija želi omogočiti, da lahko druge naprave Bluetooth vidijo vaš tablični računalnik. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
@@ -275,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kartica SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Nastavitve strežnika proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Prekliči"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"PREKLIČI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"NADALJUJ"</string>
     <string name="okay" msgid="1997666393121016642">"V redu"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"DA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NE"</string>
-    <string name="forget" msgid="7267115980248732932">"OPUSTI"</string>
+    <string name="forget" msgid="1400428660472591263">"Pozabi"</string>
+    <string name="save" msgid="879993180139353333">"Shrani"</string>
+    <string name="done" msgid="6942539184162713160">"Končano"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nastavitve"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavitve"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Bližnjica do nastavitev"</string>
@@ -325,9 +318,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Razvrsti po časovnem pasu"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ura"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Izboljšano ujemanje obraza"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Preverjanje živosti"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Pri odklepanju zahtevaj pomežik z očmi"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Samodejno zaklepanje"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po stanju pripravljenosti"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po stanju pripravljenosti, razen ko <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> poskrbi, da ostane odklenjen"</string>
@@ -348,6 +338,32 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavitev Moje lokacije, odklepanja zaslona, zaklepanja shrambe poverilnic"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Gesla"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Prstni odtis"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Upravlj. prst. odtisov"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Upor. prst. odtisa za"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Dodaj"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"zaklepanje zaslona"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> včlanjen prstni odtis</item>
+      <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> včlanjena prstna odtisa</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> včlanjeni prstni odtisi</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> včlanjenih prstnih odtisov</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Nast. prstnega odtisa"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Če želite za odklepanje zaslona ali potrjevanje nakupov uporabljati prstni odtis, morate: \n\n✓ Nastaviti nadomestni način zaklepanja zaslona \n\n✓ Dodati prstni odtis"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Iskanje tipala"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Poiščite tipalo prstnih odtisov na hrbtni strani telefona."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Ime"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"V redu"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Začnimo."</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Položite prst na tipalo prstnih odtisov. Dvignite ga, ko začutite vibriranje."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Odlično! Ponovite to."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Položite isti prst na tipalo prstnih odtisov in ga dvignite, ko začutite vibriranje."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Prstni odtis dodan."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ko vidite to ikono, lahko za preverjanje istovetnosti ali odobritev nakupa uporabite prstni odtis."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Dodaj"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Naprej"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifriranje"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifriraj tablični računalnik"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifriraj telefon"</string>
@@ -360,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Priključite polnilnik in poskusite znova."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ni kode PIN ali gesla za zaklepanje zaslona"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Preden lahko začnete s šifriranjem, morate nastaviti kodo PIN ali geslo za zaklepanje zaslona."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Če želite potrditi šifriranje naprave, morate narisati vzorec za odklepanje."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Želite šifrirati?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Šifriranja ne morete razveljaviti ali prekiniti, ker lahko izgubite podatke. Šifriranje traja eno uro ali več in v tem času se bo tablični računalnik večkrat znova zagnal."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Šifriranja ne morete razveljaviti ali prekiniti, ker lahko izgubite podatke. Šifriranje traja eno uro ali več in v tem času se bo telefon večkrat znova zagnal."</string>
@@ -391,22 +406,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Vlečenje"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Brez varnosti"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Odklepanje z obrazom"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Nizka varnost, poskusno"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Vzorec"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Srednja varnost"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Koda PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Srednja do visoka varnost"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Geslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Visoka varnost"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Trenutno zaklepanje zaslona"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funkcije za zaščito naprave ne bodo več delovale."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onem. skrbnik, šifr. pravilnik shr. poverilnic"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Brez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vlečenje"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Odklepanje z obrazom"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Vzorec"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Koda PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Geslo"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Ko nastavite zaklepanje zaslona, lahko tudi nastavite prstni odtis v »Nastavitve &gt; Varnost«."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Izklopi zaklepanje zaslona"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odstrani vzorec za odklepanje"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odstrani kodo PIN za odklepanje"</string>
@@ -427,30 +441,42 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Geslo mora vsebovati vsaj eno črko."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Geslo mora imeti vsaj eno števko."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Geslo mora imeti vsaj en simbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Geslo mora imeti vsaj eno črko."</item>
-    <item quantity="other" msgid="8186027808415585970">"Geslo mora imeti vsaj toliko črk: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Geslo mora imeti vsaj eno malo črko."</item>
-    <item quantity="other" msgid="2693910942679679225">"Geslo mora imeti vsaj toliko malih črk: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Geslo mora imeti vsaj eno veliko črko."</item>
-    <item quantity="other" msgid="3030801209112209245">"Geslo mora imeti vsaj toliko velikih črk: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Geslo mora imeti vsaj eno številko."</item>
-    <item quantity="other" msgid="4703982391407595924">"Geslo mora imeti vsaj toliko številk: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Geslo mora imeti vsaj en posebni znak."</item>
-    <item quantity="other" msgid="1221290525051187757">"Geslo mora imeti vsaj toliko posebnih znakov: %d"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Geslo mora imeti vsaj en znak, ki ni črka."</item>
-    <item quantity="other" msgid="3952508584649046404">"Geslo mora imeti vsaj toliko znakov, ki niso črke: %d."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Geslo mora imeti vsaj %d črko.</item>
+      <item quantity="two">Geslo mora imeti vsaj %d črki.</item>
+      <item quantity="few">Geslo mora imeti vsaj %d črke.</item>
+      <item quantity="other">Geslo mora imeti vsaj %d črk.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Geslo mora imeti vsaj %d malo črko.</item>
+      <item quantity="two">Geslo mora imeti vsaj %d mali črki.</item>
+      <item quantity="few">Geslo mora imeti vsaj %d male črke.</item>
+      <item quantity="other">Geslo mora imeti vsaj %d malih črk.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Geslo mora imeti vsaj %d veliko črko.</item>
+      <item quantity="two">Geslo mora imeti vsaj %d veliki črki.</item>
+      <item quantity="few">Geslo mora imeti vsaj %d velike črke.</item>
+      <item quantity="other">Geslo mora imeti vsaj %d velikih črk.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Geslo mora imeti vsaj %d številko.</item>
+      <item quantity="two">Geslo mora imeti vsaj %d številki.</item>
+      <item quantity="few">Geslo mora imeti vsaj %d številke.</item>
+      <item quantity="other">Geslo mora imeti vsaj %d številk.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Geslo mora imeti vsaj %d posebni znak.</item>
+      <item quantity="two">Geslo mora imeti vsaj %d posebna znaka.</item>
+      <item quantity="few">Geslo mora imeti vsaj %d posebne znake.</item>
+      <item quantity="other">Geslo mora imeti vsaj %d posebnih znakov.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Geslo mora imeti vsaj %d znak, ki ni črka.</item>
+      <item quantity="two">Geslo mora imeti vsaj %d znaka, ki nista črka.</item>
+      <item quantity="few">Geslo mora imeti vsaj %d znake, ki niso črke.</item>
+      <item quantity="other">Geslo mora imeti vsaj %d znakov, ki niso črke.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Skrbnik naprave ne dovoli uporabe nedavnega gesla."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Naraščajoč, padajoč ali ponavljajoč se niz števk je prepovedan"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"V redu"</string>
@@ -480,15 +506,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Če želite seznaniti z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Prikazano mora biti to geslo:&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">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ali se želite povezati s to napravo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Če želite vzpostaviti povezavo z napravo:<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>V njej vnesite:<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> in pritisnite Return ali Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Seznani"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SEZNANI"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Prekliči"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Seznanjanje pri vzpostavljeni povezavi omogoči dostop do vaših stikov in zgodovine klicev."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Ni bilo mogoče vzpostaviti povezave z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Zaradi nepravilne kode PIN ali gesla ni mogoče vzpostaviti povezave z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ni mogoče vzpostaviti povezave."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je zavrnila seznanitev."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Povezave z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ni bilo mogoče vzpostaviti."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Išči naprave"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Osveži"</string>
@@ -515,16 +534,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Dodatno"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Dodatne nast. za Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Ko je Bluetooth vklopljen, lahko vaša naprava komunicira z drugimi napravami Bluetooth v bližini."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Zaradi večje natančnosti ugotavljanja lokacije bodo aplikacije in storitve iskale naprave Bluetooth, tudi če je Bluetooth izklopljen. To lahko spremenite v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastavitvah iskanja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Vzpostavi povezavo z ..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Zvok predstavnosti"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvok telefona"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Prenos datoteke"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vnosna naprava"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetni dostop"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Dajanje stikov v skupno rabo"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Uporabi za dajanje stikov v skupno rabo"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Skupna raba internetne povezave"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Dostop do sporočil"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in zvokom nosilca podatkov bo prekinjena."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in prostoročnim zvokom bo prekinjena."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in vnosno napravo bo prekinjena."</string>
@@ -537,28 +548,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Uporaba za"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Preimenuj"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Dovoli dohodne prenose datotek"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezan s profilom za predstavnostni zvok"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezava s profilom za zvok telefona vzpostavljena"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezava s strežnikom za prenos datotek je vzpostavljena"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Povezava je vzpostavljena z zemljevidom"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Povezava s strežnikom za prenos datotek ni vzpostavljena"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Povezava z vnosno napravo je vzpostavljena"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Povezava z napravo za internetni dostop"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Skupna raba lok. internetne povezave z napravo"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Uporabi za zvok predstavnosti"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Uporabi za zvok telefona"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Uporabi za prenos datotek"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Uporabi za vnos"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Uporabi za dostop do interneta"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Uporabi za zemljevid"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Nastavitve stojala"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Uporabi stojalo za zvok"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kot zvočnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glasbo in predstavnost"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapomni si nastavitve"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Pomočnik za Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Povezava vzpostavljena prek pomočnika za Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Zaslon za predvajanje"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Predvajanje"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogočanje brezžičnega zaslona"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V bližini ni naprav."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Povezovanje"</string>
@@ -570,6 +568,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Pozabi"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Končano"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Ime"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Dovoli izmenjavo podatkov, ko se tablični računalnik dotakne druge naprave"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Dovoli izmenjavo podatkov, ko se telefon dotakne druge naprave"</string>
@@ -593,21 +593,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Izklapljanje povezave Wi‑Fi …"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Napaka"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"V načinu za letalo"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ni mogoče iskati omrežij"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Obveščanje o omrežjih"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Obveščanje, ko je na voljo javno omrežje"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izogni se slabim povezavam"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Omrežje Wi-Fi uporabi samo, če je na voljo dobra internetna povezava"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Uporaba samo omrežij z dobro internetno povezavo"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Iskanje vedno na voljo"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Vedno dovoli iskanje"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Googlova lokacijska storitev in druge aplikacije naj poiščejo omrežja, tudi če je Wi-Fi izklopljen"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Samodejno uporabi odprto omrežje Wi‑Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Naj pomočnik za Wi-Fi samodejno vzpostavi povezavo z odprtimi omrežji visoke kakovosti"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Izbira pomočnika"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Namestitev potrdil"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Za večjo natančnost in druge namene dovolite Googlovi lokacijski storitvi in drugim aplikacijam, da iščejo omrežja Wi-Fi v bližini, tudi če je Wi-Fi izklopljen. Če tega ne želite, odprite Dodatno &gt; Iskanje vedno na voljo."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacije lahko iščejo omrežja Wi-Fi v bližini, tudi če je Wi-Fi izklopljen. Če tega ne želite, odprite Dodatno &gt; Iskanje vedno na voljo."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Zaradi večje natančnosti ugotavljanja lokacije bodo aplikacije in storitve iskale omrežja Wi‑Fi, tudi če je Wi‑Fi izklopljen. To lahko spremenite v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastavitvah iskanja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Tega ne kaži več"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Ohrani povezavo Wi-Fi med spanjem"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi vklop. v stanju priprav."</string>
@@ -635,11 +630,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Dodajanje drugega omrežja"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Več"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Samodej. nastavitev (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Če želite dokončati namestitev, mora imeti tablični računalnik dostop do omrežja Wi-Fi. Po namestitvi lahko preklapljate med prenosom podatkov v mobilnem omrežju in omrežjem Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Dodatne možnosti"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Zagon nastavitve WPS ..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Pritisnite gumb »Wi‑Fi Protected Setup« na usmerjevalniku. Morda se imenuje »WPS« ali vsebuje ta simbol:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Pritisnite gumb »Wi‑Fi Protected Setup« na usmerjevalniku. Morda se imenuje »WPS« ali je označen s tem simbolom:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Vnesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> za usmerjevalnik Wi‑Fi. Namestitev lahko traja do dve minuti."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"Nastavitev WPS je uspela. Povezovanje z omrežjem ..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Vzpostavljena povezava z omrežjem Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +659,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonimna identiteta"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Geslo"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Pokaži geslo"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfiguriranje pasov dostopne točke"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4-GHz pas"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5-GHz pas"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Nastavitve naslova IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nespremenjeno)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ni navedeno)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Shranjeno"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Onemogočeno"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Konfiguracija IP-ja ni uspela"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Povezava prek Wi-Fi-ja ni uspela"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Težava s preverjanjem pristnosti"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ni v obsegu"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Ni zaznanega dostopa do interneta; samodejna vnovična vzpostavitev povezave se ne bo izvedla."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je na voljo"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je na voljo)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Vnesite geslo za omrežje"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Brez"</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>
@@ -686,6 +675,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Ali se želite prijaviti, da se lahko povežete?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> zahteva spletno prijavo pred povezavo v omrežje."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"POVEŽI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"To omrežje nima dostopa do interneta. Ga želite kljub temu uporabljati?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ne sprašuj več za to omrežje"</string>
     <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>
@@ -751,6 +742,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Pren. dos. toč. Wi-Fi AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Prenosna dostopna točka 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">"Klicanje prek Wi-Fi-ja"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Nastavitev klicanja"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Način klicanja prek Wi-Fi-ja"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Prednostno – Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Prednostno – mobilno omrežje"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Začetna stran"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
@@ -814,6 +817,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Prilagoditev svetlosti zaslona"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva svetlost"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziranje ravni svetlosti glede na razpoložljivo svetlobo"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Svetlo"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Temno"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Samodejno"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Stanje pripravljenosti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se izklopi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
@@ -865,10 +873,12 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Želite sprem. pred. kart. SIM?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> je edina kartica SIM v napravi. Želite uporabljati to kartico SIM za prenos podatkov v mobilnih omrežjih, klice in sporočila SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Napačna koda PIN kartice SIM. Zdaj se boste morali za odklenitev naprave obrniti na operaterja."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Napačna koda PIN kartice SIM. Na voljo imate še <xliff:g id="NUMBER">%d</xliff:g> poskus. Potem se boste morali za odklenitev naprave obrniti na operaterja."</item>
-    <item quantity="other" msgid="77103619544346451">"Napačna koda PIN kartice SIM. Poskusite lahko še <xliff:g id="NUMBER">%d</xliff:g>-krat."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Napačna koda PIN kartice SIM. Na voljo imate še <xliff:g id="NUMBER_1">%d</xliff:g> poskus.</item>
+      <item quantity="two">Napačna koda PIN kartice SIM. Na voljo imate še <xliff:g id="NUMBER_1">%d</xliff:g> poskusa.</item>
+      <item quantity="few">Napačna koda PIN kartice SIM. Na voljo imate še <xliff:g id="NUMBER_1">%d</xliff:g> poskuse.</item>
+      <item quantity="other">Napačna koda PIN kartice SIM. Na voljo imate še <xliff:g id="NUMBER_1">%d</xliff:g> poskusov.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Postopek za odklepanje s kodo PIN kartice SIM ni uspel."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stanje tabličnega računalnika"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Stanje telefona"</string>
@@ -917,12 +927,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Na voljo (samo za branje)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Skupno prostora"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Izračunavanje ..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikacije (podatki o aplik. in medijska vsebina)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikacije in podatki o aplikacijah"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Predstavnost"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Prenosi"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Slike, videoposnetki"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Zvok (glasba, melodije zvonjenja, podcasti ipd.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Razno"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Druge datoteke"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Predpomnjeni podatki"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Izpni skupno shrambo"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Izpni kartico SD"</string>
@@ -955,6 +965,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Izpenjanje poteka"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Prostor za shranjevanje bo pošel"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Nekatere sistemske funkcije, na primer sinhronizacija, morda ne delujejo pravilno. Poskusite sprostiti nekaj prostora tako, da zbrišete ali odpnete elemente, kot so aplikacije ali medijska vsebina."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Preimenovanje"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Vpenjanje"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Izvrženje"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Izbris in formatiranje"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Izbris in form. kot not. shr."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Povezava USB z računalnikom"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Povezava USB z računalnikom"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Vzpostavi povezavo kot"</string>
@@ -962,8 +977,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"V sistemu Windows lahko prenašate predstavnostne datoteke ali v računalniku Mac uporabite Android File Transfer (glejte www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparat (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Omogoča prenos fotografij s programsko opremo fotoaparata in prenos datotek v računalnikih, ki ne podpirajo protokola MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Namestitev orodij za prenos datotek"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Omogoča, da aplikacije, ki podpirajo MIDI, delujejo prek povezave USB s programsko opremo za MIDI v računalniku."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Drugi uporabniki"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Shramba naprave"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Izmenljiva shramba"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Razpoložljivo: <xliff:g id="FREE">%1$s</xliff:g> (Skupaj: <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Vpeto: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Tega ni bilo mogoče vpeti: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"To je varno izvrženo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Tega ni bilo mogoče varno izvreči: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"To je formatirano: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Tega ni bilo mogoče formatirati: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Preimenovanje shrambe"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Po formatiranju lahko uporabljate to shrambo (<xliff:g id="NAME_0">^1</xliff:g>) v drugih napravah. \n\nVsi podatki v tej shrambi (<xliff:g id="NAME_1">^1</xliff:g>) bodo izbrisani. Priporočamo, da podatke prej varnostno kopirate. \n\n"<b>"Varnostno kopiranje fotografij in druge predstavnosti"</b>" \nPremaknite predstavnostne datoteke v drugo shrambo v tej napravi ali jih s kablom USB prenesite v računalnik. \n\n"<b>"Varnostno kopiranje aplikacij"</b>" \nVse aplikacije, shranjene v tej shrambi (<xliff:g id="NAME_6">^1</xliff:g>), bodo odstranjene in podatki aplikacij izbrisani. Če želite ohraniti te aplikacije, jih premaknite v drugo shrambo v tej napravi."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Ko izvržete to shrambo (<xliff:g id="NAME_0">^1</xliff:g>), bodo aplikacije, shranjene v njej, prenehale delovati, predstavnostne datoteke, shranjene v njej, pa ne bodo na voljo, dokler je ne vstavite znova."</b>" \n\nTa shramba (<xliff:g id="NAME_1">^1</xliff:g>) je formatirana tako, da deluje samo v tej napravi. V drugih ne bo delovala."</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>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Za premikanje fotografij in druge predstavnosti med napravami."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Uporaba kot notranja shramba"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Za shranjevanje česar koli samo v tej napravi, vključno z aplikacijami in fotografijami. Zahteva formatiranje, ki onemogoča delovanje z drugimi napravami."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Format. kot notranja shramba"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Če želite, da bo shramba <xliff:g id="NAME_0">^1</xliff:g> varna, jo morate formatirati. \n\nPo formatiranju bo ta shramba (<xliff:g id="NAME_1">^1</xliff:g>) delovala samo v tej napravi. \n\n"<b>"S formatiranjem se izbrišejo vsi podatki, ki so trenutno shranjeni v shrambi (<xliff:g id="NAME_2">^1</xliff:g>)."</b>" Če se želite izogniti izgubi podatkov, priporočamo, da jih varnostno kopirate."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Izbris in formatiranje"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatiranje shrambe <xliff:g id="NAME">^1</xliff:g> …"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Med formatiranjem ne odstranite shrambe <xliff:g id="NAME">^1</xliff:g>."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Premik podatkov v novo shrambo"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Fotografije, datoteke in podatke aplikacij lahko premaknete v novo shrambo (<xliff:g id="NAME">^1</xliff:g>). \n\nPremik traja približno <xliff:g id="TIME">^2</xliff:g> in bo sprostil <xliff:g id="SIZE">^3</xliff:g> prostora v notranji shrambi. Nekatere aplikacije med premikanjem ne bodo delovale."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Premik zdaj"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Premik pozneje"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Premik podatkov zdaj"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Premik traja približno <xliff:g id="TIME">^1</xliff:g>. Sprostil bo <xliff:g id="SIZE">^2</xliff:g> prostora v notranji shrambi."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Premik"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Premikanje podatkov …"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Med premikanjem: \n• Ne odstranite shrambe (<xliff:g id="NAME">^1</xliff:g>). \n• Nekatere aplikacije ne bodo delovale pravilno. \n• Naprava naj bo napolnjena."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Shramba <xliff:g id="NAME">^1</xliff:g> je nared"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Shramba <xliff:g id="NAME">^1</xliff:g> je pripravljena za uporabo s fotografijami in drugo predstavnostjo."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Nova shramba <xliff:g id="NAME">^1</xliff:g> deluje. \n\nČe želite premikati fotografije, datoteke in podatke aplikacij vanjo, odprite »Nastavitve« &gt; »Shramba«."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Premik aplikacije <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Premik aplikacije <xliff:g id="APP">^1</xliff:g> in njenih podatkov v shrambo <xliff:g id="NAME_0">^2</xliff:g> bo trajal samo nekaj trenutkov. Dokler premik ne bo dokončan, aplikacije ne bo mogoče uporabljati. \n\nShrambe <xliff:g id="NAME_1">^2</xliff:g> med premikanjem ne odstranite."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Premikanje aplikacije <xliff:g id="APP">^1</xliff:g> …"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Shrambe <xliff:g id="NAME">^1</xliff:g> med premikanjem ne odstranite. \n\nAplikacija <xliff:g id="APP">^2</xliff:g> v tej napravi ne bo na voljo, dokler premik ne bo dokončan."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Preklic premika"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stanje baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Raven napolnjenosti baterije"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ji"</string>
@@ -1007,10 +1062,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Obnavljanje privzetih nastavitev APN-jev"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ponastavi na privzeto"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ponastavitev privzetih nastavitev APN-jev končana"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Ponastavitev omrežnih nastavitev"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"S tem bodo ponastavljene 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>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Ali želite ponastaviti vse omrežne nastavitve? Tega dejanja ni mogoče razveljaviti."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Ponastavi nastavitve"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Želite ponastaviti?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Omrežne nastavitve so ponastavljene"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Ponastavi napravo"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ponastavitev na tovarniške nastavitve"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Izbriše vse podatke na tabličnem računalniku"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Izbriše vse podatke iz telefona"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1084,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izbriši vse podatke na kartici SD, na primer glasbo ali fotografije."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Ponastavi tablični računalnik"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ponastavi telefon"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Želite izbrisati vse osebne podatke in prenesene aplikacije? Tega dejanja ni mogoče razveljaviti."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Želite izbrisati vse osebne podatke in prenesene aplikacije? Tega dejanja ni mogoče razveljaviti."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Izbriši vse"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Če želite potrditi ponastavitev na tovarniške nastavitve, morate narisati vzorec za odklepanje."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Ponastavitev ni opravljena, ker storitev System Clear ni na voljo."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Želite ponastaviti?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ponastavitev na tovarniške nastavitve ni na voljo za tega uporabnika"</string>
@@ -1043,8 +1102,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ali želite izbrisati vse datoteke, shranjene na pomnilniku USB? Dejanja ni mogoče razveljaviti."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ali želite izbrisati vse datoteke, shranjene na kartici SD? Dejanja ni mogoče razveljaviti."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Izbriši vse"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Če želite potrditi brisanje pomnilnika USB, morate narisati vzorec za odklepanje."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Če želite potrditi brisanje kartice SD, morate narisati vzorec za odklepanje."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavitve klicanja"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavite telefonski predal, preusmeritev klicev, čakajoči klic, ID klicatelja"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Internet prek USB-ja"</string>
@@ -1076,7 +1133,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoč"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilna omrežja"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Naročniški paket za mobilno napravo"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Privzeta aplikacija za SMS-e"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikacija za SMS-je"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ali želite zamenjati aplikacijo za SMS-e?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Ali želite za SMS-e namesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> uporabljati aplikacijo <xliff:g id="NEW_APP">%1$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Ali želite za SMS-e uporabljati aplikacijo <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
@@ -1104,7 +1161,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Način ugotavljanja lokacije"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Uporaba GPS-ja, Wi-Fi-ja in mobilnih omrežij za določanje lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Uporaba Wi-Fi-ja in mobilnih omrežij za določanje lokacije"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Uporaba GPS-a za določanje lokacije"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Uporaba GPS-ja za določanje lokacije"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Iskanje"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Iskanje"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Iskanje omrežij Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Izboljšajte natančnost lokacijskih podatkov, tako da aplikacijam in storitvam omogočite iskanje omrežij Wi-Fi, tudi ko je povezava Wi-Fi izklopljena."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Iskanje naprav Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Izboljšajte natančnost lokacijskih podatkov, tako da sistemskim storitvam omogočite iskanje naprav Bluetooth, tudi ko je Bluetooth izklopljen."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokac. z Wi-Fi-jem in mob. om."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Aplikacijam omogočite hitrejše določanje lokacije z Googlovo storitvijo za določanje lokacije. Anonimni podatki o lokaciji bodo zbrani in poslani Googlu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Določanje lokacije z Wi‑Fi-jem"</string>
@@ -1150,11 +1213,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Geslo je nastavljeno"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Koda PIN je nastavljena"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Vzorec je nastavljen"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Varnost zaslona"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Če želite nadaljevati, uporabite vzorec za napravo."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Če želite nadaljevati, vnesite kodo PIN za napravo."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Če želite nadaljevati, vnesite geslo za napravo."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Varnost naprave"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Spremeni vzorec za odklepanje"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Spremeni kodo PIN za odklepanje"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potrdite shranjeni vzorec"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Poskusite znova:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nariši vzorec za odklepanje"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Če želite pomoč, pritisnite meni."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Ko končate, dvignite prst"</string>
@@ -1176,8 +1243,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nastavi vzorec za odklepanje"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Spremeni vzorec za odklepanje"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kako narisati vzorec za odklepanje"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Preveč napačnih poskusov!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Čez <xliff:g id="NUMBER">%d</xliff:g> sekund poskusite znova."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Preveč napačnih poskusov. Poskusite znova čez <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikacija ni nameščena v telefonu."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljaj aplikacije"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje in odstranjevanje nameščenih aplikacij"</string>
@@ -1228,6 +1294,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Razvrsti po velikosti"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Pokaži storitve, ki se izvajajo"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaži predpom. procese"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija v sili"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ponast. nast. aplikacije"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ponastavitev nastavitev?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"S tem se bodo ponastavile vse nastavitve za:\n\n "<li>"onemogočene aplikacije,"</li>\n" "<li>"obvestila za onemogočene aplikacije,"</li>\n" "<li>"privzete aplikacije za dejanja,"</li>\n" "<li>"omejitev prenosa podatkov v ozadju za aplikacije,"</li>\n" "<li>"omejitve dovoljenj."</li>\n\n" Podatkov iz aplikacij ne boste izgubili."</string>
@@ -1299,6 +1366,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Delovanje aplikacij"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Se izvaja"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikoli uporabljeno)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Ni privzetih aplikacij"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uporaba pomnilnika"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ogled pomnilnika, ki ga uporabljajo aplikacije"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Zagnane storitve"</string>
@@ -1396,17 +1464,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informacije o tabličnem računalniku"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informacije o telefonu"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informacije o bateriji"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Hitri zagon"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Nastavi bližnjice na tipkovnici za zagon aplikacij"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Določite aplikacijo"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Ni bližnjice"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Išči + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Počisti"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Bližnjica za aplikacijo <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) bo izbrisana."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"V redu"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Prekliči"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplikacije"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Bližnjice"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Vnos besedila"</string>
     <string name="input_method" msgid="5434026103176856164">"Vnosna metoda"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Trenutna tipkovnica"</string>
@@ -1441,23 +1498,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zajemi vse pakete Bluetooth HCI v datoteko"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Odklepanje OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Dovoli odklepanje zagonskega nalagalnika"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Vnesite kodo PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Če želite omogočiti odklepanje OEM, vnesite kodo PIN naprave"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Želite omogočiti odklepanje OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"OPOZORILO: Ko je vklopljena ta nastavitev, funkcije za zaščito naprave v tej napravi ne bodo delovale."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Velikosti medpomnilnikov zapisovalnika dnevnika"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Velik. zap. dnev. za medpom. dnev."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Dovoli lažne lokacije"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Dovoli lažne lokacije"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Omogoči pregled atributa pogleda"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Omrežja"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Potrdilo brezžičnega zaslona"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogoči podrob. zapis. dnevnika za Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Odločen prehod iz Wi-Fi-ja v mobil. omr."</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Vedno omogoči iskanje omrežij Wi-Fi za gostovanje"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Uporaba starejšega odjemalca DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaži možnosti za potrdilo brezžičnega zaslona"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Povečaj raven zapis. dnev. za Wi-Fi; v izbir. Wi‑Fi-ja pokaži glede na SSID RSSI"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Če je ta možnost omogočena, Wi-Fi odločneje preda podatkovno povezavo mobilnemu omrežju, ko je signal Wi-Fi šibek"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Omogoči/onemogoči iskanje omrežij Wi-Fi za gostovanje glede na količino podatkovnega prometa pri vmesniku"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Velikosti medpomnilnikov zapisovalnika dnevnika"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Velik. zap. dnev. za medpom. dnev."</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Izbira konfiguracije USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Izbira konfiguracije USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Dovoli lažne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dovoli lažne lokacije"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Omogoči pregled atributa pogleda"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Uporaba odjemalca DHCP za Lollipop namesto novega odjemalca DHCP za Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ali dovolite odpravljanje težav s povezavo USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Odpravljanje težav s povezavo USB je namenjeno samo za razvoj. Lahko ga uporabljate za kopiranje podatkov med računalnikom in napravo, nameščanje aplikacij v napravo brez obveščanja in branje podatkov v dnevniku."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Ali želite preklicati dostop do odpravljanja težav prek povezave USB iz vseh računalnikov, ki ste jih pooblastili?"</string>
@@ -1561,6 +1626,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Želite uporabiti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> mora:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Ker aplikacija zakriva zahtevo za dovoljenje, z nastavitvami ni mogoče preveriti vašega odziva."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Če vklopite storitev <xliff:g id="SERVICE">%1$s</xliff:g>, vaša naprava ne bo uporabljala zaklepanja zaslona za izboljšanje šifriranja podatkov."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Vaša naprava ne bo uporabljala zaklepanja zaslona za izboljšanje šifriranja podatkov, ker ste vklopili storitev za ljudi s posebnimi potrebami."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Ker vklop storitve <xliff:g id="SERVICE">%1$s</xliff:g> vpliva na šifriranje podatkov, morate potrditi vzorec."</string>
@@ -1702,14 +1768,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistični podatki o procesih"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistični podatki o procesih, ki se izvajajo"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Poraba pomnilnika"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Vrsta aplikacij: <xliff:g id="TYPE">%1$s</xliff:g> – časovno obdobje: <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Uporabljeno <xliff:g id="USEDRAM">%1$s</xliff:g> od <xliff:g id="TOTALRAM">%2$s</xliff:g> v obdobju <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"V ozadju"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"V ospredju"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Predpomnjeni"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Trenutno stanje pomnilnika naprave: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Povprečna uporaba RAM-a"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Največja uporaba RAM-a"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Sistem Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Izvorno"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Jedro"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Predpomnjeno"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Uporaba RAM-a"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Uporaba RAM-a (v ozadju)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Trajanje izvajanja"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Procesi"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Storitve"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trajanje"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Podrobnosti pomnilnika"</string>
@@ -1726,6 +1798,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 ur"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dan"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Prikaz sistemskih"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Skrivanje sistemskih procesov"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uporaba USS-ja"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Vrsta statističnih podatkov"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"V ozadju"</string>
@@ -1748,7 +1821,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Spodnje privzete nastavitve preglasijo nastavitve aplikacij"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Privzete nastavitve"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Privzeti mehanizem"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Nastavi mehanizem za sintezo govora, ki se bo uporabljal za branje besedila"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Nastavite mehanizem za sintezo govora na izgovorjeno besedilo"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Hitrost govora"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Hitrost govorjenega besedila"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Višina tona"</string>
@@ -1822,7 +1895,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Strojna"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Samo programska"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Za tega uporabnika niso na voljo poverilnice"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Če želite potrditi ponastavitev na tovarniške nastavitve, morate narisati vzorec za odklepanje."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Vnesite geslo za shrambo poverilnic."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutno geslo:"</string>
@@ -1847,12 +1919,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Varnostno kopiraj moje podatke"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Varnostno kopiranje podatkov aplikacij, gesel za Wi-Fi in drugih nastavitev v Googlove strežnike"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Varnostno kopiranje računa"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Trenutno v nobenem računu niso shranjeni varnostno kopirani podatki"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Vključi podatke aplikacije"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Samodejna obnovitev"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri vnovični namestitvi aplikacije obnovite varnostno kopirane nastavitve in podatke"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Storitev za varnostno kopiranje je nedejavna."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"To je nastavljeno s pravilnikom za naprave."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Geslo za varn. kop. rač."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Popolne varnostne kopije namizja trenutno niso zaščitene"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dotaknite se, če želite spremeniti ali odstraniti geslo za popolno varnostno kopiranje namizja."</string>
@@ -2024,6 +2094,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Merilo animacije prehoda"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Lestvica trajanja animacije"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simul. sekund. prikazov."</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Način z več okni"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Več hkratnih dejavnosti na zaslonu"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Ali želite omogočiti način z več okni?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"OPOZORILO: To je poskusna funkcija, ki prek uporabniškega vmesnika nedavnih aplikacij omogoča hkratno izvajanje več dejavnosti na zaslonu. Nekatere aplikacije se lahko pri uporabi te funkcije zrušijo ali pa ne bodo delovale pravilno."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikacije"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ne obdrži dejavnosti"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Uniči vsako dejavnost, ko uporabnik preneha z njo"</string>
@@ -2195,7 +2269,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Uporabnik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Omejen profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Dodajanje novega uporabnika?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"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_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>
@@ -2226,13 +2300,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Želite odstraniti gosta?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Vse aplikacije in podatki v tej seji bodo izbrisani."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Odstrani"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Omogočanje telefonskih klicev"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Omogočanje telefonskih klicev in SMS-jev"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Vklop telefonskih klicev"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Vklop telefonskih klicev in sporočil SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Odstranjevanje uporabnika"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Omogočanje telefonskih klicev?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Vklop telefonskih klicev?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Zgodovina klicev bo v skupni rabi s tem uporabnikom."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Omogočanje telefonskih klicev in SMS-jev?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Zgodovina klicev in SMS-jev bo v skupni rabi s tem uporabnikom."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vklop telefonskih klicev in sporočil SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Zgodovina klicev in sporočil SMS bo dana v skupno rabo s tem uporabnikom."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Omogočanje aplikacij in vsebine"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije z omejitvami"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Dodatne nastavitve za aplikacijo"</string>
@@ -2283,8 +2357,8 @@
     <string name="user_rename" msgid="8523499513614655279">"PREIMENOVANJE"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Nastavitev omejitev za aplikacijo"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Nadzira aplikacija <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ta aplikacija ni podprta za profile z omejitvami"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ta aplikacija lahko dostopa do vaših računov"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Ta aplikacija lahko dostopa do vaših računov. Upravlja jo aplikacija <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi in mobilna omrežja"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Dovoli spreminjanje nastavitev za Wi-Fi in mobilna omrežja"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2423,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi omrežna povezava"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"sporočilo SMS pošiljanje sporočil SMS sporočila SMS izmenjava sporočil SMS"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilno mobilni operater brezžični podatki 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi klic klicanje"</string>
     <string name="keywords_home" msgid="3626170808219458848">"zaganjalnik"</string>
     <string name="keywords_display" msgid="6709007669501628320">"zaslon zaslon na dotik"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"zatemnitev zaslona zaslon na dotik akumulator"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"zatemnitev zaslona zaslon na dotik akumulator"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ozadje prilagajanje prilagajanje po meri zaslon"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"temna tema nočni način zatemnitev zaslona preobrnitev svetlobe"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"ozadje prilagajanje prilagajanje po meri zaslon"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"velikost besedila"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projiciranje predvajanje"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"prostor disk trdi disk uporaba naprave"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"poraba energije polnjenje"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"črkovanje slovar preverjanje črkovanja samodejno popravljanje"</string>
@@ -2372,6 +2448,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"račun"</string>
     <string name="keywords_users" msgid="4673901601478559100">"omejitev omeji omejeno"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"popravljanje besedila pravilno zvok vibriranje samodejno jezik poteza predlaganje predlog tema žaljiva beseda vrsta znak emoji mednarodno"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"ponastavitev nastavitve privzeto"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"privzeta aplikacija za uporabo v sili"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplikacije prenos sistem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"varnost dovoljenj za aplikacije"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplikacije privzeto"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"podrsanje geslo vzorec pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavitev brezžič. oznake NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapiši"</string>
@@ -2386,11 +2467,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Glasnost alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Glasnost zvonjenja"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Glasnost obvestila"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Prekinitve"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Ob prejemu klicev in obvestil"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Vedno prekini"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Dovoli samo prednostne prekinitve"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne prekinjaj"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dovoljeno samo prednostno"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Samodejna pravila"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Samo prednostno"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Brez prekinitev"</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="ringtone_title" msgid="5379026328015343686">"Melodija zvonjenja telefona"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Privzeti ton zvonjenja za obvestila"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibriranje tudi za klice"</string>
@@ -2416,62 +2498,133 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibriranje"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Dostop do obvestil"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne morejo brati obvestil"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Aplikacija (%d) lahko bere obvestila"</item>
-    <item quantity="other" msgid="980049191810249052">"Aplikacije (%d) lahko berejo obvestila"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d aplikacija lahko bere obvestila</item>
+      <item quantity="two">%d aplikaciji lahko bereta obvestila</item>
+      <item quantity="few">%d aplikacije lahko berejo obvestila</item>
+      <item quantity="other">%d aplikacij lahko bere obvestila</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Ni nameščenih poslušalcev obvestil."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Želite omogočiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Poslušalec <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> bo lahko bral vsa obvestila, ki jih objavi sistem ali katera koli nameščena aplikacija, kar lahko vključuje osebne podatke, kot so imena stikov in besedilo sporočil, poslanih vam. Lahko bo tudi opustil ta obvestila ali se dotikal interaktivnih gumbov v njih."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Ponudniki pogojev"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nobena aplikacija ne ponuja pogojev"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplikacija ponuja pogoje"</item>
-    <item quantity="other" msgid="358057362115673258">"%d aplikacije ponujajo pogoje"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ni nameščenih ponudnikov pogojev."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Želite omogočiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Ponudnik pogojev <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> bo lahko dodal pogoje za izhod iz načina »Ne moti«."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blokiraj"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj vse"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikoli ne pokaži obvestil za to aplikacijo"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prednost"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Prikaži obvestila na vrhu seznama in jih prikazuj, ko ima naprava nastavljene samo prednostne prekinitve"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Občutljivo"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Ko je naprava zaklenjena, skrij občutljivo vsebino v obvestilih za to aplikacijo"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Obravnavanje kot prednostno"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Naj se slišijo obvestila te aplikacije, ko je funkcija »Ne moti« nastavljena na »Samo prednostno«"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Omogočanje kukanja"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Naj ta aplikacija poudari nekatera obvestila, tako da jih za hip pokaže na trenutnem zaslonu"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skrivanje občutljive vsebine"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Ko je naprava zaklenjena, skrij vsebino obvestil te aplikacije, ki bi lahko razkrivala zasebne podatke"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokirano"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prednost"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Občutljivo"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Končano"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Dokler tega ne izklopite"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prednostne prekinitve"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Čas nedelovanja"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dnevi"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nič"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Motnje so dovoljene"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Samo prednostno"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Brez"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Avtomatizacija"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Samodejni vklop"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Ime pravila"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Dodaj pravilo"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Izbris pravila"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Ž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>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Neznano"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfiguriranje pravila"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Pravilo razporeda"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Pravila ni mogoče najti."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dnevi"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Brez"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Vsak dan"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikoli"</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>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Klici"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Sporočila"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Klici/sporočila od:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Vsi"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Samo stiki"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Stiki, označeni z zvezdico"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Dogodki in opomniki"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmi so vedno prednostne prekinitve"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Opomniki"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Dogodki"</string>
+    <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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noči med tednom"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ura začetka"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ura konca"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ali kateri koli alarm prej"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan ali kateri koli alarm prej"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Prekinitve"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Ob prejemu klicev in obvestil"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kdaj želite, da se vas zmoti?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Za koliko časa?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Vedno prekini"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"izklopljeno,vse"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Dovoli samo prednostne prekinitve"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Dovoli samo alarme"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Ne prekinjaj"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Za nedoločen čas"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minuta</item>
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> minuti</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minute</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ura</item>
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> uri</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> ure</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ur</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Sprememba na samo prednostna obvestila za nedoločen čas"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> minuto do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> minuti do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> minute do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> minut do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> uro (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> uri (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> ure (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Sprememba na samo prednostna obvestila za <xliff:g id="DURATION">%1$d</xliff:g> ur (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Sprememba na samo alarme za nedoločen čas"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> minuto (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> minuti (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> minut (do <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">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> uro do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> uri do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> ure do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Sprememba na samo alarme za <xliff:g id="DURATION">%1$d</xliff:g> ur do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Sprememba na nastavitev ne prekinjaj za nedoločen čas"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> minuto (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="two">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> minuti (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> minute (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> minut (do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> uro do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="two">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> uri do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> ure do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Sprememba na nastavitev ne prekinjaj za <xliff:g id="DURATION">%1$d</xliff:g> ur do <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Sprememba na vedno prekini"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"za vedno"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obvestila aplikacij"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavitve obvestil"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošlji povratne info. o tej napravi"</string>
@@ -2512,4 +2665,69 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Podatki o IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Relativni podatki o IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Reža <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Privzeti zagon"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"Uporabljeno: <xliff:g id="SIZE">%1$s</xliff:g> – <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Povezave domene"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Odpiranje URL-jev domene"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Dovoli aplikaciji, da neposredno odpre URL-je domene"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Podprti URL-ji domene"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Druge privzete nastavitve"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"Uporabljeno: <xliff:g id="SIZE">%1$s</xliff:g> – <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"notranji pomnilnik"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"zunanji pomnilnik"</string>
+    <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">"Poraba 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="storage_used" msgid="7128074132917008743">"Uporabljena shramba"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Vklopljeno"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blokirano"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Občutljivo"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prednostno"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prednostno in občutljivo"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> odobreno dovoljenje</item>
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> odobreni dovoljenji</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> odobrena dovoljenja</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> odobrenih dovoljenj</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Število odobrenih dovoljenj: <xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="two">Število odobrenih dovoljenj: <xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="few">Število odobrenih dovoljenj: <xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Število odobrenih dovoljenj: <xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Nastavljene so nekatere privzete nastavitve"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Ni privzetih nastavitev"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Vse aplikacije"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Omogočeno"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Osebno"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Služba"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirano"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prednostno"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Občutljivo"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Z URL-ji domene"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Onemogočil skrbnik"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Dodatno"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Neznana aplikacija"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Izbira profila"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Dovoljenja za aplikacije"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Dod. dostop dovoljen toliko aplikacijam: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Dovoljenih je toliko aplikacij: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL-ji domene"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Ne odpre URL-jev domene"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Odpre domeno »<xliff:g id="DOMAIN">%s</xliff:g>«"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Odpre domeno »<xliff:g id="DOMAIN">%s</xliff:g>« in povezane URL-je"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija lahko odpre URL-je svoje domene</item>
+      <item quantity="two"><xliff:g id="COUNT">%d</xliff:g> aplikaciji lahko odpreta URL-je svoje domene</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacije lahko odprejo URL-je svoje domene</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacij lahko odpre URL-je svoje domene</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Ni prepoznano"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Privzete aplikacije"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Brskalnik"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Ni privzetega brskalnika"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Privzeto)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Shramba za aplikacije"</string>
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
new file mode 100644
index 0000000..e4152ae
--- /dev/null
+++ b/res/values-sq-rAL/strings.xml
@@ -0,0 +1,4986 @@
+<?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">
+    <!-- no translation found for yes (4676390750360727396) -->
+    <skip />
+    <!-- no translation found for no (6731231425810196216) -->
+    <skip />
+    <!-- no translation found for create (3578857613172647409) -->
+    <skip />
+    <!-- no translation found for allow (3349662621170855910) -->
+    <skip />
+    <!-- no translation found for deny (6947806159746484865) -->
+    <skip />
+    <!-- no translation found for device_info_default (7847265875578739287) -->
+    <skip />
+    <!-- no translation found for show_dev_countdown (7201398282729229649) -->
+    <!-- no translation found for show_dev_on (1110711554982716293) -->
+    <skip />
+    <!-- no translation found for show_dev_already (2151632240145446227) -->
+    <skip />
+    <!-- no translation found for header_category_wireless_networks (5110914332313954940) -->
+    <skip />
+    <!-- no translation found for header_category_connections (6471513040815680662) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_access (7580499097416970962) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
+    <!-- no translation found for turn_on_radio (8706561489788373676) -->
+    <skip />
+    <!-- no translation found for turn_off_radio (1820294552893884115) -->
+    <skip />
+    <!-- no translation found for sms_over_ims_on (5085290395865632925) -->
+    <skip />
+    <!-- no translation found for sms_over_ims_off (8354792045992793959) -->
+    <skip />
+    <!-- no translation found for ims_reg_required_on (3885152087309614653) -->
+    <skip />
+    <!-- no translation found for ims_reg_required_off (1720570343422743943) -->
+    <skip />
+    <!-- no translation found for volte_provisioned_flag_on (6023503159480902956) -->
+    <skip />
+    <!-- no translation found for volte_provisioned_flag_off (6168612015904744405) -->
+    <skip />
+    <!-- no translation found for lte_ram_dump_on (8568568019520172177) -->
+    <skip />
+    <!-- no translation found for lte_ram_dump_off (2514507918652378283) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewADN (8743377494429930831) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewFDN (7934301566925610318) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewSDN (7130280686244955669) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_getPDP (560610293888406317) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_in (1915416319177520020) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_out (5238736759641916278) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_emergency (2485604591272668370) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_off (1434084741785525415) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_in (9045363884600341051) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_not (2851853244069662307) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_idle (7489244938838742820) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_ringing (4883724645684297895) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_offhook (4174402846862780998) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_disconnected (1959735267890719418) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connecting (8404571440697917823) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connected (7074301157399238697) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_suspended (5315325487890334196) -->
+    <skip />
+    <!-- no translation found for radioInfo_unknown (737385314432468266) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_packets (8654359809877290639) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_bytes (4018206969492931883) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_dbm (3621221793699882781) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_asu (1422248392727818082) -->
+    <skip />
+    <!-- no translation found for radioInfo_lac (8415219164758307156) -->
+    <skip />
+    <!-- no translation found for radioInfo_cid (4362599198392643138) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (6325292633327972272) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (3364184561355611897) -->
+    <skip />
+    <!-- no translation found for sdcard_format (6285310523155166716) -->
+    <skip />
+    <!-- no translation found for sdcard_format (6713185532039187532) -->
+    <skip />
+    <!-- no translation found for small_font (2295331917424072635) -->
+    <skip />
+    <!-- no translation found for medium_font (2068475425515133701) -->
+    <skip />
+    <!-- no translation found for large_font (599055175160971446) -->
+    <skip />
+    <!-- no translation found for font_size_save (3450855718056759095) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (8281011784066476192) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (5922637503871474866) -->
+    <skip />
+    <!-- no translation found for battery_info_status_label (8109155295509700309) -->
+    <skip />
+    <!-- no translation found for battery_info_power_label (7465140230991349382) -->
+    <skip />
+    <!-- no translation found for battery_info_scale_label (3649763192389778437) -->
+    <skip />
+    <!-- no translation found for battery_info_level_label (8706526709307788737) -->
+    <skip />
+    <!-- no translation found for battery_info_health_label (6416051542741886958) -->
+    <skip />
+    <!-- no translation found for battery_info_technology_label (788304533220748681) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_label (8971764146757637863) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_units (8658490792208288107) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_label (1968383098818648037) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_units (9098950587249987550) -->
+    <skip />
+    <!-- no translation found for battery_info_uptime (5548545143573527992) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_battery (2557725975486185849) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_plugged (176716874713478188) -->
+    <skip />
+    <!-- no translation found for battery_info_screen_on (376277447175613889) -->
+    <skip />
+    <!-- no translation found for battery_info_status_unknown (196130600938058547) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging (1705179948350365604) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_ac (2909861890674399949) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_usb (2207489369680923929) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_wireless (3574032603735446573) -->
+    <skip />
+    <!-- no translation found for battery_info_status_discharging (310932812698268588) -->
+    <skip />
+    <!-- no translation found for battery_info_status_not_charging (2820070506621483576) -->
+    <skip />
+    <!-- no translation found for battery_info_status_full (2824614753861462808) -->
+    <skip />
+    <!-- no translation found for battery_info_power_unplugged (5987246575519551081) -->
+    <skip />
+    <!-- no translation found for battery_info_power_ac (6808516193001604634) -->
+    <skip />
+    <!-- no translation found for battery_info_power_usb (8012931702516331797) -->
+    <skip />
+    <!-- no translation found for battery_info_power_wireless (6819163295739305097) -->
+    <skip />
+    <!-- no translation found for battery_info_power_ac_usb (6777734146838328688) -->
+    <skip />
+    <!-- no translation found for battery_info_power_unknown (7344115502868899881) -->
+    <skip />
+    <!-- no translation found for battery_info_health_unknown (5664295556921944255) -->
+    <skip />
+    <!-- no translation found for battery_info_health_good (8070356565806711806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_overheat (8442959549291368806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_dead (1725917445762829059) -->
+    <skip />
+    <!-- no translation found for battery_info_health_over_voltage (2420269351664490121) -->
+    <skip />
+    <!-- no translation found for battery_info_health_unspecified_failure (6347021103185471590) -->
+    <skip />
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
+    <!-- no translation found for bluetooth (5549625000628014477) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (2849387702249327748) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility_timeout (8002247464357005429) -->
+    <skip />
+    <!-- no translation found for bluetooth_lock_voice_dialing (3139322992062086225) -->
+    <skip />
+    <!-- no translation found for bluetooth_lock_voice_dialing_summary (4741338867496787042) -->
+    <skip />
+    <!-- no translation found for bluetooth_devices (1886018064039454227) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_name (8415828355207423800) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_details (4594773497930028085) -->
+    <skip />
+    <!-- no translation found for bluetooth_profile_details (6823621790324933337) -->
+    <skip />
+    <!-- no translation found for bluetooth_name_not_set (2653752006416027426) -->
+    <skip />
+    <!-- no translation found for bluetooth_scan_for_devices (9214184305566815727) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_device (4352483834491958740) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
+    <skip />
+    <!-- no translation found for bluetooth_empty_list_user_restricted (1185354873716211496) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_disconnect_question (5334933802445256306) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting (16583128958125247) -->
+    <skip />
+    <!-- no translation found for bluetooth_disable_profile_title (5916643979709342557) -->
+    <skip />
+    <!-- no translation found for bluetooth_disable_profile_message (2895844842011809904) -->
+    <skip />
+    <string name="bluetooth_unknown" msgid="644716244548801421"></string>
+    <!-- no translation found for bluetooth_device (5291950341750186887) -->
+    <skip />
+    <!-- no translation found for progress_scanning (192587958424295789) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (1085232930277181436) -->
+    <skip />
+    <!-- no translation found for bluetooth_notif_ticker (4726721390078512173) -->
+    <skip />
+    <!-- no translation found for bluetooth_notif_title (2485175521845371514) -->
+    <skip />
+    <!-- no translation found for bluetooth_notif_message (5300852675110479862) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
+    <skip />
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
+    <!-- no translation found for bluetooth_permission_request (1523129741266262748) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement (1712443355224737143) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_discovery (786921566047356213) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_discovery (5510358858113713272) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (8863617309580598607) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (6487606808683607975) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_start_broadcast (3535628155254187911) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (8810858601242763295) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_explaination (4249322115655011799) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (3346529092809011149) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (4724094889807196118) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (989613204829097159) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6671615712909139801) -->
+    <skip />
+    <!-- no translation found for bluetooth_turning_on (4850574877288036646) -->
+    <skip />
+    <!-- no translation found for bluetooth_turning_off (2337747302892025192) -->
+    <skip />
+    <!-- no translation found for bluetooth_auto_connect (40711424456733571) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_permission_request (4747918249032890077) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_notif_message (3687933246423942977) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_dialog_text (8455427559949998023) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
+    <skip />
+    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (6555508756987053866) -->
+    <skip />
+    <!-- no translation found for bluetooth_remember_choice (6198284561603824931) -->
+    <skip />
+    <!-- no translation found for bluetooth_pb_remember_choice (2901499974259177202) -->
+    <skip />
+    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
+    <skip />
+    <!-- no translation found for bluetooth_map_acceptance_dialog_text (8712508202081143737) -->
+    <skip />
+    <!-- no translation found for date_and_time (9062980487860757694) -->
+    <skip />
+    <!-- no translation found for choose_timezone (1362834506479536274) -->
+    <skip />
+    <!-- no translation found for display_preview_label (1127597250917274792) -->
+    <skip />
+    <!-- no translation found for display_font_size_label (8941851418397475389) -->
+    <skip />
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <!-- no translation found for intent_sender_sendbroadcast_text (1415735148895872715) -->
+    <skip />
+    <!-- no translation found for intent_sender_action_label (616458370005452389) -->
+    <skip />
+    <!-- no translation found for intent_sender_startactivity_text (5080516029580421895) -->
+    <skip />
+    <!-- no translation found for intent_sender_resource_label (6963659726895482829) -->
+    <skip />
+    <!-- no translation found for intent_sender_account_label (465210404475603404) -->
+    <skip />
+    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
+    <skip />
+    <!-- no translation found for proxy_clear_text (5555400754952012657) -->
+    <skip />
+    <!-- no translation found for proxy_port_label (5655276502233453400) -->
+    <skip />
+    <!-- no translation found for proxy_exclusionlist_label (7700491504623418701) -->
+    <skip />
+    <!-- no translation found for proxy_exclusionlist_hint (6084099226687226948) -->
+    <skip />
+    <!-- no translation found for proxy_defaultView_text (6387985519141433291) -->
+    <skip />
+    <!-- no translation found for proxy_action_text (2957063145357903951) -->
+    <skip />
+    <!-- no translation found for proxy_hostname_label (8490171412999373362) -->
+    <skip />
+    <!-- no translation found for proxy_hostname_hint (2076157057003936176) -->
+    <skip />
+    <!-- no translation found for proxy_error (8926675299638611451) -->
+    <skip />
+    <!-- no translation found for proxy_error_dismiss (4993171795485460060) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_host (8052095511862922213) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_exclusion_list (6467799485443290961) -->
+    <skip />
+    <!-- no translation found for proxy_error_empty_port (5539106187558215246) -->
+    <skip />
+    <!-- no translation found for proxy_error_empty_host_set_port (2451694104858226781) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_port (2671425042711054494) -->
+    <skip />
+    <!-- no translation found for proxy_warning_limited_support (7229337138062837422) -->
+    <skip />
+    <!-- no translation found for proxy_url_title (7185282894936042359) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_location_label (16475158265551708) -->
+    <skip />
+    <!-- no translation found for radio_info_neighboring_location_label (2385625674055934880) -->
+    <skip />
+    <!-- no translation found for radio_info_cellinfo_label (1300937728020622362) -->
+    <skip />
+    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
+    <skip />
+    <!-- no translation found for radio_info_data_attempts_label (1731106244577323381) -->
+    <skip />
+    <!-- no translation found for radio_info_gprs_service_label (2331818110375395364) -->
+    <skip />
+    <!-- no translation found for radio_info_roaming_label (6141505430275138647) -->
+    <skip />
+    <!-- no translation found for radio_info_imei_label (1220524224732944192) -->
+    <skip />
+    <!-- no translation found for radio_info_call_redirect_label (1654674226961476872) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_resets_label (3241667824729310546) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_disconnects_label (1683069665736339820) -->
+    <skip />
+    <!-- no translation found for radio_info_current_network_label (3256402602440102610) -->
+    <skip />
+    <!-- no translation found for radio_info_data_successes_label (4417894113689054945) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_received_label (3345184342444878849) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_service_label (2082332114596916985) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_strength_label (1931937920896925766) -->
+    <skip />
+    <!-- no translation found for radio_info_call_status_label (4896238900685510883) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_sent_label (5009102250704375687) -->
+    <skip />
+    <!-- no translation found for radio_info_radio_resets_label (9211343458143291617) -->
+    <skip />
+    <!-- no translation found for radio_info_message_waiting_label (6981842420058672207) -->
+    <skip />
+    <!-- no translation found for radio_info_phone_number_label (7192944627907412169) -->
+    <skip />
+    <!-- no translation found for radio_info_band_mode_label (441469694142042022) -->
+    <skip />
+    <!-- no translation found for radio_info_network_type_label (3706382548257257987) -->
+    <skip />
+    <!-- no translation found for radio_info_set_perferred_label (9039200405863503267) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_ipaddr (498747917793263530) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_hostname (3054888474808217853) -->
+    <skip />
+    <!-- no translation found for radio_info_http_client_test (5733604021077701555) -->
+    <skip />
+    <!-- no translation found for ping_test_label (7255376471490860631) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_label (6399460520126501354) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_update_label (7258686760358791539) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_refresh_label (6902302130315125102) -->
+    <skip />
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
+    <!-- no translation found for oem_radio_info_label (6163141792477958941) -->
+    <skip />
+    <!-- no translation found for band_mode_title (954174198903776205) -->
+    <skip />
+    <!-- no translation found for band_mode_loading (548764766363847336) -->
+    <skip />
+    <!-- no translation found for band_mode_set (5730560180249458484) -->
+    <skip />
+    <!-- no translation found for band_mode_failed (1495968863884716379) -->
+    <skip />
+    <!-- no translation found for band_mode_succeeded (2701016190055887575) -->
+    <skip />
+    <!-- no translation found for sdcard_changes_instructions (4482324130377280131) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_screen_mass_storage_text (3741220147296482474) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_total_bytes_label (9184160745785062144) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (1636218515775929394) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (2048419626134861599) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_available_bytes_label (763232429899373001) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (7993410985895217054) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (2742075324087038036) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (9191210735703409245) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (6462544066195404905) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (7761390725880773697) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (5145797653495907970) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_used_bytes_label (8820289486001170836) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (7503429447676219564) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (2763464949274455656) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (3624143937437417788) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (4518291824764698112) -->
+    <skip />
+    <!-- no translation found for skip_label (47510779345218297) -->
+    <skip />
+    <!-- no translation found for next_label (4693520878012668114) -->
+    <skip />
+    <!-- no translation found for language_picker_title (5349877711342869319) -->
+    <skip />
+    <!-- no translation found for activity_picker_label (6295660302548177109) -->
+    <skip />
+    <!-- no translation found for device_info_label (6551553813651711205) -->
+    <skip />
+    <!-- no translation found for battery_info_label (4132685016148679403) -->
+    <skip />
+    <!-- no translation found for display_label (8074070940506840792) -->
+    <skip />
+    <!-- no translation found for phone_info_label (7820855350955963628) -->
+    <skip />
+    <!-- no translation found for phone_info_label (2127552523124277664) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (8101475181301178428) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (5743100901106177102) -->
+    <skip />
+    <!-- no translation found for proxy_settings_label (3271174136184391743) -->
+    <skip />
+    <!-- no translation found for cancel (6859253417269739139) -->
+    <skip />
+    <!-- no translation found for okay (1997666393121016642) -->
+    <skip />
+    <string name="forget" msgid="1400428660472591263">"Harro"</string>
+    <!-- no translation found for save (879993180139353333) -->
+    <skip />
+    <string name="done" msgid="6942539184162713160">"U krye!"</string>
+    <!-- no translation found for settings_label (1626402585530130914) -->
+    <skip />
+    <!-- no translation found for settings_label_launcher (8344735489639482340) -->
+    <skip />
+    <!-- no translation found for settings_shortcut (3936651951364030415) -->
+    <skip />
+    <!-- no translation found for airplane_mode (8837269988154128601) -->
+    <skip />
+    <!-- no translation found for radio_controls_title (3447085191369779032) -->
+    <skip />
+    <!-- no translation found for wireless_networks_settings_title (3643009077742794212) -->
+    <skip />
+    <!-- no translation found for radio_controls_summary (2837395036275123133) -->
+    <skip />
+    <!-- no translation found for cellular_data_title (2525947635539415202) -->
+    <skip />
+    <!-- no translation found for calls_title (3544471959217176768) -->
+    <skip />
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
+    <!-- no translation found for cellular_data_summary (4575500999626276446) -->
+    <skip />
+    <!-- no translation found for allow_data_usage_title (2238205944729213062) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (7625933694709170887) -->
+    <skip />
+    <!-- no translation found for roaming_warning_multiuser (6458990250829214777) -->
+    <skip />
+    <!-- no translation found for roaming_warning_multiuser (6368421100292355440) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (6068100976707316772) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (3616956422251879163) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title (3350640463596716780) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title_setup_wizard (2391530758339384324) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_summary (7095318986757583584) -->
+    <skip />
+    <!-- no translation found for date_time_auto (7076906458515908345) -->
+    <skip />
+    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
+    <skip />
+    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
+    <skip />
+    <!-- no translation found for zone_auto (334783869352026648) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
+    <skip />
+    <!-- no translation found for date_time_24hour_title (3203537578602803850) -->
+    <skip />
+    <!-- no translation found for date_time_24hour (1193032284921000063) -->
+    <skip />
+    <!-- no translation found for date_time_set_time_title (6296795651349047016) -->
+    <skip />
+    <!-- no translation found for date_time_set_time (5716856602742530696) -->
+    <skip />
+    <!-- no translation found for date_time_set_timezone_title (3047322337368233197) -->
+    <skip />
+    <!-- no translation found for date_time_set_timezone (5045627174274377814) -->
+    <skip />
+    <!-- no translation found for date_time_set_date_title (6928286765325608604) -->
+    <skip />
+    <!-- no translation found for date_time_set_date (7021491668550232105) -->
+    <skip />
+    <!-- no translation found for zone_list_menu_sort_alphabetically (5683377702671088588) -->
+    <skip />
+    <!-- no translation found for zone_list_menu_sort_by_timezone (2720190443744884114) -->
+    <skip />
+    <!-- no translation found for date_picker_title (1338210036394128512) -->
+    <skip />
+    <!-- no translation found for time_picker_title (483460752287255019) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout (4590337686681194648) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout_summary (6128431871360905631) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout_summary_with_exception (5579064842797188409) -->
+    <skip />
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
+    <!-- no translation found for security_enable_widgets_title (2754833397070967846) -->
+    <skip />
+    <!-- no translation found for security_enable_widgets_disabled_summary (1557090442377855233) -->
+    <skip />
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <!-- no translation found for owner_info_settings_edit_text_hint (4608681417960923911) -->
+    <skip />
+    <!-- no translation found for show_user_info_on_lockscreen_label (8408914624925608365) -->
+    <skip />
+    <!-- no translation found for user_info_settings_title (1195015434996724736) -->
+    <skip />
+    <!-- no translation found for show_profile_info_on_lockscreen_label (2741208907263877990) -->
+    <skip />
+    <!-- no translation found for profile_info_settings_title (3518603215935346604) -->
+    <skip />
+    <!-- no translation found for Accounts_settings_title (1643879107901699406) -->
+    <skip />
+    <!-- no translation found for location_settings_title (1369675479310751735) -->
+    <skip />
+    <!-- no translation found for account_settings_title (626177544686329806) -->
+    <skip />
+    <!-- no translation found for security_settings_title (7945465324818485460) -->
+    <skip />
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
+    <!-- no translation found for cdma_security_settings_summary (6068799952798901542) -->
+    <skip />
+    <!-- no translation found for security_passwords_title (2930627259125138363) -->
+    <skip />
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Gjurma e gishtit"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Menaxho gjurm. gishtit"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Përdor gjurmët për"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Shto"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"kyçja e ekranit"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> gjurma gishti u regjistruan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> gjurmë gishti u regjistrua</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Konfigurimi i gjurmës së gishtit"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Për të përdorur gjurmën e gishtit për të shkyçur ekranin ose për të konfirmuar blerjet, ne duhet që: \n\n✓ Të konfigurojmë metodën rezervë të kyçjes së ekranit \n\n✓ Të shtojmë gjurmën e gishtit tënd"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Gjej sensorin"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Gjej sensorin e gjurmës së gishtit në pjesën e pasme të telefonit"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Emri"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Në rregull"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Fshi"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Le të fillojmë!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Vendose gishtin mbi sensorin e gjurmës së gishtit. Ngrije pasi të ndjesh një dridhje."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Fantastike! Tani përsërite."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Vendos të njëjtin gisht mbi sensorin e gjurmës së gishtit dhe ngrije pasi të ndjesh një dridhje."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Gjurma e gishtit u shtua!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sa herë që shikon këtë ikonë, mund të përdorësh gjurmën e gishtit për identifikimin ose për të autorizuar një blerje."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Shto"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Përpara"</string>
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (2876073029767953111) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (5573427498609458721) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_low_charge_text (2029407131227814893) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (4785376766063053901) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (4071395977297369642) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_confirm_title (5100339496381875522) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (4453629424172409792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (5682944380460921880) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (6689952371032099350) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (951918761585534875) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_time_remaining (1655047311546745695) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_time_remaining (1862964662304683072) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_force_power_cycle (556504311511212648) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_force_power_cycle (1794353635603020327) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_warn_wipe (2738374897337991667) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_enter_password (2223340178473871064) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (7133499413023075961) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (4478225241476039013) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3083477162766772532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_data_corrupt_title (8759119849089795751) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_data_corrupt_summary (3775740783651700375) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_data_corrupt_summary (6898436151871328007) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_switch_input_method (4168332125223483198) -->
+    <skip />
+    <!-- no translation found for lock_settings_picker_title (1095755849152582712) -->
+    <skip />
+    <!-- no translation found for backup_lock_settings_picker_title (8530380598637963916) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (2084576942666016993) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (5045866882028324941) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_enable_summary (4791110798817242301) -->
+    <skip />
+    <!-- no translation found for unlock_backup_info_summary (108524727803788172) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_title (7117155352183088342) -->
+    <skip />
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <!-- no translation found for unlock_set_unlock_none_title (5679243878975864640) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (8914673583104628191) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (7062696666227725593) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (907878650556383388) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (8856220848940929546) -->
+    <skip />
+    <string name="current_screen_lock" msgid="4104091715420072219">"Kyçja aktuale e ekranit"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (2120729867788851674) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_off (5881952274566013651) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_none (8467360084676871617) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_pattern (7837270780919299289) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_pin (3541326261341386690) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_password (1203938057264146610) -->
+    <skip />
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Pasi të kesh konfiguruar një kyçje të ekranit, mund të konfigurosh po ashtu gjurmën e gishtit te Parametrat &gt; Siguria."</string>
+    <!-- no translation found for unlock_disable_lock_title (1427036227416979120) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_pattern_summary (6801602880568869201) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_pin_summary (8856842745366993387) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_password_summary (192161194564577025) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_pattern_title (2044092014872741130) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_pin_title (806629901095938484) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_password_title (5606298470358768865) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_too_short (7328975683669256660) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_short (1677649103470518953) -->
+    <skip />
+    <!-- no translation found for lockpassword_press_continue (122706614386757182) -->
+    <skip />
+    <!-- no translation found for lockpassword_continue_label (4602203784934526940) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_too_long (7016906583950201704) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6419879099090294052) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_contains_non_digits (1079053457942945709) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_recently_used (7909781183925861119) -->
+    <skip />
+    <!-- no translation found for lockpassword_illegal_character (8742901630116866738) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_alpha (5203836082520634764) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_digit (3958033271435659825) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_symbol (7226621405629726899) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_letters (5677371623980347934) -->
+    <!-- no translation found for lockpassword_password_requires_lowercase (5396846200894553640) -->
+    <!-- no translation found for lockpassword_password_requires_uppercase (2483949715040341677) -->
+    <!-- no translation found for lockpassword_password_requires_numeric (9156410893744210033) -->
+    <!-- no translation found for lockpassword_password_requires_symbols (5384442837439742233) -->
+    <!-- no translation found for lockpassword_password_requires_nonletter (4175064976268466293) -->
+    <!-- no translation found for lockpassword_password_recently_used (6098087796784262081) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_no_sequential_digits (6830610582179569631) -->
+    <skip />
+    <!-- no translation found for lockpassword_ok_label (313822574062553672) -->
+    <skip />
+    <!-- no translation found for lockpassword_cancel_label (8818529276331121899) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_cancel_label (6431583477570493261) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_continue_label (3559793618653400434) -->
+    <skip />
+    <!-- no translation found for lock_setup (3355847066343753943) -->
+    <!-- no translation found for lock_setup (5507462851158901718) -->
+    <skip />
+    <!-- no translation found for device_admin_title (3562216873644263804) -->
+    <skip />
+    <!-- no translation found for manage_device_admin (5059296715271077278) -->
+    <skip />
+    <!-- no translation found for manage_device_admin_summary (7672709110988761075) -->
+    <skip />
+    <!-- no translation found for manage_trust_agents (4629279457536987768) -->
+    <skip />
+    <!-- no translation found for disabled_because_no_backup_security (6877660253409580377) -->
+    <skip />
+    <!-- no translation found for manage_trust_agents_summary (6804319935640148441) -->
+    <skip />
+    <!-- no translation found for bluetooth_quick_toggle_title (1037056952714061893) -->
+    <skip />
+    <!-- no translation found for bluetooth_quick_toggle_summary (5293641680139873341) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings (1810521656168174329) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_title (1908745291161353016) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_summary (2091062709530570462) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_request (6385750334766370310) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_pin_msg (4954085254142996877) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_key_msg (333005542843637754) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (6813273136442138444) -->
+    <skip />
+    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
+    <skip />
+    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_pin_other_device (4637977124526813470) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_other_device (2798719004030279602) -->
+    <skip />
+    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
+    <skip />
+    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
+    <skip />
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (2796550001376088433) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_will_share_phonebook (4982239145676394429) -->
+    <skip />
+    <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
+    <!-- no translation found for bluetooth_connecting_error_message (229861986106185022) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_scan_title (2277464653118896016) -->
+    <skip />
+    <!-- no translation found for bluetooth_search_for_devices (2754007356491461674) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_device_settings (907776049862799122) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_title (8875124878198774180) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_name_label (8111146086595617285) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_internet_option (7112953286863428412) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_keyboard_option (2271954176947879628) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_dialog_contacts_option (7747163316331917594) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_dialog_title (1417255032435317301) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_dialog_sharing_phonebook_title (7664141669886358618) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_dialog_contants_request (5531109163573611348) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_dialog_paring_request (8451248193517851958) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_devices (1970524193086791964) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_found_devices (1647983835063249680) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_no_found_devices (7594339669961811591) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_connect (3997659895003244941) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_disconnect (8220072022970148683) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_pair_connect (7611522504813927727) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_unpair (662992425948536144) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_disconnect_unpair (7644014238070043798) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_context_connect_advanced (2643129703569788771) -->
+    <skip />
+    <!-- no translation found for bluetooth_menu_advanced (8572178316357220524) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_titlebar (2142159726881547669) -->
+    <skip />
+    <!-- no translation found for bluetooth_empty_list_bluetooth_off (6351930724051893423) -->
+    <skip />
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Për të përmirësuar saktësinë e vendndodhjes, aplikacionet dhe shërbimet do të skanojnë për pajisje Bluetooth, edhe kur Bluetooth është joaktiv. Këtë mund ta ndryshosh te <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>parametrat e skanimit<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <!-- no translation found for bluetooth_connect_specific_profiles_title (6952214406025825164) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_hid_profile (3282295189719352075) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_user_profile (8037627994382458698) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5455448395850929200) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5266851881175033601) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_title (6066342531927499308) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_online_mode_title (3689050071425683114) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_online_mode_summary (1204424107263248336) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_profile_header_title (102745381968579605) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_rename_device (5148578059584955791) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_enable_opp_title (8222550640371627365) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_user_profile_summary_connected (4602294638909590612) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_nap_profile_summary_connected (1561383706411975199) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings (3218335822716052885) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_title (5543069893044375188) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_headset (1001821426078644650) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_a2dp (8791004998846630574) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_remember (5551459057010609115) -->
+    <skip />
+    <!-- no translation found for wifi_assistant_title (2553267316621598101) -->
+    <skip />
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmeto"</string>
+    <!-- no translation found for wifi_display_enable_menu_item (4883036464138167674) -->
+    <skip />
+    <!-- no translation found for wifi_display_no_devices_found (1382012407154143453) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_connecting (5688608834000748607) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_connected (8364125226376985558) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_not_available (5714978725794210102) -->
+    <skip />
+    <!-- no translation found for wifi_display_details (7791118209992162698) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_title (5740656401635054838) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_forget (9119048225398894580) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_done (5703116500357822557) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_name (4756080222307467898) -->
+    <skip />
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_title (6769159366307299004) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_summary (8302974395787498915) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_summary (5237208142892767592) -->
+    <skip />
+    <!-- no translation found for android_beam_settings_title (7832812974600338649) -->
+    <skip />
+    <!-- no translation found for android_beam_on_summary (3618057099355636830) -->
+    <skip />
+    <!-- no translation found for android_beam_off_summary (4663095428454779138) -->
+    <skip />
+    <!-- no translation found for android_beam_disabled_summary (1737782116894793393) -->
+    <skip />
+    <!-- no translation found for android_beam_label (6257036050366775040) -->
+    <skip />
+    <!-- no translation found for android_beam_explained (6981652347448777459) -->
+    <skip />
+    <!-- no translation found for nsd_quick_toggle_title (3125572815278848258) -->
+    <skip />
+    <!-- no translation found for nsd_quick_toggle_summary (155692215972781276) -->
+    <skip />
+    <!-- no translation found for wifi_quick_toggle_title (8850161330437693895) -->
+    <skip />
+    <!-- no translation found for wifi_quick_toggle_summary (2696547080481267642) -->
+    <skip />
+    <!-- no translation found for wifi_settings (29722149822540994) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (8719175790520448014) -->
+    <skip />
+    <!-- no translation found for wifi_settings_title (3103415012485692233) -->
+    <skip />
+    <!-- no translation found for wifi_settings_summary (668767638556052820) -->
+    <skip />
+    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
+    <skip />
+    <!-- no translation found for wifi_select_network (4210954938345463209) -->
+    <skip />
+    <!-- no translation found for wifi_starting (6732377932749942954) -->
+    <skip />
+    <!-- no translation found for wifi_stopping (8952524572499500804) -->
+    <skip />
+    <!-- no translation found for wifi_error (3207971103917128179) -->
+    <skip />
+    <!-- no translation found for wifi_in_airplane_mode (8652520421778203796) -->
+    <skip />
+    <!-- no translation found for wifi_notify_open_networks (3755768188029653293) -->
+    <skip />
+    <!-- no translation found for wifi_notify_open_networks_summary (3716818008370391253) -->
+    <skip />
+    <!-- no translation found for wifi_poor_network_detection (4925789238170207169) -->
+    <skip />
+    <!-- no translation found for wifi_poor_network_detection_summary (7843672905900544785) -->
+    <skip />
+    <!-- no translation found for wifi_avoid_poor_network_detection_summary (4674423884870027498) -->
+    <skip />
+    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
+    <skip />
+    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
+    <skip />
+    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
+    <skip />
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
+    <skip />
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Për të përmirësuar saktësinë e vendndodhjes, aplikacionet dhe shërbimet do të skanojnë për rrjetet Wi‑Fi, edhe kur Wi‑Fi është joaktiv. Këtë mund ta ndryshosh te <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>parametrat e skanimit<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <!-- no translation found for wifi_scan_notify_remember_choice (5340097010842405981) -->
+    <skip />
+    <!-- no translation found for wifi_setting_sleep_policy_title (5149574280392680092) -->
+    <skip />
+    <!-- no translation found for wifi_setting_on_during_sleep_title (8308975500029751565) -->
+    <skip />
+    <!-- no translation found for wifi_setting_sleep_policy_error (8174902072673071961) -->
+    <skip />
+    <!-- no translation found for wifi_suspend_efficiency_title (2338325886934703895) -->
+    <skip />
+    <!-- no translation found for wifi_suspend_optimizations (1220174276403689487) -->
+    <skip />
+    <!-- no translation found for wifi_suspend_optimizations_summary (4151428966089116856) -->
+    <skip />
+    <!-- no translation found for wifi_limit_optimizations_summary (9000801068363468950) -->
+    <skip />
+    <!-- no translation found for wifi_add_network (6234851776910938957) -->
+    <skip />
+    <!-- no translation found for wifi_access_points (7053990007031968609) -->
+    <skip />
+    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
+    <skip />
+    <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
+    <skip />
+    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
+    <skip />
+    <!-- no translation found for wifi_menu_p2p (7619851399250896797) -->
+    <skip />
+    <!-- no translation found for wifi_menu_scan (1470911530412095868) -->
+    <skip />
+    <!-- no translation found for wifi_menu_advanced (7522252991919573664) -->
+    <skip />
+    <!-- no translation found for wifi_menu_connect (4996220309848349408) -->
+    <skip />
+    <!-- no translation found for wifi_menu_remember (8814185749388713796) -->
+    <skip />
+    <!-- no translation found for wifi_menu_forget (8736964302477327114) -->
+    <skip />
+    <!-- no translation found for wifi_menu_modify (2068554918652440105) -->
+    <skip />
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
+    <!-- no translation found for wifi_empty_list_wifi_off (8056223875951079463) -->
+    <skip />
+    <!-- no translation found for wifi_empty_list_wifi_on (8746108031587976356) -->
+    <skip />
+    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
+    <skip />
+    <!-- no translation found for wifi_other_network (1484433183857764750) -->
+    <skip />
+    <!-- no translation found for wifi_more (3195296805089107950) -->
+    <skip />
+    <!-- no translation found for wifi_setup_wps (8128702488486283957) -->
+    <skip />
+    <!-- no translation found for wifi_show_advanced (3409422789616520979) -->
+    <skip />
+    <!-- no translation found for wifi_wps_setup_title (8207552222481570175) -->
+    <skip />
+    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
+    <skip />
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Shtyp butonin Konfigurimi i mbrojtur i Wi‑Fi në rrugëzuesin tënd. Ai mund të quhet \"WPS\" ose mund të jetë i shënuar me këtë simbol:"</string>
+    <!-- no translation found for wifi_wps_onstart_pin (223344506445335358) -->
+    <skip />
+    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
+    <skip />
+    <!-- no translation found for wifi_wps_connected (7153432445748931183) -->
+    <skip />
+    <!-- no translation found for wifi_wps_in_progress (3372311348221357944) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
+    <skip />
+    <!-- no translation found for wifi_ssid (5519636102673067319) -->
+    <skip />
+    <!-- no translation found for wifi_ssid_hint (897593601067321355) -->
+    <skip />
+    <!-- no translation found for wifi_security (6603611185592956936) -->
+    <skip />
+    <!-- no translation found for wifi_signal (5514120261628065287) -->
+    <skip />
+    <!-- no translation found for wifi_status (4824568012414605414) -->
+    <skip />
+    <!-- no translation found for wifi_speed (3526198708812322037) -->
+    <skip />
+    <!-- no translation found for wifi_frequency (7791090119577812214) -->
+    <skip />
+    <!-- no translation found for wifi_ip_address (1440054061044402918) -->
+    <skip />
+    <!-- no translation found for wifi_eap_method (8529436133640730382) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for wifi_eap_ca_cert (3521574865488892851) -->
+    <skip />
+    <!-- no translation found for wifi_eap_user_cert (1291089413368160789) -->
+    <skip />
+    <!-- no translation found for wifi_eap_identity (4359453783379679103) -->
+    <skip />
+    <!-- no translation found for wifi_eap_anonymous (2989469344116577955) -->
+    <skip />
+    <!-- no translation found for wifi_password (5948219759936151048) -->
+    <skip />
+    <!-- no translation found for wifi_show_password (6461249871236968884) -->
+    <skip />
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfiguro brezin AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Brezi 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Brezi 5 GHz"</string>
+    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
+    <skip />
+    <!-- no translation found for wifi_unchanged (3410422020930397102) -->
+    <skip />
+    <!-- no translation found for wifi_unspecified (5431501214192991253) -->
+    <skip />
+    <!-- no translation found for wifi_wps_available_first_item (4422547079984583502) -->
+    <skip />
+    <!-- no translation found for wifi_wps_available_second_item (8427520131718215301) -->
+    <skip />
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_turnon_message (203123538572122989) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_turnoff_message (5538901671131941043) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_confirm_allow (5355973075896817232) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_confirm_deny (4463982053823520710) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_title (7726205804813286950) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_message (3673833421453455747) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_connect (5065506390164939225) -->
+    <skip />
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Ky rrjet nuk ka qasje në internet. Të përdoret ky rrjet prapëseprapë?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Mos pyet përsëri për këtë rrjet"</string>
+    <!-- no translation found for wifi_connect (1076622875777072845) -->
+    <skip />
+    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
+    <skip />
+    <!-- no translation found for wifi_forget (8168174695608386644) -->
+    <skip />
+    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
+    <skip />
+    <!-- no translation found for wifi_save (3331121567988522826) -->
+    <skip />
+    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
+    <skip />
+    <!-- no translation found for wifi_cancel (6763568902542968964) -->
+    <skip />
+    <!-- no translation found for wifi_skip_anyway (6965361454438011190) -->
+    <skip />
+    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
+    <skip />
+    <!-- no translation found for wifi_skipped_message (6761689889733331124) -->
+    <skip />
+    <!-- no translation found for wifi_skipped_message (1385490367826852775) -->
+    <skip />
+    <!-- no translation found for wifi_skipped_message (6084295135297772350) -->
+    <skip />
+    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
+    <skip />
+    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
+    <skip />
+    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
+    <skip />
+    <!-- no translation found for wifi_connect_failed_message (4474691090681670156) -->
+    <skip />
+    <!-- no translation found for wifi_connect_failed_message (8870885845666880869) -->
+    <skip />
+    <!-- no translation found for wifi_connect_failed_message (2185803140161396572) -->
+    <skip />
+    <!-- no translation found for wifi_saved_access_points_titlebar (2996149477240134064) -->
+    <skip />
+    <!-- no translation found for wifi_advanced_titlebar (4485841401774142908) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_title (3655327399028584656) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_error (837281974489794378) -->
+    <skip />
+    <!-- no translation found for wifi_advanced_mac_address_title (6571335466330978393) -->
+    <skip />
+    <!-- no translation found for wifi_advanced_ip_address_title (6215297094363164846) -->
+    <skip />
+    <!-- no translation found for wifi_saved_access_points_label (2013409399392285262) -->
+    <skip />
+    <!-- no translation found for wifi_advanced_settings_label (3654366894867838338) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_save (7296724066102908366) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_cancel (6582567330136502340) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (2513142355364274970) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (8164264988361096450) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (8744583948328391047) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (40470058023181052) -->
+    <skip />
+    <!-- no translation found for wifi_dns1 (7344118050720080045) -->
+    <skip />
+    <!-- no translation found for wifi_dns2 (1368601006824882659) -->
+    <skip />
+    <!-- no translation found for wifi_gateway (163914742461092086) -->
+    <skip />
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_settings_title (5444461191435291082) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_device_info (3191876744469364173) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_search (3436429984738771974) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_searching (2396704492143633876) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_rename (8448896306960060415) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_peer_devices (299526878463303432) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_failed_connect_message (8921447388048243547) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_failed_rename_message (2562182284946936380) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_disconnect_title (3216846049677448420) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_disconnect_message (8227342771610125771) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_disconnect_multiple_message (3283805371034883105) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_cancel_connect_title (255267538099324413) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_cancel_connect_message (7477756213423749402) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (834559380069647086) -->
+    <skip />
+    <!-- no translation found for wifi_tether_checkbox_text (1847167643625779136) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_checkbox_text (7763495093333664887) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_checkbox_text_summary (3800646230853724318) -->
+    <skip />
+    <!-- no translation found for wifi_tether_starting (1322237938998639724) -->
+    <skip />
+    <!-- no translation found for wifi_tether_stopping (4835852171686388107) -->
+    <skip />
+    <!-- no translation found for wifi_tether_enabled_subtext (8948641212931906143) -->
+    <skip />
+    <!-- no translation found for wifi_tether_failed_subtext (1484941858530919002) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_ap_text (7974681394041609308) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_configure_ap_text (5478614731464220432) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_configure_ap_text_summary (5618031116920832182) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_subtext (7957547035983257748) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_ssid_default (8467525402622138547) -->
+    <skip />
+    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Telefonata me Wi-Fi"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferenca e telefonatës"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modaliteti i telefonatës me Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Preferohet Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Preferohet rrjeti celular"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Kur telefonata me Wi-Fi është e aktivizuar, telefoni t\'i kalojë telefonatat nëpërmjet rrjeteve Wi-Fi ose nëpërmjet rrjetit të operatorit tënd celular, në varësi të preferencës tënde 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>
+    <!-- no translation found for home_settings (212375129455718176) -->
+    <skip />
+    <!-- no translation found for display_settings_title (1708697328627382561) -->
+    <skip />
+    <!-- no translation found for sound_settings (5534671337768745343) -->
+    <skip />
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <!-- no translation found for all_volume_title (4296957391257836961) -->
+    <skip />
+    <!-- no translation found for musicfx_title (3415566786340790345) -->
+    <skip />
+    <!-- no translation found for ring_volume_title (7938706566797464165) -->
+    <skip />
+    <!-- no translation found for vibrate_in_silent_title (3897968069156767036) -->
+    <skip />
+    <!-- no translation found for notification_sound_title (5137483249425507572) -->
+    <skip />
+    <!-- no translation found for incoming_call_volume_title (8073714801365904099) -->
+    <skip />
+    <!-- no translation found for notification_volume_title (2012640760341080408) -->
+    <skip />
+    <!-- no translation found for checkbox_notification_same_as_incoming_call (1073644356290338921) -->
+    <skip />
+    <!-- no translation found for home_work_profile_not_supported (1357721012342357037) -->
+    <skip />
+    <!-- no translation found for notification_sound_dialog_title (3805140135741385667) -->
+    <skip />
+    <!-- no translation found for media_volume_title (3576565767317118106) -->
+    <skip />
+    <!-- no translation found for media_volume_summary (5363248930648849974) -->
+    <skip />
+    <!-- no translation found for alarm_volume_title (2285597478377758706) -->
+    <skip />
+    <!-- no translation found for dock_settings_summary (455802113668982481) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (8533399267725365088) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_title (1171590821131077296) -->
+    <skip />
+    <!-- no translation found for lock_sounds_enable_title (450098505659399520) -->
+    <skip />
+    <!-- no translation found for haptic_feedback_enable_title (2438293710530828760) -->
+    <skip />
+    <!-- no translation found for audio_record_proc_title (4271091199976457534) -->
+    <skip />
+    <!-- no translation found for volume_media_description (7949355934788807863) -->
+    <skip />
+    <!-- no translation found for volume_ring_description (5936851631698298989) -->
+    <skip />
+    <!-- no translation found for volume_notification_description (5810902320215328321) -->
+    <skip />
+    <!-- no translation found for volume_alarm_description (8322615148532654841) -->
+    <skip />
+    <!-- no translation found for volume_ring_mute (3018992671608737202) -->
+    <skip />
+    <!-- no translation found for volume_media_mute (3399059928695998166) -->
+    <skip />
+    <!-- no translation found for volume_notification_mute (7955193480006444159) -->
+    <skip />
+    <!-- no translation found for volume_alarm_mute (4452239420351035936) -->
+    <skip />
+    <!-- no translation found for dock_settings (1820107306693002541) -->
+    <skip />
+    <!-- no translation found for dock_settings_title (9161438664257429372) -->
+    <skip />
+    <!-- no translation found for dock_audio_settings_title (3324750259959570305) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_desk (6487784412371139335) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_car (6740897586006248450) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_none (8215337394914283607) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_none (289909253741048784) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_unknown (4465059868974255693) -->
+    <skip />
+    <!-- no translation found for dock_not_found_title (3290961741828952424) -->
+    <skip />
+    <!-- no translation found for dock_not_found_text (8405432495282299143) -->
+    <skip />
+    <!-- no translation found for dock_not_found_text (1460497923342627801) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_title (885839627097024110) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_on (838102386448981339) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_on (8491180514199743771) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_off (5077843049805652363) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_off (3151046599205265919) -->
+    <skip />
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
+    <!-- no translation found for category_personal (1299663247844969448) -->
+    <skip />
+    <!-- no translation found for category_work (8699184680584175622) -->
+    <skip />
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
+    <!-- no translation found for display_settings (7965901687241669598) -->
+    <skip />
+    <!-- no translation found for accelerometer_title (7854608399547349157) -->
+    <skip />
+    <!-- no translation found for accelerometer_summary_on (429982132339828942) -->
+    <skip />
+    <!-- no translation found for accelerometer_summary_on (1133737282813048021) -->
+    <skip />
+    <!-- no translation found for accelerometer_summary_off (4781734213242521682) -->
+    <skip />
+    <!-- no translation found for accelerometer_summary_off (5485489363715740761) -->
+    <skip />
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
+    <!-- no translation found for brightness_title (5746272622112982836) -->
+    <skip />
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"E ndriçuar"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"E errët"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatike"</string>
+    <!-- no translation found for screen_timeout (4351334843529712571) -->
+    <skip />
+    <!-- no translation found for screen_timeout_title (5130038655092628247) -->
+    <skip />
+    <!-- no translation found for screen_timeout_summary (327761329263064327) -->
+    <skip />
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <!-- no translation found for wallpaper_settings_fragment_title (519078346877860129) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_disabled_prompt (3857507943322777651) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_when_to_dream (8352267826043957746) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_dream_start (4998187847985120168) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
+    <skip />
+    <!-- no translation found for automatic_brightness (5014143533884135461) -->
+    <skip />
+    <!-- no translation found for lift_to_wake_title (4555378006856277635) -->
+    <skip />
+    <!-- no translation found for doze_title (2259176504273878294) -->
+    <skip />
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
+    <!-- no translation found for title_font_size (4405544325522105222) -->
+    <skip />
+    <!-- no translation found for dialog_title_font_size (2231507851258955038) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings (3392331196873564292) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_category (5136244267576697004) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_title (9018585580955414596) -->
+    <skip />
+    <!-- no translation found for sim_pin_toggle (1742123478029451888) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (5058355081270397764) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (2503536505568814324) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (2813800553917012356) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (258981978215428916) -->
+    <skip />
+    <!-- no translation found for sim_pin_change (6311414184279932368) -->
+    <skip />
+    <!-- no translation found for sim_enter_pin (6608715137008508432) -->
+    <skip />
+    <!-- no translation found for sim_enable_sim_lock (4517742794997166918) -->
+    <skip />
+    <!-- no translation found for sim_disable_sim_lock (7664729528754784824) -->
+    <skip />
+    <!-- no translation found for sim_enter_old (6074196344494634348) -->
+    <skip />
+    <!-- no translation found for sim_enter_new (8742727032729243562) -->
+    <skip />
+    <!-- no translation found for sim_reenter_new (6523819386793546888) -->
+    <skip />
+    <!-- no translation found for sim_change_pin (7328607264898359112) -->
+    <skip />
+    <!-- no translation found for sim_bad_pin (2345230873496357977) -->
+    <skip />
+    <!-- no translation found for sim_pins_dont_match (8449681619822460312) -->
+    <skip />
+    <!-- no translation found for sim_change_failed (304964924772218382) -->
+    <skip />
+    <!-- no translation found for sim_change_succeeded (8556135413096489627) -->
+    <skip />
+    <!-- no translation found for sim_lock_failed (5651596916127873626) -->
+    <skip />
+    <!-- no translation found for sim_enter_ok (6475946836899218919) -->
+    <skip />
+    <!-- no translation found for sim_enter_cancel (6240422158517208036) -->
+    <skip />
+    <!-- no translation found for sim_multi_sims_title (9159427879911231239) -->
+    <skip />
+    <!-- no translation found for sim_multi_sims_summary (7018740080801483990) -->
+    <skip />
+    <!-- no translation found for sim_change_data_title (294357201685244532) -->
+    <skip />
+    <!-- no translation found for sim_change_data_message (1313940695939674633) -->
+    <skip />
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
+    <!-- no translation found for wrong_pin_code_pukked (4003655226832658066) -->
+    <skip />
+    <!-- no translation found for wrong_pin_code (1582398808893048097) -->
+    <!-- no translation found for pin_failed (1848423634948587645) -->
+    <skip />
+    <!-- no translation found for device_info_settings (1119755927536987178) -->
+    <skip />
+    <!-- no translation found for device_info_settings (475872867864762157) -->
+    <skip />
+    <!-- no translation found for system_update_settings_list_item_title (3342887311059985961) -->
+    <skip />
+    <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
+    <!-- no translation found for firmware_version (4801135784886859972) -->
+    <skip />
+    <!-- no translation found for model_number (3765737700545384794) -->
+    <skip />
+    <!-- no translation found for fcc_equipment_id (149114368246356737) -->
+    <skip />
+    <!-- no translation found for baseband_version (1848990160763524801) -->
+    <skip />
+    <!-- no translation found for kernel_version (9192574954196167602) -->
+    <skip />
+    <!-- no translation found for build_number (3075795840572241758) -->
+    <skip />
+    <!-- no translation found for selinux_status (6212165375172061672) -->
+    <skip />
+    <!-- no translation found for device_info_not_available (8062521887156825182) -->
+    <skip />
+    <!-- no translation found for device_status_activity_title (1411201799384697904) -->
+    <skip />
+    <!-- no translation found for device_status (607405385799807324) -->
+    <skip />
+    <!-- no translation found for device_status_summary (3292717754497039686) -->
+    <skip />
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
+    <!-- no translation found for storage_settings (4211799979832404953) -->
+    <skip />
+    <!-- no translation found for storage_settings_title (8746016738388094064) -->
+    <skip />
+    <!-- no translation found for storage_settings_summary (3543813623294870759) -->
+    <skip />
+    <!-- no translation found for storage_settings_summary (9176693537325988610) -->
+    <skip />
+    <!-- no translation found for status_number (1138837891091222272) -->
+    <skip />
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_msid_number (909010114445780530) -->
+    <skip />
+    <!-- no translation found for status_prl_version (1007470446618081441) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
+    <!-- no translation found for status_icc_id (943368755577172747) -->
+    <skip />
+    <!-- no translation found for status_network_type (952552009117455166) -->
+    <skip />
+    <!-- no translation found for status_latest_area_info (7222470836568238054) -->
+    <skip />
+    <!-- no translation found for status_data_state (4578972321533789767) -->
+    <skip />
+    <!-- no translation found for status_service_state (2323931627519429503) -->
+    <skip />
+    <!-- no translation found for status_signal_strength (3732655254188304547) -->
+    <skip />
+    <!-- no translation found for status_roaming (2638800467430913403) -->
+    <skip />
+    <!-- no translation found for status_operator (2274875196954742087) -->
+    <skip />
+    <!-- no translation found for status_wifi_mac_address (2202206684020765378) -->
+    <skip />
+    <!-- no translation found for status_bt_address (4195174192087439720) -->
+    <skip />
+    <!-- no translation found for status_serial_number (2257111183374628137) -->
+    <skip />
+    <!-- no translation found for status_unavailable (7862009036663793314) -->
+    <skip />
+    <!-- no translation found for status_up_time (7294859476816760399) -->
+    <skip />
+    <!-- no translation found for status_awake_time (2393949909051183652) -->
+    <skip />
+    <!-- no translation found for internal_memory (9129595691484260784) -->
+    <skip />
+    <!-- no translation found for sd_memory (2510246194083052841) -->
+    <skip />
+    <!-- no translation found for sd_memory (151871913888051515) -->
+    <skip />
+    <!-- no translation found for memory_available (5052397223077021181) -->
+    <skip />
+    <!-- no translation found for memory_available_read_only (6497534390167920206) -->
+    <skip />
+    <!-- no translation found for memory_size (6629067715017232195) -->
+    <skip />
+    <!-- no translation found for memory_calculating_size (2188358544203768588) -->
+    <skip />
+    <!-- no translation found for memory_apps_usage (5128673488173839077) -->
+    <skip />
+    <!-- no translation found for memory_media_usage (3738830697707880405) -->
+    <skip />
+    <!-- no translation found for memory_downloads_usage (3755173051677533027) -->
+    <skip />
+    <!-- no translation found for memory_dcim_usage (558887013613822577) -->
+    <skip />
+    <!-- no translation found for memory_music_usage (1363785144783011606) -->
+    <skip />
+    <!-- no translation found for memory_media_misc_usage (6094866738586451683) -->
+    <skip />
+    <!-- no translation found for memory_media_cache_usage (6704293333141177910) -->
+    <skip />
+    <!-- no translation found for sd_eject (4988563376492400073) -->
+    <skip />
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (5009296896648072891) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3300599435073550246) -->
+    <skip />
+    <!-- no translation found for sd_insert_summary (5264016886409577313) -->
+    <skip />
+    <!-- no translation found for sd_insert_summary (2048640010381803841) -->
+    <skip />
+    <!-- no translation found for sd_mount (8966695015677343116) -->
+    <skip />
+    <!-- no translation found for sd_mount (5940523765187704135) -->
+    <skip />
+    <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
+    <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
+    <!-- no translation found for sd_format (2148179271623099054) -->
+    <skip />
+    <!-- no translation found for sd_format (2576054280507119870) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6331905044907914603) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (212703692181793109) -->
+    <skip />
+    <!-- no translation found for memory_clear_cache_title (5423840272171286191) -->
+    <skip />
+    <!-- no translation found for memory_clear_cache_message (4550262490807415948) -->
+    <skip />
+    <!-- no translation found for mtp_ptp_mode_summary (3710436114807789270) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_title (3077285629197874055) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_title (3634502237262534381) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_text (4322636662873269018) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_text (6998379994779187692) -->
+    <skip />
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
+    <!-- no translation found for dlg_error_unmount_text (4346280469528260684) -->
+    <skip />
+    <!-- no translation found for dlg_error_unmount_text (3073562815631781894) -->
+    <skip />
+    <!-- no translation found for unmount_inform_text (7120241136790744265) -->
+    <skip />
+    <!-- no translation found for unmount_inform_text (1904212716075458402) -->
+    <skip />
+    <!-- no translation found for sd_ejecting_title (8824572198034365468) -->
+    <skip />
+    <!-- no translation found for sd_ejecting_summary (2028753069184908491) -->
+    <skip />
+    <!-- no translation found for storage_low_title (1388569749716225155) -->
+    <skip />
+    <!-- no translation found for storage_low_summary (7737465774892563129) -->
+    <skip />
+    <!-- no translation found for storage_menu_rename (7141058657592615390) -->
+    <skip />
+    <!-- no translation found for storage_menu_mount (1014683672493425425) -->
+    <skip />
+    <!-- no translation found for storage_menu_unmount (681485356885955898) -->
+    <skip />
+    <!-- no translation found for storage_menu_format (8334422679047059459) -->
+    <skip />
+    <!-- no translation found for storage_menu_format_internal (6553368530402755543) -->
+    <skip />
+    <!-- no translation found for storage_menu_usb (5708207885333243384) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (679612779321689418) -->
+    <skip />
+    <!-- no translation found for usb_connection_category (7805945595165422882) -->
+    <skip />
+    <!-- no translation found for usb_mtp_title (3399663424394065964) -->
+    <skip />
+    <!-- no translation found for usb_mtp_summary (4617321473211391236) -->
+    <skip />
+    <!-- no translation found for usb_ptp_title (3852760810622389620) -->
+    <skip />
+    <!-- no translation found for usb_ptp_summary (7673397474756664929) -->
+    <skip />
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Lejo që aplikacionet e aktivizuara të MIDI të funksionojnë në USB me softuerin MIDI në kompjuterin tënd."</string>
+    <!-- no translation found for storage_other_users (808708845102611856) -->
+    <skip />
+    <!-- no translation found for storage_internal_title (690771193137801021) -->
+    <skip />
+    <!-- no translation found for storage_external_title (2723851748972673696) -->
+    <skip />
+    <!-- no translation found for storage_volume_summary (476551204412943800) -->
+    <skip />
+    <!-- no translation found for storage_mount_success (687641090137253647) -->
+    <skip />
+    <!-- no translation found for storage_mount_failure (8928389741212129060) -->
+    <skip />
+    <!-- no translation found for storage_unmount_success (5737203344673441677) -->
+    <skip />
+    <!-- no translation found for storage_unmount_failure (4161722509712992231) -->
+    <skip />
+    <!-- no translation found for storage_format_success (3023144070597190555) -->
+    <skip />
+    <!-- no translation found for storage_format_failure (8343688274191391889) -->
+    <skip />
+    <!-- no translation found for storage_rename_title (8242663969839491485) -->
+    <skip />
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Pas formatimit, kartën <xliff:g id="NAME_0">^1</xliff:g> mund ta përdorësh në pajisje të tjera. \n\nTë gjitha të dhënat në <xliff:g id="NAME_1">^1</xliff:g> do të fshihen. Rekomandohet që të kryesh rezervimin në fillim. \n\n"<b>"Rezervo fotografitë dhe artikujt e tjerë \"media\""</b>" \nZhvendosi skedarët \"media\" në hapësira alternative ruajtjeje në këtë pajisje ose transferoji ato në një kompjuter duke përdorur një kabllo USB-je. \n\n"<b>"Rezervo aplikacionet"</b>" \nTë gjitha aplikacionet e ruajtura në <xliff:g id="NAME_6">^1</xliff:g> do të çinstalohen dhe të dhënat e tyre do të fshihen. Për t\'i ruajtur këto aplikacione, zhvendosi në hapësira alternative ruajtjeje në këtë pajisje."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kur ta nxjerrësh <xliff:g id="NAME_0">^1</xliff:g>, aplikacionet e ruajtura në të do të ndalojnë së funksionuari ndërsa skedarët \"media\" nuk do të jenë të përdorshëm derisa ta fusësh atë sërish."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> është formatuar për të funksionuar vetëm me këtë pajisje. Ai nuk do të funksionojë me pajisje të tjera."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfiguro <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Përdore si hapësirë portative ruajtjeje"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Për të zhvendosur fotografi dhe artikuj të tjerë \"media\" mes pajisjeve."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Përdore si hapësirë të brendshme ruajtjeje"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Për të ruajtur diçka vetëm në këtë pajisje, duke përfshirë aplikacionet dhe fotografitë. Kërkon formatim që e parandalon atë të funksionojë me pajisje të tjera."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formato si hapësirë të brendshme ruajtjeje"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Kjo kërkon që <xliff:g id="NAME_0">^1</xliff:g> të formatohet për ta bërë të sigurt atë. \n\nPas formatimit, <xliff:g id="NAME_1">^1</xliff:g> do të funksionojë vetëm në këtë pajisje. \n\n"<b>"Formatimi fshin të gjitha të dhënat që ruhen aktualisht në <xliff:g id="NAME_2">^1</xliff:g>."</b>" Për të shmangur humbjen e të dhënave, rekomandohet rezervimi i tyre."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Fshi dhe formato"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Po formaton <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Mos e hiq kartën <xliff:g id="NAME">^1</xliff:g> ndërsa formatohet."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Zhvendos të dhënat në hapësirën e re të ruajtjes"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Mund të zhvendosësh fotografitë, skedarët dhe të dhënat e aplikacionit në kartën e re <xliff:g id="NAME">^1</xliff:g>. \n\nZhvendosja kërkon rreth <xliff:g id="TIME">^2</xliff:g> dhe do të lirojë <xliff:g id="SIZE">^3</xliff:g> në hapësirën e brendshme. Disa aplikacione nuk do të funksionojnë gjatë këtij procesi."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Zhvendos tani"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Zhvendos më vonë"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Zhvendos të dhënat tani"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Kjo zhvendosje kërkon rreth <xliff:g id="TIME">^1</xliff:g> dhe do të lirojë <xliff:g id="SIZE">^2</xliff:g> në hapësirën e brendshme."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Zhvendos"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Po zhvendos të dhënat..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Gjatë zhvendosjes: \n• Mos e hiq <xliff:g id="NAME">^1</xliff:g>. \n• Disa aplikacione nuk do të funksionojnë mirë. \n• Mbaje pajisjen të ngarkuar."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> është gati"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> është tani gati për t\'u përdorur me fotografitë dhe skedarët e tjerë \"media\"."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> po funksionon. \n\nPër të zhvendosur fotografitë, skedarët dhe të dhënat e aplikacioneve te kjo pajisje, shko te Cilësimet &gt; Hapësira ruajtëse."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Zhvendos <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Zhvendosja e aplikacionit <xliff:g id="APP">^1</xliff:g> dhe të dhënave të tij në <xliff:g id="NAME_0">^2</xliff:g> do të zgjasë vetëm pak çaste. Nuk do të jesh në gjendje ta përdorësh aplikacionin derisa zhvendosja të përfundojë. \n\nMos e hiq <xliff:g id="NAME_1">^2</xliff:g> gjatë zhvendosjes."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Po zhvendos <xliff:g id="APP">^1</xliff:g> ..."</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Mos e hiq kartën <xliff:g id="NAME">^1</xliff:g> gjatë zhvendosjes. \n\nAplikacioni <xliff:g id="APP">^2</xliff:g> në këtë pajisje nuk do të mund të përdoret derisa të përfundojë zhvendosja."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Anulo zhvendosjen"</string>
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (4974192007399968164) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <!-- no translation found for apn_auth_type (6167205395676037015) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_none (5069592676845549926) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_pap (1666934536996033383) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_chap (3369626283789068360) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_pap_chap (9102343063036134541) -->
+    <skip />
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for apn_roaming_protocol (3386954381510788422) -->
+    <skip />
+    <!-- no translation found for carrier_enabled (407655861175280806) -->
+    <skip />
+    <!-- no translation found for carrier_enabled_summaryOn (6338915271908057531) -->
+    <skip />
+    <!-- no translation found for carrier_enabled_summaryOff (4300790190221203756) -->
+    <skip />
+    <!-- no translation found for bearer (594270280031923558) -->
+    <skip />
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <!-- no translation found for menu_new (3014205883303921729) -->
+    <skip />
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <string name="error_title" msgid="7631322303341024692"></string>
+    <!-- no translation found for error_name_empty (8418502878620394756) -->
+    <skip />
+    <!-- no translation found for error_apn_empty (6056233831214537267) -->
+    <skip />
+    <!-- no translation found for error_mcc_not3 (4560171714156251661) -->
+    <skip />
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <!-- no translation found for restore_default_apn (8178010218751639581) -->
+    <skip />
+    <!-- no translation found for menu_restore (8260067415075573273) -->
+    <skip />
+    <!-- no translation found for restore_default_apn_completed (2824775307377604897) -->
+    <skip />
+    <string name="reset_network_title" msgid="4557113742173895074">"Rivendosja e parametrave të rrjetit"</string>
+    <!-- no translation found for reset_network_desc (581668983587311282) -->
+    <skip />
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Rivendos parametrat"</string>
+    <!-- no translation found for reset_network_final_desc (4874737348054213767) -->
+    <skip />
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Rivendos parametrat"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Të rivendoset?"</string>
+    <!-- no translation found for reset_network_complete_toast (787829973559541880) -->
+    <skip />
+    <!-- no translation found for device_reset_title (2384019005638768076) -->
+    <skip />
+    <!-- no translation found for master_clear_title (5907939616087039756) -->
+    <skip />
+    <!-- no translation found for master_clear_desc (8317211882509025841) -->
+    <skip />
+    <!-- no translation found for master_clear_desc (9165016501623540228) -->
+    <skip />
+    <!-- no translation found for master_clear_accounts (6412857499147999073) -->
+    <skip />
+    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (7744115866662613411) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (4801026652617377093) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (969364037450286809) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (1397239046334307625) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (4728558173931599429) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (1737638779582964966) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (3130786116528304116) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (7550632653343157971) -->
+    <skip />
+    <!-- no translation found for master_clear_final_desc (1062841478823409667) -->
+    <skip />
+    <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
+    <skip />
+    <!-- no translation found for master_clear_failed (7959646179737950703) -->
+    <skip />
+    <!-- no translation found for master_clear_confirm_title (7572642091599403668) -->
+    <skip />
+    <!-- no translation found for master_clear_not_available (1000370707967468909) -->
+    <skip />
+    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
+    <skip />
+    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
+    <skip />
+    <!-- no translation found for media_format_title (3999653431422767156) -->
+    <skip />
+    <!-- no translation found for media_format_title (4427528440306787972) -->
+    <skip />
+    <!-- no translation found for media_format_summary (776603298628082065) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (4557243156946319034) -->
+    <skip />
+    <!-- no translation found for media_format_desc (8764037252319942415) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (6293669371185352810) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (6721544380069373626) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (699929778486375913) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (3344525419872744989) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for call_settings_title (5188713413939232801) -->
+    <skip />
+    <!-- no translation found for call_settings_summary (7291195704801002886) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_usb (6688416425801386511) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_wifi (3277144155960302049) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_bluetooth (355855408317564420) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_usb_bluetooth (5355828977109785001) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_all (8356136101061143841) -->
+    <skip />
+    <!-- no translation found for usb_title (7483344855356312510) -->
+    <skip />
+    <!-- no translation found for usb_tethering_button_text (585829947108007917) -->
+    <skip />
+    <!-- no translation found for usb_tethering_available_subtext (156779271296152605) -->
+    <skip />
+    <!-- no translation found for usb_tethering_active_subtext (8916210851136467042) -->
+    <skip />
+    <!-- no translation found for usb_tethering_storage_active_subtext (5210094834194907094) -->
+    <skip />
+    <!-- no translation found for usb_tethering_unavailable_subtext (1044622421184007254) -->
+    <skip />
+    <!-- no translation found for usb_tethering_turnon_subtext (4748616058219273033) -->
+    <skip />
+    <!-- no translation found for usb_tethering_errored_subtext (1377574819427841992) -->
+    <skip />
+    <!-- no translation found for bluetooth_tether_checkbox_text (2379175828878753652) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_available_subtext (8811610320942954709) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_available_subtext (4229220575771946723) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (1666736165420290466) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext_config (1790242032929221788) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext (2093881379028235555) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext (706860924389041342) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_errored_subtext (4926566308991142264) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_overflow_error (6285122039489881969) -->
+    <skip />
+    <!-- no translation found for bluetooth_untether_blank (2871192409329334813) -->
+    <skip />
+    <!-- no translation found for tethering_help_button_text (656117495547173630) -->
+    <skip />
+    <!-- no translation found for network_settings_title (4871233236744292831) -->
+    <skip />
+    <!-- no translation found for manage_mobile_plan_title (7630170375010107744) -->
+    <skip />
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikacioni për SMS"</string>
+    <!-- no translation found for sms_change_default_dialog_title (1958688831875804286) -->
+    <skip />
+    <!-- no translation found for sms_change_default_dialog_text (1522783933230274787) -->
+    <skip />
+    <!-- no translation found for sms_change_default_no_previous_dialog_text (602683880284921998) -->
+    <skip />
+    <!-- no translation found for network_scorer_change_active_dialog_title (3776301550387574975) -->
+    <skip />
+    <!-- no translation found for network_scorer_change_active_dialog_text (8035173880322990715) -->
+    <skip />
+    <!-- no translation found for network_scorer_change_active_no_previous_dialog_text (7444620909047611601) -->
+    <skip />
+    <!-- no translation found for mobile_unknown_sim_operator (2156912373230276157) -->
+    <skip />
+    <!-- no translation found for mobile_no_provisioning_url (2399426808423775711) -->
+    <skip />
+    <!-- no translation found for mobile_insert_sim_card (9052590985784056395) -->
+    <skip />
+    <!-- no translation found for mobile_connect_to_internet (1733894125065249639) -->
+    <skip />
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
+    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
+    <skip />
+    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
+    <skip />
+    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
+    <skip />
+    <!-- no translation found for location_mode_title (3982009713118421689) -->
+    <skip />
+    <!-- no translation found for location_mode_high_accuracy_title (8241802585110932849) -->
+    <skip />
+    <!-- no translation found for location_mode_battery_saving_title (711273645208158637) -->
+    <skip />
+    <!-- no translation found for location_mode_sensors_only_title (3040366132175435160) -->
+    <skip />
+    <!-- no translation found for location_mode_location_off_title (2829713015012529465) -->
+    <skip />
+    <!-- no translation found for location_category_recent_location_requests (1938721350424447421) -->
+    <skip />
+    <!-- no translation found for location_no_recent_apps (2800907699722178041) -->
+    <skip />
+    <!-- no translation found for location_category_location_services (7437150886946685979) -->
+    <skip />
+    <!-- no translation found for location_high_battery_use (517199943258508020) -->
+    <skip />
+    <!-- no translation found for location_low_battery_use (8602232529541903596) -->
+    <skip />
+    <!-- no translation found for location_mode_screen_title (4528716772270246542) -->
+    <skip />
+    <!-- no translation found for location_mode_high_accuracy_description (5349014493087338351) -->
+    <skip />
+    <!-- no translation found for location_mode_battery_saving_description (7581657383062066461) -->
+    <skip />
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Përdor GPS-në për të përcaktuar vendndodhjen"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Po skanon"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Po skanon"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Skanimi i Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Përmirëso vendndodhjen duke i lejuar aplikacionet dhe shërbimet të skanojnë për rrjete Wi‑Fi, edhe kur Wi‑Fi është joaktiv."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Skanimi i Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Përmirëso vewndndodhjen duke lejuar shërbimet e sistemit të skanojnë për pajisje Bluetooth, edhe kur Bluetooth është joaktiv"</string>
+    <!-- no translation found for location_network_based (6010456018401296590) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level (5626515380188353712) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level_wifi (4234820941954812210) -->
+    <skip />
+    <!-- no translation found for location_gps (8392461023569708478) -->
+    <skip />
+    <!-- no translation found for location_street_level (1669562198260860802) -->
+    <skip />
+    <!-- no translation found for location_street_level (4617445745492014203) -->
+    <skip />
+    <!-- no translation found for assisted_gps (4649317129586736885) -->
+    <skip />
+    <!-- no translation found for assisted_gps_enabled (8751899609589792803) -->
+    <skip />
+    <!-- no translation found for assisted_gps_disabled (6982698333968010748) -->
+    <skip />
+    <!-- no translation found for use_location_title (5206937465504979977) -->
+    <skip />
+    <!-- no translation found for use_location_summary (3978805802386162520) -->
+    <skip />
+    <!-- no translation found for location_access_title (7064108942964081243) -->
+    <skip />
+    <!-- no translation found for location_access_summary (69031404093194341) -->
+    <skip />
+    <!-- no translation found for location_sources_heading (1278732419851088319) -->
+    <skip />
+    <!-- no translation found for about_settings (593457295516533765) -->
+    <skip />
+    <!-- no translation found for about_settings (1743378368185371685) -->
+    <skip />
+    <!-- no translation found for about_settings_summary (3371517697156165959) -->
+    <skip />
+    <!-- no translation found for legal_information (5769301644270604095) -->
+    <skip />
+    <!-- no translation found for contributors_title (5917703088825286504) -->
+    <skip />
+    <!-- no translation found for regulatory_information (5695464367088752150) -->
+    <skip />
+    <!-- no translation found for copyright_title (865906688917260647) -->
+    <skip />
+    <!-- no translation found for license_title (1990487604356037871) -->
+    <skip />
+    <!-- no translation found for terms_title (7697580845616764642) -->
+    <skip />
+    <!-- no translation found for webview_license_title (2813507464175738967) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_title (7553683406244228650) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_unavailable (4210539215951487627) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_loading (3337535809093591740) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_title (1289483965535937431) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_activity_title (6901214628496951727) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_activity_unreachable (232523852222964470) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_activity_loading (8059022597639516348) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_password_header (8624900666929394990) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_pattern_header (6949761069941694050) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_pin_header (7598849519816138302) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_password_header (6308478184889846633) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pattern_header (7543433733032330821) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pin_header (49038294648213197) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_passwords_dont_match (6850677112663979120) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_pins_dont_match (4757532830594400147) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_lock_generic_header (3811438094903786145) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_set_toast (4875050283108629383) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_set_toast (6011826444725291475) -->
+    <skip />
+    <!-- no translation found for lockpassword_pattern_set_toast (6867259621331406236) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pattern_generic (7050256155547273836) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pin_generic (1072670959803859869) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_password_generic (1022239625083264596) -->
+    <skip />
+    <!-- no translation found for lockpassword_invalid_pin (15588049067548470) -->
+    <skip />
+    <!-- no translation found for lockpassword_invalid_password (4038507398784975200) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_unlock_wrong (1745247595356012176) -->
+    <skip />
+    <string name="lock_settings_title" msgid="4213839087748988686">"Siguria e pajisjes"</string>
+    <!-- no translation found for lockpattern_change_lock_pattern_label (5679630792003440352) -->
+    <skip />
+    <!-- no translation found for lockpattern_change_lock_pin_label (266707138486731661) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_intro_header (308287052221942814) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_intro_footer (1118579101409152113) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_inprogress (6667844062721656773) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_incorrect_too_short (1348234155120957561) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_entered_header (4316818983675591604) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_confirm (8054853451639221265) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_confirmed_header (8455614172231880211) -->
+    <skip />
+    <!-- no translation found for lockpattern_confirm_button_text (1128204343957002841) -->
+    <skip />
+    <!-- no translation found for lockpattern_restart_button_text (3337574403350953926) -->
+    <skip />
+    <!-- no translation found for lockpattern_retry_button_text (1949847413862309134) -->
+    <skip />
+    <!-- no translation found for lockpattern_continue_button_text (4723771754714471410) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_title (3207750489460466680) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_title (6920616873671115281) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_summary (1165707416664252167) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_visible_pattern_title (2615606088906120711) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_tactile_feedback_title (8898518337442601027) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_power_button_instantly_locks (5735444062633666327) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_power_button_instantly_locks_summary (8196258755143711694) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_choose_lock_pattern (1652352830005653447) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_change_lock_pattern (1123908306116495545) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_help_how_to_record (2614673439060830433) -->
+    <skip />
+    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts (6909161623701848863) -->
+    <skip />
+    <!-- no translation found for activity_not_found (5551664692991605325) -->
+    <skip />
+    <!-- no translation found for manageapplications_settings_title (7041951105633616745) -->
+    <skip />
+    <!-- no translation found for manageapplications_settings_summary (1794401500935451259) -->
+    <skip />
+    <!-- no translation found for applications_settings (1721442176406964682) -->
+    <skip />
+    <!-- no translation found for applications_settings_summary (6683465446264515367) -->
+    <skip />
+    <!-- no translation found for applications_settings_header (1014813055054356646) -->
+    <skip />
+    <!-- no translation found for install_applications (4872012136210802181) -->
+    <skip />
+    <!-- no translation found for install_applications_title (4987712352256508946) -->
+    <skip />
+    <!-- no translation found for install_unknown_applications_title (663831043139080992) -->
+    <skip />
+    <!-- no translation found for install_unknown_applications (176855644862942064) -->
+    <skip />
+    <!-- no translation found for install_all_warning (3263360446508268880) -->
+    <skip />
+    <!-- no translation found for install_all_warning (8113734576826384682) -->
+    <skip />
+    <!-- no translation found for advanced_settings (1777249286757067969) -->
+    <skip />
+    <!-- no translation found for advanced_settings_summary (4016682978071086747) -->
+    <skip />
+    <!-- no translation found for application_info_label (5736524913065714880) -->
+    <skip />
+    <!-- no translation found for storage_label (8700867073480107253) -->
+    <skip />
+    <!-- no translation found for auto_launch_label (3012617472833815382) -->
+    <skip />
+    <!-- no translation found for auto_launch_label_generic (3230569852551968694) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_label (663250687205465394) -->
+    <skip />
+    <!-- no translation found for permissions_label (2605296874922726203) -->
+    <skip />
+    <!-- no translation found for cache_header_label (1877197634162461830) -->
+    <skip />
+    <!-- no translation found for clear_cache_btn_text (5756314834291116325) -->
+    <skip />
+    <!-- no translation found for cache_size_label (7505481393108282913) -->
+    <skip />
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
+    <!-- no translation found for total_size_label (1048676419552557254) -->
+    <skip />
+    <!-- no translation found for application_size_label (8494609207373874267) -->
+    <skip />
+    <!-- no translation found for external_code_size_label (3459343140355961335) -->
+    <skip />
+    <!-- no translation found for data_size_label (8679376373625710107) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (7533821466482000453) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (626414192825329708) -->
+    <skip />
+    <!-- no translation found for uninstall_text (3644892466144802466) -->
+    <skip />
+    <!-- no translation found for uninstall_all_users_text (851857393177950340) -->
+    <skip />
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
+    <!-- no translation found for disable_text (6544054052049395202) -->
+    <skip />
+    <!-- no translation found for enable_text (9217362512327828987) -->
+    <skip />
+    <!-- no translation found for clear_user_data_text (5597622864770098388) -->
+    <skip />
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
+    <!-- no translation found for auto_launch_enable_text (2652825923953591251) -->
+    <skip />
+    <!-- no translation found for always_allow_bind_appwidgets_text (3368654672141202604) -->
+    <skip />
+    <!-- no translation found for auto_launch_disable_text (7800385822185540166) -->
+    <skip />
+    <!-- no translation found for clear_activities (7408923511535174430) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_text (1616155457673106022) -->
+    <skip />
+    <!-- no translation found for ask_compatibility (7225195569089607846) -->
+    <skip />
+    <!-- no translation found for enable_compatibility (5806819252068617811) -->
+    <skip />
+    <!-- no translation found for unknown (1592123443519355854) -->
+    <skip />
+    <!-- no translation found for sort_order_alpha (1410278099123670628) -->
+    <skip />
+    <!-- no translation found for sort_order_size (7024513286636502362) -->
+    <skip />
+    <!-- no translation found for show_running_services (5736278767975544570) -->
+    <skip />
+    <!-- no translation found for show_background_processes (2009840211972293429) -->
+    <skip />
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacioni i emergjencave"</string>
+    <!-- no translation found for reset_app_preferences (1321050641018356925) -->
+    <skip />
+    <!-- no translation found for reset_app_preferences_title (6093179367325336662) -->
+    <skip />
+    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
+    <skip />
+    <!-- no translation found for reset_app_preferences_button (2559089511841281242) -->
+    <skip />
+    <!-- no translation found for manage_space_text (8852711522447794676) -->
+    <skip />
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (8693024463731076091) -->
+    <skip />
+    <!-- no translation found for filter_apps_all (5142129378749391876) -->
+    <skip />
+    <!-- no translation found for filter_apps_disabled (5364447573326472890) -->
+    <skip />
+    <!-- no translation found for filter_apps_third_party (7786348047690140979) -->
+    <skip />
+    <!-- no translation found for filter_apps_running (7767071454371350486) -->
+    <skip />
+    <!-- no translation found for filter_apps_onsdcard (4843063154701023349) -->
+    <skip />
+    <!-- no translation found for filter_apps_onsdcard (1477351142334784771) -->
+    <skip />
+    <!-- no translation found for disabled (9206776641295849915) -->
+    <skip />
+    <!-- no translation found for not_installed (2797554494953450291) -->
+    <skip />
+    <!-- no translation found for no_applications (7336588977497084921) -->
+    <skip />
+    <!-- no translation found for internal_storage (1584700623164275282) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (2673203150465132465) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (7623513618171928235) -->
+    <skip />
+    <!-- no translation found for recompute_size (7722567982831691718) -->
+    <skip />
+    <!-- no translation found for clear_data_dlg_title (5605258400134511197) -->
+    <skip />
+    <!-- no translation found for clear_data_dlg_text (8847257251846779938) -->
+    <skip />
+    <!-- no translation found for dlg_ok (2402639055725653590) -->
+    <skip />
+    <!-- no translation found for dlg_cancel (1674753358972975911) -->
+    <skip />
+    <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
+    <!-- no translation found for app_not_found_dlg_text (8333723538280257243) -->
+    <skip />
+    <!-- no translation found for clear_data_failed (1907582169616856698) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_title (7441012826373143593) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (6371247225487725860) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (1092177570631523106) -->
+    <skip />
+    <!-- no translation found for security_settings_desc (1292421279262430109) -->
+    <skip />
+    <!-- no translation found for security_settings_desc (61749028818785244) -->
+    <skip />
+    <!-- no translation found for security_settings_desc_multi (7300932212437084403) -->
+    <skip />
+    <!-- no translation found for security_settings_desc_multi (6610268420793984752) -->
+    <skip />
+    <!-- no translation found for join_two_items (1336880355987539064) -->
+    <skip />
+    <!-- no translation found for join_many_items_last (5925635036718502724) -->
+    <skip />
+    <!-- no translation found for join_many_items_first (4333907712038448660) -->
+    <skip />
+    <!-- no translation found for join_many_items_middle (7556692394478220814) -->
+    <skip />
+    <!-- no translation found for security_settings_billing_desc (8061019011821282358) -->
+    <skip />
+    <!-- no translation found for security_settings_premium_sms_desc (8734171334263713717) -->
+    <skip />
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
+    <!-- no translation found for invalid_size_value (7563537715280712285) -->
+    <skip />
+    <!-- no translation found for empty_list_msg (5993162337235907160) -->
+    <skip />
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
+    <!-- no translation found for move_app (5042838441401731346) -->
+    <skip />
+    <!-- no translation found for move_app_to_internal (2299714147283854957) -->
+    <skip />
+    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
+    <skip />
+    <!-- no translation found for move_app_to_sdcard (4350451696315265420) -->
+    <skip />
+    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
+    <skip />
+    <!-- no translation found for moving (6431016143218876491) -->
+    <skip />
+    <!-- no translation found for insufficient_storage (481763122991093080) -->
+    <skip />
+    <!-- no translation found for does_not_exist (3476487214886606748) -->
+    <skip />
+    <!-- no translation found for app_forward_locked (6331564656683790866) -->
+    <skip />
+    <!-- no translation found for invalid_location (2786030127356312746) -->
+    <skip />
+    <!-- no translation found for system_package (6222593098063037137) -->
+    <skip />
+    <!-- no translation found for force_stop_dlg_title (977530651470711366) -->
+    <skip />
+    <!-- no translation found for force_stop_dlg_text (7208364204467835578) -->
+    <skip />
+    <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
+    <!-- no translation found for move_app_failed_dlg_text (3465267182923054022) -->
+    <skip />
+    <!-- no translation found for app_install_location_title (2068975150026852168) -->
+    <skip />
+    <!-- no translation found for app_install_location_summary (5155453752692959098) -->
+    <skip />
+    <!-- no translation found for app_disable_dlg_title (3916469657537695436) -->
+    <skip />
+    <!-- no translation found for app_disable_dlg_text (3562567756362627323) -->
+    <skip />
+    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
+    <skip />
+    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
+    <skip />
+    <!-- no translation found for app_disable_notifications_dlg_title (7669264654851761857) -->
+    <skip />
+    <!-- no translation found for app_disable_notifications_dlg_text (5088484670924769845) -->
+    <skip />
+    <!-- no translation found for app_ops_settings (5108481883575527511) -->
+    <skip />
+    <!-- no translation found for app_ops_running (7706949900637284122) -->
+    <skip />
+    <!-- no translation found for app_ops_never_used (9114608022906887802) -->
+    <skip />
+    <string name="no_default_apps" msgid="2915315663141025400">"Asnjë apl. i parazgjedhur"</string>
+    <!-- no translation found for storageuse_settings_title (5657014373502630403) -->
+    <skip />
+    <!-- no translation found for storageuse_settings_summary (3748286507165697834) -->
+    <skip />
+    <!-- no translation found for runningservices_settings_title (8097287939865165213) -->
+    <skip />
+    <!-- no translation found for runningservices_settings_summary (854608995821032748) -->
+    <skip />
+    <!-- no translation found for service_restarting (2242747937372354306) -->
+    <skip />
+    <!-- no translation found for cached (1059590879740175019) -->
+    <skip />
+    <!-- no translation found for no_running_services (2059536495597645347) -->
+    <skip />
+    <!-- no translation found for service_started_by_app (818675099014723551) -->
+    <skip />
+    <!-- no translation found for service_client_name (4037193625611815517) -->
+    <skip />
+    <!-- no translation found for service_background_processes (6844156253576174488) -->
+    <skip />
+    <!-- no translation found for service_foreground_processes (7583975676795574276) -->
+    <skip />
+    <!-- no translation found for memory (6609961111091483458) -->
+    <skip />
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <!-- no translation found for running_process_item_user_label (3129887865552025943) -->
+    <skip />
+    <!-- no translation found for running_process_item_removed_user_label (8250168004291472959) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_s_s (5790575965282023145) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_s_p (8019860457123222953) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_p_s (744424668287252915) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_p_p (1607384595790852782) -->
+    <skip />
+    <!-- no translation found for running_processes_header_title (6588371727640789560) -->
+    <skip />
+    <!-- no translation found for running_processes_header_footer (723908176275428442) -->
+    <skip />
+    <!-- no translation found for running_processes_header_system_prefix (6104153299581682047) -->
+    <skip />
+    <!-- no translation found for running_processes_header_apps_prefix (5787594452716832727) -->
+    <skip />
+    <!-- no translation found for running_processes_header_free_prefix (4620613031737078415) -->
+    <skip />
+    <!-- no translation found for running_processes_header_used_prefix (5924288703085123978) -->
+    <skip />
+    <!-- no translation found for running_processes_header_cached_prefix (7950853188089434987) -->
+    <skip />
+    <!-- no translation found for running_processes_header_ram (996092388884426817) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_settings_title (3224004818524731568) -->
+    <skip />
+    <!-- no translation found for no_services (7133900764462288263) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_services_title (391168243725357375) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_processes_title (928115582044655268) -->
+    <skip />
+    <!-- no translation found for service_stop (6369807553277527248) -->
+    <skip />
+    <!-- no translation found for service_manage (1876642087421959194) -->
+    <skip />
+    <!-- no translation found for service_stop_description (9146619928198961643) -->
+    <skip />
+    <!-- no translation found for heavy_weight_stop_description (2979218727598321095) -->
+    <skip />
+    <!-- no translation found for background_process_stop_description (5034773197139654588) -->
+    <skip />
+    <!-- no translation found for service_manage_description (7050092269951613102) -->
+    <skip />
+    <!-- no translation found for main_running_process_description (1130702347066340890) -->
+    <skip />
+    <!-- no translation found for process_service_in_use_description (8993335064403217080) -->
+    <skip />
+    <!-- no translation found for process_provider_in_use_description (5586603325677678940) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_title (4253292537154337233) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (3371302398335665793) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (3920243762189484756) -->
+    <skip />
+    <!-- no translation found for language_settings (5292716747264442359) -->
+    <skip />
+    <!-- no translation found for language_keyboard_settings_title (243220021717425813) -->
+    <skip />
+    <!-- no translation found for language_settings_category (2288258489940617043) -->
+    <skip />
+    <!-- no translation found for keyboard_settings_category (8275523930352487827) -->
+    <skip />
+    <!-- no translation found for phone_language (8870144109924299673) -->
+    <skip />
+    <string name="phone_language_summary" msgid="3871309445655554211"></string>
+    <!-- no translation found for auto_replace (6199184757891937822) -->
+    <skip />
+    <!-- no translation found for auto_replace_summary (370288728200084466) -->
+    <skip />
+    <!-- no translation found for auto_caps (6379232078052591265) -->
+    <skip />
+    <!-- no translation found for auto_caps_summary (6358102538315261466) -->
+    <skip />
+    <!-- no translation found for auto_punctuate (4595367243950425833) -->
+    <skip />
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
+    <!-- no translation found for auto_punctuate_summary (4372126865670574837) -->
+    <skip />
+    <!-- no translation found for show_password (3001113966880559611) -->
+    <skip />
+    <!-- no translation found for ime_security_warning (4135828934735934248) -->
+    <skip />
+    <!-- no translation found for spellchecker_security_warning (9060897418527708922) -->
+    <skip />
+    <!-- no translation found for spellchecker_quick_settings (246728645150092058) -->
+    <skip />
+    <!-- no translation found for spellchecker_language (6041050114690541437) -->
+    <skip />
+    <!-- no translation found for failed_to_open_app_settings_toast (1251067459298072462) -->
+    <skip />
+    <!-- no translation found for pointer_settings_category (8183819795164034286) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
+    <!-- no translation found for game_controller_settings_category (8794508575329923718) -->
+    <skip />
+    <!-- no translation found for vibrate_input_devices (2599591466928793082) -->
+    <skip />
+    <!-- no translation found for vibrate_input_devices_summary (4595570516865299153) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_title (8030087214949381372) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_setup_button (8514583747236476384) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_switch_hint (3889961090676293795) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_default_label (2952672513543482165) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_picker_title (556081931972771610) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_title (3427169369758733521) -->
+    <skip />
+    <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
+    <!-- no translation found for user_dict_settings_add_menu_title (4056762757149923551) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_title (4702613990174126482) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_screen_title (742580720124344291) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_more_options (8848798370746019825) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_less_options (2441785268726036101) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_confirm (6225823625332416144) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_word_option_name (7868879174905963135) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_shortcut_option_name (660089258866063925) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_locale_option_name (5696358317061318532) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_word_hint (5725254076556821247) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_shortcut_hint (7333763456561873445) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_edit_dialog_title (8967476444840548674) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_context_menu_edit_title (2210564879320004837) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_context_menu_delete_title (9140703913776549054) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_empty_text (8165273379942105271) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_all_languages (6742000040975959247) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_more_languages (7316375944684977910) -->
+    <skip />
+    <!-- no translation found for testing (6584352735303604146) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (193561832258534798) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (8656693364332840056) -->
+    <skip />
+    <!-- no translation found for testing_battery_info (3497865525976497848) -->
+    <skip />
+    <!-- no translation found for input_methods_settings_title (6800066636850553887) -->
+    <skip />
+    <!-- no translation found for input_method (5434026103176856164) -->
+    <skip />
+    <!-- no translation found for current_input_method (2636466029213488159) -->
+    <skip />
+    <!-- no translation found for input_method_selector (4311213129681430709) -->
+    <skip />
+    <!-- no translation found for input_method_selector_show_automatically_title (1001612945471546158) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_show_title (3891824124222371634) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_hide_title (7699647095118680424) -->
+    <skip />
+    <!-- no translation found for configure_input_method (1317429869771850228) -->
+    <skip />
+    <!-- no translation found for input_method_settings (5801295625486269553) -->
+    <skip />
+    <!-- no translation found for input_method_settings_button (6778344383871619368) -->
+    <skip />
+    <!-- no translation found for active_input_method_subtypes (3596398805424733238) -->
+    <skip />
+    <!-- no translation found for use_system_language_to_select_input_method_subtypes (3346751753141428573) -->
+    <skip />
+    <!-- no translation found for input_methods_settings_label_format (6002887604815693322) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title (4421813273170250462) -->
+    <skip />
+    <!-- no translation found for onscreen_keyboard_settings_summary (5841558383556238653) -->
+    <skip />
+    <!-- no translation found for builtin_keyboard_settings_title (7688732909551116798) -->
+    <skip />
+    <!-- no translation found for builtin_keyboard_settings_summary (2392531685358035899) -->
+    <skip />
+    <!-- no translation found for development_settings_title (215179176067683667) -->
+    <skip />
+    <!-- no translation found for development_settings_summary (1815795401632854041) -->
+    <skip />
+    <!-- no translation found for development_settings_not_available (4308569041701535607) -->
+    <skip />
+    <!-- no translation found for vpn_settings_not_available (956841430176985598) -->
+    <skip />
+    <!-- no translation found for tethering_settings_not_available (6765770438438291012) -->
+    <skip />
+    <!-- no translation found for apn_settings_not_available (7873729032165324000) -->
+    <skip />
+    <!-- no translation found for enable_adb (7982306934419797485) -->
+    <skip />
+    <!-- no translation found for enable_adb_summary (4881186971746056635) -->
+    <skip />
+    <!-- no translation found for clear_adb_keys (4038889221503122743) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (1778455732762984579) -->
+    <skip />
+    <!-- no translation found for keep_screen_on (1146389631208760344) -->
+    <skip />
+    <!-- no translation found for keep_screen_on_summary (2173114350754293009) -->
+    <skip />
+    <!-- no translation found for bt_hci_snoop_log (3340699311158865670) -->
+    <skip />
+    <!-- no translation found for bt_hci_snoop_log_summary (730247028210113851) -->
+    <skip />
+    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
+    <skip />
+    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
+    <skip />
+    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
+    <skip />
+    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
+    <skip />
+    <!-- no translation found for select_logd_size_title (7433137108348553508) -->
+    <skip />
+    <!-- no translation found for select_logd_size_dialog_title (1206769310236476760) -->
+    <skip />
+    <!-- no translation found for allow_mock_location (2787962564578664888) -->
+    <skip />
+    <!-- no translation found for allow_mock_location_summary (317615105156345626) -->
+    <skip />
+    <!-- no translation found for debug_view_attributes (6485448367803310384) -->
+    <skip />
+    <string name="debug_networking_category" msgid="7044075693643009662">"Rrjeti"</string>
+    <!-- no translation found for wifi_display_certification (8611569543791307533) -->
+    <skip />
+    <!-- no translation found for wifi_verbose_logging (4203729756047242344) -->
+    <skip />
+    <!-- no translation found for wifi_aggressive_handover (9194078645887480917) -->
+    <skip />
+    <!-- no translation found for wifi_allow_scan_with_traffic (3601853081178265786) -->
+    <skip />
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Përdor klientin DHCP të trashëgimisë"</string>
+    <!-- no translation found for wifi_display_certification_summary (1155182309166746973) -->
+    <skip />
+    <!-- no translation found for wifi_verbose_logging_summary (6615071616111731958) -->
+    <skip />
+    <!-- no translation found for wifi_aggressive_handover_summary (6328455667642570371) -->
+    <skip />
+    <!-- no translation found for wifi_allow_scan_with_traffic_summary (2575101424972686310) -->
+    <skip />
+    <!-- no translation found for select_logd_size_title (7433137108348553508) -->
+    <skip />
+    <!-- no translation found for select_logd_size_dialog_title (1206769310236476760) -->
+    <skip />
+    <!-- no translation found for select_usb_configuration_title (2649938511506971843) -->
+    <skip />
+    <!-- no translation found for select_usb_configuration_dialog_title (6385564442851599963) -->
+    <skip />
+    <!-- no translation found for allow_mock_location (2787962564578664888) -->
+    <skip />
+    <!-- no translation found for allow_mock_location_summary (317615105156345626) -->
+    <skip />
+    <!-- no translation found for debug_view_attributes (6485448367803310384) -->
+    <skip />
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Përdor klientin DHCP nga Lollipop në vend të klientit të ri DHCP të Android."</string>
+    <!-- no translation found for adb_warning_title (6234463310896563253) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (7316799925425402244) -->
+    <skip />
+    <!-- no translation found for adb_keys_warning_message (6932230298032192937) -->
+    <skip />
+    <!-- no translation found for dev_settings_warning_title (7244607768088540165) -->
+    <skip />
+    <!-- no translation found for dev_settings_warning_message (2298337781139097964) -->
+    <skip />
+    <!-- no translation found for verify_apps_over_usb_title (4177086489869041953) -->
+    <skip />
+    <!-- no translation found for verify_apps_over_usb_summary (9164096969924529200) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_title (7733257271454664956) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_summary (1798088409346660567) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_title (2112813067171502209) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_message (605444326545922054) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_title (2226662853797940829) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_summary (2750027486786530064) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_title (273220585729800783) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_message (3858482712337574407) -->
+    <skip />
+    <!-- no translation found for enable_terminal_title (95572094356054120) -->
+    <skip />
+    <!-- no translation found for enable_terminal_summary (67667852659359206) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
+    <!-- no translation found for allow_bind_app_widget_activity_allow_bind_title (2538303018392590627) -->
+    <skip />
+    <!-- no translation found for allow_bind_app_widget_activity_allow_bind (1584388129273282080) -->
+    <skip />
+    <!-- no translation found for allow_bind_app_widget_activity_always_allow_bind (7037503685859688034) -->
+    <skip />
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
+    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
+    <skip />
+    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (5440362857006046193) -->
+    <skip />
+    <!-- no translation found for last_time_used_label (8459441968795479307) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings (3975902491934816215) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_title (2130492524656204459) -->
+    <skip />
+    <!-- no translation found for accessibility_services_title (2592221829284342237) -->
+    <skip />
+    <!-- no translation found for accessibility_system_title (7187919089874130484) -->
+    <skip />
+    <!-- no translation found for accessibility_display_title (7610175687949675162) -->
+    <skip />
+    <!-- no translation found for accessibility_captioning_title (7589266662024836291) -->
+    <skip />
+    <!-- no translation found for accessibility_screen_magnification_title (7001782548715744981) -->
+    <skip />
+    <!-- no translation found for accessibility_screen_magnification_summary (2380627654189671754) -->
+    <skip />
+    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
+    <skip />
+    <!-- no translation found for accessibility_global_gesture_preference_summary_on (6180927399052022181) -->
+    <skip />
+    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
+    <skip />
+    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_large_text_preference_title (6307247527580207161) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_high_text_contrast_preference_title (2567402942683463779) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_preference_title (2472285215737820469) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_auto_update_preference_title (7218498768415430963) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_auto_update_preference_summary (4392059334816220155) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call_prerefence_title (6673851944175874235) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_speak_password_preference_title (5986628515113204844) -->
+    <skip />
+    <!-- no translation found for accessibility_long_press_timeout_preference_title (6708467774619266508) -->
+    <skip />
+    <!-- no translation found for accessibility_display_inversion_preference_title (2119647786141420802) -->
+    <skip />
+    <!-- no translation found for accessibility_display_inversion_preference_subtitle (8658240868230680912) -->
+    <skip />
+    <!-- no translation found for accessibility_display_daltonizer_preference_title (5800761362678707872) -->
+    <skip />
+    <!-- no translation found for accessibility_display_daltonizer_preference_subtitle (3484969015295282911) -->
+    <skip />
+    <!-- no translation found for enable_quick_setting (2366999897816894536) -->
+    <skip />
+    <!-- no translation found for daltonizer_type (1124178250809091080) -->
+    <skip />
+    <!-- no translation found for daltonizer_type_overridden (3116947244410245916) -->
+    <skip />
+    <!-- no translation found for daltonizer_mode_disabled (7482661936053801862) -->
+    <skip />
+    <!-- no translation found for daltonizer_mode_monochromacy (8485709880666106721) -->
+    <skip />
+    <!-- no translation found for daltonizer_mode_deuteranomaly (5475532989673586329) -->
+    <skip />
+    <!-- no translation found for daltonizer_mode_protanomaly (8424148009038666065) -->
+    <skip />
+    <!-- no translation found for daltonizer_mode_tritanomaly (481725854987912389) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_settings (3344942964710773365) -->
+    <skip />
+    <!-- no translation found for accessibility_feature_state_on (2864292320042673806) -->
+    <skip />
+    <!-- no translation found for accessibility_feature_state_off (4172584906487070211) -->
+    <skip />
+    <!-- no translation found for accessibility_feature_or_input_method_not_allowed (5950315477009501647) -->
+    <skip />
+    <!-- no translation found for captioning_preview_title (1234015253497016890) -->
+    <skip />
+    <!-- no translation found for captioning_standard_options_title (3284211791180335844) -->
+    <skip />
+    <!-- no translation found for captioning_locale (4559155661018823503) -->
+    <skip />
+    <!-- no translation found for captioning_text_size (6737002449104466028) -->
+    <skip />
+    <!-- no translation found for captioning_preset (8939737196538429044) -->
+    <skip />
+    <!-- no translation found for captioning_custom_options_title (5067500939930322405) -->
+    <skip />
+    <!-- no translation found for captioning_background_color (9053011212948992570) -->
+    <skip />
+    <!-- no translation found for captioning_background_opacity (6029993616419971202) -->
+    <skip />
+    <!-- no translation found for captioning_window_color (6902052743419717394) -->
+    <skip />
+    <!-- no translation found for captioning_window_opacity (5041556024849862376) -->
+    <skip />
+    <!-- no translation found for captioning_foreground_color (85623486537640059) -->
+    <skip />
+    <!-- no translation found for captioning_foreground_opacity (4370967856995419788) -->
+    <skip />
+    <!-- no translation found for captioning_edge_color (3670094753735263238) -->
+    <skip />
+    <!-- no translation found for captioning_edge_type (5997247394951682154) -->
+    <skip />
+    <!-- no translation found for captioning_typeface (1826169240566563259) -->
+    <skip />
+    <!-- no translation found for captioning_preview_text (4067935959797375065) -->
+    <skip />
+    <!-- no translation found for captioning_preview_characters (7105909138497851769) -->
+    <skip />
+    <!-- no translation found for locale_default (2593883646136326969) -->
+    <skip />
+    <!-- no translation found for color_title (4258931051732243983) -->
+    <skip />
+    <!-- no translation found for color_unspecified (5179683785413568326) -->
+    <skip />
+    <!-- no translation found for color_none (3475640044925814795) -->
+    <skip />
+    <!-- no translation found for color_white (8045195170201590239) -->
+    <skip />
+    <!-- no translation found for color_gray (9192312087142726313) -->
+    <skip />
+    <!-- no translation found for color_black (7517353520909872561) -->
+    <skip />
+    <!-- no translation found for color_red (4949354900304125428) -->
+    <skip />
+    <!-- no translation found for color_green (5537717328428845841) -->
+    <skip />
+    <!-- no translation found for color_blue (7731984529016953223) -->
+    <skip />
+    <!-- no translation found for color_cyan (7033027180641173211) -->
+    <skip />
+    <!-- no translation found for color_yellow (9112680561610873529) -->
+    <skip />
+    <!-- no translation found for color_magenta (5059212823607815549) -->
+    <skip />
+    <!-- no translation found for enable_service_title (3061307612673835592) -->
+    <skip />
+    <!-- no translation found for capabilities_list_title (86713361724771971) -->
+    <skip />
+    <!-- no translation found for touch_filtered_warning (8644034725268915030) -->
+    <skip />
+    <!-- no translation found for enable_service_encryption_warning (3064686622453974606) -->
+    <skip />
+    <!-- no translation found for secure_lock_encryption_warning (464101518421886337) -->
+    <skip />
+    <!-- no translation found for enable_service_pattern_reason (777577618063306751) -->
+    <skip />
+    <!-- no translation found for enable_service_pin_reason (7882035264853248228) -->
+    <skip />
+    <!-- no translation found for enable_service_password_reason (1224075277603097951) -->
+    <skip />
+    <!-- no translation found for capability_title_receiveAccessibilityEvents (1869032063969970755) -->
+    <skip />
+    <!-- no translation found for capability_desc_receiveAccessibilityEvents (2095111008854376237) -->
+    <skip />
+    <!-- no translation found for disable_service_title (3624005212728512896) -->
+    <skip />
+    <!-- no translation found for disable_service_message (2012273739481042318) -->
+    <skip />
+    <!-- no translation found for accessibility_no_services_installed (7200948194639038807) -->
+    <skip />
+    <!-- no translation found for accessibility_service_default_description (1072730037861494125) -->
+    <skip />
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
+    <!-- no translation found for print_settings (4742428530112487843) -->
+    <skip />
+    <!-- no translation found for print_settings_title (3685449667822217816) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_title (2338435517408144841) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
+    <skip />
+    <!-- no translation found for print_no_services_installed (8443039625463872294) -->
+    <skip />
+    <!-- no translation found for print_no_printers_found (989018646884973683) -->
+    <skip />
+    <!-- no translation found for print_menu_item_settings (6591330373682227082) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_printers (2890738028215834012) -->
+    <skip />
+    <!-- no translation found for print_feature_state_on (8098901852502441048) -->
+    <skip />
+    <!-- no translation found for print_feature_state_off (7294876968403966040) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_service (3811645167869797802) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_printer (8251218970577291032) -->
+    <skip />
+    <!-- no translation found for print_menu_item_search (7025589328240514553) -->
+    <skip />
+    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
+    <skip />
+    <!-- no translation found for print_service_disabled (7739452396114245222) -->
+    <skip />
+    <!-- no translation found for print_print_jobs (3582094777756968793) -->
+    <skip />
+    <!-- no translation found for print_print_job (7563741676053287211) -->
+    <skip />
+    <!-- no translation found for print_restart (8373999687329384202) -->
+    <skip />
+    <!-- no translation found for print_cancel (3621199386568672235) -->
+    <skip />
+    <!-- no translation found for print_job_summary (8472427347192930694) -->
+    <skip />
+    <!-- no translation found for print_printing_state_title_template (5736107667714582025) -->
+    <skip />
+    <!-- no translation found for print_cancelling_state_title_template (7102968925358219875) -->
+    <skip />
+    <!-- no translation found for print_failed_state_title_template (1436099128973357969) -->
+    <skip />
+    <!-- no translation found for print_blocked_state_title_template (9065391617425962424) -->
+    <skip />
+    <!-- no translation found for print_search_box_shown_utterance (7730361832020726951) -->
+    <skip />
+    <!-- no translation found for print_search_box_hidden_utterance (7980832833405818400) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (7190304207330319919) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for power_usage_not_available (3214000535532434353) -->
+    <skip />
+    <!-- no translation found for power_usage_level_and_status (7449847570973811784) -->
+    <skip />
+    <!-- no translation found for power_discharge_remaining (4925678997049911808) -->
+    <skip />
+    <!-- no translation found for power_charge_remaining (6132074970943913135) -->
+    <skip />
+    <!-- no translation found for power_discharging_duration (1605929174734600590) -->
+    <skip />
+    <!-- no translation found for power_charging (1779532561355864267) -->
+    <skip />
+    <!-- no translation found for power_charging_duration (2853265177761520490) -->
+    <skip />
+    <!-- no translation found for power_charging_duration_ac (3969186192576594254) -->
+    <skip />
+    <!-- no translation found for power_charging_duration_usb (182405645340976546) -->
+    <skip />
+    <!-- no translation found for power_charging_duration_wireless (1829295708243159464) -->
+    <skip />
+    <!-- no translation found for power_usage_list_summary (2409288197839512482) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_on_battery (4970762168505236033) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for battery_stats_charging_label (4223311142875178785) -->
+    <skip />
+    <!-- no translation found for battery_stats_screen_on_label (7150221809877509708) -->
+    <skip />
+    <!-- no translation found for battery_stats_gps_on_label (1193657533641951256) -->
+    <skip />
+    <!-- no translation found for battery_stats_wifi_running_label (1845839195549226252) -->
+    <skip />
+    <!-- no translation found for battery_stats_wake_lock_label (1908942681902324095) -->
+    <skip />
+    <!-- no translation found for battery_stats_phone_signal_label (3537569115723850618) -->
+    <skip />
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (3208518458663637035) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (3056108148042308690) -->
+    <skip />
+    <!-- no translation found for history_details_title (3608240585315506067) -->
+    <skip />
+    <!-- no translation found for details_title (3792801565213935385) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (3023346080675904613) -->
+    <skip />
+    <!-- no translation found for power_flashlight (7794409781003567614) -->
+    <skip />
+    <!-- no translation found for power_wifi (1135085252964054957) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (4612478572401640759) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for power_unaccounted (709925017022660740) -->
+    <skip />
+    <!-- no translation found for power_overcounted (2762354976171358445) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_wake_lock (5125438890233677880) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_wifi_running (3134357198266380400) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (262638572890253393) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (8971710128438365919) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (5468564329333954445) -->
+    <skip />
+    <!-- no translation found for usage_type_radio_active (1732647857619420121) -->
+    <skip />
+    <!-- no translation found for usage_type_data_wifi_send (1847552143597396162) -->
+    <skip />
+    <!-- no translation found for usage_type_data_wifi_recv (5678475911549183829) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
+    <skip />
+    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
+    <skip />
+    <!-- no translation found for usage_type_total_battery_capacity (3798285287848675346) -->
+    <skip />
+    <!-- no translation found for usage_type_computed_power (5862792259009981479) -->
+    <skip />
+    <!-- no translation found for usage_type_actual_power (7047814738685578335) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (7861051816778419018) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (4570481408106287454) -->
+    <skip />
+    <!-- no translation found for battery_action_display (7338551244519110831) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (8181553479021841207) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (6284747418668280364) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_flashlight (2908579430841025494) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (2375567464707394131) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3355461362094706957) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (8069070756186680367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (1942935021750897422) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (4071352514714259230) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8530418792605735226) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6907588126789841231) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (5959067516281866135) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (3974902365643634514) -->
+    <skip />
+    <!-- no translation found for battery_desc_users (7682989161885027823) -->
+    <skip />
+    <!-- no translation found for battery_desc_unaccounted (7404256448541818019) -->
+    <skip />
+    <!-- no translation found for battery_msg_unaccounted (1963583522633067961) -->
+    <skip />
+    <!-- no translation found for battery_desc_overcounted (5481865509489228603) -->
+    <skip />
+    <!-- no translation found for mah (95245196971239711) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for battery_saver (1426682272004907982) -->
+    <skip />
+    <!-- no translation found for battery_saver_turn_on_automatically_title (9023847300114669426) -->
+    <skip />
+    <!-- no translation found for battery_saver_turn_on_automatically_never (6610846456314373) -->
+    <skip />
+    <!-- no translation found for battery_saver_turn_on_automatically_pct (7536784431655058267) -->
+    <skip />
+    <!-- no translation found for process_stats_summary_title (1144688045609771677) -->
+    <skip />
+    <!-- no translation found for process_stats_summary (109387941605607762) -->
+    <skip />
+    <!-- no translation found for app_memory_use (7849258480392171939) -->
+    <skip />
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> nga <xliff:g id="TOTALRAM">%2$s</xliff:g> të përdorura në <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
+    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
+    <skip />
+    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
+    <skip />
+    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
+    <skip />
+    <!-- no translation found for process_stats_memory_status (4251599550196193093) -->
+    <skip />
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Sistemi operativ Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Origjinale"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Bërthama"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Memoriet specifike"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Përdorimi i RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Përdorimi i RAM (në sfond)"</string>
+    <!-- no translation found for process_stats_run_time (6520628955709369115) -->
+    <skip />
+    <string name="processes_subtitle" msgid="6827502409379462438">"Proceset"</string>
+    <!-- no translation found for services_subtitle (4296402367067266425) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_duration (2323483592994720196) -->
+    <skip />
+    <!-- no translation found for mem_details_title (6548392825497290498) -->
+    <skip />
+    <!-- no translation found for mem_state_subtitle (2407238869781011933) -->
+    <skip />
+    <!-- no translation found for mem_use_subtitle (7319468770222422412) -->
+    <skip />
+    <!-- no translation found for mem_use_kernel_type (8698327165935012484) -->
+    <skip />
+    <!-- no translation found for mem_use_native_type (5976704902328347400) -->
+    <skip />
+    <!-- no translation found for mem_use_kernel_cache_type (6411475064463957513) -->
+    <skip />
+    <!-- no translation found for mem_use_zram_type (9087217476795358232) -->
+    <skip />
+    <!-- no translation found for mem_use_free_type (717708548454880840) -->
+    <skip />
+    <!-- no translation found for mem_use_total (6308786055749777934) -->
+    <skip />
+    <!-- no translation found for menu_duration_3h (4714866438374738385) -->
+    <skip />
+    <!-- no translation found for menu_duration_6h (1940846763432184132) -->
+    <skip />
+    <!-- no translation found for menu_duration_12h (7890465404584356294) -->
+    <skip />
+    <!-- no translation found for menu_duration_1d (3393631127622285458) -->
+    <skip />
+    <!-- no translation found for menu_show_system (8864603400415567635) -->
+    <skip />
+    <string name="menu_hide_system" msgid="4106826741703745733">"Fshih sistemin"</string>
+    <!-- no translation found for menu_use_uss (467765290771543089) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
+    <skip />
+    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
+    <skip />
+    <!-- no translation found for voice_input_output_settings (1336135218350444783) -->
+    <skip />
+    <!-- no translation found for voice_input_output_settings_title (2442850635048676991) -->
+    <skip />
+    <!-- no translation found for voice_search_settings_title (2775469246913196536) -->
+    <skip />
+    <!-- no translation found for keyboard_settings_title (5080115226780201234) -->
+    <skip />
+    <!-- no translation found for voice_category (1430370497125803904) -->
+    <skip />
+    <!-- no translation found for voice_input_settings (1099937800539324567) -->
+    <skip />
+    <!-- no translation found for voice_input_settings_title (2676028028084981891) -->
+    <skip />
+    <!-- no translation found for voice_service_preference_section_title (3778706644257601021) -->
+    <skip />
+    <!-- no translation found for voice_interactor_preference_summary (1801414022026937190) -->
+    <skip />
+    <!-- no translation found for voice_recognizer_preference_summary (669880813593690527) -->
+    <skip />
+    <!-- no translation found for voice_interaction_security_warning (6378608263983737325) -->
+    <skip />
+    <!-- no translation found for tts_settings (8186971894801348327) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (1237820681016639683) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (5916421806783703823) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_synth_title (4755558388333117572) -->
+    <skip />
+    <!-- no translation found for tts_default_synth_summary (7326298606388069173) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
+    <skip />
+    <!-- no translation found for tts_lang_not_selected (7395787019276734765) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for tts_engine_error (3305141107104670703) -->
+    <skip />
+    <!-- no translation found for tts_engine_error_config (5820525416624637313) -->
+    <skip />
+    <!-- no translation found for tts_engine_error_reselect (2415399149293842112) -->
+    <skip />
+    <!-- no translation found for tts_engine_security_warning (8786238102020223650) -->
+    <skip />
+    <!-- no translation found for tts_engine_network_required (1190837151485314743) -->
+    <skip />
+    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
+    <skip />
+    <!-- no translation found for tts_status_title (7268566550242584413) -->
+    <skip />
+    <!-- no translation found for tts_status_ok (1309762510278029765) -->
+    <skip />
+    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
+    <skip />
+    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
+    <skip />
+    <!-- no translation found for tts_status_checking (4983413982985913047) -->
+    <skip />
+    <!-- no translation found for tts_engines_section (7515470972378742429) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_settings (4974538563074395920) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_is_enabled_summary (4909484006804022115) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_is_disabled_summary (7644198182255168200) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
+    <!-- no translation found for pico_languages_and_voices (4611320375917773238) -->
+    <skip />
+    <!-- no translation found for pico_installed (2452546687858267414) -->
+    <skip />
+    <!-- no translation found for pico_not_installed (6266845418419994311) -->
+    <skip />
+    <!-- no translation found for pico_voice_summary_female (8047327176247727492) -->
+    <skip />
+    <!-- no translation found for pico_voice_summary_male (8331266854058577610) -->
+    <skip />
+    <!-- no translation found for tts_notif_engine_install_title (7000346872482649034) -->
+    <skip />
+    <!-- no translation found for tts_notif_engine_install_message (7250804349781973329) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_button (1030512042040722285) -->
+    <skip />
+    <!-- no translation found for tts_engine_preference_section_title (448294500990971413) -->
+    <skip />
+    <!-- no translation found for tts_general_section_title (4402572014604490502) -->
+    <skip />
+    <!-- no translation found for gadget_title (5519037532720577836) -->
+    <skip />
+    <!-- no translation found for gadget_toggle_wifi (319262861956544493) -->
+    <skip />
+    <!-- no translation found for gadget_toggle_bluetooth (7538903239807020826) -->
+    <skip />
+    <!-- no translation found for gadget_state_template (5156935629902649932) -->
+    <skip />
+    <!-- no translation found for gadget_state_on (6909119593004937688) -->
+    <skip />
+    <!-- no translation found for gadget_state_off (5220212352953066317) -->
+    <skip />
+    <!-- no translation found for gadget_state_turning_on (3395992057029439039) -->
+    <skip />
+    <!-- no translation found for gadget_state_turning_off (2395546048102176157) -->
+    <skip />
+    <!-- no translation found for gadget_wifi (4712584536500629417) -->
+    <skip />
+    <!-- no translation found for gadget_bluetooth (8998572807378694410) -->
+    <skip />
+    <!-- no translation found for gadget_location (2974757497945178165) -->
+    <skip />
+    <!-- no translation found for gadget_sync (858895763714222152) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_template (930541920933123603) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_auto (6667967252426515446) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_full (6814570109772137631) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_half (3696671957608774204) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_off (946382262872753084) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (5662579425832406705) -->
+    <skip />
+    <!-- no translation found for credentials_title (4446234003860769883) -->
+    <skip />
+    <!-- no translation found for credentials_install (466093273825150847) -->
+    <skip />
+    <!-- no translation found for credentials_install (953914549998062317) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (4220422806818210676) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
+    <skip />
+    <!-- no translation found for credentials_reset (3239382277144980418) -->
+    <skip />
+    <!-- no translation found for credentials_reset_summary (3369361230171260282) -->
+    <skip />
+    <!-- no translation found for trusted_credentials (4266945289534242402) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
+    <skip />
+    <!-- no translation found for advanced_security_title (2434776238010578865) -->
+    <skip />
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
+    <!-- no translation found for credentials_settings_not_available (7968275634486624215) -->
+    <skip />
+    <string name="credentials_unlock" msgid="385427939577366499"></string>
+    <!-- no translation found for credentials_unlock_hint (2301301378040499348) -->
+    <skip />
+    <!-- no translation found for credentials_old_password (7553393815538684028) -->
+    <skip />
+    <!-- no translation found for credentials_reset_hint (6297256880896133631) -->
+    <skip />
+    <!-- no translation found for credentials_password_too_short (7502749986405522663) -->
+    <skip />
+    <!-- no translation found for credentials_wrong_password (2541932597104054807) -->
+    <skip />
+    <!-- no translation found for credentials_reset_warning (5320653011511797600) -->
+    <skip />
+    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
+    <skip />
+    <!-- no translation found for credentials_erased (2907836028586342969) -->
+    <skip />
+    <!-- no translation found for credentials_not_erased (93461830775441220) -->
+    <skip />
+    <!-- no translation found for credentials_enabled (7588607413349978930) -->
+    <skip />
+    <!-- no translation found for credentials_configure_lock_screen_hint (6757119179588664966) -->
+    <skip />
+    <!-- no translation found for usage_access_title (332333405495457839) -->
+    <skip />
+    <!-- no translation found for allow_usage_access_title (2134237975190472249) -->
+    <skip />
+    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
+    <!-- no translation found for privacy_settings (5446972770562918934) -->
+    <skip />
+    <!-- no translation found for privacy_settings_title (4856282165773594890) -->
+    <skip />
+    <!-- no translation found for backup_section_title (7952232291452882740) -->
+    <skip />
+    <!-- no translation found for personal_data_section_title (7815209034443782061) -->
+    <skip />
+    <!-- no translation found for backup_data_title (1239105919852668016) -->
+    <skip />
+    <!-- no translation found for backup_data_summary (708773323451655666) -->
+    <skip />
+    <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
+    <skip />
+    <!-- no translation found for include_app_data_title (2829970132260278394) -->
+    <skip />
+    <!-- no translation found for auto_restore_title (5397528966329126506) -->
+    <skip />
+    <!-- no translation found for auto_restore_summary (4235615056371993807) -->
+    <skip />
+    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
+    <skip />
+    <!-- no translation found for local_backup_password_title (3860471654439418822) -->
+    <skip />
+    <!-- no translation found for local_backup_password_summary_none (393503434408227110) -->
+    <skip />
+    <!-- no translation found for local_backup_password_summary_change (2731163425081172638) -->
+    <skip />
+    <!-- no translation found for local_backup_password_toast_success (582016086228434290) -->
+    <skip />
+    <!-- no translation found for local_backup_password_toast_confirmation_mismatch (3495167398824569524) -->
+    <skip />
+    <!-- no translation found for local_backup_password_toast_validation_failure (5646377234895626531) -->
+    <skip />
+    <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
+    <!-- no translation found for backup_erase_dialog_message (5221011285568343155) -->
+    <skip />
+    <!-- no translation found for device_admin_settings_title (1335557832906433309) -->
+    <skip />
+    <!-- no translation found for active_device_admin_msg (6930903262612422111) -->
+    <skip />
+    <!-- no translation found for remove_device_admin (3596845261596451437) -->
+    <skip />
+    <!-- no translation found for select_device_admin_msg (2645509057946368094) -->
+    <skip />
+    <!-- no translation found for no_device_admins (702695100241728775) -->
+    <skip />
+    <!-- no translation found for managed_profile_device_admin_info (5048846624960067582) -->
+    <skip />
+    <!-- no translation found for personal_device_admin_title (2849617316347669861) -->
+    <skip />
+    <!-- no translation found for managed_device_admin_title (7853955652864478435) -->
+    <skip />
+    <!-- no translation found for no_trust_agents (7450273545568977523) -->
+    <skip />
+    <!-- no translation found for add_device_admin_msg (6246742476064507965) -->
+    <skip />
+    <!-- no translation found for add_device_admin (7133327675884827091) -->
+    <skip />
+    <!-- no translation found for device_admin_add_title (7705551449705676363) -->
+    <skip />
+    <!-- no translation found for device_admin_warning (2026747446313628233) -->
+    <skip />
+    <!-- no translation found for device_admin_status (4252975713178851910) -->
+    <skip />
+    <!-- no translation found for profile_owner_add_title (6249331160676175009) -->
+    <skip />
+    <!-- no translation found for adding_profile_owner_warning (6469780138110334180) -->
+    <skip />
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
+    <!-- no translation found for sound_category_sound_title (1488759370067953996) -->
+    <skip />
+    <!-- no translation found for notification_log_title (3766148588239398464) -->
+    <skip />
+    <!-- no translation found for sound_category_call_ringtone_vibrate_title (1543777228646645163) -->
+    <skip />
+    <!-- no translation found for sound_category_system_title (1480844520622721141) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title (2970260757780025029) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_editing_network (6020614644556717979) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connecting_network (5572226790101017822) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connected_network (1608788657122010919) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_add_network (6932651000151032301) -->
+    <skip />
+    <!-- no translation found for wifi_setup_not_connected (6997432604664057052) -->
+    <skip />
+    <!-- no translation found for wifi_setup_add_network (5939624680150051807) -->
+    <skip />
+    <!-- no translation found for wifi_setup_refresh_list (3411615711486911064) -->
+    <skip />
+    <!-- no translation found for wifi_setup_skip (6661541841684895522) -->
+    <skip />
+    <!-- no translation found for wifi_setup_next (3388694784447820477) -->
+    <skip />
+    <!-- no translation found for wifi_setup_back (144777383739164044) -->
+    <skip />
+    <!-- no translation found for wifi_setup_detail (2336990478140503605) -->
+    <skip />
+    <!-- no translation found for wifi_setup_connect (7954456989590237049) -->
+    <skip />
+    <!-- no translation found for wifi_setup_forget (2562847595567347526) -->
+    <skip />
+    <!-- no translation found for wifi_setup_save (3659235094218508211) -->
+    <skip />
+    <!-- no translation found for wifi_setup_cancel (3185216020264410239) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_scanning (5317003416385428036) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_select_network (7519563569903137003) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_existing_network (6394925174802598186) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_unsecured_network (8143046977328718252) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_edit_network (4765340816724760717) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_new_network (7468952850452301083) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_connecting (4971421484401530740) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_proceed_to_next (6708250000342940031) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_eap_not_supported (5335338851032315905) -->
+    <skip />
+    <!-- no translation found for wifi_setup_eap_not_supported (1955087534276570962) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connecting (2793554932006756795) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connected (736032046548460779) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_enabled (558480439730263116) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_disabled (1741194106479011384) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_in_progress (4501160520879902723) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
+    <skip />
+    <!-- no translation found for sync_failed (1696499856374109647) -->
+    <skip />
+    <!-- no translation found for sync_active (8476943765960863040) -->
+    <skip />
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
+    <!-- no translation found for add_account_label (7811707265834013767) -->
+    <skip />
+    <!-- no translation found for managed_profile_not_available_label (3489771164851107822) -->
+    <skip />
+    <!-- no translation found for remove_managed_profile_label (3856519337797285325) -->
+    <skip />
+    <!-- no translation found for background_data (5779592891375473817) -->
+    <skip />
+    <!-- no translation found for background_data_summary (8328521479872763452) -->
+    <skip />
+    <!-- no translation found for background_data_dialog_title (6059217698124786537) -->
+    <skip />
+    <!-- no translation found for background_data_dialog_message (6981661606680941633) -->
+    <skip />
+    <!-- no translation found for sync_automatically (1682730255435062059) -->
+    <skip />
+    <!-- no translation found for sync_enabled (4551148952179416813) -->
+    <skip />
+    <!-- no translation found for sync_disabled (8511659877596511991) -->
+    <skip />
+    <!-- no translation found for sync_error (5060969083117872149) -->
+    <skip />
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
+    <!-- no translation found for settings_backup (2274732978260797031) -->
+    <skip />
+    <!-- no translation found for settings_backup_summary (7916877705938054035) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
+    <!-- no translation found for sync_one_time_sync (6766593624598183090) -->
+    <skip />
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <!-- no translation found for sync_plug (3905078969081888738) -->
+    <skip />
+    <!-- no translation found for header_application_sync_settings (6205903695598000286) -->
+    <skip />
+    <!-- no translation found for header_data_and_synchronization (5165024023936509896) -->
+    <skip />
+    <!-- no translation found for preference_change_password_title (8955581790270130056) -->
+    <skip />
+    <!-- no translation found for header_account_settings (5382475087121880626) -->
+    <skip />
+    <!-- no translation found for remove_account_label (5921986026504804119) -->
+    <skip />
+    <!-- no translation found for header_add_an_account (756108499532023798) -->
+    <skip />
+    <!-- no translation found for finish_button_label (481587707657751116) -->
+    <skip />
+    <!-- no translation found for really_remove_account_title (8800653398717172460) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (1936147502815641161) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (3483528757922948356) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (4010643669489606536) -->
+    <skip />
+    <!-- no translation found for provider_label (7724593781904508866) -->
+    <skip />
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_title (8923508322291625282) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_message (1938380442159016449) -->
+    <skip />
+    <!-- no translation found for wimax_settings (2655139497028469039) -->
+    <skip />
+    <!-- no translation found for status_wimax_mac_address (8390791848661413416) -->
+    <skip />
+    <!-- no translation found for enter_password (8035706727471334122) -->
+    <skip />
+    <!-- no translation found for enter_pin (5305333588093263790) -->
+    <skip />
+    <!-- no translation found for enter_pattern (4187435713036808566) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_wrong_pattern (8423835922362956999) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_wrong_password (5200857195368904047) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_wrong_pin (755720788765259382) -->
+    <skip />
+    <!-- no translation found for checking_decryption (8287458611802609493) -->
+    <skip />
+    <!-- no translation found for starting_android (8581493237458496835) -->
+    <skip />
+    <!-- no translation found for delete (4219243412325163003) -->
+    <skip />
+    <!-- no translation found for misc_files (6720680815969643497) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count (4647048020823912088) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
+    <!-- no translation found for select_all (1562774643280376715) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_title (8605478913544273282) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
+    <skip />
+    <!-- no translation found for debug_debugging_category (6781250159513471316) -->
+    <skip />
+    <!-- no translation found for debug_app (8349591734751384446) -->
+    <skip />
+    <!-- no translation found for debug_app_not_set (718752499586403499) -->
+    <skip />
+    <!-- no translation found for debug_app_set (2063077997870280017) -->
+    <skip />
+    <!-- no translation found for select_application (5156029161289091703) -->
+    <skip />
+    <!-- no translation found for no_application (2813387563129153880) -->
+    <skip />
+    <!-- no translation found for wait_for_debugger (1202370874528893091) -->
+    <skip />
+    <!-- no translation found for wait_for_debugger_summary (1766918303462746804) -->
+    <skip />
+    <!-- no translation found for debug_input_category (1811069939601180246) -->
+    <skip />
+    <!-- no translation found for debug_drawing_category (6755716469267367852) -->
+    <skip />
+    <!-- no translation found for debug_hw_drawing_category (6220174216912308658) -->
+    <skip />
+    <!-- no translation found for media_category (4388305075496848353) -->
+    <skip />
+    <!-- no translation found for debug_monitoring_category (7640508148375798343) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_touches (1356420386500834339) -->
+    <skip />
+    <!-- no translation found for show_touches_summary (6684407913145150041) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (5470814345876056420) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (2569622766672785529) -->
+    <skip />
+    <!-- no translation found for show_hw_screen_updates (5036904558145941590) -->
+    <skip />
+    <!-- no translation found for show_hw_screen_updates_summary (1115593565980196197) -->
+    <skip />
+    <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+    <skip />
+    <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+    <skip />
+    <!-- no translation found for debug_hw_overdraw (2968692419951565417) -->
+    <skip />
+    <!-- no translation found for disable_overlays (2074488440505934665) -->
+    <skip />
+    <!-- no translation found for disable_overlays_summary (3578941133710758592) -->
+    <skip />
+    <!-- no translation found for simulate_color_space (6745847141353345872) -->
+    <skip />
+    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
+    <skip />
+    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
+    <skip />
+    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
+    <skip />
+    <!-- no translation found for usb_audio_disable_routing (8114498436003102671) -->
+    <skip />
+    <!-- no translation found for usb_audio_disable_routing_summary (980282760277312264) -->
+    <skip />
+    <!-- no translation found for debug_layout (5981361776594526155) -->
+    <skip />
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
+    <!-- no translation found for force_rtl_layout_all_locales (2259906643093138978) -->
+    <skip />
+    <!-- no translation found for force_rtl_layout_all_locales_summary (9192797796616132534) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for force_hw_ui (6426383462520888732) -->
+    <skip />
+    <!-- no translation found for force_hw_ui_summary (5535991166074861515) -->
+    <skip />
+    <!-- no translation found for force_msaa (7920323238677284387) -->
+    <skip />
+    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
+    <skip />
+    <!-- no translation found for show_non_rect_clip (505954950474595172) -->
+    <skip />
+    <!-- no translation found for track_frame_time (6146354853663863443) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for animator_duration_scale_title (3406722410819934083) -->
+    <skip />
+    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
+    <skip />
+    <string name="enable_multi_window" msgid="1091779249819137016">"Mod. me shumë dritare"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Shumë aktivitete në ekran në të njëjtën kohë."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Të aktivizohet modaliteti me shumë dritare?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"PARALAJMËRIM: Ky është një funksion shumë eksperimental që lejon aktivitete të shumta në ekran në të njëjtën kohë nëpërmjet ndërfaqes së përdoruesit të aplikacioneve të fundit. Disa aplikacione mund të pësojnë ndërprerje aksidentale ose të mos funksionojnë si duhet kur përdoren me këtë funksion."</string>
+    <!-- no translation found for debug_applications_category (4206913653849771549) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (8366775083630234121) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4280600650253107163) -->
+    <skip />
+    <!-- no translation found for show_all_anrs (28462979638729082) -->
+    <skip />
+    <!-- no translation found for show_all_anrs_summary (641908614413544127) -->
+    <skip />
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_app_summary_title (4147258989837459172) -->
+    <skip />
+    <!-- no translation found for data_usage_accounting (7170028915873577387) -->
+    <skip />
+    <!-- no translation found for data_usage_app (4970478397515423303) -->
+    <skip />
+    <!-- no translation found for data_usage_app_info_label (3409931235687866706) -->
+    <skip />
+    <!-- no translation found for data_usage_cellular_data (4859424346276043677) -->
+    <skip />
+    <!-- no translation found for data_usage_data_limit (1193930999713192703) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_app_items_header_text (5017850810459372828) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_roaming (8042359966835203296) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_restrict_background (1989394568592253331) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_allow_background (2694761978633359223) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (5322857680792601899) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (2296217964873872571) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_hide_wifi (7290056718050186769) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_ethernet (5181361208532314097) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_hide_ethernet (3326702187179943681) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_metered (6235119991372755026) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_sim_cards (6410498422797244073) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_cellular_networks (5243515735055652279) -->
+    <skip />
+    <!-- no translation found for account_settings_menu_auto_sync (6243013719753700377) -->
+    <skip />
+    <!-- no translation found for account_settings_menu_auto_sync_personal (785541379617346438) -->
+    <skip />
+    <!-- no translation found for account_settings_menu_auto_sync_work (329565580969147026) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_empty (8621855507876539282) -->
+    <skip />
+    <!-- no translation found for data_usage_label_foreground (4938034231928628164) -->
+    <skip />
+    <!-- no translation found for data_usage_label_background (3225844085975764519) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restricted (3568465218866589705) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile (2613595056882494652) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (3934211003105066167) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (6233554774946681175) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (2558557840444266906) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_wifi_limit (1394901415264660888) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (481146038146585749) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_ethernet (7298064366282319911) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (2084466270343460491) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_list_mobile (7219011330831181312) -->
+    <skip />
+    <!-- no translation found for data_usage_list_none (3933892774251050735) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (5900650720568852325) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_forground_label (7654319010655983591) -->
+    <skip />
+    <!-- no translation found for data_usage_background_label (2722008379947694926) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (2279171379771253165) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (7510046552380574925) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (3720075732277934106) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary_disabled (1446565717342917727) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (1613108390242737923) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (5871168521456832764) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_denied_dialog (4674085030810350875) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (8581983093524041669) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (8651376294887142858) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (8821760330497941117) -->
+    <skip />
+    <!-- no translation found for data_usage_warning_editor_title (3704136912240060339) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_editor_title (9153595142385030015) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (5788774061143636263) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (3511301596446820549) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background_title (2201315502223035062) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background (8210134218644196511) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background_multiuser (3262993384666280985) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background_multiuser (4352615206362479722) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_limit (860566507375933039) -->
+    <skip />
+    <!-- no translation found for data_usage_uninstalled_apps (614263770923231598) -->
+    <skip />
+    <!-- no translation found for data_usage_uninstalled_apps_users (7986294489899813194) -->
+    <skip />
+    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
+    <skip />
+    <!-- no translation found for data_usage_total_during_range (4091294280619255237) -->
+    <skip />
+    <!-- no translation found for data_usage_total_during_range_mobile (5961720793603268572) -->
+    <skip />
+    <!-- no translation found for data_usage_total_during_range_mobile (1625833170144610767) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_title (7383175371006596441) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_body (3262343834446126044) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_mobile (2326986339431119372) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_wifi (1761738002328299714) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_wifi_disabled (727808462375941567) -->
+    <skip />
+    <!-- no translation found for data_usage_disclaimer (6887858149980673444) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_return_to_call (5613717339452772491) -->
+    <skip />
+    <!-- no translation found for vpn_name (4689699885361002297) -->
+    <skip />
+    <!-- no translation found for vpn_type (5435733139514388070) -->
+    <skip />
+    <!-- no translation found for vpn_server (2123096727287421913) -->
+    <skip />
+    <!-- no translation found for vpn_mppe (6639001940500288972) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_identifier (4098175859460006296) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_secret (4526453255704888704) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_user_cert (6880651510020187230) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_ca_cert (91338213449148229) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
+    <skip />
+    <!-- no translation found for vpn_show_options (7182688955890457003) -->
+    <skip />
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_dns_servers (5570715561245741829) -->
+    <skip />
+    <!-- no translation found for vpn_routes (3818655448226312232) -->
+    <skip />
+    <!-- no translation found for vpn_username (1863901629860867849) -->
+    <skip />
+    <!-- no translation found for vpn_password (6756043647233596772) -->
+    <skip />
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <!-- no translation found for vpn_no_ca_cert (2095005387500126113) -->
+    <skip />
+    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
+    <skip />
+    <!-- no translation found for vpn_cancel (1979937976123659332) -->
+    <skip />
+    <!-- no translation found for vpn_save (4233484051644764510) -->
+    <skip />
+    <!-- no translation found for vpn_connect (8469608541746132301) -->
+    <skip />
+    <!-- no translation found for vpn_edit (8647191407179996943) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
+    <skip />
+    <!-- no translation found for vpn_title (6317731879966640551) -->
+    <skip />
+    <!-- no translation found for vpn_create (5628219087569761496) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (408275284159243490) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
+    <skip />
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
+    <!-- no translation found for vpn_no_network (3050233675132726155) -->
+    <skip />
+    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_system_tab (3984284264816924534) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_user_tab (2244732111398939475) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_label (3864493185845818506) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_label (2498444573635146913) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_label (3633691709300260836) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_confirmation (83215982842660869) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_confirmation (8199697813361646792) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_confirmation (443561923016852941) -->
+    <skip />
+    <!-- no translation found for spellcheckers_settings_title (399981228588011501) -->
+    <skip />
+    <!-- no translation found for current_backup_pw_prompt (7735254412051914576) -->
+    <skip />
+    <!-- no translation found for new_backup_pw_prompt (8755501377391998428) -->
+    <skip />
+    <!-- no translation found for confirm_new_backup_pw_prompt (3238728882512787864) -->
+    <skip />
+    <!-- no translation found for backup_pw_set_button_text (2387480910044648795) -->
+    <skip />
+    <!-- no translation found for backup_pw_cancel_button_text (8845630125391744615) -->
+    <skip />
+    <!-- no translation found for additional_system_update_settings_list_item_title (214987609894661992) -->
+    <skip />
+    <!-- no translation found for selinux_status_disabled (924551035552323327) -->
+    <skip />
+    <!-- no translation found for selinux_status_permissive (6004965534713398778) -->
+    <skip />
+    <!-- no translation found for selinux_status_enforcing (2252703756208463329) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
+    <skip />
+    <!-- no translation found for done_button (1991471253042622230) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_info_message (4583879256548819713) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_warning_message (8216218659139190498) -->
+    <skip />
+    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
+    <skip />
+    <!-- no translation found for user_settings_title (6151874007858148344) -->
+    <skip />
+    <!-- no translation found for user_list_title (7937158411137563543) -->
+    <skip />
+    <!-- no translation found for user_add_user_or_profile_menu (6923838875175259418) -->
+    <skip />
+    <!-- no translation found for user_add_user_menu (1675956975014862382) -->
+    <skip />
+    <!-- no translation found for user_summary_restricted_profile (6354966213806839107) -->
+    <skip />
+    <!-- no translation found for user_need_lock_message (2596365678651842785) -->
+    <skip />
+    <!-- no translation found for user_set_lock_button (8311219392856626841) -->
+    <skip />
+    <!-- no translation found for user_summary_not_set_up (8778205026866794909) -->
+    <skip />
+    <!-- no translation found for user_summary_restricted_not_set_up (1628116001964325544) -->
+    <skip />
+    <!-- no translation found for user_summary_managed_profile_not_set_up (1659125858619760573) -->
+    <skip />
+    <!-- no translation found for user_owner (3879126011135546571) -->
+    <skip />
+    <!-- no translation found for user_you (1639158809315025986) -->
+    <skip />
+    <!-- no translation found for user_nickname (5148818000228994488) -->
+    <skip />
+    <!-- no translation found for user_add_user_type_title (2146438670792322349) -->
+    <skip />
+    <!-- no translation found for user_add_user_item_summary (4702776187132008661) -->
+    <skip />
+    <!-- no translation found for user_add_profile_item_summary (5931663986889138941) -->
+    <skip />
+    <!-- no translation found for user_add_user_item_title (8212199632466198969) -->
+    <skip />
+    <!-- no translation found for user_add_profile_item_title (8353515490730363621) -->
+    <skip />
+    <!-- no translation found for user_add_user_title (2108112641783146007) -->
+    <skip />
+    <!-- no translation found for user_add_user_message_long (8562152293752222985) -->
+    <skip />
+    <!-- no translation found for user_add_user_message_short (1511354412249044381) -->
+    <skip />
+    <!-- no translation found for user_setup_dialog_title (1765794166801864563) -->
+    <skip />
+    <!-- no translation found for user_setup_dialog_message (1004068621380867148) -->
+    <skip />
+    <!-- no translation found for user_setup_profile_dialog_message (3896568553327558731) -->
+    <skip />
+    <!-- no translation found for user_setup_button_setup_now (3391388430158437629) -->
+    <skip />
+    <!-- no translation found for user_setup_button_setup_later (3068729597269172401) -->
+    <skip />
+    <!-- no translation found for user_cannot_manage_message (8440449301994432789) -->
+    <skip />
+    <!-- no translation found for user_cannot_manage_message (1133251987818014757) -->
+    <skip />
+    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
+    <skip />
+    <!-- no translation found for user_remove_user_menu (6897150520686691355) -->
+    <skip />
+    <!-- no translation found for user_add_on_lockscreen_menu (3025132738715222247) -->
+    <skip />
+    <!-- no translation found for user_new_user_name (369856859816028856) -->
+    <skip />
+    <!-- no translation found for user_new_profile_name (2632088404952119900) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_self_title (8432050170899479556) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_title (1163721647646152032) -->
+    <skip />
+    <!-- no translation found for user_profile_confirm_remove_title (5573161550669867342) -->
+    <skip />
+    <!-- no translation found for work_profile_confirm_remove_title (2017323555783522213) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_self_message (8167855311779740207) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_self_message (5391888073786090274) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_message (1020629390993095037) -->
+    <skip />
+    <!-- no translation found for work_profile_confirm_remove_message (7593793549364168783) -->
+    <skip />
+    <!-- no translation found for user_profile_confirm_remove_message (7373754145959298522) -->
+    <skip />
+    <!-- no translation found for user_adding_new_user (1521674650874241407) -->
+    <skip />
+    <!-- no translation found for user_delete_user_description (3158592592118767056) -->
+    <skip />
+    <!-- no translation found for user_delete_button (5131259553799403201) -->
+    <skip />
+    <!-- no translation found for user_guest (8475274842845401871) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_title (5613997155527410675) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_title (3405527634738147409) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_confirm_message (2194459201944413257) -->
+    <skip />
+    <!-- no translation found for user_exit_guest_dialog_remove (6351370829952745350) -->
+    <skip />
+    <!-- no translation found for user_enable_calling (5128605672081602348) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_sms (9172507088023097063) -->
+    <skip />
+    <!-- no translation found for user_remove_user (6490483480937295389) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_confirm_title (4315789475268695378) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_confirm_message (8061594235219352787) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_and_sms_confirm_title (7243308401401932681) -->
+    <skip />
+    <!-- no translation found for user_enable_calling_and_sms_confirm_message (4025082715546544967) -->
+    <skip />
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
+    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
+    <skip />
+    <!-- no translation found for only_one_home_message (3538846733750242759) -->
+    <skip />
+    <!-- no translation found for global_change_warning (8045013389464294039) -->
+    <skip />
+    <!-- no translation found for global_change_warning (2461264421590324675) -->
+    <skip />
+    <!-- no translation found for global_locale_change_title (5956281361384221451) -->
+    <skip />
+    <!-- no translation found for global_font_change_title (1887126466191012035) -->
+    <skip />
+    <!-- no translation found for nfc_payment_settings_title (1807298287380821613) -->
+    <skip />
+    <!-- no translation found for google_wallet (9122936252378589227) -->
+    <skip />
+    <!-- no translation found for nfc_payment_no_apps (2481080809791416010) -->
+    <skip />
+    <!-- no translation found for nfc_payment_favor_foreground (8881893980929835838) -->
+    <skip />
+    <!-- no translation found for nfc_payment_learn_more (5583407773744324447) -->
+    <skip />
+    <!-- no translation found for nfc_more_title (815910943655133280) -->
+    <skip />
+    <!-- no translation found for nfc_payment_menu_item_add_service (2885947408068969081) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_label (7315817259485674542) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (8961120988148253016) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default_instead_of (3803693771001226795) -->
+    <skip />
+    <!-- no translation found for restriction_settings_title (4233515503765879736) -->
+    <skip />
+    <!-- no translation found for restriction_menu_reset (2067644523489568173) -->
+    <skip />
+    <!-- no translation found for restriction_menu_change_pin (740081584044302775) -->
+    <skip />
+    <!-- no translation found for app_notifications_switch_label (9124072219553687583) -->
+    <skip />
+    <!-- no translation found for help_label (6886837949306318591) -->
+    <skip />
+    <!-- no translation found for user_account_title (1127193807312271167) -->
+    <skip />
+    <!-- no translation found for user_picture_title (7297782792000291692) -->
+    <skip />
+    <!-- no translation found for extreme_threats_title (6549541803542968699) -->
+    <skip />
+    <!-- no translation found for extreme_threats_summary (8777860706500920667) -->
+    <skip />
+    <!-- no translation found for severe_threats_title (8362676353803170963) -->
+    <skip />
+    <!-- no translation found for severe_threats_summary (8848126509420177320) -->
+    <skip />
+    <!-- no translation found for amber_alerts_title (2772220337031146529) -->
+    <skip />
+    <!-- no translation found for amber_alerts_summary (4312984614037904489) -->
+    <skip />
+    <!-- no translation found for repeat_title (6473587828597786996) -->
+    <skip />
+    <!-- no translation found for call_manager_enable_title (7718226115535784017) -->
+    <skip />
+    <!-- no translation found for call_manager_enable_summary (8458447798019519240) -->
+    <skip />
+    <!-- no translation found for call_manager_title (4479949569744516457) -->
+    <skip />
+    <!-- no translation found for call_manager_summary (5918261959486952674) -->
+    <skip />
+    <!-- no translation found for cell_broadcast_settings (2451014351355183338) -->
+    <skip />
+    <!-- no translation found for network_operators_settings (2583178259504630435) -->
+    <skip />
+    <!-- no translation found for access_point_names (1381602020438634481) -->
+    <skip />
+    <!-- no translation found for enhanced_4g_lte_mode_title (5808043757309522392) -->
+    <skip />
+    <!-- no translation found for enhanced_4g_lte_mode_summary (1376589643017218924) -->
+    <skip />
+    <!-- no translation found for preferred_network_type_title (3431041717309776341) -->
+    <skip />
+    <!-- no translation found for preferred_network_type_summary (6564884693884755019) -->
+    <skip />
+    <!-- no translation found for work_sim_title (4843322164662606891) -->
+    <skip />
+    <!-- no translation found for user_restrictions_title (5794473784343434273) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <!-- no translation found for app_restrictions_custom_label (6160672982086584261) -->
+    <skip />
+    <!-- no translation found for user_restrictions_controlled_by (3164078767438313899) -->
+    <skip />
+    <!-- no translation found for app_sees_restricted_accounts (7503264525057246240) -->
+    <skip />
+    <!-- no translation found for app_sees_restricted_accounts_and_controlled_by (6968697624437267294) -->
+    <skip />
+    <!-- no translation found for restriction_wifi_config_title (8889556384136994814) -->
+    <skip />
+    <!-- no translation found for restriction_wifi_config_summary (70888791513065244) -->
+    <skip />
+    <!-- no translation found for restriction_bluetooth_config_title (8871681580962503671) -->
+    <skip />
+    <!-- no translation found for restriction_bluetooth_config_summary (8372319681287562506) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_title (5888100955212267941) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_summary_config (3232480757215851738) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_summary (3891097373396149915) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_summary (825331120501418592) -->
+    <skip />
+    <!-- no translation found for restriction_location_enable_title (5020268888245775164) -->
+    <skip />
+    <!-- no translation found for restriction_location_enable_summary (3489765572281788755) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
+    <!-- no translation found for user_image_take_photo (1280274310152803669) -->
+    <!-- no translation found for user_image_take_photo (7496128293167402354) -->
+    <skip />
+    <!-- no translation found for user_image_choose_photo (7940990613897477057) -->
+    <!-- no translation found for user_image_choose_photo (3746334626214970837) -->
+    <skip />
+    <!-- no translation found for user_image_photo_selector (5492565707299454873) -->
+    <skip />
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <!-- no translation found for sim_setup_wizard_title (1732682852692274928) -->
+    <skip />
+    <!-- no translation found for sim_settings_title (6822745211458959756) -->
+    <skip />
+    <!-- no translation found for sim_settings_summary (4050372057097516088) -->
+    <skip />
+    <!-- no translation found for sim_cards_changed_message (7900721153345139783) -->
+    <skip />
+    <!-- no translation found for sim_cards_changed_message_summary (5452545583546944683) -->
+    <skip />
+    <!-- no translation found for sim_cellular_data_unavailable (9018555543451203035) -->
+    <skip />
+    <!-- no translation found for sim_cellular_data_unavailable_summary (3654805961942166428) -->
+    <skip />
+    <!-- no translation found for sim_calls_always_use (7936774751250119715) -->
+    <skip />
+    <!-- no translation found for select_sim_for_data (2366081042162853044) -->
+    <skip />
+    <!-- no translation found for data_switch_started (2040761479817166311) -->
+    <skip />
+    <!-- no translation found for select_sim_for_calls (3503094771801109334) -->
+    <skip />
+    <!-- no translation found for sim_select_card (211285163525563293) -->
+    <skip />
+    <!-- no translation found for sim_card_number_title (7845379943474336488) -->
+    <skip />
+    <!-- no translation found for sim_slot_empty (8964505511911854688) -->
+    <skip />
+    <!-- no translation found for sim_editor_name (1722945976676142029) -->
+    <skip />
+    <!-- no translation found for sim_name_hint (7038643345238968930) -->
+    <skip />
+    <!-- no translation found for sim_editor_title (4034301817366627870) -->
+    <skip />
+    <!-- no translation found for sim_editor_carrier (5684523444677746573) -->
+    <skip />
+    <!-- no translation found for sim_editor_number (6705955651035440667) -->
+    <skip />
+    <!-- no translation found for sim_editor_color (2542605938562414355) -->
+    <skip />
+    <!-- no translation found for sim_card_select_title (6668492557519243456) -->
+    <skip />
+    <!-- no translation found for color_orange (4417567658855022517) -->
+    <skip />
+    <!-- no translation found for color_purple (3888532466427762504) -->
+    <skip />
+    <!-- no translation found for sim_no_inserted_msg (210316755353227087) -->
+    <skip />
+    <!-- no translation found for sim_status_title (6744870675182447160) -->
+    <skip />
+    <!-- no translation found for sim_call_back_title (5181549885999280334) -->
+    <skip />
+    <!-- no translation found for sim_outgoing_call_title (1019763076116874255) -->
+    <skip />
+    <!-- no translation found for sim_other_call_settings (8247802316114482477) -->
+    <skip />
+    <!-- no translation found for preferred_network_offload_title (1605829724169550275) -->
+    <skip />
+    <!-- no translation found for preferred_network_offload_header (2321173571529106767) -->
+    <skip />
+    <!-- no translation found for preferred_network_offload_footer (5857279426054744020) -->
+    <skip />
+    <!-- no translation found for preferred_network_offload_popup (2252915199889604600) -->
+    <skip />
+    <!-- no translation found for sim_signal_strength (9144010043784767984) -->
+    <skip />
+    <!-- no translation found for sim_notification_title (6272913297433198340) -->
+    <skip />
+    <!-- no translation found for sim_notification_summary (5024470200658902406) -->
+    <skip />
+    <!-- no translation found for sim_pref_divider (6778907671867621874) -->
+    <skip />
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
+    <!-- no translation found for sim_selection_required_pref (3446721423206414652) -->
+    <skip />
+    <!-- no translation found for dashboard_title (5453710313046681820) -->
+    <skip />
+    <!-- no translation found for search_results_title (1796252422574886932) -->
+    <skip />
+    <!-- no translation found for search_menu (7053532283559077164) -->
+    <skip />
+    <!-- no translation found for query_hint_text (3350700807437473939) -->
+    <skip />
+    <!-- no translation found for search_recents_queries_label (2128811638532309069) -->
+    <skip />
+    <!-- no translation found for search_results_label (4163304782363526148) -->
+    <skip />
+    <!-- no translation found for keywords_wifi (8947676711698613374) -->
+    <skip />
+    <!-- no translation found for keywords_more_default_sms_app (895656981962034647) -->
+    <skip />
+    <!-- no translation found for keywords_more_mobile_networks (4939725094449606744) -->
+    <skip />
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"telefono telefonatë me wifi wi-fi"</string>
+    <!-- no translation found for keywords_home (3626170808219458848) -->
+    <skip />
+    <!-- no translation found for keywords_display (6709007669501628320) -->
+    <skip />
+    <!-- no translation found for keywords_display_brightness_level (8923289340474728990) -->
+    <skip />
+    <!-- no translation found for keywords_display_auto_brightness (8357056338746666901) -->
+    <skip />
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tema e errët modaliteti i natës ekrani i zbehtë ndërrimi i ndriçimit"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"sfondi personalizo përshtat ekrani"</string>
+    <!-- no translation found for keywords_display_font_size (3404655440064726124) -->
+    <skip />
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"transmetimi i projektimit"</string>
+    <!-- no translation found for keywords_storage (6572905220031852173) -->
+    <skip />
+    <!-- no translation found for keywords_battery (2096185085932675704) -->
+    <skip />
+    <!-- no translation found for keywords_spell_checker (6106749039734174140) -->
+    <skip />
+    <!-- no translation found for keywords_voice_input (3519547605812413860) -->
+    <skip />
+    <!-- no translation found for keywords_text_to_speech_output (392447904221657930) -->
+    <skip />
+    <!-- no translation found for keywords_date_and_time (2631808108134830066) -->
+    <skip />
+    <!-- no translation found for keywords_factory_data_reset (4355133848707691977) -->
+    <skip />
+    <!-- no translation found for keywords_printing (1701778563617114846) -->
+    <skip />
+    <!-- no translation found for keywords_sounds_and_notifications (5965996187974887000) -->
+    <skip />
+    <!-- no translation found for keywords_sounds_and_notifications_interruptions (2912933812460077912) -->
+    <skip />
+    <!-- no translation found for keywords_app (6334757056536837791) -->
+    <skip />
+    <!-- no translation found for keywords_location (782326973714313480) -->
+    <skip />
+    <!-- no translation found for keywords_location_mode (8584992704568356084) -->
+    <skip />
+    <!-- no translation found for keywords_accounts (1957925565953357627) -->
+    <skip />
+    <!-- no translation found for keywords_users (4673901601478559100) -->
+    <skip />
+    <!-- no translation found for keywords_keyboard_and_ime (5251531893531063855) -->
+    <skip />
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"rivendos preferencat e parazgjedhura"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"aplikacioni i parazgjedhur i urgjencës i akullit"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"sistemi i aplikacioneve për shkarkimin e aplikacioneve"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"siguria e lejeve të aplikacioneve"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"aplikacionet e parazgjedhura"</string>
+    <!-- no translation found for keywords_lockscreen (4806191868723291541) -->
+    <skip />
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
+    <!-- no translation found for write_tag (8571858602896222537) -->
+    <skip />
+    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <skip />
+    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <skip />
+    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <skip />
+    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <skip />
+    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <skip />
+    <!-- no translation found for default_sound (8821684447333687810) -->
+    <skip />
+    <!-- no translation found for notification_settings (8791730980212496561) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <!-- no translation found for notification_volume_option_title (6064656124416882130) -->
+    <skip />
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Vetëm me prioritet lejon"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Rregullat automatike"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Vetëm me prioritet"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Vetëm alarmet"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Nuk ka ndërprerje"</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>
+    <!-- no translation found for ringtone_title (5379026328015343686) -->
+    <skip />
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <!-- no translation found for vibrate_when_ringing_title (3806079144545849032) -->
+    <skip />
+    <!-- no translation found for notification_section_header (95661783916799134) -->
+    <skip />
+    <!-- no translation found for notification_pulse_title (1247988024534030629) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_show (6407527697810672847) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_hide (7891552853357258782) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_interstitial_message (6164532459432182244) -->
+    <skip />
+    <!-- no translation found for app_notifications_title (5810577805218003760) -->
+    <skip />
+    <!-- no translation found for other_sound_settings (3151004537006844718) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (1340569241625989837) -->
+    <skip />
+    <!-- no translation found for docking_sounds_title (155236288949940607) -->
+    <skip />
+    <!-- no translation found for touch_sounds_title (5326587106892390176) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for dock_audio_media_title (1346838179626123900) -->
+    <skip />
+    <!-- no translation found for dock_audio_media_disabled (3430953622491538080) -->
+    <skip />
+    <!-- no translation found for dock_audio_media_enabled (667849382924908673) -->
+    <skip />
+    <!-- no translation found for emergency_tone_silent (1067515631635824291) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8941852695428130667) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (8281126443204950847) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_summary_zero (2409912785614953348) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_summary_nonzero (7930130030691218387) -->
+    <!-- no translation found for no_notification_listeners (2767405417723149879) -->
+    <skip />
+    <!-- no translation found for notification_listener_security_warning_title (6494221261778885893) -->
+    <skip />
+    <!-- no translation found for notification_listener_security_warning_summary (2780319203595885564) -->
+    <skip />
+    <!-- no translation found for loading_notification_apps (5031818677010335895) -->
+    <skip />
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blloko të gjitha"</string>
+    <!-- no translation found for app_notification_block_summary (9049487483231233726) -->
+    <skip />
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Trajtoje si me prioritet"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Lejo dëgjimin e njoftimeve të këtij aplikacioni kur Mos shqetëso është caktuar si Vetëm me prioritet"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Lejo shikimin e shpejtë"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Lejoje këtë aplikacion që të theksojë njoftimet duke i rrëshqitur shkurtimisht në pamje në ekranin aktual"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Fshihi përmbajtjet delikate"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Kur pajisja është e kyçur, fshihi përmbajtjet në njoftimet e këtij aplikacioni ku mund të shfaqen informacione private"</string>
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7723839972982746568) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_done (3484067728568791014) -->
+    <skip />
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Emri i rregullit"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Shto rregullin"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Fshi rregullin"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Të fshihet rregulli \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Fshi"</string>
+    <!-- no translation found for zen_mode_rule_type (2289413469580142888) -->
+    <skip />
+    <!-- no translation found for zen_mode_rule_type_unknown (3049377282766700600) -->
+    <skip />
+    <!-- no translation found for zen_mode_configure_rule (8865785428056490305) -->
+    <skip />
+    <!-- no translation found for zen_schedule_rule_type_name (3201273040477861538) -->
+    <skip />
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Rregulli nuk u gjet."</string>
+    <!-- no translation found for zen_mode_rule_summary_combination (2526506268333198254) -->
+    <skip />
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Ditët"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Asnjë"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Çdo ditë"</string>
+    <!-- no translation found for summary_divider_text (7228986578690919294) -->
+    <skip />
+    <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> deri në <xliff:g id="END">%2$s</xliff:g>"</string>
+    <!-- no translation found for zen_mode_calls (7051492091133751208) -->
+    <skip />
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
+    <skip />
+    <!-- no translation found for zen_mode_from (1033337300289871697) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmet"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Alarmet rikujtuese"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Ngjarjet"</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>
+    <!-- no translation found for zen_mode_when (2767193283311106373) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ditën tjetër"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Ndërprerjet"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Kur vijnë telefonatat dhe njoftimet"</string>
+    <!-- no translation found for zen_mode_interruptions_voice_prompt (3041817362475695079) -->
+    <skip />
+    <!-- no translation found for zen_mode_duration_voice_prompt (7381920739389625133) -->
+    <skip />
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Ndërprit gjithmonë"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"joaktive,të gjitha,gjithçka"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Lejo vetëm ndërprerjet prioritare"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Lejo vetëm alarmet"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Mos ndërprit"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <!-- no translation found for zen_mode_duration_indefinte_voice_label (9026001994945950539) -->
+    <skip />
+    <!-- no translation found for zen_mode_duration_minutes_voice_label (4750982084453980) -->
+    <!-- no translation found for zen_mode_duration_hours_voice_label (175180249071227957) -->
+    <!-- no translation found for zen_mode_summary_priority_indefinitely (5417246022606171241) -->
+    <skip />
+    <!-- no translation found for zen_mode_summary_priority_by_minute (1938955186728929112) -->
+    <!-- no translation found for zen_mode_summary_priority_by_hour (6664710096150897823) -->
+    <!-- no translation found for zen_mode_summary_alarams_only_indefinite (7941708969866496605) -->
+    <skip />
+    <!-- no translation found for zen_mode_summary_alarms_only_by_minute (6122003583875424601) -->
+    <!-- no translation found for zen_mode_summary_alarms_only_by_hour (2407703455581767748) -->
+    <!-- no translation found for zen_mode_summary_no_interruptions_indefinite (5705225870569410806) -->
+    <skip />
+    <!-- no translation found for zen_mode_summary_no_interruptions_by_minute (4719882120685708458) -->
+    <!-- no translation found for zen_mode_summary_no_interruptions_by_hour (1508397683895056389) -->
+    <!-- no translation found for zen_mode_summary_always (6172985102689237703) -->
+    <skip />
+    <!-- no translation found for zen_mode_duration_indefinite_voice_synonyms (4213829562303429456) -->
+    <skip />
+    <!-- no translation found for notification_settings_apps_title (1125354590652967250) -->
+    <skip />
+    <!-- no translation found for notification_app_settings_button (6685640230371477485) -->
+    <skip />
+    <!-- no translation found for device_feedback (3238056036766293294) -->
+    <skip />
+    <!-- no translation found for restr_pin_enter_admin_pin (2451187374960131018) -->
+    <skip />
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
+    <!-- no translation found for screen_pinning_title (2292573232264116542) -->
+    <skip />
+    <!-- no translation found for screen_pinning_description (1137904524037468263) -->
+    <skip />
+    <!-- no translation found for screen_pinning_unlock_pattern (8282268570060313339) -->
+    <skip />
+    <!-- no translation found for screen_pinning_unlock_pin (8757588350454795286) -->
+    <skip />
+    <!-- no translation found for screen_pinning_unlock_password (2514079566873826434) -->
+    <skip />
+    <!-- no translation found for screen_pinning_unlock_none (3814188275713871856) -->
+    <skip />
+    <!-- no translation found for managed_user_title (8101244883654409696) -->
+    <skip />
+    <!-- no translation found for experimental_preference (7083015446690681376) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_title (6176450657107806043) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_rotate (4544299861233497728) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_stay_in_portrait (292745182318093651) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_stay_in_landscape (3804752830204062162) -->
+    <skip />
+    <!-- no translation found for display_auto_rotate_stay_in_current (317932372686498096) -->
+    <skip />
+    <!-- no translation found for imei_information_title (8499085421609752290) -->
+    <skip />
+    <!-- no translation found for encryption_interstitial_header (5790264941172726485) -->
+    <skip />
+    <!-- no translation found for encryption_continue_button (1121880322636992402) -->
+    <skip />
+    <!-- no translation found for encryption_interstitial_message_pin (3705622704667901162) -->
+    <skip />
+    <!-- no translation found for encryption_interstitial_message_pattern (2944051427890104942) -->
+    <skip />
+    <!-- no translation found for encryption_interstitial_message_password (1439296580879440802) -->
+    <skip />
+    <!-- no translation found for encrypt_require_pin (2063945047845243752) -->
+    <skip />
+    <!-- no translation found for encrypt_require_pattern (6898479411004015810) -->
+    <skip />
+    <!-- no translation found for encrypt_require_password (8770628366276570518) -->
+    <skip />
+    <!-- no translation found for encrypt_dont_require_pin (1082444817726247368) -->
+    <skip />
+    <!-- no translation found for encrypt_dont_require_pattern (6668299362640433843) -->
+    <skip />
+    <!-- no translation found for encrypt_dont_require_password (2580403214917009046) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_require_pin (8299960550048989807) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_require_pattern (1499790256154146639) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_require_password (8841994614218049215) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_message_pin (1890374082842868489) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_message_pattern (4474332516537386384) -->
+    <skip />
+    <!-- no translation found for encrypt_talkback_dialog_message_password (8166099418487083927) -->
+    <skip />
+    <!-- no translation found for imei_information_title (8499085421609752290) -->
+    <skip />
+    <!-- no translation found for imei_information_summary (2074095606556565233) -->
+    <skip />
+    <!-- no translation found for slot_number (3762676044904653577) -->
+    <skip />
+    <string name="launch_by_default" msgid="2184141780491382435">"Hap si parazgjedhje"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> të përdorura në <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Lidhjet e domenit"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Hap URL-të e domenit"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Lejo aplikacionin që të hapë drejtpërdrejt URL-të e domenit"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL-të e domenëve që kanë mbështetje"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Parazgjedhjet e tjera"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> të përdorura në <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"memoria e brendshme"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"memoria e jashtme"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Hapësira e brendshme ruajtëse"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Hapësira jashtme ruajtëse"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Përdorimi i të dhënave të aplikacioneve"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> përdorur prej <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Hapësira ruajtëse e përdorur"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Aktive"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blloko"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Delikate"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Me prioritet"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Me prioritet dhe delikate"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> leje u dhanë</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> leje u dha</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> nga <xliff:g id="COUNT_3">%d</xliff:g> leje u dhanë</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> nga <xliff:g id="COUNT_1">%d</xliff:g> leje u dha</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Janë caktuar disa parazgjedhje"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Nuk është caktuar asnjë parazgjedhje"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Të gjitha aplikacionet"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Të aktivizuara"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personale"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Puna"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Të bllokuara"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Me prioritet"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Delikate"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Me URL-të e domenit"</string>
+    <!-- no translation found for trust_agent_disabled_device_admin (5982562414642596563) -->
+    <skip />
+    <string name="advanced_apps" msgid="4812975097124803873">"Të përparuara"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Aplikacion i panjohur"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Zgjidh profilin"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Lejet e aplikacionit"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> nga <xliff:g id="COUNT_1">%d</xliff:g> aplikacioneve iu lejua qasje shtesë"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> nga <xliff:g id="COUNT_1">%d</xliff:g> aplikacione u lejuan"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL-të e domenit"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Mos hap asnjë URL të domenit"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Hap \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Hap \'<xliff:g id="DOMAIN">%s</xliff:g>\' dhe URL-të e lidhura"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacione mund të hapin URL-të e domeneve të tyre</item>
+      <item quantity="one">Një aplikacion mund të hapë URL-të e domenit të tij</item>
+    </plurals>
+    <!-- no translation found for fingerprint_not_recognized (1739529686957438119) -->
+    <skip />
+    <string name="default_apps_title" msgid="1854974637597514435">"Aplikacionet e parazgjedhura"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplikacioni për shfletim"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Nuk ka asnjë shfletues të parazgjedhur"</string>
+    <string name="default_app" msgid="6864503001385843060">"(I parazgjedhur)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Hapësira ruajtëse e apl."</string>
+</resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 3399cf9..c433133 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"АКА"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Притискање дугмета"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"искључи/укључи звук микрофона"</item>
     <item msgid="1148142988678569310">"медији за пројекат"</item>
     <item msgid="9130014005474445273">"активирај VPN"</item>
+    <item msgid="1165192162975045562">"упис на позадину"</item>
+    <item msgid="7129487923652967258">"структура помоћи"</item>
+    <item msgid="1069023208100114540">"снимак екрана помоћи"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Локација"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Искључи/укључи звук микрофона"</item>
     <item msgid="5906017727368097853">"Медији за пројекат"</item>
     <item msgid="2486614710846178542">"Активирај VPN"</item>
+    <item msgid="5586547561693629602">"Упис на позадину"</item>
+    <item msgid="32794179825485062">"Структура помоћи"</item>
+    <item msgid="7872852746938272552">"Снимак екрана помоћи"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"мала"</item>
     <item msgid="4212263919458209842">"критична"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Искључено"</item>
-    <item msgid="5656544177755411222">"Ограничен број прекида"</item>
-    <item msgid="8735337502532332056">"Без прекида"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Нормална"</item>
     <item msgid="866544120205026771">"Умерена"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Розе"</item>
     <item msgid="6131821495505931173">"Црвена"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (протокол за пренос медија)"</item>
+    <item msgid="8856820259201251036">"PTP (протокол за пренос слика)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB етернет)"</item>
+    <item msgid="2686051673589572111">"Извор звука"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3225e56..0f099c0 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -22,10 +22,11 @@
     <string name="allow" msgid="3349662621170855910">"Дозволи"</string>
     <string name="deny" msgid="6947806159746484865">"Одбиј"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Непознато"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Треба да обавите још <xliff:g id="STEP_COUNT">%1$d</xliff:g> корак да бисте постали програмер."</item>
-    <item quantity="other" msgid="6722953419953594148">"Треба да обавите још <xliff:g id="STEP_COUNT">%1$d</xliff:g> корака да бисте постали програмер."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Треба да обавите још <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> корак да бисте постали програмер.</item>
+      <item quantity="few">Треба да обавите још <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> корака да бисте постали програмер.</item>
+      <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="header_category_wireless_networks" msgid="5110914332313954940">"Бежична веза и мреже"</string>
@@ -40,6 +41,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Искључи SMS преко IMS-а"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Потребно је укључити IMS регистрацију"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Потребно је да се искључи IMS регистрација"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Укључи ознаку додељено за VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Искључи ознаку додељено за VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Укључи слику стања lte ram-а"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Искључи слику стања lte ram-а"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Прикажи SIM адресар"</string>
@@ -135,16 +138,7 @@
     <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_connected" msgid="6038755206916626419">"Повезано"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Повезано (без телефона)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Повезано (без медија)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Повезано је (нема приступа порукама)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Повезано (без телефона или медија)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Веза је прекинута"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Прекидање везе..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Повезивање…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Упаривање..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Неименовани Bluetooth уређај"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Претраживање"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Нема Bluetooth уређаја у близини."</string>
@@ -154,7 +148,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Приказ примљених датотека"</string>
     <string name="device_picker" msgid="4978696506172252813">"Изаберите Bluetooth уређај"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Захтев за Bluetooth дозволу"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Апликација жели да укључи Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Апликација жели да УКЉУЧИ Bluetooth за овај уређај."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Апликација жели да учини таблет видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Апликација жели да учини телефон видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Апликација жели да учини таблет видљивим за друге Bluetooth уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
@@ -275,12 +269,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ОТКАЖИ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"НАСТАВИ"</string>
     <string name="okay" msgid="1997666393121016642">"Потврди"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ДА"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"НЕ"</string>
-    <string name="forget" msgid="7267115980248732932">"ЗАБОРАВИ"</string>
+    <string name="forget" msgid="1400428660472591263">"Заборави"</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>
@@ -325,9 +317,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Побољшање подударања лица"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Провера живости"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Тражи трептај ока при откључавању"</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_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>
@@ -348,6 +337,31 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подешавање Моје локације, откључавања екрана, закључавања складишта акредитива"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Лозинке"</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="3453670509485083962">"Додај"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"закључавање екрана"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Подешав. отиска прста"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Да бисте користили отисак прста за откључавање екрана или потврду куповина, потребно је: \n\n✓ да подесимо резервни метод за закључавање екрана \n\n✓ да додамо ваш отисак прста"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Пронађите сензор"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"На полеђини уређаја пронађите сензор за отисак прста."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Да почнемо!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Ставите прст на сензор за отиске прстију. Подигните га када осетите вибрацију."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Одлично! Још једном."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Ставите исти прст на сензор за отиске прстију и подигните га када осетите вибрацију."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отисак прста је додат!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Када год видите ову икону, можете да користите отисак прста ради идентификације или да бисте одобрили куповину."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Додај"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Даље"</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>
@@ -360,7 +374,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Укључите пуњач и покушајте поново."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Нема PIN-а или лозинке за закључавање екрана"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Потребно је да подесите PIN или лозинку за закључавање екрана да бисте могли да започнете шифровање."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Треба да нацртате шаблон за откључавање да бисте потврдили шифровање уређаја."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Желите ли да шифрујете?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Операција шифровања је неопозива и уколико је прекинете, изгубићете податке. Шифровање траје један сат или дуже и у том периоду таблет ће се поново покренути неколико пута."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Операција шифровања је неопозива и уколико је прекинете, изгубићете податке. Шифровање траје један сат или дуже и у том периоду телефон ће се поново покренути неколико пута."</string>
@@ -391,22 +404,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Откључавање лицем"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Низак ниво безбедности, експериментално"</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_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="current_screen_lock" msgid="4104091715420072219">"Актуелно закључавање екрана"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Функције за заштиту уређаја више неће радити."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Онемогућио администратор, смернице за шифровање или складиштење акредитива"</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_biometric_weak" msgid="3008473624490350142">"Откључавање лицем"</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_password" msgid="1203938057264146610">"Лозинка"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Када подесите закључавање екрана, можете да подесите и отисак прста у Подешавањима &gt; Безбедност."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Искључивање закључавања екрана"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Уклањање шаблона за откључавање"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Уклањање PIN кода за откључавање"</string>
@@ -427,30 +439,36 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Лозинка мора да садржи најмање једно слово."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Лозинка мора да садржи најмање једну цифру."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Лозинка мора да садржи најмање један симбол."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Лозинка мора да садржи најмање 1 слово."</item>
-    <item quantity="other" msgid="8186027808415585970">"Лозинка мора да садржи најмање %d слова."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Лозинка мора да садржи најмање 1 мало слово."</item>
-    <item quantity="other" msgid="2693910942679679225">"Лозинка мора да садржи најмање %d мала(их) слова."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Лозинка мора да садржи најмање 1 велико слово."</item>
-    <item quantity="other" msgid="3030801209112209245">"Лозинка мора да садржи најмање %d велика(их) слова."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Лозинка мора да садржи најмање 1 цифру."</item>
-    <item quantity="other" msgid="4703982391407595924">"Лозинка мора да садржи најмање %d цифре(ара)."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Лозинка мора да садржи најмање 1 посебан симбол."</item>
-    <item quantity="other" msgid="1221290525051187757">"Лозинка мора да садржи најмање %d посебна(их) симбола."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Лозинка мора да садржи најмање 1 знак који није слово."</item>
-    <item quantity="other" msgid="3952508584649046404">"Лозинка мора да садржи најмање %d знак(ов)а који нису слова."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Лозинка мора да садржи најмање %d слово.</item>
+      <item quantity="few">Лозинка мора да садржи најмање %d слова.</item>
+      <item quantity="other">Лозинка мора да садржи најмање %d слова.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Лозинка мора да садржи најмање %d мало слово.</item>
+      <item quantity="few">Лозинка мора да садржи најмање %d мала слова.</item>
+      <item quantity="other">Лозинка мора да садржи најмање %d малих слова.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Лозинка мора да садржи најмање %d велико слово.</item>
+      <item quantity="few">Лозинка мора да садржи најмање %d велика слова.</item>
+      <item quantity="other">Лозинка мора да садржи најмање %d великих слова.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Лозинка мора да садржи најмање %d цифру.</item>
+      <item quantity="few">Лозинка мора да садржи најмање %d цифре.</item>
+      <item quantity="other">Лозинка мора да садржи најмање %d цифара.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Лозинка мора да садржи најмање %d специјалан симбол.</item>
+      <item quantity="few">Лозинка мора да садржи најмање %d специјална симбола.</item>
+      <item quantity="other">Лозинка мора да садржи најмање %d специјалних симбола.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Лозинка мора да садржи најмање %d знак који није слово.</item>
+      <item quantity="few">Лозинка мора да садржи најмање %d знака који нису слова.</item>
+      <item quantity="other">Лозинка мора да садржи најмање %d знакова који нису слова.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Администратор уређаја не дозвољава употребу недавно коришћене лозинке."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Растући, опадајући или поновљени низ цифара је забрањен"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Потврди"</string>
@@ -480,15 +498,8 @@
     <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_accept" msgid="6163520056536604875">"Упари"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"УПАРИ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Откажи"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Упаривање омогућава приступ контактима и историји позива након повезивања."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Упаривање са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g> није могуће."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Упаривање са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g> није могуће због нетачног PIN-а или приступног кода."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Није могуће комуницирати са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> је одбио/ла упаривање"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Није могуће повезати се са уређајем <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>
@@ -515,16 +526,8 @@
     <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="3719383048635344071">"Да би побољшале тачност локације, апликације и услуге ће скенирати Bluetooth уређаје, чак и када је Bluetooth искључен. Ово можете да промените у <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>подешавањима скенирања<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Повезивање са…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Звук медија"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Звук телефона"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Пренос датотеке"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Улазни уређај"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Приступ Интернету"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Дељење контаката"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Користите за дељење контаката"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Дељење интернет везе"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Приступ порукама"</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>
@@ -537,28 +540,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"Повезано са звуком медија"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Повезано са звуком телефона"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Повезано са сервером за пренос датотека"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Повезано је са мапом"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Није повезано са сервером за пренос датотека"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Повезан са улазним уређајем"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Коришћење за звук медија"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Коришћење за аудио телефона"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Коришћење за пренос датотека"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Користи за улаз"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Користи за приступ Интернету"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Користи се за мапу"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Повезано преко Wi‑Fi помоћника"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Пребацивање екрана"</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>
@@ -570,6 +560,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +585,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Искључивање Wi-Fi-ja..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Грешка"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"У Режиму рада у авиону"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Није могуће скенирати мреже"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Обавештење мреже"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Обавештавање када год је доступна јавна мрежа"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Избегавај лоше везе"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не користи Wi-Fi мрежу ако нема добру интернет везу"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Коришћење само оних мрежа које имају добру интернет везу"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Скенирање је увек доступно"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Увек дозвољавај скенирање"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Дозволите Google-овој услузи лоцирања и другим апликацијама да скенирају мреже, чак и када је Wi-Fi искључен"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Аутоматски користи отворени Wi‑Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Омогућ. аутоматског повезивања са отвореним мрежама које се покажу као квалитетне за Wi‑Fi помоћника"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Изаберите помоћника"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталирај сертификате"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Да би, између осталог, побољшале тачност локације, Google и друге апликације могу да скенирају оближње мреже, чак и када је Wi-Fi искључен. Ако не желите да се то дешава, идите на Напредно &gt; Скенирање је увек доступно."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Апликације могу да скенирају оближње мреже, чак и када је Wi-Fi искључен. Ако не желите да се то дешава, идите на Напредно &gt; Скенирање је увек доступно."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Да би унапредиле тачност лоцирања, апликације и услуге ће скенирати Wi‑Fi мреже, чак и када је 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="5340097010842405981">"Не приказуј поново"</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>
@@ -635,11 +622,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Додај још једну мрежу"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Још"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Аутоматско подешавање (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Да бисте завршили подешавање, таблет мора да има приступ Wi-Fi-ју. После подешавања можете да пребацујете са мобилних података на Wi-Fi и обрнуто."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Напредне опције"</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="5940801028985255304">"Притисните дугме Заштићено подешавање Wi-Fi-ја на рутеру. Можда се зове „WPS“ или садржи овај симбол:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Притисните дугме Wi-Fi заштићено подешавање на рутеру. Можда се зове „WPS“ или је означено овим симболом:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Унесите PIN <xliff:g id="NUMBER">%1$s</xliff:g> са Wi-Fi рутера. Подешавање ће бити довршено за највише два минута."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS је успео. Повезивање на мрежу..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Успостављена је веза са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +651,15 @@
     <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="219415018348922629">"Конфигурисање опсега приступне тачке"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(непромењено)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(није наведено)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Сачувано"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Онемогућено"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP конфигурација је отказала"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi веза је отказала"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем са потврдом аутентичности"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Није у опсегу"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Приступ интернету није откривен, аутоматско повезивање није могуће."</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_security_none" msgid="7985461072596594400">"Нема"</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>
@@ -686,6 +667,8 @@
     <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="1509171132175355674">"Ова мрежа нема приступ интернету. Желите ли ипак да је користите?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Не питај поново за ову мрежу"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Повежи"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Повезивање са мрежом није успело"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
@@ -708,7 +691,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Напредна Wi-Fi подешавања"</string>
     <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi опсег фреквенција"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Наведите опсег фреквенција за операцију"</string>
-    <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Проблем приликом подешавања опсега фреквенција."</string>
+    <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Проблем при подешавању опсега фреквенција."</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_saved_access_points_label" msgid="2013409399392285262">"Сачуване мреже"</string>
@@ -751,6 +734,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK преносни Wi‑Fi хотспот"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> преносни Wi‑Fi хотспот"</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_mode_title" msgid="2164073796253284289">"Подешавање позивања"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Режим позивања преко Wi-Fi-ја"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Предност има Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Предност има мобилна мрежа"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Када је Позивање преко Wi-Fi-ја укључено, телефон може да преусмерава позиве преко Wi-Fi мрежа или мреже мобилног оператера у зависности од тога које сте подешавање изабрали и који сигнал је јачи. Пре него што укључите ову функцију, информишите се код мобилног оператера о накнадама и другим детаљима."</string>
     <string name="home_settings" msgid="212375129455718176">"Почетна"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -814,6 +809,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"Тема"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Светло"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Тамно"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Аутоматски"</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>
@@ -865,10 +865,11 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Ажурирати жељени SIM?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> је једина SIM картица у уређају. Да ли желите да користите ову SIM картицу за мобилне податке, позиве и SMS-ове?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Нетачан SIM PIN кôд. Сада морате да контактирате мобилног оператера да бисте откључали уређај."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Нетачан SIM PIN кôд. Имате још <xliff:g id="NUMBER">%d</xliff:g> покушај, а онда морате да контактирате мобилног оператера да бисте откључали уређај."</item>
-    <item quantity="other" msgid="77103619544346451">"Нетачан SIM PIN кôд. Имате још <xliff:g id="NUMBER">%d</xliff:g> покушаја."</item>
-  </plurals>
+    <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="few">Нетачан SIM PIN кôд. Имате још <xliff:g id="NUMBER_1">%d</xliff:g> покушаја.</item>
+      <item quantity="other">Нетачан SIM PIN кôд. Имате још <xliff:g id="NUMBER_1">%d</xliff:g> покушаја.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Радња са SIM PIN кодом није успела!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Статус таблета"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Статус телефона"</string>
@@ -917,12 +918,12 @@
     <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="2348501997988663688">"Апликације (подаци апликација и медијски садржај)"</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_dcim_usage" msgid="558887013613822577">"Слике, видео снимци"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музика, звукови звона, поткастови итд.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Разно"</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="default" msgid="6915293408836853020">"Ослобађање SD картице"</string>
@@ -955,6 +956,11 @@
     <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_mount" msgid="1014683672493425425">"Прикључи"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Избаци"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Обриши и форматирај"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Обриши и форматирај интерну меморију"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB уређај је повезан са рачунаром"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB уређај је повезан са рачунаром"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Повежи као"</string>
@@ -962,8 +968,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Омогућава вам да преносите медијске датотеке у Windows-у, односно помоћу апликације Android File Transfer на Мач рачунарима (погледајте www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Омогућава вам да преносите фотографије помоћу софтвера за камеру и да преносите датотеке на рачунаре који не подржавају MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Инсталирај алатке за пренос датотека"</string>
+    <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_external_title" msgid="2723851748972673696">"Преносива меморија"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"Слободно: <xliff:g id="FREE">%1$s</xliff:g> (укупно <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Уређај <xliff:g id="NAME">%1$s</xliff:g> је прикључен"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Прикључивање уређаја <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="4161722509712992231">"Безбедно избацивање уређаја <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="8343688274191391889">"Форматирање није успело: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Преименујте меморију"</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="3677827796634199714"><b>"Када избаците овај уређај <xliff:g id="NAME_0">^1</xliff:g>, апликације које су на њему сачуване ће престати да функционишу и медијске датотеке које су на њему сачуване неће бити доступне док га поново не уметнете."</b>" \n\nУређај <xliff:g id="NAME_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_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_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="1259216693690378749">"Не уклањајте уређај <xliff:g id="NAME">^1</xliff:g> док се форматира."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Пренесите подат. у нову меморију"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Слике, датотеке и податке апликација можете да пренесете на овај нови уређај <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="5035719146373359329"><b>"Пренос траје око <xliff:g id="TIME">^1</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="8641916179067596592">"Током преноса: \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_move_confirm_title" msgid="292782012677890250">"Пренесите апликацију <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Пренос апликације <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="4288580957960820740">"Не уклањајте уређај <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="battery_status_title" msgid="9159414319574976203">"Статус батерије"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво батерије"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Називи приступних тачака"</string>
@@ -1007,10 +1053,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Враћање подразумеваних подешавања назива приступне тачке."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Поново постави подразумевано"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Поновно постављање подразумеваних подешавања назива приступне тачке је завршено"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Ресетуј подешавања мреже"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Овим ћете ресетовати сва подешавања мреже, укључујући:\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="4874737348054213767">"Желите ли да ресетујете сва подешавања мреже? Ова радња не може да се опозове!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Ресетуј подешавања"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Желите ли да ресетујете?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Подешавања мреже су ресетована"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Ресетуј уређај"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ресетовање на фабричка подешавања"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Брише све податке са таблета"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Брише све податке у телефону"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Овим бришете све податке из "<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>
@@ -1024,9 +1075,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Избриши све податке са SD картице, као што су музика или фотографије"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Враћање таблета на подразумеване вредности"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Поново постави телефон"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Желите ли да избришете све личне информације и преузете апликације? Не можете да опозовете ову радњу!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Желите ли да обришете све личне податке и преузете апликације? Не можете да опозовете ову радњу!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Избриши све"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Треба да нацртате шаблон за откључавање да бисте потврдили ресетовање на фабричка подешавања."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Није обављено враћање на почетне вредности зато што услуга брисања система није доступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Враћање на почетне вредности?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ресетовање на фабричка подешавања није доступно за овог корисника"</string>
@@ -1043,8 +1093,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Желите ли да избришете USB меморију и све датотеке ускладиштене у њој? Не можете да опозовете ову радњу!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Желите ли да избришете SD картицу, бришући на тај начин све датотеке ускладиштене на њој? Не можете да опозовете ту радњу!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Избриши све"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Потребно је да нацртате шаблон за откључавање да бисте потврдили да желите да избришете USB меморију."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Треба да нацртате шаблон за откључавање да бисте потврдили да желите да избришете SD картицу."</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>
@@ -1076,7 +1124,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помоћ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Мобилне мреже"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифни пакет за мобилни уређај"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Подразумевана апликација за 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>
@@ -1104,7 +1152,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим локације"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Коришћење GPS-а, Wi‑Fi-ја и мобилних мрежа за одређивање локације"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Коришћење Wi‑Fi-ја и мобилних мрежа за одређивање локације"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Користите GPS за одређивање локације"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Користите GPS за одређивање локације"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Скенирање"</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="2070686681074461301">"Унапредите лоцирање тако што ћете дозволити апликацијама и услугама да скенирају Wi‑Fi мреже, чак и када је Wi‑Fi искључен"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth скенирање"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Унапредите лоцирање тако што ћете дозволити системским услугама да скенирају Bluetooth уређаје, чак и када је Bluetooth искључен"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Лок. на осн. Wi-Fi и моб. мреже"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Нека апл. користе Google-ову услугу лоцирања за брже одређивање локације. Анонимни подаци о локацији прикупљаће се и слати Google-у."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Локација се одређује помоћу Wi-Fi-ја"</string>
@@ -1132,7 +1186,7 @@
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Позадине"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Добављачи сателитских слика:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лиценца отвореног кода"</string>
-    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Дошло је до проблема приликом учитавања лиценци."</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>
@@ -1150,11 +1204,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"Безбедност екрана"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Употребите шаблон за уређај да бисте наставили."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Унесите PIN уређаја да бисте наставили."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Унесите лозинку уређаја да бисте наставили."</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_need_to_unlock" msgid="757935356911054465">"Потврдите сачувани шаблон"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Покушајте поново:"</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>
@@ -1176,8 +1234,7 @@
     <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_header" msgid="819903817323783498">"Превише нетачних покушаја!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Покушајте поново за <xliff:g id="NUMBER">%d</xliff:g> секунде(и)."</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="manageapplications_settings_title" msgid="7041951105633616745">"Управљај апликацијама"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управљање инсталираним апликацијама и њихово уклањање"</string>
@@ -1228,6 +1285,7 @@
     <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>
@@ -1299,6 +1357,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Коришћење меморије"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Преглед искоришћене меморије по апликацијама"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Покренуте услуге"</string>
@@ -1396,17 +1455,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информације о таблету"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информације о телефону"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Информације о батерији"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Брзо покретање"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Подешавање тастерских пречица за покретање апликација"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Додељивање апликацијe"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Нема пречице"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Претрага + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Брисање"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Пречица за <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) биће избрисана."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Потврди"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Откажи"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Апликације"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Пречице"</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>
@@ -1441,23 +1489,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сними све Bluetooth HCI пакете у датотеци"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Откључавање OEM-a"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Дозволи откључавање функције за покретање"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Унесите PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Унесите PIN уређаја да бисте омогућили откључавање од стране произвођача оригиналне опреме (OEM)"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Желите ли да дозволите откључавање произвођача оригиналне опреме (OEM)?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"УПОЗОРЕЊЕ: Функције за заштиту уређаја неће функционисати на овом уређају док је ово подешавање укључено."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Величине бафера података у програму за евидентирање"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Изаберите величине по баферу евиденције"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Дозволи лажне локације"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозволи лажне локације"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Омогући проверу атрибута за преглед"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Умрежавање"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертификација бежичног екрана"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Омогући детаљнију евиденцију за Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агресиван прелаз са Wi‑Fi мреже на мобилну"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Увек дозволи скенирање Wi‑Fi-ја у ромингу"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Користи застарели DHCP клијент"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Приказ опција за сертификацију бежичног екрана"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Повећава ниво евидентирања за Wi‑Fi. Приказ по SSID RSSI-у у бирачу Wi‑Fi мреже"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Када се омогући, Wi‑Fi ће бити агресивнији при пребацивању мреже за пренос података на Мобилну, када је Wi‑Fi сигнал слаб"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Дозволи/забрани скенирање Wi-Fi-ја у ромингу на основу присутног протока података на интерфејсу"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Величине бафера података у програму за евидентирање"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Изаберите величине по баферу евиденције"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Изаберите конфигурацију USB-а"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Изаберите конфигурацију USB-а"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Дозволи лажне локације"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозволи лажне локације"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Омогући проверу атрибута за преглед"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Користите DHCP клијент из Lollipop-а уместо новог Android DHCP клијента."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Дозволи отклањање USB грешака?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Отклањање USB грешака намењено је само за сврхе програмирања. Користите га за копирање података са рачунара на уређај и обрнуто, инсталирање апликација на уређају без обавештења и читање података из евиденције."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Желите ли да опозовете приступ отклањању USB грешака са свих рачунара које сте претходно одобрили?"</string>
@@ -1561,6 +1617,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Магента"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Желите ли да користите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> треба да обавља следеће радње:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Пошто апликација скрива захтев за дозволу, Подешавања не могу да верификују одговор."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако укључите <xliff:g id="SERVICE">%1$s</xliff:g>, уређај неће користити закључавање екрана да би побољшао шифровање података."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Пошто сте укључили услугу приступачности, уређај неће користити закључавање екрана да би побољшао шифровање података."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Пошто укључивање услуге <xliff:g id="SERVICE">%1$s</xliff:g> утиче на шифровање података, треба да потврдите шаблон."</string>
@@ -1702,14 +1759,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Апликације типа <xliff:g id="TYPE">%1$s</xliff:g> у периоду од <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> од <xliff:g id="TOTALRAM">%2$s</xliff:g> је употребљено током <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</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_memory_status" msgid="4251599550196193093">"Меморија уређаја је тренутно <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Просечно коришћење RAM-а"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Максимално коришћење RAM-а"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android ОС"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"Процеси"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Услуге"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Трајање"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Детаљи меморије"</string>
@@ -1726,6 +1789,7 @@
     <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_hide_system" msgid="4106826741703745733">"Сакриј системске"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Користи јединствену величину скупа"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистичких података"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"У позадини"</string>
@@ -1748,7 +1812,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Доленаведена подразумевана подешавања замењују подешавања апликације"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Подразумевана подешавања"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Подразумевани уређај"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Подешава уређај за синтезу говора који ће се користити за говорни текст"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Подесите механизам за синтетисање говора који ће да се користи за изговорени текст"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Брзина говора"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Брзина изговарања текста"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ниво"</string>
@@ -1822,7 +1886,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"Потребно је да нацртате шаблон за откључавање да бисте потврдили инсталацију акредитива."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Унесите лозинку за складиште акредитива."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Тренутна лозинка:"</string>
@@ -1847,12 +1910,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"Тренутно ниједан налог не чува резервне копије података"</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="5355557151569037197">"Услуга прављења резервне копије није активна."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ово одређују смернице за уређај."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Рез. копија лоз. рачунара"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Резервне копије читавог система тренутно нису заштићене"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Додирните да бисте променили или уклонили лозинку за прављење резервних копија читавог система на рачунару"</string>
@@ -2024,6 +2085,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Размера анимације прелаза"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator размера трајања"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Симулирај секундарне екране"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Режим са више прозора"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Више активности на екрану у исто време."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Желите ли да омогућите режим са више прозора?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"УПОЗОРЕЊЕ: Ово је функција која је у великој мери експериментална и која омогућава више активности на екрану у исто време помоћу корисничког интерфејса за Недавне апликације. Неке апликације могу да откажу или неће функционисати исправно када се користе са овом функцијом."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Апликације"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не чувај активности"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Уништи сваку активност чим је корисник напусти"</string>
@@ -2195,7 +2260,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="718192651887726259">"Можете да делите овај уређај са другим људима ако направите још корисника. Сваки корисник има сопствени простор, који може да прилагођава помоћу сопствених апликација, позадине и тако даље. Корисници могу да прилагођавају и подешавања уређаја која утичу на свакога, попут 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>
@@ -2226,13 +2291,13 @@
     <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="8310589470979488255">"Омогући телефонске позиве"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Омогући телефонске позиве и SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Укључи телефонске позиве"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Укључи телефонске позиве и SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Уклони корисника"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Желите да омогућите телефонске позиве?"</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_sms_confirm_title" msgid="188164598768941316">"Желите да омогућите телефонске позиве и SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Историја позива и SMS-ова ће бити дељена са овим корисником."</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="application_restrictions" msgid="8207332020898004394">"Дозволе за апликације и садржај"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликације са ограничењима"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подешавања апликације"</string>
@@ -2255,7 +2320,7 @@
     <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="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="user_account_title" msgid="1127193807312271167">"Налог за садржај"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ИД слике"</string>
@@ -2283,8 +2348,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"Ова апликација није подржана на ограниченим профилима"</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>
@@ -2349,13 +2414,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi мрежа веза"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текст порука слање SMS-а поруке размена порука"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"мобилни мобилни оператер бежично подаци 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi позив позивање"</string>
     <string name="keywords_home" msgid="3626170808219458848">"покретач"</string>
     <string name="keywords_display" msgid="6709007669501628320">"екран додирни екран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затамнити екран додирни екран батерија"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затамнити екран додирни екран батерија"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"позадина персонализовати прилагодити екран"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"тамна тема ноћни режим затамни екран замени осветљеност"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"позадина персонализовати прилагодити екран"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"величина текста"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"пребацити"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"пребацивање пројекта"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"простор диск хард диск уређај коришћење"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"напајање коришћење пунити"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"правопис речник провера правописа аутоматски исправити"</string>
@@ -2372,6 +2439,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"налог"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ограничење ограничити ограничено"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст исправка исправити звук вибрирати аутоматски језик покрет предлагати предлог тема увредљиво реч куцати емоџи међународно"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"ресетуј на подразумевана подешавања"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"хитно у хитним случајевима апликација подразумевана"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"преузимање апликација, апликације, систем"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"апликације дозволе безбедност"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"подразумевано подешавање апликација"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"превлачење лозинка шаблон pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Подесите Wi-Fi NFC ознаку"</string>
     <string name="write_tag" msgid="8571858602896222537">"Напиши"</string>
@@ -2386,11 +2458,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Прекиди"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Само приоритетни прекиди"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Увек прекини"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Дозволи само приоритетне прекиде"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не прекидај"</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_option_important_interruptions" msgid="3903928008177972500">"Само приоритетни прекиди"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Само аларми"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Без прекида"</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="ringtone_title" msgid="5379026328015343686">"Звук звона телефона"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Подразумевана мелодија звона обавештења"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрација и за позиве"</string>
@@ -2416,62 +2489,124 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибрација"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Приступ обавештењима"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Апликације не могу да читају обавештења"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d апликација може да чита обавештења"</item>
-    <item quantity="other" msgid="980049191810249052">"Апликације (%d) могу да читају обавештења"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d апликација може да чита обавештења</item>
+      <item quantity="few">%d апликације могу да читају обавештења</item>
+      <item quantity="other">%d апликација може да чита обавештења</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Нема инсталираних монитора обавештења."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Желите ли да омогућите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ће моћи да чита сва обавештења која поставља систем или било која инсталирана апликација, што може да обухвата личне податке као што су имена контаката и текстови порука које примате. Такође ће моћи да одбацује ова обавештења или додирује дугмад за радње у оквиру њих."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Добављачи услова"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ниједна апликација не пружа услове"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d апликација пружа услове"</item>
-    <item quantity="other" msgid="358057362115673258">"%d апликације(а) пружају услове"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ниједан добављач услова није инсталиран."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Желите ли да омогућите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ће моћи да додаје услове за излаз режиму Не узнемиравај."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Учитавање апликација..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Блокирај"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај све"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Никада не приказуј обавештења из ове апликације"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Приоритет"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Приказуј обавештења у врху листе и настави да их приказујеш када је уређај подешен само на прекиде у случају приоритета"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Осетљиво"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Када је уређај закључан, сакриј сав осетљив садржај из обавештења ове апликације"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Третирај као приоритет"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Дозволите да се обавештења ове апликације чују када је опција Не узнемиравај подешена на Само приоритетни прекиди"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Дозволи завиривање"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Дозволите овој апликацији да истиче одређена обавештења тако што ће их накратко приказивати на актуелном екрану"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Сакриј осетљив садржај"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Када је уређај закључан, сакријте садржај из обавештења ове апликације који може да открије приватне податке"</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="zen_mode_default_option" msgid="6940069025071935243">"Док не искључите"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Приоритетни прекиди"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Време одмора"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Дана"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ниједан"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Дозвољени прекиди"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Само приоритетни прекиди"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Нема"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Аутоматизација"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Аутоматски укључи"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Назив правила"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Додај правило"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Избриши правило"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Желите ли да избришете правило „<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="3201273040477861538">"Правило распореда"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Правило није пронађено."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никада"</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_from" msgid="1033337300289871697">"Позиви/поруке од"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Свих"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Само контакти"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Само контакти са звездицом"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Догађаји и подсетници"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Аларми су увек приоритетни прекиди"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Аларми"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Подсетници"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Догађаји"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Изабрани позиваоци"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Поновни позиваоци"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ако иста особа позове по други пут у периоду од <xliff:g id="MINUTES">%d</xliff:g> мин, дозволи позив"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Аутоматски укључи"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Никад"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следећег дана"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> или било који аларм пре тога"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"Прекиди"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"За долазне позиве и обавештења"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Када желите да вас прекинемо?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Колико дуго?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Увек прекини"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"искључено, потпуно, све"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Дозволи само приоритетне прекиде"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Дозволи само аларме"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Не прекидај"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"На неодређено време"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> минут</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> минута</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минута</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Пребацује у режим само приоритетних обавештења на неодређено време"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Пребацује у режим само приоритетних обавештења у трајању од <xliff:g id="DURATION">%1$d</xliff:g> минута до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Пребацује у режим само приоритетних обавештења у трајању од <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>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Пребацује у режим само приоритетних обавештења у трајању од <xliff:g id="DURATION">%1$d</xliff:g> сата (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Пребацује у режим само приоритетних обавештења у трајању од <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>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Пребацује у режим само са алармима на неодређено време"</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="few">Пребацује у режим само са алармима у трајању од <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>
+    </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="few">Пребацује у режим само са алармима у трајању од <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>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Пребацује у режим без узнемиравања на неодређено време"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Пребацује у режим без узнемиравања у трајању од <xliff:g id="DURATION">%1$d</xliff:g> минута (до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="few">Пребацује у режим без узнемиравања у трајању од <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Пребацује у режим без узнемиравања у трајању од <xliff:g id="DURATION">%1$d</xliff:g> сата до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Пребацује у режим без узнемиравања у трајању од <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>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Пребацује у режим увек прекидај"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"заувек"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Обавешт. апликација"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Подешавања обавештења"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Шаљи повратне информације о уређају"</string>
@@ -2512,4 +2647,66 @@
     <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="2184141780491382435">"Подразумевано покрени"</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="app_launch_domain_links_title" msgid="458956710410857777">"Линкови домена"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Отварај URL-ове домена"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Дозволите апликацији да директно отвара URL-ове домена"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Подржани URL-ови домена"</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="410824961149037234">"интерне меморије"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"спољне меморије"</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="storage_used" msgid="7128074132917008743">"Складишни простор у употреби"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Укључена"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Блокирана"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Осетљива"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Приоритетна"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Приоритетна и осетљива"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> дозвола је одобрена</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> дозволе су одобрене</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> дозвола је одобрено</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Дата је <xliff:g id="COUNT_2">%d</xliff:g> од <xliff:g id="COUNT_3">%d</xliff:g> дозвола</item>
+      <item quantity="few">Дате су <xliff:g id="COUNT_2">%d</xliff:g> од <xliff:g id="COUNT_3">%d</xliff:g> дозвола</item>
+      <item quantity="other">Дато је <xliff:g id="COUNT_2">%d</xliff:g> од <xliff:g id="COUNT_3">%d</xliff:g> дозвола</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Подешене су неке подразумеване вредности"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Нису подешене подразумеване вредности"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Све апликације"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Омогућене"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Личне"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Посао"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блокирана"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Приоритетна"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Осетљива"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Са URL-овима домена"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Онемогућио је администратор"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Напредна"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Изаберите профил"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Дозволе за апликације"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Апликације са додатним приступом (<xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g>)"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Апликације са дозволом (<xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g>)"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL-ови домена"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Не отварај никакве URL-ове домена"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Отварај „<xliff:g id="DOMAIN">%s</xliff:g>“"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Отварај „<xliff:g id="DOMAIN">%s</xliff:g>“ и сродне URL-ове"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> апликација може да отвара URL-ове домена</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> апликације могу да отварају URL-ове домена</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> апликација може да отвара URL-ове домена</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Није препознат"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Подразумеване апликације"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Апликација прегледача"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Нема подразумеваног прегледача"</string>
+    <string name="default_app" msgid="6864503001385843060">"(подразумевано)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Меморија за апликације"</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 07fb8b4..c4d1920 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Tryckknapp"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"stäng av/slå på mikrofonen"</item>
     <item msgid="1148142988678569310">"projicera media"</item>
     <item msgid="9130014005474445273">"aktivera VPN"</item>
+    <item msgid="1165192162975045562">"skriv bakgrund"</item>
+    <item msgid="7129487923652967258">"assistentstruktur"</item>
+    <item msgid="1069023208100114540">"assistentskärmdump"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Plats"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Stäng av/slå på mikrofonen"</item>
     <item msgid="5906017727368097853">"Projicera media"</item>
     <item msgid="2486614710846178542">"Aktivera VPN"</item>
+    <item msgid="5586547561693629602">"Skriv bakgrund"</item>
+    <item msgid="32794179825485062">"Assistentstruktur"</item>
+    <item msgid="7872852746938272552">"Assistentskärmdump"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"låg"</item>
     <item msgid="4212263919458209842">"kritiskt låg"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Av"</item>
-    <item msgid="5656544177755411222">"Begränsade avbrott"</item>
-    <item msgid="8735337502532332056">"Inga avbrott"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Måttlig"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Rosa"</item>
     <item msgid="6131821495505931173">"Röd"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB-ethernet)"</item>
+    <item msgid="2686051673589572111">"Ljudkälla"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 35c35aa..a22ac7b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Tillåt"</string>
     <string name="deny" msgid="6947806159746484865">"Neka"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Okänd"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Du är nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> steg från att bli utvecklare."</item>
-    <item quantity="other" msgid="6722953419953594148">"Du är nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> steg från att bli utvecklare."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Du är nu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steg från att bli utvecklare.</item>
+      <item quantity="one">Du är nu <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> steg från att bli utvecklare.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Nu är du en utvecklare!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det behövs inte. Du är redan utvecklare."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Trådlöst och nätverk"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Inaktivera SMS över IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS-registreringen måste vara aktiverad"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS-registreringen måste vara inaktiverad"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Aktivera VoLTE-administrationsflagga"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Inaktivera VoLTE-administrationsflagga"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Aktivera LTE RAM-dump"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Inaktivera LTE RAM-dump"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visa SIM-adressbok"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Bluetooth-sändning"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vill du inaktivera profilen?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Följande kommer att inaktiveras:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;från:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Ansluten"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ansluten (ingen telefon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ansluten (inga media)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Ansluten (ingen meddelandeåtkomst)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ansluten (ingen telefon och inga media)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Kopplas ifrån"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Kopplar ifrån…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Ansluter…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Parkoppling…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Namnlös Bluetooth-enhet"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Söker"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Inga Bluetooth-enheter fanns i närheten."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Visa mottagna filer"</string>
     <string name="device_picker" msgid="4978696506172252813">"Välj Bluetooth-enhet"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Begäran om Bluetooth-behörighet"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app vill aktivera Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"En app vill slå PÅ Bluetooth på enheten."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app vill göra din surfplatta synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app vill göra din mobil synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app vill göra din surfplatta synlig för andra Bluetooth-enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-inställningar"</string>
     <string name="cancel" msgid="6859253417269739139">"Avbryt"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"AVBRYT"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"FORTSÄTT"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"JA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"NEJ"</string>
-    <string name="forget" msgid="7267115980248732932">"GLÖM"</string>
+    <string name="forget" msgid="1400428660472591263">"Glöm"</string>
+    <string name="save" msgid="879993180139353333">"Spara"</string>
+    <string name="done" msgid="6942539184162713160">"Klar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Inställningar"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Inställningar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Genväg för inställningar"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortera efter tidszon"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Tid"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Förbättra ansiktsmatchningen"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Liveness-kontroll"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Blinkning krävs vid upplåsning"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Lås automatiskt"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> efter viloläge"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> efter viloläge, utom när den hålls olåst av <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,19 +336,42 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeravtryck"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Hantera fingeravtryck"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Använd avtryck för"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Lägg till"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"skärmlås"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingeravtryck har registrerats</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingeravtryck har registrerats</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Konfig. fingeravtryck"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Om du vill använda ditt fingeravtryck för att låsa upp skärmen eller bekräfta köp måste vi göra följande: \n\n✓ Konfigurera en metod för skärmlås i bakgrunden \n\n✓ Lägga till ditt fingeravtryck"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Hitta sensorn"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Leta reda på fingeravtryckssensorn på baksidan av mobilen."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Namn"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Radera"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Sätt igång!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Sätt fingret på fingeravtryckssensorn. Lyft fingret när du känner vibrationen."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Perfekt! Gör det igen."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Sätt samma finger på fingeravtryckssensorn och lyft det när du känner vibrationen."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingeravtrycket har lagts till!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"När du ser den här ikonen kan du identifiera dig eller auktorisera ett köp med hjälp av ditt fingeravtryck."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Lägg till"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Nästa"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera surfplattan"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptera telefonen"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypterad"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"Du kan kryptera dina konton, inställningar, hämtade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett grafiskt lösenord, en pinkod eller ett lösenord) och krypterar surfplattan måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa standardinställningarna, vilket raderar all data.\n\n Krypteringen tar minst en timme. Du måste börja med batteriet laddat och låta surfplattan vara ansluten till ett strömuttag under hela processen. Om du avbryter kommer vissa eller alla data att försvinna."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"Du kan kryptera dina konton, inställningar, hämtade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett grafiskt lösenord, en pinkod eller ett lösenord) och krypterar mobilen måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa standardinställningarna, vilket raderar all data.\n\n Krypteringen tar minst en timme. Du måste börja med batteriet laddat och låta mobilen vara ansluten till ett strömuttag under hela processen. Om du avbryter kommer vissa eller alla data att försvinna."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"Du kan kryptera dina konton, inställningar, nedladdade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett grafiskt lösenord, en pinkod eller ett lösenord) och krypterar surfplattan måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa standardinställningarna, vilket raderar all data.\n\n Krypteringen tar minst en timme. Du måste börja med batteriet laddat och låta surfplattan vara ansluten till ett strömuttag under hela processen. Om du avbryter kommer vissa eller alla data att försvinna."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"Du kan kryptera dina konton, inställningar, nedladdade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett grafiskt lösenord, en pinkod eller ett lösenord) och krypterar mobilen måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa standardinställningarna, vilket raderar all data.\n\n Krypteringen tar minst en timme. Du måste börja med batteriet laddat och låta mobilen vara ansluten till ett strömuttag under hela processen. Om du avbryter kommer vissa eller alla data att försvinna."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kryptera surfplattan"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kryptera telefonen"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Ladda batteriet och försök igen."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Anslut laddaren och försök igen."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"PIN-kod eller lösenord saknas för skärmlåset"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset innan du påbörjar krypteringen."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Du måste rita ditt grafiska lösenord för att bekräfta krypteringen av enheten."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vill du kryptera?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas surfplattan om flera gånger."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas mobilen om flera gånger."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Dra"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Ingen säkerhet"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Ansiktslås"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Låg säkerhet, experimentell"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Grafiskt lösenord"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Medelhög säkerhet"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medelhög till hög säkerhet"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Lösenord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hög säkerhet"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Nuvarande skärmlås"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Enhetsskyddsfunktioner slutar att fungera."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inaktiverad p.g.a. admin., kryptering eller uppgiftslagring"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Inget"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Dra"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Ansiktslås"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Grafiskt lösenord"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-kod"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Lösenord"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"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_lock_pattern_summary" msgid="6801602880568869201">"Ta bort grafiskt lösenord"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ta bort PIN-kod för upplåsning"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Lösenord måste innehålla minst en bokstav."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Lösenord måste innehålla minst en siffra."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Lösenord måste innehålla minst en symbol."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Lösenord måste innehålla minst en bokstav."</item>
-    <item quantity="other" msgid="8186027808415585970">"Lösenord måste innehålla minst %d bokstäver."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Lösenordet måste innehålla minst en liten bokstav."</item>
-    <item quantity="other" msgid="2693910942679679225">"Lösenord måste innehålla minst %d små bokstäver."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Lösenord måste innehålla minst en stor bokstav."</item>
-    <item quantity="other" msgid="3030801209112209245">"Lösenord måste innehålla minst %d stora bokstäver."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Lösenord måste innehålla minst en siffra."</item>
-    <item quantity="other" msgid="4703982391407595924">"Lösenord måste innehålla minst %d siffror."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Lösenord måste innehålla minst en specialsymbol."</item>
-    <item quantity="other" msgid="1221290525051187757">"Lösenordet måste innehålla minst %d specialsymboler."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Lösenordet måste innehålla minst ett tecken som inte är en bokstav."</item>
-    <item quantity="other" msgid="3952508584649046404">"Lösenordet måste innehålla minst %d tecken som inte är bokstäver."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Lösenordet måste innehålla minst %d bokstäver.</item>
+      <item quantity="one">Lösenordet måste innehålla minst en bokstav.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Lösenordet måste innehålla minst %d små bokstäver.</item>
+      <item quantity="one">Lösenordet måste innehålla minst en liten bokstav.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Lösenordet måste innehålla minst %d stora bokstäver.</item>
+      <item quantity="one">Lösenordet måste innehålla minst en stor bokstav.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Lösenordet måste innehålla minst %d siffror.</item>
+      <item quantity="one">Lösenordet måste innehålla minst en siffra.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Lösenordet måste innehålla minst %d specialsymboler.</item>
+      <item quantity="one">Lösenordet måste innehålla minst en specialsymbol.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Lösenordet måste innehålla minst %d tecken som inte är bokstäver.</item>
+      <item quantity="one">Lösenordet måste innehålla minst ett tecken som inte är en bokstav.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Enhetsadministratören tillåter inte att ett lösenord som använts nyligen används igen."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"En stigande, sjunkande eller upprepad sekvens av siffror är inte tillåten"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Om du vill koppla med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; måste lösenordet &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; visas i den"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Från:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vill du koppla den till enheten?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Koppla till:<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>Skriv:<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> och tryck sedan på Retur."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Parkoppling"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"KOPPLA"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Avbryt"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Om du kopplar enheten får du tillgång till dina kontakter och din samtalshistorik när du är ansluten."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Det gick inte att koppla till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Det gick inte att koppla till <xliff:g id="DEVICE_NAME">%1$s</xliff:g> på grund av en felaktig PIN-kod eller nyckel."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Det går inte att kommunicera med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Parkoppling avvisad av <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Det gick inte att ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Sök efter enheter"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Uppdatera"</string>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"I syfte att förbättra platsangivelserna kan appar och tjänster söka efter Bluetooth-enheter, även om Bluetooth har inaktiverats. 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_specific_profiles_title" msgid="6952214406025825164">"Anslut till…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medialjud"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefonljud"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Filöverföring"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Indataenhet"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetåtkomst"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktdelning"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Använd för kontaktdelning"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Delning av Internetanslutning"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Meddelandeåtkomst"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån medialjud."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån indataenheten."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Använd för"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Byt namn"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Tillåt inkommande överföringar"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ansluten till medialjud"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ansluten till telefonens ljud"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ansluten till filöverföringsserver"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Ansluten till MAP"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Inte ansluten till filöverföringsserver"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ansluten till indataenhet"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ansluten för Internetåtkomst"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Dela lokal Internetanslutning med enhet"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Använd för medialjud"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Använd för telefonens ljud"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Använd för filöverföring"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Använd för inmatning"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Använd för Internetåtkomst"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Använd för MAP"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dockningsinställningar"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Använd dockningsstation för ljud"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som högtalartelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"För musik och media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kom ihåg inställningarna"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Ansluten via Wi-Fi-assistent"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Casta skärmen"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Casta"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivera Wi-Fi-skärmdelning"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Inga enheter fanns i närheten."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Ansluter"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Glöm"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Klar"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Namn"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillåt datautbyte när surfplattan vidrör en annan enhet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillåt datautbyte när mobilen vidrör en annan enhet"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi inaktiveras …"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fel"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"I flygplansläge"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Det går inte att söka efter nätverk"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Nätverksmeddelande"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Meddela när ett offentligt nätverk är tillgängligt"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Undvik dåliga anslutningar"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Använd inte Wi-Fi-nätverk som inte har en bra internetanslutning"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Använd endast nätverk som har en bra internetanslutning"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Inställningen \"sök alltid\" är tillgänglig"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Tillåt alltid skanning"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Tillåt att Googles platstjänst och andra appar söker efter nätverk, även när Wi-Fi inte har aktiverats"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Använd automatiskt öppna Wi-Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Tillåt att en Wi-Fi-assistent ansluter till öppna nätverk som bedöms vara av hög kvalitet."</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Välja assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installera certifikat"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"För att bland annat noggrannheten i platsangivelsen ska förbättras kan Google och vissa appar söka efter nätverk i närheten även när Wi-Fi är avstängt. Om du inte vill att detta ska ske väljer du Avancerat &gt; Inställningen \"sök alltid\" är tillgänglig."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Appar kan söka efter nätverk i närheten även om Wi-Fi är avstängt. Om du inte vill att det ska hända väljer du Avancerat &gt; Inställningen \"sök alltid\" är tillgänglig."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"I syfte att förbättra platsangivelserna kan appar och tjänster söka efter Wi-Fi-nätverk, även om Wi-Fi har inaktiverats. Du kan ändra detta i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>LINK_BEGIN_0sökinställningarna<xliff:g id="LINK_END_1">LINK_END</xliff:g>LINK_END_1."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Visa inte igen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Behåll Wi-Fi i viloläge"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi på i viloläge"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Lägg till ett annat nätverk"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk installation (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Surfplattan måste vara ansluten till Wi-Fi för att du ska kunna slutföra konfigurationen. När du är färdig med konfigurationen kan du välja mellan mobildata och Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Avancerade alternativ"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Skyddad Wi-Fi-konfiguration"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Startar WPS ..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Tryck på knappen för skyddad Wi-Fi-konfiguration på routern. Den kan kallas WPS eller vara märkt med denna symbol:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Tryck på knappen för skyddad Wi-Fi-konfiguration på routern. Den kan kallas WPS eller vara märkt med denna symbol:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Ange pinkoden <xliff:g id="NUMBER">%1$s</xliff:g> på din Wi-Fi-router. Det kan ta upp till två minuter att slutföra konfigurationen."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS slutfördes. Ansluter till nätverket ..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Ansluten till Wi-Fi-nätverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Lösenord"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Visa lösenord"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Konfigurera AP-band"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GHz-bandet"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz-bandet"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-inställningar"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(oförändrat)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ospecificerat)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Sparat"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inaktiverad"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurationsfel"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-anslutningsfel"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Utom räckhåll"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Ingen internetåtkomst hittades. Det går inte att återansluta automatiskt."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tillgängligt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tillgängligt)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ange nätverkslösenordet"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vill du logga in och ansluta?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> kräver onlineinloggning före ansl. till nätverk."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ANSLUT"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Nätverket har ingen internetåtkomst. Vill du ändå använda nätverket?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Fråga inte igen för det här nätverket"</string>
     <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>
@@ -695,9 +670,9 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Hoppa över ändå"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Hoppa inte över"</string>
-    <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"VARNING: Om du inaktiverar Wi‑Fi använder surfplattan bara mobildata för hämtningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
-    <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"VARNING: Om du inaktiverar Wi‑Fi använder enheten bara mobildata för hämtningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
-    <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"VARNING: Om du inaktiverar Wi‑Fi använder mobilen bara mobildata för hämtningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"VARNING: Om du inaktiverar Wi‑Fi använder surfplattan bara mobildata för nedladdningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
+    <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"VARNING: Om du inaktiverar Wi‑Fi använder enheten bara mobildata för nedladdningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
+    <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"VARNING: Om du inaktiverar Wi‑Fi använder mobilen bara mobildata för nedladdningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Om du inte använder Wi‑Fi:\n\nSurfplattan kommer inte att ha någon internetanslutning.\n\nDu får inte programvaruuppdateringar förrän du ansluter till internet.\n\nFunktioner för enhetsskydd kan inte aktiveras."</string>
     <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Om du inte använder Wi‑Fi:\n\nEnheten kommer inte att ha någon internetanslutning.\n\nDu får inga programvaruuppdateringar förrän du är ansluten till internet.\n\nFunktioner för enhetsskydd kan inte aktiveras."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Om du inte använder Wi‑Fi:\n\nMobilen kommer inte att ha någon internetanslutning.\n\nDu får inte programvaruuppdateringar förrän du ansluter till internet.\n\nFunktioner för enhetsskydd kan inte aktiveras."</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK Wi‑Fi-surfzon"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Mobil Wi‑Fi-surfzon med <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-samtal"</string>
+    <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Samtalsinställningar"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-samtalsläge"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi i första hand"</item>
+    <item msgid="5267397515594230396">"Mobil i första hand"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Startskärm"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ljud"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ändra skärmens ljusstyrka"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Anpassad ljusstyrka"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimera ljusstyrkan efter det tillgängliga ljuset"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Ljust"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Mörkt"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatiskt"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Viloläge"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skärmen stängs av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Uppdatera primärt SIM-kort?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> är det enda SIM-koret i enheten. Vill du använda det här SIM-kortet för mobildata, samtal och sms?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Du angav fel pinkod för SIM-kortet och måste nu kontakta operatören för att låsa upp enheten."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Du angav fel pinkod för SIM-kortet. <xliff:g id="NUMBER">%d</xliff:g> försök återstår innan du måste kontakta operatören för att låsa upp enheten."</item>
-    <item quantity="other" msgid="77103619544346451">"Du angav fel pinkod för SIM-kortet. <xliff:g id="NUMBER">%d</xliff:g> försök återstår."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Du angav fel pinkod för SIM-kortet. <xliff:g id="NUMBER_1">%d</xliff:g> försök återstår.</item>
+      <item quantity="one">Du angav fel pinkod för SIM-kortet. <xliff:g id="NUMBER_0">%d</xliff:g> försök återstår innan du måste kontakta operatören för att låsa upp enheten.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Det gick inte att låsa upp med pinkoden för SIM-kortet."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Pekdatorns status"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonens status"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Tillgängligt (skrivskyddat)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totalt utrymme"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beräknas..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Appar (appdata och medieinnehåll)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Appar och appdata"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
-    <string name="memory_downloads_usage" msgid="3755173051677533027">"Hämtningar"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Nedladdningar"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Bilder, videor"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Ljud (musik, ringsignaler, poddsändningar m.m.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</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>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Monterar bort"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Lagringsutrymmet börjar ta slut"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Vissa systemfunktioner, t.ex. synkronisering, fungerar kanske inte som de ska. Försök att frigöra utrymme genom att ta bort eller lossa objekt, till exempel appar eller medieinnehåll."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Byt namn"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Montera"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Mata ut"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Radera och formatera"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Rensa/format. som internminne"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-anslutning till dator"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-anslutning till dator"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Anslut som"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Gör att du kan överföra mediefiler i Windows eller använda Android-appen för filöverföring på Mac (läs mer på www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Gör att du kan överföra foton med kameraprogrammet och överföra filer på datorer som inte har stöd för MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installera filöverföringsverktyg"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Gör så att appar som stöder MIDI kan användas med MIDI-program på datorn via USB."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Andra användare"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Lagring på enhet"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Externa lagringsenheter"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ledigt (totalt <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> har monterats"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Det gick inte att montera <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> har matats ut på ett säkert sätt"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Det gick inte att mata ut <xliff:g id="NAME">%1$s</xliff:g> på ett säkert sätt"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> har formaterats"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Det gick inte att formatera <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Byt namn på lagringsutrymmet"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Efter formateringen kan du använda ditt <xliff:g id="NAME_0">^1</xliff:g> på andra enheter. \n\nAll data på detta <xliff:g id="NAME_1">^1</xliff:g> raderas, så tänk på att säkerhetskopiera först. \n\n"<b>"Säkerhetskopiera foton och annan media"</b>" \nFlytta mediefilerna till ett annat lagringsutrymme på enheten, eller överför dem till en dator via USB-kabel. \n\n"<b>"Säkerhetskopiera appar"</b>" \nAlla appar som har lagrats på ditt <xliff:g id="NAME_6">^1</xliff:g> avinstalleras och deras data raderas. Om du vill behålla apparna flyttar du dem till ett annat lagringsutrymme på enheten."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"När du matar ut ditt <xliff:g id="NAME_0">^1</xliff:g> slutar appar som har lagrats på det att fungera, och mediefiler som har lagrats blir inte tillgängliga förrän det har kopplats in igen."</b>" \n\nDitt <xliff:g id="NAME_1">^1</xliff:g> är formaterat för att endast fungera på den här enheten. Det fungerar inte på andra enheter."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurera ditt <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Använd som bärbar lagringsenhet"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Flytta foton och annan media mellan enheter."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Använd som internminne"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Lagra vad du vill, endast på den här enheten (inklusive appar och foton). Formatering som hindrar att det fungerar på andra enheter krävs."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Formatera som internminne"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Detta kräver att ditt <xliff:g id="NAME_0">^1</xliff:g> formateras så att det blir säkert. \n\nEfter formateringen fungerar ditt <xliff:g id="NAME_1">^1</xliff:g> endast på den här enheten. \n\n"<b>"Formateringen raderar all data som har lagrats på ditt <xliff:g id="NAME_2">^1</xliff:g>."</b>" Säkerhetskopiera data om du vill undvika att förlora den."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Radera och formatera"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formaterar <xliff:g id="NAME">^1</xliff:g> …"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ta inte bort ditt <xliff:g id="NAME">^1</xliff:g> medan det formateras."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Flytta data till ny lagring"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Du kan flytta foton, filer och appdata till ditt nya <xliff:g id="NAME">^1</xliff:g>. \n\nDet tar omkring <xliff:g id="TIME">^2</xliff:g> och <xliff:g id="SIZE">^3</xliff:g> av internminnet frigörs. Vissa appar fungerar inte under tiden."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Flytta nu"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Flytta senare"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Flytta data nu"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Flytten tar omkring <xliff:g id="TIME">^1</xliff:g>. <xliff:g id="SIZE">^2</xliff:g> av internminnet frigörs."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Flytta"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Flyttar data ..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Under flytten: \n• Ta inte bort ditt <xliff:g id="NAME">^1</xliff:g>. \n• Vissa appar fungerar inte som de ska. \n• Håll enheten laddad."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Ditt <xliff:g id="NAME">^1</xliff:g> är klart"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Ditt <xliff:g id="NAME">^1</xliff:g> är klart att använda med foton och annan media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Ditt nya <xliff:g id="NAME">^1</xliff:g> fungerar. \n\nOm du vill flytta foton, filer och appdata till enheten öppnar du Inställningar &gt; Lagring."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Flytta <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Det tar bara några minuter att flytta <xliff:g id="APP">^1</xliff:g> och dess data till <xliff:g id="NAME_0">^2</xliff:g>. Du kan inte använda appen förrän flytten är klar. \n\nTa inte bort ditt <xliff:g id="NAME_1">^2</xliff:g> under flytten."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Flyttar <xliff:g id="APP">^1</xliff:g> …"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ta inte bort ditt <xliff:g id="NAME">^1</xliff:g> under flytten. \n\nAppen <xliff:g id="APP">^2</xliff:g> på den här enheten blir inte tillgänglig förrän flytten är klar."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Avbryt flytten"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batterinivå"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN:er"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Återställer standardinställningar för APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Återställ standardinst."</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Återställning av standardinställningar för APN har slutförts."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Nätverksinställningarna har återställts"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Alla nätverksinställningar kommer att återställas, inklusive:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Återställ inställningar"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Vill du återställa alla nätverksinställningar? Det går inte att ångra den här åtgärden."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Återställ inställningar"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vill du återställa?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Nätverksinställningarna har inte återställts"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Återställ enhet"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinst."</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Raderar alla data på surfplattan"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Raderar alla data på telefonen"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Radera alla data på SD-kortet, som musik och foton."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Återställ surfplattan"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Återställ telefonen"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Vill du radera all personlig information och alla hämtade appar? Åtgärden kan inte ångras."</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Vill du radera alla personliga uppgifter och alla nedladdade appar? Det går inte att ångra den här åtgärden."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Radera allt"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du måste rita ditt grafiska lösenord om du vill återställa standardinställningarna."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Återställningen utfördes inte eftersom tjänsten för systemrensning inte är tillgänglig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vill du återställa?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Den här användaren kan inte återställa till standardinställningarna"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vill du radera USB-lagringsenheten och ta bort alla filer? Åtgärden kan inte ångras."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vill du radera SD-kortet och alla filer på kortet? Åtgärden kan inte ångras."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Radera allt"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du måste bekräfta att du vill rensa USB-lagringsenheten genom att rita ditt grafiska lösenord."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Du måste bekräfta att du vill rensa SD-kortet genom att rita ditt grafiska lösenord."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Samtalsinställningar"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ställ in röstbrevlåda, vidarebefordra samtal, samtal väntar, nummerpres."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Internetdelning via USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjälp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobilnät"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilplan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standardapp för sms"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Sms-app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vill du byta sms-app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vill du använda <xliff:g id="NEW_APP">%1$s</xliff:g> som sms-app i stället för <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vill du använda <xliff:g id="NEW_APP">%s</xliff:g> som sms-app?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Platsläge"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Använd GPS, Wi-Fi och mobilnät för att bestämma plats"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Använd Wi-Fi och mobilnät för att bestämma plats"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Ange plats med hjälp av GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Avgör plats med hjälp av GPS"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Genomsöker"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Genomsöker"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-sökning"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Förbättra platsangivelserna genom att låta appar och tjänster söka efter Wi-Fi-nätverk, även om Wi-Fi har inaktiverats."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-sökning"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Förbättra platsangivelserna genom att låta systemtjänster söka efter Bluetooth-enheter, även om Bluetooth har inaktiverats."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi- och mobilnätsplats"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ge appar möjlighet att snabbare se var du är med Googles platstjänst. Anonym platsinformation samlas in och skickas till Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Platsen fastställs via Wi-Fi"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Lösenordet angavs"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-koden angavs"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Lösenordet har angetts"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Skärmsäkerhet"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Fortsätt genom att ange enhetens grafiska lösenord."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Fortsätt genom att ange enhetens pinkod."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Fortsätt genom att ange enhetens lösenord."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Säkerhet för enhet"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Byt grafiskt lösenord"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Ändra PIN-kod för upplåsning"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekräfta sparat grafiskt lösenord"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Försök igen:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Rita ett grafiskt lösenord"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryck på Menu om du vill ha hjälp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lyft fingret när du är klar"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ange grafiskt lösenord"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Byt grafiskt lösenord"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Så här ritar du ett grafiskt lösenord"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"För många felaktiga försök!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Försök igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"För många felaktiga försök. Försök igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Appen är inte installerad på mobilen."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hantera appar"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hantera och ta bort installerade appar"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sortera efter storlek"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Visa tjänster som körs"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Visa cachade processer"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"App för nödsituationer"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Återställ inställningarna"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vill du återställa?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Det återställer alla inställningar för:\n\n "<li>"Inaktiverade appar"</li>\n" "<li>"Inaktiverade appmeddelanden"</li>\n" "<li>"Standardappar för åtgärder"</li>\n" "<li>"Begränsningar i bakgrundsdata för appar"</li>\n" "<li>"Begränsningar för alla behörigheter"</li>\n\n" Ingen appdata kommer att försvinna."</string>
@@ -1237,7 +1286,7 @@
     <string name="filter_dlg_title" msgid="8693024463731076091">"Välj filteralternativ"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alla"</string>
     <string name="filter_apps_disabled" msgid="5364447573326472890">"Inaktiverade"</string>
-    <string name="filter_apps_third_party" msgid="7786348047690140979">"Hämtade"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Nedladdade"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kör"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Appåtgärder"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Kör"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Har aldrig använts)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Inga standardappar."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Använt utrymme"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Visa lagring som används av appar"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktiva tjänster"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Information om surfplattan"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformation"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Batteriinformation"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Snabbstart"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Ställ in kortkommandon för att starta appar"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Tilldela app"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Ingen genväg"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Sök + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Rensa"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Din genväg för <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>(<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) rensas."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Avbryt"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Appar"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Genvägar"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Textinmatning"</string>
     <string name="input_method" msgid="5434026103176856164">"Indatametod"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Aktuellt tangentbord"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samla alla HCI-paket för Bluetooth i en fil"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-upplåsning"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Tillåt att bootloadern låses upp"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Ange pinkoden"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ange enhetens pinkod om du vill aktivera OEM-upplåsning"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vill du tillåta OEM-upplåsning?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"Varning! Funktionerna för enhetsskydd fungerar inte på enheten när den här inställningen är aktiverad."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Buffertstorlekar för logg"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Välj loggstorlekar per loggbuffert"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivera inspektion av visningsattribut"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Nätverk"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifiering för Wi-Fi-skärmdelning"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktivera utförlig loggning för Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiv överlämning fr. Wi-Fi t. mobil"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Tillåt alltid sökning efter Wi-Fi-roaming"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Använd äldre DHCP-klient"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Visa certifieringsalternativ för Wi-Fi-skärmdelning"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Öka loggningsnivån för Wi-Fi, visa per SSID RSSI i Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"När funktionen har aktiverats kommer dataanslutningen lämnas över från Wi-Fi till mobilen på ett aggressivare sätt när Wi-Fi-signalen är svag"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Tillåt/tillåt inte sökning efter Wi-Fi-roaming utifrån mängden datatrafik i gränssnittet"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Buffertstorlekar för logg"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Välj loggstorlekar per loggbuffert"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Välj USB-konfiguration"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Välj USB-konfiguration"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivera inspektion av visningsattribut"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Använd DHCP-klienten från Lollipop i stället för den nya Android DHCP-klienten."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ska USB-felsökning tillåtas?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-felsökning ska endast användas i utvecklingssyfte. Använd den för att kopiera data mellan datorn och enheten, installera appar på enheten utan meddelanden och läsa loggdata."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Vill du återkalla åtkomst till USB-felsökning för alla datorer som du tidigare har godkänt?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> behöver:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Svaret kan inte verifieras av Inställningar, eftersom en app skymmer en begäran om behörighet."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> används inte skärmlåset för att förbättra datakryptering på enheten."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Eftersom du har aktiverat en tillgänglighetstjänst används inte skärmlåset för att förbättra datakryptering på enheten."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Eftersom datakrypteringen påverkas om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> måste du bekräfta ditt grafiska lösenord."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistik"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nördig statistik om processer som körs"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Minnesanvändning"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g>-appar under <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> av <xliff:g id="TOTALRAM">%2$s</xliff:g> har använts under <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Bakgrundsprocesser"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Förgrundsprocesser"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Cachade processer"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Mängden tillgängligt minne på enheten är för närvarande <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Genomsnittlig RAM-användning"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximal RAM-användning"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Operativsystemet Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Inbyggt"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kärna"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Cacheminnen"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"RAM-användning"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM-användning (bakgrund)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Speltid"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Processer"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Tjänster"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Längd"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Minnesinformation"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 timmar"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Visa system"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Dölj systemet"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Använd USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktyp"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Bakgrundsprocesser"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Standardinställningarna nedan åsidosätter appinställningarna"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardinställningar"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Standardmotor"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Anger talsyntesmotorn som ska användas för talat text"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Konfigurera talsyntesmotorn så att den kan användas för talad test"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Talhastighet"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Talhastighet för texten"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Maskinvarustöd"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Endast programvara"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Användaruppgifter är inte tillgängliga för den här användaren"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du måste rita ditt grafiska lösenord för att bekräfta uppgifterna."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Säkerhetskopiera mina data"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"spara en säkerhetskopia av appdata, Wi-Fi-lösenord och andra inställningar på Googles servrar"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Backupkonto"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Säkerhetskopierade data lagras för tillfället inte på något konto"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Inkludera appdata"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk återställning"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"När du installerar om en app återställs säkerhetskopierade inställningar och data"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Säkerhetskopieringstjänsten är inaktiv."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Detta anges i enhetspolicyn."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Lösenord för säkerhetskopia av datorn"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"De fullständiga säkerhetskopiorna av datorn är för närvarande inte skyddade"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tryck om du vill ändra eller ta bort lösenordet för fullständig säkerhetskopiering av datorn"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala, övergångsanimering"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Längdskala för Animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulera sekundär skärm"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Flerfönsterläge"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Flera aktiviteter på skärmen samtidigt"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Vill du aktivera flerfönsterläget?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"VARNING! Det här är en funktion på experimentstadiet som gör att flera aktiviteter kan pågå samtidigt på skärmen via gränssnittet för Senaste apparna. Det kan hända att appar kraschar eller inte fungerar som de ska när den används."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Appar"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Behåll inte aktiviteter"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Förstör aktiviteter så fort användaren lämnar dem"</string>
@@ -2110,7 +2166,7 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ca <xliff:g id="TOTAL">%1$s</xliff:g> har använts enligt pekdatorns mätning.  Resultatet kan skilja sig från operatörens beräkning av dataanvändningen."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ca <xliff:g id="TOTAL">%1$s</xliff:g> har använts enligt mobilens mätning. Resultatet kan skilja sig från operatörens beräkning av dataanvändningen."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Nätverksbegränsningar"</string>
-    <string name="data_usage_metered_body" msgid="3262343834446126044">"Nätverk med datapriser behandlas som mobilnät om det finns begränsningar för bakgrundsdata. Appar kan varna innan du använder dessa nätverk för stora hämtningar."</string>
+    <string name="data_usage_metered_body" msgid="3262343834446126044">"Nätverk med datapriser behandlas som mobilnät om det finns begränsningar för bakgrundsdata. Appar kan varna innan du använder dessa nätverk för stora nedladdningar."</string>
     <string name="data_usage_metered_mobile" msgid="2326986339431119372">"Mobilnät"</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>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Användare"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begränsad profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Lägga till ny användare?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Du kan dela enheten med andra om du skapar flera användare. Varje 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, t.ex. Wi‑Fi.\n\nNä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_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>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Vill du ta bort gästen?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Alla appar och data i denna session kommer att raderas."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Ta bort"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Tillåt samtal"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Tillåt samtal och sms"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Aktivera telefonsamtal"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Aktivera telefonsamtal och sms"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Ta bort användare"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Vill du tillåta telefonsamtal?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Vill du aktivera telefonsamtal?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Samtalshistoriken delas med den här användaren."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Vill du tillåta samtal och sms?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Samtals- och sms-historiken delas med den här användaren."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vill du aktivera telefonsamtal och sms?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Samtals- och sms-historiken delas med den här användaren."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillåt appar och innehåll"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Appar med begränsningar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utöka appens inställningar"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"BYT NAMN"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Konfigurera appbegränsningar"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Styrs av <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Den här appen stöds inte i begränsade profiler"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Den här appen har åtkomst till dina konton"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Den här appen har inte åtkomst till dina konton. Styrs av <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi och mobilt"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Tillåt ändring av inställningar för Wi-Fi-och mobilt"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi-nätverksanslutning"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textmeddelande sms:a meddelanden skicka sms"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiltelefon mobil operatör trådlös data 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi samtal ringer"</string>
     <string name="keywords_home" msgid="3626170808219458848">"översikt"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skärm pekskärm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"tona ned skärm pekskärm batteri"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"tona ned skärm pekskärm batteri"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"bakgrund anpassa skärm"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"mörkt tema nattläge dämpad skärm invertera ljusstyrka"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"bakgrund anpassa anpassa skärm"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textstorlek"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projicera cast"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"utrymme disk hårddisk enhet användning"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"energianvändning laddning"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"stavning ordbok stavningskontroll autokorrigering"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"begränsning begränsa begränsad"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"textkorrigering korrigera ljud vibrera automatiskt språk gest föreslå förslag tema stötande ord skriva emoji internationell"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"återställa inställningar standardinställningar"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"nödsituation i nödfall standardapp"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"appar ladda ned appar system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"appar behörigheter säkerhet"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"appar standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"dra lösenord mönster pinkod"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ange en NFC-tagg för Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Avbrott"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Vid inkommande samtal och aviseringar"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Avbryt alltid"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Tillåt bara prioriterade avbrott"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Avbryt inte"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tillåt endast prioriterade"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiska regler"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Bara prioriterade"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Endast alarm"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Inga avbrott"</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="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardsignal för avisering"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrera också vid samtal"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibration"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Åtkomst till aviseringar"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Appar kan läsa meddelanden"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app kan läsa meddelanden"</item>
-    <item quantity="other" msgid="980049191810249052">"%d appar kan läsa meddelanden"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d appar kan läsa meddelanden</item>
+      <item quantity="one">%d app kan läsa meddelanden</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Inga meddelandelyssnare har installerats."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vill du aktivera <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kommer att kunna läsa alla meddelanden från systemet eller en installerad app. Meddelandena kan innehålla personliga uppgifter som kontaktnamn och texten i meddelanden som skickas till dig. Lyssnaren kan även avvisa sådana meddelanden eller trycka på åtgärdsknappar i dem."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Appar som innehåller villkor"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Inga appar innehåller villkor"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app innehåller villkor"</item>
-    <item quantity="other" msgid="358057362115673258">"%d appar innehåller villkor"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Inga appar som innehåller villkor har installerats."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vill du aktivera <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan lägga till avslutningsvillkor till läget Stör ej."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Läser in appar ..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Blockera"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Blockera alla"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Visa aldrig aviseringar från den här appen"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritet"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Visa aviseringar högst upp på listan och fortsätt visa dem när enheten är inställd på endast prioriterade avbrott"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Känsligt"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Dölj känsligt innehåll från appens aviseringar när enheten är låst"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Behandla som prioriterad"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Tillåt att aviseringar från den här appen hörs när funktionen Stör ej är inställd på Endast prioriterade"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Tillåt snabbtitt"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Tillåt att den här appen framhäver vissa aviseringar genom att dra in dem på den aktuella skärmen en kort stund."</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Dölj känsligt innehåll"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Dölj innehåll som kan avslöja privat information från appens aviseringar när enheten är låst"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blockerad"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Känsligt"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Klart"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Tills du inaktiverar detta"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriterade avbrott"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Avbrottstid"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dagar"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ingen"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Avbrott tillåts"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Endast prioriterade"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ingen"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisering"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Aktivera automatiskt"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Regelnamn"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Lägg till regel"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ta bort regel"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Vill du ta bort regeln <xliff:g id="RULE">%1$s</xliff:g>?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Radera"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Regeltyp"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Okänd"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfigurera regel"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Schemalägg regel"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Regeln hittades inte."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dagar"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Inga"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Varje dag"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldrig"</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> till <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Samtal"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Meddelanden"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Samtal/meddelanden från"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Vem som helst"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Endast kontakter"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Endast stjärnmärkta kontakter"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Händelser och påminnelser"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Larm är alltid prioriterade avbrott"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarm"</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_selected_callers" msgid="3127598874060615742">"Valda personer som ringer"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Återuppringning"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Om samma person ringer upp en andra gång inom <xliff:g id="MINUTES">%d</xliff:g> minuter ska detta tillåtas"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktivera automatiskt"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldrig"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Varje kväll"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Veckodagskvällar"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttid"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttid"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nästa dag"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> eller vid tidigare alarm"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nästa dag eller vid tidigare alarm"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nästa dag"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Avbrott"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Vid inkommande samtal och aviseringar"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"När vill du bli avbruten?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Hur länge?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Avbryt alltid"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"av, alla, allt"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Tillåt bara prioriterade samtal och aviseringar"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Tillåt endast alarm"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Avbryt inte"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Tills vidare"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuter</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minut</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> timmar</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> timme</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Ändra till endast prioriterade aviseringar tills vidare"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Ändra till endast prioriterade aviseringar i <xliff:g id="DURATION">%1$d</xliff:g> minuter till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ändra till endast prioriterade aviseringar i en minut till och med <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Ändra till endast prioriterade aviseringar i <xliff:g id="DURATION">%1$d</xliff:g> timmar (till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ändra till endast prioriterade aviseringar i en timme till och med <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Ändra till endast alarm tills vidare"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Ändra till endast alarm i <xliff:g id="DURATION">%1$d</xliff:g> minuter (till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ändra till endast alarm i en minut till och med <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">Ändra till endast alarm i <xliff:g id="DURATION">%1$d</xliff:g> timmar till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ändra till endast alarm i en timme till och med <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Ändra till avbryt inte tills vidare"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Ändra till inga avbrott i <xliff:g id="DURATION">%1$d</xliff:g> minuter (till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ändra till inga avbrott i en minut till och med <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Ändra till inga avbrott i <xliff:g id="DURATION">%1$d</xliff:g> timmar till och med <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ändra till inga avbrott i en timme till och med <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ändra till avbryt alltid"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"för alltid"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appaviseringar"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enheten"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Information om IMEI-kod"</string>
     <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="2184141780491382435">"Starta som standard"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> används i <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Domänlänkar"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Öppna domänadresser"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Tillåt att appen öppnar domänadresser direkt"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Domänadresser som stöds"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Andra standardinställningar"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> används i <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"internminne"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"externt minne"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Internminne"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Extern lagring"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Appens dataanvändning"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> använt sedan <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Lagringsutrymme som används"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"På"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Blockera"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Känsligt"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Prioritet"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Prioritet och känsligt"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> behörigheter har getts</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> behörighet har getts</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> av <xliff:g id="COUNT_3">%d</xliff:g> behörigheter har beviljats</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> behörighet har beviljats</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Några standardinställningar har angetts"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Inga standardinställningar har angetts"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Alla appar"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Aktiverad"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personligt"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Arbetet"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blockerad"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritet"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Känsligt"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med domänadresser"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Har inaktiverats av administratören"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Avancerat"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Okänd app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Välj profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Appens behörigheter"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> appar har ytterligare åtkomst"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> appar tillåts"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domänadresser"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Öppna inga domänadresser"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Öppna <xliff:g id="DOMAIN">%s</xliff:g>"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Öppna <xliff:g id="DOMAIN">%s</xliff:g> och relaterade webbadresser"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> appar kan öppna domänadresser</item>
+      <item quantity="one">En app kan öppna domänadresser</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Identifierades inte"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Standardappar"</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_app" msgid="6864503001385843060">"(Standard)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Applagring"</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 2ef1f02..ca1d4d6 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Kichupo cha kusukuma"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"zima au uwashe sauti ya maikrofoni"</item>
     <item msgid="1148142988678569310">"maudhui ya mradi"</item>
     <item msgid="9130014005474445273">"anzisha VPN"</item>
+    <item msgid="1165192162975045562">"mandhari ya kuandikwa"</item>
+    <item msgid="7129487923652967258">"muundo wa mapendekezo"</item>
+    <item msgid="1069023208100114540">"picha ya skrini ya mapendekezo"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Eneo"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Zima ama uwashe sauti ya maikrofoni"</item>
     <item msgid="5906017727368097853">"Maudhui ya mradi"</item>
     <item msgid="2486614710846178542">"Anzisha VPN"</item>
+    <item msgid="5586547561693629602">"Mandhari ya kuandikwa"</item>
+    <item msgid="32794179825485062">"Muundo wa mapendekezo"</item>
+    <item msgid="7872852746938272552">"Picha ya skrini ya mapendekezo"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Fupi"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"chini"</item>
     <item msgid="4212263919458209842">"muhimu"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Kimezimwa"</item>
-    <item msgid="5656544177755411222">"Ukatizwaji mdogo"</item>
-    <item msgid="8735337502532332056">"Haikatizwi kabisa"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Kawaida"</item>
     <item msgid="866544120205026771">"Wastani"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Waridi"</item>
     <item msgid="6131821495505931173">"Nyekundu"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Itifaki ya Kuhamisha Maudhui)"</item>
+    <item msgid="8856820259201251036">"PTP (Itifaki ya Kuhamisha Picha)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethaneti ya USB)"</item>
+    <item msgid="2686051673589572111">"Chanzo cha Sauti"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d2abdc9..2c5f23c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Ruhusu"</string>
     <string name="deny" msgid="6947806159746484865">"Kana"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Haijulikani"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Sasa umebakisha hatua <xliff:g id="STEP_COUNT">%1$d</xliff:g> uwe msanidi programu."</item>
-    <item quantity="other" msgid="6722953419953594148">"Sasa umebakisha hatua <xliff:g id="STEP_COUNT">%1$d</xliff:g> uwe msanidi programu."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Umebakisha hatua <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ili uwe msanidi programu.</item>
+      <item quantity="one">Umebakisha hatua <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ili uwe msanidi programu.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sasa wewe ni msanidi programu!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Hakuna haja, tayari wewe ni msanidi programu."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Isiyotumia waya na mitandao"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Zima SMS juu ya IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Inahitaji kuwasha usajili wa IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Inahitaji kuzima usajili wa IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Washa alama inayoonyesha VoLTE inatumika"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Zima alama inayoonyesha VoLTE inatumika"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Washa Ite ram dump"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Zima Ite ram dump"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ona anwani za kijitabu cha SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Inasambaza"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wasifu ulemazwe?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Hii italemaza:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kutoka:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Umeunganishwa"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Imeunganishwa (hakuna simu)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Imeunganishwa(hakuna vyombo vya habari)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Imeunganishwa (hakuna ufikiaji kwa ujumbe)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Imeunganishwa(hakuna simu au vyombo vya habari)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Imetenganishwa"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Inatenganisha..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Inaunganisha…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Inaoanisha..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Kifaa cha Bluetooth kisicho na jina"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Inatafuta"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Hakuna vifaa vya Bluetooth vilivyopatikana karibu."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Onyesha faili zilizopokewa"</string>
     <string name="device_picker" msgid="4978696506172252813">"Chagua kifaa cha Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Ombi la kibali cha Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Programu inataka kuwasha Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Programu inataka KUWASHA Bluetooth kwenye kifaa hiki."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Programu inataka kufanya kompyuta yako ndogo ionekane kwenye vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Programu inataka kufanya simu yako ionekane kwenye vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Programu inataka kufanya kompyuta yako ndogo ionekane kwenye vifaa vingine vya Bluetooth. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
@@ -277,12 +270,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kadi ya SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Mipangilio ya seva mbadala"</string>
     <string name="cancel" msgid="6859253417269739139">"Ghairi"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"GHAIRI"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ENDELEA"</string>
     <string name="okay" msgid="1997666393121016642">"Sawa"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"NDIYO"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"HAPANA"</string>
-    <string name="forget" msgid="7267115980248732932">"SAHAU"</string>
+    <string name="forget" msgid="1400428660472591263">"Sahau"</string>
+    <string name="save" msgid="879993180139353333">"Hifadhi"</string>
+    <string name="done" msgid="6942539184162713160">"Nimemaliza"</string>
     <string name="settings_label" msgid="1626402585530130914">"Mipangilio"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Mipangilio"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Mipangilio ya njia ya mkato"</string>
@@ -327,9 +318,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Panga kulingana na saa za eneo"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tarehe"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Saa"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Boresha ulinganishaji sura"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Ukaguzi wa moja kwa moja"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Inahitaji kukopesa jicho inapofungua"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Funga kiotomatiki"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> baada ya kuingia katika hali tulivu"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> baada ya hali tuli, isipokuwa kinapowekwa bila kufungwa na <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -350,6 +338,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati-tambulishi"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Manenosiri"</string>
+    <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="3453670509485083962">"Ongeza"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"kufunga skrini"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other">Vitambulisho <xliff:g id="COUNT_1">%1$d</xliff:g> vimeandikishwa</item>
+      <item quantity="one">kitambulisho <xliff:g id="COUNT_0">%1$d</xliff:g> kimeandikishwa</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Kitambulisho kimesanidiwa!"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Kutumia kitambulisho chako kufungua skrini yako au kuthibitisha ununuzi, tutahitaji: \n\n ✓ Kuweka njia yako mbadala ya kufungua skrini \n\n ✓ Kuongeza kitambulisho chako"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Tafuta kihisi"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Tafuta kihisi cha kitambulisho upande wa nyuma wa simu yako."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Jina"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"SAWA"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Futa"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Acha tuanze!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Weka kidole kwenye kihisi cha kitambulisho. Inua kidole utakaposikia mtetemo."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Vizuri! Rudia sasa."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Weka kidole kile kile kwenye kihisi cha kitambulisho na uinue kidole utakaposikia mtetemo."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Kitambulisho kimeongezwa!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kila unapoona aikoni hii, unaweza kutumia kitambulisho chako kujitambulisha au kuidhinisha ununuzi."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Ongeza"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Inayofuata"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Usimbaji fiche"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Simba kompyuta kibao kwa njia fiche"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Simba simu"</string>
@@ -362,7 +374,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Tafadhali weka chaja yako kisha ujaribu tena."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Hakuna PIN ya kufunga skrini au nenosiri"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Unahitaji kuweka PIN au nenosiri la kufunga skrini kabla kuanza usimbaji fiche."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe usimbaji kwa njia fiche wa kifaa chako."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Simba?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo kompyuta kibao itajiwasha mara kadhaa."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo simu itajiwasha mara kadhaa."</string>
@@ -393,22 +404,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Telezesha kidole"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Hakuna salama"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Kufungua kwa Uso"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Usalama wa chini, wa kujaribu"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Mchoro"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Usalama wastani"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Wastani hadi usalama wa juu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Nenosiri"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Usalama wa juu"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Kifunga skrini cha sasa"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Vipengele vya ulinzi wa kifaa havitaendelea kufanya kazi."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Imelemazwa na msimamizi, sera ya usimbaji fiche, au hifadhi ya stakabadhi"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Hamna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Telezesha kidole"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Kufungua kwa Uso"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Mchoro"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Nenosiri"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Mara unapoweka kufunga skrini, unaweza pia kuweka kitambulisho chako katika Mipangilio na Usalama."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Lemaza kufungwa kwa skrini"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ondoa umbo la kufungua"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ondoa PIN ufunguaji"</string>
@@ -431,18 +441,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Nenosiri lazima liwe na angalau herufi moja."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Nenosiri lazima liwe na angalau tarakimu moja."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Nenosiri lazima liwe na angalau alama moja."</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for lockpassword_password_requires_letters:other (8186027808415585970) -->
-    <!-- String.format failed for translation -->
-    <!-- no translation found for lockpassword_password_requires_lowercase:other (2693910942679679225) -->
-    <!-- String.format failed for translation -->
-    <!-- no translation found for lockpassword_password_requires_uppercase:other (3030801209112209245) -->
-    <!-- String.format failed for translation -->
-    <!-- no translation found for lockpassword_password_requires_numeric:other (4703982391407595924) -->
-    <!-- String.format failed for translation -->
-    <!-- no translation found for lockpassword_password_requires_symbols:other (1221290525051187757) -->
-    <!-- String.format failed for translation -->
-    <!-- no translation found for lockpassword_password_requires_nonletter:other (3952508584649046404) -->
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Nenosiri lazima liwe na angalau herufi %d.</item>
+      <item quantity="one">Nenosiri lazima liwe na angalau herufi moja.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Nenosiri lazima liwe na angalau herufi %d ndogo.</item>
+      <item quantity="one">Nenosiri lazima liwe na angalau herufi moja ndogo.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Nenosiri lazima liwe na angalau herufi %d kubwa.</item>
+      <item quantity="one">Nenosiri lazima liwe na angalau herufi moja kubwa.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Nenosiri lazima liwe na angalau tarakimu % d.</item>
+      <item quantity="one">Nenosiri lazima liwe na angalau tarakimu moja.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Nenosiri lazima liwe na angalau alama % d maalum.</item>
+      <item quantity="one">Nenosiri lazima liwe na angalau alama 1 maalum.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Nenosiri lazima liwe na angalau herufi %d ambazo si herufi za alfabeti.</item>
+      <item quantity="one">Nenosiri lazima liwe na angalau herufi moja ambayo si ya alfabeti.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Kidhibiti cha kifaa haruhusu kutumia nenosiri lililotumiwa hivi karibuni."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Mlolongo wa kupanda, kushuka au kujirudia wa tarakakimu hauruhusiwi"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Sawa"</string>
@@ -472,15 +494,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Ili kuoanisha na :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;hakikisha inaonyesha nenosiri hili:&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;Llinganisha na kifaa hiki?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Kulinganisha na: <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> Andika: <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>, kisha bonyeza Rejea au Ingiza."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Oanisha"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"OANISHA"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Ghairi"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Kuoanisha hutoa ruhusa ya kufikiwa kwa unaowasiliana nao na rekodi ya simu zilizopigwa unapounganishwa."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Haikuwezakulinganisha na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Haikuweza kulingana na <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kwa sababu ya PIN isiyo sahihi au msimbo ya kuingia."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Haiwezi kuanzisha mawasiliano na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Ulinganishaji umekataliwa na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Haikuweza kuunganisha kwa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Chunguza vifaa"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Onyesha upya"</string>
@@ -507,16 +522,8 @@
     <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="ble_scan_notify_text" msgid="3719383048635344071">"Ili kuboresha usahihi wa kutambua mahali, programu na huduma zitaangalia vifaa vya Bluetooth, hata wakati Bluetooth imezimwa. Unaweza kubadilisha hali hii katika <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mipangilio ya kuchanganua<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Unganisha kwa..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media ya sauti"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Sauti ya simu"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Uhamishaji wa faili"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Kifaa cha kuingiza"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ufikivu wa mtandao"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kushiriki anwani"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Tumia kwa kushiriki anwani"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Kushiriki muunganisho wa tovuti"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Ufikiaji wa Ujumbe"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya kifaa kisichotumia mikono."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa kifaa cha kuingiza."</string>
@@ -529,28 +536,15 @@
     <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_enable_opp_title" msgid="8222550640371627365">"Ruhusu mahamisho ya faili inayoingia"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Imeunganishwa kwenye sikika ya njia ya mawasiliano"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Imeunganishwa kwenye sauti ya simu"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Imeunganishwa kwenye seva ya kuhamisha faili"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Imeunganishwa kwenye ramani"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Haijaunganishwa kwenye seva ya kuhamisha faili"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Umeunganishwa kwa kifaa cha kuingiza"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Tumia kwa sauti ya media"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Tumia kwa sauti ya simu"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Tumia kwa hali faili"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Tumia kwa kuingiza"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Tumia kwa ufikiaji mtandao"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Tumia kwa ramani"</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_remember" msgid="5551459057010609115">"Kumbuka mipangilio"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Kisaidizi cha Wi-Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Imeunganishwa kupitia Kisaidizi cha Wi-Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Utumaji wa Skrini"</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>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Hakuna vifaa vilivyopatikana karibu."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Inaunganisha"</string>
@@ -562,6 +556,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Sahau"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Imekamilika"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Jina"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Ruhusu ubadilishanaji wa data wakati kompyuta kibao inagusa kifaa kingine"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Ruhusu ubadilishanaji wa data wakati simu inagusa kifaa kingine"</string>
@@ -585,21 +581,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Inazima Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Hitilafu"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Hali ya ndege imewashwa"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Haiwezi kutambaza mitandao"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Arifa ya mtandao"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Tuma arifa wakati wowote mtandao wa umma unapopatikana"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Epuka miunganisho mibovu"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"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_scan_always_available" msgid="3470564139944368030">"Angalia Mitandao Inayopatikana"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Ruhusu uchanganuzi wakati wote"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Ruhusu huduma ya Google ya kutambua mahali na programu zingine ziangalie mitandao inayopatikana, hata wakati Wi-Fi imezimwa"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Tumia Wi-Fi huru kiotomatiki"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Ruhusu kisaidizi cha Wi-Fi kiunganishe kiotomatiki kwenye mitandao huru iliyotambuliwa kuwa ya ubora wa juu"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Chagua kisaidizi"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sakinisha vyeti"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Ili kuboresha usahihi wa eneo na kwa ajili ya madhumuni mengine, Google na programu nyingine huchanganua kutafuta mitandao iliyokaribu, hata wakati Wi-Fi imezimwa. Ikiwa hutaki hili litokee, nenda kwenye &gt; Uchanganuzi Mahiri unapatikana wakati wote."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programu zinaweza kuchanganua kutafuta mitandao iliyokaribu, hata wakati Wi-Fi imezimwa. Ikiwa hutaki hili litokee, nenda kwenye &gt; Uchanganuzi Mahiri unapatikana wakati wote."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Ili kuboresha usahihi wa kutambua mahali, programu na huduma zitaangalia mitandao ya Wi-Fi, hata wakati Wi-Fi imezimwa. 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_remember_choice" msgid="5340097010842405981">"Usionyeshe tena"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Washa Wi-Fi wakati wa kulala"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi iwashwe hata katika hali tuli"</string>
@@ -627,11 +618,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Ongeza mtandao mwingine"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Zaidi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Usanidi kiotomatiki (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Ili kukamilisha usanidi, kompyuta yako kibao inahitaji kufikia Wi-Fi. Baada ya usanidi,  unaweza kubadili kati ya data ya simu za mkononi na Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Chaguo za kina"</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="5940801028985255304">"Bonyeza kitufe Kilicholindwa cha Usanidi wa Wi-Fi kwenye kisambaza data chako. Huenda kinaitwa \"WPS\" au kina ishara hii:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Bonyeza kitufe cha Wi‑Fi Protected Setup kwenye ruta yako. Inaweza kuitwa \'\'WPS\'\' au kuwekwa alama hii:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Weka pin <xliff:g id="NUMBER">%1$s</xliff:g> kwenye kisambaza data chako cha Wi-Fi. Huenda usanidi ukachukua hadi dakika mbili kabla ukamilike."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS imefanikiwa. Inaunganisha kwenye mtandao..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Umeunganishwa kwenye mtandao-hewa wa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -657,20 +647,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Kitambulisho kisichojulikana"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Nenosiri"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Onyesha nenosiri"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Weka Bendi ya AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Bendi ya GHz 2.4"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Bendi ya GHz 5"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Mipangilio ya IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(haijabadilishwa)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(haijabainishwa)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Imehifadhiwa"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Imelemazwa"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Haikuweza Kusanidi IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Haikuweza Kuunganisha kwenye WiFi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tatizo la uthibitishaji"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Haiko karibu"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Hakuna Ufikiaji kwa Intaneti Uliogunduliwa, haitaweza kuunganisha kiotomatiki."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS inapatikana"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS inapatikana"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Weka nenosiri la mtandao wako"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Hamna"</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>
@@ -678,6 +663,8 @@
     <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="1509171132175355674">"Mtandao huu hauna ufikiaji wa Intaneti. Je, ungependa kutumia mtandao huu hata hivyo?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Usiulizie mtandao huu tena"</string>
     <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>
@@ -743,6 +730,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Mtandao-hewa wa Wi-Fi wa AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> intaneti ya Wi-Fi ya kusambazwa"</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_mode_title" msgid="2164073796253284289">"Mapendeleo ya kupiga simu"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Hali ya upigaji simu kwa Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Inayopendelea Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Inayopendelea mitandao ya simu za mkononi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Mwanzo"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
@@ -806,6 +805,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Rekebisha mwangaza wa skrini"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Mwangaza uliorekebishwa"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Boresha kiwango cha ung\'avu cha mwanga unaopatikana"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Mandhari"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Mwangaza"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Nyeusi"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Otomatiki"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Zima skrini"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrini huzima"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> za kutokuwa na shughuli"</string>
@@ -857,10 +861,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Unataka kubadili SIM kadi?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> ndiyo SIM ya pekee katika kifaa chako. Unataka kutumia SIM hii kupata huduma ya data, kupiga simu, na ujumbe wa SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Msimbo wa PIN ya SIM usio sahihi sasa lazima uwasiliane na mtoa huduma wako ili ufungue kifaa chako."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Msimbo wa PIN ya SIM usio sahihi, umesalia na majaribio <xliff:g id="NUMBER">%d</xliff:g> kabla ulazimike kuwasiliana na mtoa huduma wako ili ufungue kifaa chako."</item>
-    <item quantity="other" msgid="77103619544346451">"Msimbo wa PIN ya SIM usio sahihi, umesalia na majaribio <xliff:g id="NUMBER">%d</xliff:g>."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Msimbo wa PIN ya SIM si sahihi, umebakisha majaribio <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
+      <item quantity="one">Msimbo wa PIN ya SIM si sahihi, umebakisha majaribio <xliff:g id="NUMBER_0">%d</xliff:g> kabla ya kulazimika kuwasiliana na mtoa huduma wako ili afungue kifaa chako.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Utendakazi wa PIN ya SIM umeshindwa!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Hali ya kompyuta kibao"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Hali ya simu"</string>
@@ -909,12 +913,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Inapatikana (soma-tu)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Jumla ya nafasi"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Inahesabu..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Programu (data na maudhui ya media)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Programu na data ya programu"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Vipakuliwa"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Picha, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Sauti (muziki, toni milio, podikasti n.k)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Mengineyo."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Faili nyingine"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data iliyowekwa kwenye akiba"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Angua hifadhi iliyoshirikishwa"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Ondoa kadi ya SD"</string>
@@ -947,6 +951,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Shughuli ya kuanguliwa inaendelea"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Nafasi ya kuhifadhi inakwisha"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Baadhi ya vipengee vya mfumo, kama vile usawazishaji, huenda visifanye kazi vizuri. Jaribu kuongeza nafasi kwa kufuta au kubanua vipengee, kama vile programu au maudhui ya vyombo vya habari."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Badilisha jina"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Pachika"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Ondoa"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Futa data yote na upangilie upye"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Futa na upangilie upya kama hifadhi ya mfumo"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Kuunganishwa kwenye kompyuta kwa USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Kuunganishwa kwenye kompyuta kwa USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Unganisha kama"</string>
@@ -954,8 +963,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Hukuwezesha kuhamisha faili za media kwenye Windows, au kwa kutumia Uhamishaji Faili wa Android kwenye Mac  (angalia www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Hukuwezesha kuhamisha picha kwa kutumia programu ya kamera, na kuhamisha faili zozote kwenye kompyuta ambayo haitumii MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Sakinisha zana za kuhamisha fali"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Huruhusu programu zinazotumia MIDI zifanye kazi kupitia USB kwa kutumia programu ya MIDI kwenye kompyuta yako."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Watumiaji wengine"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Hifadhi ya kifaa"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Hifadhi unayoweza kuondoa"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> haijatumika (Jumla <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> imepachikwa"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Haikuweza kupachika <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> imeondolewa kwa usalama"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Haikuweza kuondoa <xliff:g id="NAME">%1$s</xliff:g> kwa usalama"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> imepangiliwa upya"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Haikuweza kupangilia upya <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Badilisha jina la hifadhi"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Baada ya kupanga, unaweza kutumia <xliff:g id="NAME_0">^1</xliff:g> hii katika vifaa vingine. \n\nData yote katika <xliff:g id="NAME_1">^1</xliff:g> hii itafutwa. Hifadhi nakala rudufu ya maudhui yaliyomo humo kwanza. \n\n"<b>"Hifadhi nakala rudufu ya picha na maudhui mengine"</b>" \nHamishia faili zako za maudhui kwenye hifadhi mbadala katika kifaa hiki, au uyahamishie kwenye kompyuta ukitumia kebo ya USB. \n\n"<b>"Hifadhi nakala rudufu ya programu"</b>" \nProgramu zote zilizohifadhiwa katika <xliff:g id="NAME_6">^1</xliff:g> hii zitaondolewa na data yake ifutwe. Ili kusalia na programu hizi, zihamishie kwenye hifadhi mbadala katika kifaa hiki."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Unapoondoa <xliff:g id="NAME_0">^1</xliff:g> hii, programu zilizohifadhiwa ndani yake zitaacha kufanya kazi, na faili za maudhui zilizohifadhiwa ndani yake hazitapatikana hadi itakapopachikwa tena."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> hii imepangiliwa ili ifanye kazi kwenye kifaa hiki pekee. Haitafanya kazi kwenye vifaa vingine vyovyote."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Sanidi <xliff:g id="NAME">^1</xliff:g> yako"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Tumia kama hifadhi inayohamishika"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Kwa ajili ya kuhamisha picha na maudhui mengine kati ya vifaa."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Tumia kama hifadhi ya ndani"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Kwa ajili ya kuhifadhi kitu chochote kwenye kifaa hiki tu, ikiwa ni pamoja na programu na picha. Inahitaji kupangwa ili isifanye kazi na vifaa vingine."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Panga kawa hifadhi ya ndani"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Hii inahitaji <xliff:g id="NAME_0">^1</xliff:g> ipangwe upya ili kuifanya salama. \n\nBaada ya kuipanga, <xliff:g id="NAME_1">^1</xliff:g> hii itafanya kazi kwenye kifaa hiki pekee. \n\n"<b>"Kupanga kutafuta data yote iliyohifadhiwa kwa sasa katika <xliff:g id="NAME_2">^1</xliff:g>."</b>" Kuepuka kupoteza data, hifadhi nakala rudufu."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Futa data yote na upange upya"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Inapanga <xliff:g id="NAME">^1</xliff:g>..."</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Usiondoe <xliff:g id="NAME">^1</xliff:g> inapopanga."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Hamishia data kwenye hifadhi mpya"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Unaweza kuhamishia picha zako, faili, na data ya programu kwenye <xliff:g id="NAME">^1</xliff:g> hii mpya. \n\nKuhamisha kunachukua takriban <xliff:g id="TIME">^2</xliff:g> na kutaacha nafasi ya <xliff:g id="SIZE">^3</xliff:g> kwenye hifadhi ya ndani. Baadhi ya programu huenda hazitafanya kazi uhamishaji unapoendelea."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Hamisha sasa"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Hamisha baadaye"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Hamisha data sasa"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Kuhamisha kutachukua takriban <xliff:g id="TIME">^1</xliff:g>. Kutaacha nafasi ya <xliff:g id="SIZE">^2</xliff:g> kwenye hifadhi ya ndani."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Hamisha"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Hamisha data..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Wakati wa kuhamisha: \n•Usiondoe <xliff:g id="NAME">^1</xliff:g>. \n • Baadhi ya programu hazitafanya kazi kwa usahihi. \n •Weka kifaa kikae na chaji."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> iko tayari"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> yako iko tayari kutumiwa na picha na maudhui mengine."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> yako mpya inafanya kazi. \n\nKuhamishia picha, faili na data ya programu kwenye kifaa hiki, nenda kwenye Mipangilio &gt; Hifadhi."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Hamisha <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Kuhamisha <xliff:g id="APP">^1</xliff:g> na data yake kwenda <xliff:g id="NAME_0">^2</xliff:g> kutachukua dakika chache tu. Hutaweza kutumia programu hadi ukamilishe kuhamisha. \n\nUsiondoe <xliff:g id="NAME_1">^2</xliff:g> wakati wa kuhamisha."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Inahamisha <xliff:g id="APP">^1</xliff:g>..."</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Usionde <xliff:g id="NAME">^1</xliff:g> wakati wa kuhamisha. \n\nProgramu ya <xliff:g id="APP">^2</xliff:g> haitapatikana kwenye kifaa hiki hadi ukamilishe kuhamisha."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Ghairi kuhamisha"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Hali ya betri"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Kiwango cha betri"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -999,10 +1048,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Inarejesha mipangilio mbadala ya APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rudisha kwenye chaguo-msingi"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Kuweka upya kwa mipangilio mbadala ya APN kumekamilika"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Mipangilio ya mtandao imewekwa upya"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Hatua hii itaweka upya mipangilio yote ya mtandao, ikiwemo: \n\n"<li>"Wi-Fi"</li>\n<li>"Data ya simu za mkononi"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Weka upya mipangilio"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"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_confirm_title" msgid="1759888886976962773">"Iwekwe upya?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Mipangilio ya mtandao imewekwa upya"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Zima na uwashe tena kifaa"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Rejesha data ya mwanzo"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Futa data yote iliyo kwenye kompyuta kibao"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Inafuta data yote katika simu"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1016,9 +1070,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Futa data zote kwenye kadi ya SD, kama vile muziki au picha."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Rejesha mipangilio ambayo kompyuta kibao ilitoka nayo kiwandani"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Rejesha mipangilio ya mwanzoni ya simu"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Ungependa kufuta taarifa zako zote za kibinafsi na zilizopakuliwa? Hauwezi kutendua hatua hii!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Ungependa kufuta maelezo yako yote ya kibinafsi na programu zilizopakuliwa? Huwezi kutendua hatua hii!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Futa kila kitu"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Unahitaji kuweka mchoro wa kufungua ili uthibitishe urejeshaji mipangilio ambayo ilitoka nayo kiwandani."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Hakuna mpangilio mpya uliofanywa kwa sababu huduma ya Mfumo wa Kufuta haipatikani."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Iwekwe upya?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Urejeshaji wa mipangilio ya kiwandani haupatikani kwa mtumiaji huyu"</string>
@@ -1035,8 +1088,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Futa hifadhi ya USB, inafuta faili zote zilizohifadhiwa hapo? Hatua hii haiwezi kutenguliwa!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Futa kadi ya SD, inafuta faili zote zilizohifadhiwa huko? Hauwezi kutengua hatua hii!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Futa kila kitu"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe kwamba unataka kufuta hifadhi ya USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe kwamba unataka kufuta kadi ya SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Mipangilio ya simu"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Weka mipangilio ya ujumbe wa sauti, kupitisha simu, kusubiri simu, kitambulisho cha mteja"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Shiriki intaneti kwa USB"</string>
@@ -1068,7 +1119,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usaidizi"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mitandao ya simu za mkononi"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mpango wa vifaa vya mkononi"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Programu chaguo-msingi ya SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Programu ya SMS"</string>
     <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>
@@ -1098,7 +1149,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Hali ya eneo"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Tumia GPS, Wi-Fi na mitandao ya simu kutambua mahali"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Tumia Wi-Fi na mitandao ya simu kutambua mahali"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Tumia GPS kutambua eneo lako"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Tumia GPS kutambua eneo"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Kuchanganua"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Kuchanganua"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi inachanganua"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Boresha huduma za mahali kwa kuruhusu programu na huduma ziangalie mitandao ya Wi-Fi hata wakati Wi-Fi imezimwa"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth inachanganua"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Boresha mahali kwa kuruhusu huduma za mfumo ziangalie vifaa vya Bluetooth, hata wakati Bluetooth imezimwa"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Mahali pa mtandao wa Wi-Fi na simu za mkononi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu zitumie huduma ya Google ya kutambua eneo ili kukadiria mahali ulipo kwa haraka. Data ya mahali isiyokutambulisha itakusanywa na kutumwa kwa Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Eneo limethibitishwa na Wi-Fi"</string>
@@ -1144,11 +1201,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Nenosiri limewekwa"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN imewekwa"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mchoro umewekwa"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Usalama wa skrini"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Tumia mchoro wa kufungua kifaa chako ili uendelee."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Weka PIN ya kifaa chako ili uendelee."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Weka nenosiri la kifaa chako ili uendelee."</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 wa kufungua si sahihi"</string>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Usalama wa kifaa"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Badilisha umbo la kufungua"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Badilisha PIN ya kufungua"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Thibitisha mchoro uliohifadhiwa"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Jaribu tena:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Mchoro wa kufungua"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Bonyeza menyu upate usaidizi"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Ondoa kidole ukimaliza"</string>
@@ -1170,8 +1231,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Weka mchoro wa kufungua"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Badilisha umbo la kufungua"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Jinsi ya kuchora mchoro wa kufungua"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Mjarabio mengi yasiyo sahihi"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Jaribu tena baada ya sekunde <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Majaribio mengi mno yasiyo sahihi. Jaribu tena baada ya sekunde <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Programu haijasakinishwa kwenye simu yako."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Dhibiti programu"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Dhibiti na ondoa programu zilizosakinishwa"</string>
@@ -1222,6 +1282,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Panga kwa ukubwa"</string>
     <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_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>
@@ -1293,6 +1354,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Matumizi ya hifadhi"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Tazama hifadhi iliyotumika na programu"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Huduma zinazoendeshwa"</string>
@@ -1352,7 +1414,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Mipangilio ya kibodi halisi"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Bonyeza kibonye cha \'Space\' mara mbili ili uweke \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Fanya manenosiri yaonekane"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Mbinu hii ya ingizo huenda ikaweza kukusanya maandishi yote unayoandika, pamoja na data ya kibinafsi kama vile nenosiri na nambari za kadi ya mkopo. Inatoka kwa programu <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Tumia mbinu hii ya ingizo?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Huenda mbinu hii ya kuingiza ikakusanya maandishi yote unayoandika, pamoja na data ya kibinafsi kama vile manenosiri na nambari za kadi za mkopo. Inatoka kwa programu <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Je, ungependa kutumia mbinu hii ya kingiza?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Kisasishaji hiki kinaweza kukusanya maandishi yote wakati unaangika, pamoja na data za kibinafsi kama nenosiri na namari za kadi ya mkopo. Inatoka kwa programu <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Tumia kisasishaji hiki?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Mipangilio"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Lugha"</string>
@@ -1390,17 +1452,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Maelezo ya kompyuta kibao"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Maelezo ya simu"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Maelezo ya betri"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Kufungua kwa kasi"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Weka mikato ya kibodi kuzindua programu"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Teua programu"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Hakuna njia za mkato"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Tafuta + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Futa"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Njia mkato yako ya (<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>(<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) itafutwa."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Sawa"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Ghairi"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Programu"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Njia za mkato"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Uingizaji maandishi"</string>
     <string name="input_method" msgid="5434026103176856164">"Mbinu ya uingizaji"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Kibodi inayotumika Sasa"</string>
@@ -1411,7 +1462,7 @@
     <string name="configure_input_method" msgid="1317429869771850228">"Sanidi mbinu za ingizo"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Mipangilio"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Mipangilio"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Mbinu amilifu za uingizaji"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Mbinu zinazotumika"</string>
     <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Tumia lugha ya mfumo"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Mipangilio ya <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Chagua mbinu amilifu za ingizo"</string>
@@ -1435,23 +1486,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Nasa pakiti zote za Bluetooth HCI katika faili"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Ufunguaji wa OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Ruhusu bootloader ifunguliwe"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Weka PIN yako"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Weka PIN ya kifaa chako ili uwashe kipengele cha fungua kwa OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Je, ungependa kuruhusu ufunguaji wa OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ONYO: Vipengele vya ulinzi wa kifaa havitafanya kazi kwenye kifaa hiki wakati mpangilio huu umewashwa."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Ukubwa wa kiweka bafa ya kumbukumbu"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Chagua ukubwa wa kila Kumbukumbu"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Ruhusu maeneo ya jaribio"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Ruhusu maeneo ya majaribio"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Washa ukaguzi wa sifa ya onyesho"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Mtandao"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Chaguo za cheti cha kuonyesha pasiwaya"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Washa Uwekaji kumbukumbu za WiFi kutumia Sauti"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Ukabidhi kutoka Wifi kwenda Mtandao wa Simu"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Ruhusu Uchanganuzi wa Matumizi ya Mitandao mingine"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Tumia kiteja cha DHCP kilichopitwa na wakati"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Onyesha chaguo za cheti cha kuonyesha pasiwaya"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Ongeza hatua ya uwekaji kumbukumbu ya Wi-Fi, onyesha kwa kila SSID RSSI kwenye Kichukuzi cha Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Ikiwashwa, Wifi itakabidhi kwa hima muunganisho wa data kwa mtandao wa Simu za Mkononi, mawimbi ya Wifi yanapokuwa hafifu"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Ruhusu au Zuia Uchanganuzi wa Matumizi ya Mitandao mingine ya Wifi kulingana na kiasi cha trafiki ya data kilicho kwenye kiolesura"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Ukubwa wa kiweka bafa ya kumbukumbu"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Chagua ukubwa wa kila Kumbukumbu"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Chagua Usanidi wa USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Chagua Usanidi wa USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ruhusu maeneo ya jaribio"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Ruhusu maeneo ya majaribio"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Washa ukaguzi wa sifa ya onyesho"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Tumia kiteja cha DHCP kutoka Lollipop badala ya kiteja kipya cha DHCP cha Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ruhusu utatuaji USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ueuaji wa USB umekusudiwa kwa malengo ya utengenezaji tu. Itumi kunakili data kati ya kompyuta yako na kifaa chako, kusanidi programu kwa kifaa chako bila arifa, na kusoma data ya rajisi."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Unataka kubatilisha ufikiaji wa urekebishaji wa USB kutoka kwenye kompyuta zote ulizotangulia kuidhinisha?"</string>
@@ -1555,6 +1614,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Majenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Ungependa kutumia <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> inahitaji:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Kwa sababu programu yako inazuia ombi la ruhusa, Mipangilio haiwezi kuthibitisha majibu yako."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ukiwasha <xliff:g id="SERVICE">%1$s</xliff:g>, kifaa chako hakitatumia kufunga skrini yako ili kuboresha usimbaji wa data kwa njia fiche."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Kwa sababu umewasha huduma ya ufikiaji, kifaa chako hakitatumia kufunga skrini yako ili kuboresha usimbaji wa data kwa njia fiche."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Kwa sababu kuwasha <xliff:g id="SERVICE">%1$s</xliff:g> huathiri usimbaji wa data kwa njia fiche, unahitaji kuthibitisha mchoro wako."</string>
@@ -1696,14 +1756,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Takwimu za Mchakato"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Takwimu za kitaalamu kuhusu michakato inayoendeshwa"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Kumbukumbu iliyotumika"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> programu imepita <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> kati ya <xliff:g id="TOTALRAM">%2$s</xliff:g> ilitumika katika kipindi cha <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Ikifanya kazi chinichini"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Ikifanya kazi waziwazi"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Iliyowekwa kwenye akiba"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Kumbukumbu ya kifaa kwa sasa <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Matumizi wastani ya RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Upeo wa matumizi ya RAM"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Mfumo wa uendeshaji wa Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Asili"</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">"Akiba"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Matumizi ya RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Matumizi ya RAM (chini chini)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Muda wa kuendesha"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Michakato"</string>
     <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>
@@ -1720,6 +1786,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"Saa 12"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"Siku 1"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Onyesha mfumo"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ficha mfumo"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Tumia USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Aina ya takwimu"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Ikifanya kazi chinichini"</string>
@@ -1742,7 +1809,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Mipangilio mbadala ya hapa chini inafuta mipangilio ya programu"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Mipangilio ya chaguo-msingi"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Injini mbadala"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Inaweka injini ya hotumba ya mwondoko kwa kutumiwa na maandishi yaliyotamkwa"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Weka injini ya usanisi wa usemi itumike kwa maandishi yanayotamkwa"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Kiwango cha usemaji"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kasi ya kutamkwa kwa maneno"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Giza"</string>
@@ -1816,7 +1883,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Inaweza kutumiwa na maunzi"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Programu pekee"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kitambulisho hakipatikani kwa mtumiaji huyu"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe usakinishaji wa hati tambulishi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Weka nenosiri ili stakabadhi zihifadhiwe"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nenosiri la sasa:"</string>
@@ -1841,12 +1907,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Hifadhi nakala ya data yangu"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Hifadhi nakala ya data ya programu, manenosiri ya Wi-Fi na mipangilio mingine kwenye seva za Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Akaunti mbadala"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Hakuna akaunti ambayo kwa sasa inahifadhi nakala rudufu za data"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Jumuisha data ya programu"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Onyesha upya otomatiki"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wakati wa kusanidi upya programu, rejesha mipangilio na data ambazo zina nakala rudufu"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Huduma ya kuhifadhi nakala rudufu haifanyi kazi."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Hii huweka na sera ya kifaa yako."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la hifadhi rudufu ya eneo kazi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Hifadhi rudufu kamili za eneo kazi hazijalindwa kwa sasa"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Gusa ili ubadilishe au uondoe nenosiri la hifadhi rudufu kamili za eneo kazi"</string>
@@ -2018,6 +2082,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Mageuzi ya kipimo cha huiani"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Mizani ya muda wa uhuishaji"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Iga maonyesho ya upili"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Hali ya kutumia dirisha nyingi"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Shughuli nyingi kwenye skrini kwa wakati mmoja."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Ungependa kuwasha hali ya kutumia dirisha nyingi?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ONYO: Hiki ni kipengele cha majaribio kinachoruhusu shughuli nyingi kwenye skrini kwa wakati mmoja kwa kutumia kiolesura cha programu za Hivi Majuzi. Baadhi ya programu zinaweza kuacha kufanya kazi au zisifanye kazi kwa usahihi zinapotumiwa pamoja na kipengele hiki."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Programu"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Usihifadhi shughuli"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Haribu kila shughuli pindi tu mtumiaji anapoondoka"</string>
@@ -2189,10 +2257,10 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Mtumiaji"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Wasifu uliozuiwa"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Ungependa kuongeza mtumiaji?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Unaweza kutumia kifaa hiki pamoja na watu wengine kwa kuongeza watumiaji wa ziada. Kila mtumiaji ana nafasi yake mwenyewe, ambayo anaweza kuweka programu anazopenda, mandhari na kadhalika. Watumiaji pia wanaweza kurekebisha mipangilio ya kifaa inayoathiri kila mtu kama Wi-Fi. \n\n Unapomwongeza mtumiaji mpya, mtu huyo anahitaji kujitayarishia nafasi yake. \n\n Mtumiaji yeyote anaweza kusasishia watumiaji wengine wote programu."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Unaweza kutumia kifaa hiki pamoja na watu wengine kwa kuongeza watumiaji wa ziada. Kila mtumiaji ana nafasi yake mwenyewe, ambayo anaweza kuweka programu anazopenda, mandhari na kadhalika. Watumiaji pia wanaweza kurekebisha mipangilio ya kifaa inayoathiri kila mtu kama Wi-Fi.\n\nUnapomwongeza mtumiaji mpya, mtu huyo anahitaji kujitayarishia nafasi yake.\n\nMtumiaji yeyote anaweza kuwasasishia watumiaji wengine wote programu."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Unapomwongeza mtumiaji mpya, mtu huyo anahitaji kusanidi nafasi yake.\n\nMtumiaji yoyote anaweza kusasisha programu kwa ajili ya watumiaji wengine wote."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Mtumiaji aongezwe sasa?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Hakikisha kuwa kuna mtu wa kuchukua kifaa na kusanidi nafasi"</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_later" msgid="3068729597269172401">"Siyo sasa"</string>
@@ -2220,13 +2288,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Ungependa kumuondoa aliyealikwa?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Programu zote na data katika kipindi hiki zitafutwa."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Ondoa"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Ruhusu kupiga simu"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Ruhusu simu na SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Washa kipengele cha kupiga simu"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Washa kipengele cha SMS na kupiga simu"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Ondoa mtumiaji"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Ungependa kuruhusu kupiga simu?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Ungependa kuwasha kipengele cha kupiga simu?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Rekodi ya simu zilizopigwa itashirikiwa na mtumiaji huyu."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Unependa kuruhusu simu na SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Rekodi ya simu zilizopigwa na SMS zilizopokelewa itashirikiwa na mtumiaji huyu."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ungependa kuwasha SMS na kupiga simu?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Rekodi ya simu zilizopigwa na SMS zilizopokelewa itashirikiwa na mtumiaji huyu."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Ruhusu programu na maudhui"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programu zilizo na vizuizi"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Panua mipangilio ya programu"</string>
@@ -2277,8 +2345,8 @@
     <string name="user_rename" msgid="8523499513614655279">"BADILISHA JINA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Weka vizuizi vya programu"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Inadhibitiwa na <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Programu hii haitumiki katika wasifu zilizowekewa vikwazo"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Programu hii inaweza kufikia akaunti zako"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Programu hii inaweza kufikia akaunti yako. Imedhibitiwa na <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi na Vifaa vya Mkononi"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Ruhusu marekebisho ya mipangilio ya Wi‑Fi na Vifaa vya Mkononi"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2343,13 +2411,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"muunganisho wa mtandao wa wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ujumbe wa maandishi ujumbe ujumbe ujumbe"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"simu ya mkononi simu mtoa huduma isiyotumia waya data 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"upigaji simu kwa wi-fi"</string>
     <string name="keywords_home" msgid="3626170808219458848">"kifungua programu"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skrini ya kugusa"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"fifiliza skrini skrini ya kugusa betri"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"fifiliza skrini skrini ya kugusa betri"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"mandhari weka mapendeleo geuza ikufae onyesho"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"mandhari nyeusi hali ya usiku fifiza skrini geuza mwangaza"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"mandhari weka mapendeleo geuza ikufae onyesho"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ukubwa wa maandishi"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"mradi"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"mradi umetumwa"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"nafasi diski diski kuu kifaa matumizi"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"chaji ya matumizi ya nishati"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"tahajia kamusi kagua tahajia sahihisha kiotomatiki"</string>
@@ -2366,6 +2436,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"akaunti"</string>
     <string name="keywords_users" msgid="4673901601478559100">"zuio zuia imezuiwa"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"kusahihisha maandishi sahihi sauti tetema otomatiki lugha ishara pendekeza pendekezo mandhari kukera neno chapa emoji kimataifa"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"weka mapendeleo chaguo-msingi upya"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"programu chaguo-msingi ya dharura ya barafu"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"mfumo wa programu wa kupakua programu"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"usalama wa ruhusa za programu"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"chaguo-msingi ya programu"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"telezesha kidole nenosiri mchoro pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sanidi tagi ya NFC ya Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Andika"</string>
@@ -2380,11 +2455,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Sauti ya kengele"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Sauti ya mlio"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Sauti ya arifa"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Kukatizwa"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Simu na arifa zinapoingia"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Katiza wakati wote"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Ruhusu kukatizwa na vipaumbele pekee"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Usikatize"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Ruhusu kipaumbele pekee"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sheria za otomatiki"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Kipaumbele tu"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Kengele pekee"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Hakuna kukatizwa"</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="ringtone_title" msgid="5379026328015343686">"Mlio wa simu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Mlio chaguo-msingi wa arifa"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Tetema pia simu zinapoingia"</string>
@@ -2410,62 +2486,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Tetema"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Kufikia arifa"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programu haziwezi kusoma arifa"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Programu %d inaweza kusoma arifa"</item>
-    <item quantity="other" msgid="980049191810249052">"Programu %d zinaweza kusoma arifa"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">Programu %d zinaweza kusoma arifa</item>
+      <item quantity="one">Programu %d inaweza kusoma arifa</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Hakuna visikilizaji vya arifa vilivyosakinishwa."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Je, unataka kuwezesha <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> itaweza kusoma arifa zote zilizochapishwa na mfumo au programu yoyote iliyosakinishwa, inayoweza kujumuisha maelezo ya binafsi kama vile majina ya anwani na maandishi ya ujumbe uliotumwa kwako. Pia itaweza kukataa arifa hizi au kugusa vitufe vya kutenda ndani yake."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Vitoa masharti"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Hakuna programu za kutoa masharti"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d programu hutoa masharti"</item>
-    <item quantity="other" msgid="358057362115673258">"%d programu zinatoa masharti"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Hakuna vitoa masharti vilivyosanikishwa."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Je, ungependa kuwasha <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> itaweza kuongeza au kuondoa masharti katika hali ya Usinisumbue."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Zuia"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Zuia zote"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Usionyeshe arifa kutoka programu hii kabisa"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Kipaumbele"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Onyesha arifa katika sehemu ya juu ya orodha na uruhusu ziendelee kuingia wakati kifaa kinakubali kukatizwa na vipaumbele pekee"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Nyeti"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Kifaa kikiwa kimefungwa, ficha maudhui yoyote nyeti kutoka arifa za programu hii"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Weka kama kipaumbele"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Ruhusu arifa za programu hii zitamkwe wakati hali ya Usinisumbue imewekwa kama Kipaumbele pekee"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Ruhusu mwonekano wa kuchungulia"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Ruhusu programu hii iangazie arifa fulani kwa kuzitelezesha kidogo ili zionekane kwenye skrini ya sasa"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ficha maudhui nyeti"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Wakati kifaa kimefungwa, ficha maudhui katika arifa za programu hii ambayo yanaweza kutambua maelezo ya faragha"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Imezuiwa"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Kipaumbele"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Nyeti"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Nimemaliza"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Hadi utakapozima hili"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Kukatizwa na vipaumbele pekee"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Wakati wa hali tuli"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Siku"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Hamna"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Makatizo yanaruhusiwa"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Kipaumbele tu"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Hamna"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Uwekaji otomatiki"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Washa kiotomatiki"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Jina la sheria"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Ongeza sheria"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Futa sheria"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Je, ungependa kufuta \"<xliff:g id="RULE">%1$s</xliff:g>\" sheria?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Futa"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Aina ya sheria"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Isiyojulikana"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Sanidi sheria"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Weka ratiba ya sheria"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Sheria haikupatikana."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Isiwahi kamwe"</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_from" msgid="1033337300289871697">"Simu au ujumbe kutoka"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Mtu yeyote"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Ninaowasiliana nao tu"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Wenye nyota pekee"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Matukio na vikumbusho"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Kengele ni katizo zinazopewa kipaumbele wakati wote"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Kengele"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Vikumbusho"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Matukio"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Wanaopiga simu 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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Usiku wa siku za wiki"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Wakati wa Kuanza"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Wakati wa kuisha"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> siku inayofuata"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> au kengele yoyote kabla"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> siku inayofuata au kengele yoyote kabla"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> siku inayofuata"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Kukatizwa"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Simu na arifa zinapoingia"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Je, ungependa kukatizwa lini?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Kwa muda gani?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Katiza wakati wote"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"imezimwa, zote, kila kitu"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Ruhusu kukatizwa na vipaumbele pekee"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Ruhusu kengele pekee"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Usikatize"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Bila kikomo"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other">Dakika <xliff:g id="COUNT_1">%d</xliff:g> </item>
+      <item quantity="one">Dakika <xliff:g id="COUNT_0">%d</xliff:g> </item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other">Saa <xliff:g id="COUNT_1">%d</xliff:g> </item>
+      <item quantity="one">Saa <xliff:g id="COUNT_0">%d</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Badilisha utumie hali ya arifa za kipaumbele pekee kwa muda usiojulikana"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Badilisha utumie hali ya arifa za kipaumbele pekee kwa dakika <xliff:g id="DURATION">%1$d</xliff:g> hadi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Badilisha utumie hali ya arifa za kipaumbele pekee kwa saa moja hadi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Badilisha utumie hali ya arifa za kipaumbele pekee kwa saa <xliff:g id="DURATION">%1$d</xliff:g> (hadi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> )</item>
+      <item quantity="one">Badilisha utumie hali ya arifa za kipaumbele pekee kwa saa moja hadi<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Badilisha utumie kengele pekee kwa muda usiojulikana"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Badilisha utumie kengele pekee kwa dakika <xliff:g id="DURATION">%1$d</xliff:g> (hadi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Badilisha utumie kengele pekee kwa dakika moja hadi <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">Badilisha utumie kengele pekee kwa saa <xliff:g id="DURATION">%1$d</xliff:g> hadi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Badilisha utumie kengele pekee kwa saa moja hadi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Badilisha utumie hali ya usikatize kwa muda usiojulikana"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Badilisha utumie hali ya usikatize kwa dakika <xliff:g id="DURATION">%1$d</xliff:g> (hadi <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Badilisha utumie hali ya usikatize kwa dakika moja hadi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Badilisha utumie hali ya usikatize kwa saa <xliff:g id="DURATION">%1$d</xliff:g> mpaka <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Badilisha utumie hali ya usikatize kwa saa moja hadi <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Badilisha utumie hali ya katiza wakati wote"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"milele"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Arifa za programu"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Tuma maoni kuhusu kifaa hiki"</string>
@@ -2506,4 +2635,63 @@
     <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="2184141780491382435">"Fungua kama chaguo-msingi"</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="app_launch_domain_links_title" msgid="458956710410857777">"Viungo vya kikoa"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Fungua URL za Kikoa"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Ruhusu programu ifungue URL za Kikoa moja kwa moja"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL za vikoa zinazotumika"</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_type_internal" msgid="410824961149037234">"hifadhi ya ndani"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"hifadhi ya nje"</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>
+    <string name="data_summary_format" msgid="6213211533341068366">"Imetumia <xliff:g id="SIZE">%1$s</xliff:g> tangu <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Hifadhi iliyotumika"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Imewashwa"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Zuia"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Nyeti"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Kipaumbele"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Kipaumbele na Nyeti"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other">Ruhusa <xliff:g id="COUNT_1">%d</xliff:g> zimetolewa</item>
+      <item quantity="one">Ruhusa <xliff:g id="COUNT_0">%d</xliff:g> imetolewa</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">Imetoa ruhusa <xliff:g id="COUNT_2">%d</xliff:g> kati ya <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="one">Imetoa ruhusa <xliff:g id="COUNT_0">%d</xliff:g> kati ya <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Baadhi ya chaguo-msingi zimewekwa"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Hakuna chaguo-misingi zilizowekwa"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Programu Zote"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Imewashwa"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Binafsi"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Kazini"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Imezuiwa"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Kipaumbele"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Nyeti"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Zenye URL za kikoa"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Imezimwa na msimamizi"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Vipengele vya kina"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Programu isiyojulikana"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Chagua Wasifu"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Ruhusa za programu"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Idhini ya ufikiaji wa ziada imetolewa kwa programu <xliff:g id="COUNT_0">%d</xliff:g> kati ya <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Inaruhusu programu <xliff:g id="COUNT_0">%d</xliff:g> kati ya <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL za Kikoa"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Usifungue URL ya kikoa chochote"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Fungua \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Fungua \'<xliff:g id="DOMAIN">%s</xliff:g>\' na URL zinazohusiana"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other">Programu <xliff:g id="COUNT">%d</xliff:g> zinaweza kufungua URL za vikoa vyake</item>
+      <item quantity="one">Programu moja inaweza kufungua URL za kikoa chake</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Haitambuliwi"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Programu Chaguo-msingi"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Programu ya kivinjari"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Hakuna Kivinjari chaguo-msingi"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Chaguo-msingi)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Hifadhi ya programu"</string>
 </resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index e1bb33e..03809c4 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -24,7 +24,6 @@
     <dimen name="content_margin_left">16dip</dimen>
     <dimen name="description_margin_top">26dip</dimen>
     <dimen name="crypt_clock_size">120sp</dimen>
-    <dimen name="setup_title_size">24sp</dimen>
     <dimen name="appwidget_min_width">325dip</dimen>
     <dimen name="appwidget_min_height">50dip</dimen>
 
@@ -87,4 +86,7 @@
     <dimen name="wifi_assistant_padding_start_end">24dp</dimen>
     <dimen name="wifi_assistant_padding">25dp</dimen>
     <dimen name="wifi_assistant_text_padding">24dp</dimen>
+
+    <dimen name="confirm_credentials_security_method_margin">72dp</dimen>
+    <dimen name="fab_margin">24dp</dimen>
 </resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index d09b23e..8cf0e86 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -68,5 +68,4 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">16sp</item>
     </style>
-
 </resources>
diff --git a/res/values-sw600dp/themes.xml b/res/values-sw600dp/themes.xml
new file mode 100644
index 0000000..f26e2f5
--- /dev/null
+++ b/res/values-sw600dp/themes.xml
@@ -0,0 +1,23 @@
+<?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
+  -->
+<resources>
+    <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
+      <item name="confirmDeviceCredentialsSideMargin">0dp</item>
+      <item name="confirmDeviceCredentialsTopMargin">64dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta-rIN/arrays.xml
index ac6f5b5..b9f46d5 100644
--- a/res/values-ta-rIN/arrays.xml
+++ b/res/values-ta-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"புஷ் பொத்தான்"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"மைக்ரோஃபோனை முடக்கு/இயக்கு"</item>
     <item msgid="1148142988678569310">"புராஜக்ட் மீடியா"</item>
     <item msgid="9130014005474445273">"VPNஐ இயக்கு"</item>
+    <item msgid="1165192162975045562">"வால்பேப்பரை எழுது"</item>
+    <item msgid="7129487923652967258">"கட்டமைப்புக்கு உதவு"</item>
+    <item msgid="1069023208100114540">"ஸ்கிரீன்ஷாட்டுக்கு உதவு"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"இருப்பிடம்"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"மைக்ரோஃபோனை முடக்கு/இயக்கு"</item>
     <item msgid="5906017727368097853">"புராஜக்ட் மீடியா"</item>
     <item msgid="2486614710846178542">"VPNஐ இயக்கு"</item>
+    <item msgid="5586547561693629602">"வால்பேப்பரை எழுது"</item>
+    <item msgid="32794179825485062">"கட்டமைப்புக்கு உதவு"</item>
+    <item msgid="7872852746938272552">"ஸ்கிரீன்ஷாட்டுக்கு உதவு"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"குறுகியது"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"குறைவு"</item>
     <item msgid="4212263919458209842">"மோசமாக உள்ளது"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"முடக்கத்தில்"</item>
-    <item msgid="5656544177755411222">"குறிப்பிட்ட அறிவிப்புகள் மட்டும்"</item>
-    <item msgid="8735337502532332056">"எதையும் தெரிவிக்காதே"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"இயல்பு"</item>
     <item msgid="866544120205026771">"நடுத்தரம்"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"பிங்க்"</item>
     <item msgid="6131821495505931173">"சிவப்பு"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (மீடியா பரிமாற்ற நெறிமுறை)"</item>
+    <item msgid="8856820259201251036">"PTP (படப் பரிமாற்ற நெறிமுறை)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB ஈத்தர்நெட்)"</item>
+    <item msgid="2686051673589572111">"ஆடியோ மூலம்"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 21f128c..c0dc3f3 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"அனுமதி"</string>
     <string name="deny" msgid="6947806159746484865">"நிராகரி"</string>
     <string name="device_info_default" msgid="7847265875578739287">"அறியப்படாத"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"நீங்கள் டெவெலப்பராக மாறுவதற்கு இப்போது <xliff:g id="STEP_COUNT">%1$d</xliff:g> படியே உள்ளது."</item>
-    <item quantity="other" msgid="6722953419953594148">"நீங்கள் டெவெலப்பராக மாறுவதற்கு இப்போது <xliff:g id="STEP_COUNT">%1$d</xliff:g> படிகளே உள்ளன."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">டெவெலப்பராவதற்கு இப்போது <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> படிகளே உள்ளன.</item>
+      <item quantity="one">டெவெலப்பராவதற்கு இப்போது <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> படியே உள்ளது.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"இப்போது டெவெலப்பராகிவிட்டீர்கள்!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"தேவையில்லை, நீங்கள் ஏற்கனவே ஒரு டெவெலப்பர்."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"வயர்லெஸ் &amp; நெட்வொர்க்குகள்"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS மூலமாக SMS ஐ முடக்கு"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS பதிவுசெய்தல் தேவை என்பதை இயக்கு"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS பதிவு தேவை முடக்கப்பட்டது"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE ஒதுக்கீட்டுக் கொடியை இயக்கவும்"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE ஒதுக்கீட்டுக் கொடியை முடக்கவும்"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram ஐக் காலியாக்குவதை இயக்கு"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram ஐக் காலியாக்குவதை முடக்கு"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"சிம் முகவரி புத்தகத்தைக் காட்டு"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"இணைக்கப்பட்டது"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"இணைக்கப்பட்டது (மொபைல் இல்லை)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"இணைக்கப்பட்டது (மீடியா இல்லை)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"இணைக்கப்பட்டது (செய்திக்கான அணுகல் இல்லை)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"இணைக்கப்பட்டது (மொபைல் அல்லது மீடியாவுடன் அல்ல)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"தொடர்பு துண்டிக்கப்பட்டது"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"துண்டிக்கிறது..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"இணைக்கிறது..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"இணைக்கிறது..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"பெயரிடப்படாத புளூடூத் சாதனம்"</string>
     <string name="progress_scanning" msgid="192587958424295789">"தேடுகிறது"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"புளூடூத் சாதனங்கள் எதுவும் அருகில் கண்டறியப்படவில்லை."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"பெற்ற கோப்புகளைக் காட்டு"</string>
     <string name="device_picker" msgid="4978696506172252813">"புளூடூத் சாதனத்தைத் தேர்வுசெய்க"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"புளூடூத் அனுமதி கோரிக்கை"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"பயன்பாடு புளூடூத் ஐ இயக்க விரும்புகிறது."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"ஒரு பயன்பாடு சாதனத்தின் புளுடூதை இயக்க நினைக்கிறது."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"உங்கள் டேப்லெட்டை பிற புளூடூத் சாதனங்களுக்கு <xliff:g id="TIMEOUT">%1$d</xliff:g> வினாடிகள் தெரியும்படி வைத்திருக்க பயன்பாடு விரும்புகிறது."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"உங்கள் தொலைபேசியைப் பிற புளூடூத் சாதனங்களுக்கு <xliff:g id="TIMEOUT">%1$d</xliff:g> வினாடிகள் தெரியும்படி வைத்திருக்க பயன்பாடு விரும்புகிறது."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"உங்கள் டேப்லெட்டைப் பிற புளூடூத் சாதனங்களுக்குத் தெரியும்படி வைக்க பயன்பாடு விரும்புகிறது. பின்னர் நீங்கள் இதை புளூடூத் அமைப்புகளில் மாற்றிக்கொள்ளலாம்."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ரத்துசெய்"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"தொடர்"</string>
     <string name="okay" msgid="1997666393121016642">"சரி"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ஆம்"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"இல்லை"</string>
-    <string name="forget" msgid="7267115980248732932">"புறக்கணி"</string>
+    <string name="forget" msgid="1400428660472591263">"மறந்துவிடு"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"முகத்தின் பொருத்தத்தை மேம்படுத்தவும்"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"லைவ்னஸ் சரிபார்ப்பு"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"திறக்கும்போது கண் சிமிட்டல் தேவை"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"கடவுச்சொற்கள்"</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="3453670509485083962">"சேர்"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"திரைப் பூட்டு"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"கைரேகையை அமைக்கவும்"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"திரையைத் திறக்க அல்லது பர்சேஸ்களை உறுதிப்படுத்த வேண்டி உங்கள் கைரேகையைப் பயன்படுத்த, நீங்கள் செய்ய வேண்டியது: \n\n✓ மாற்றுத் திரைப்பூட்டு முறையை அமைக்கவும் \n\n✓ உங்கள் கைரேகையைச் சேர்க்கவும்"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"உணர்வியைக் கண்டறிக"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"உங்கள் ஃபோனின் பின்புறம் இருக்கும் கைரேகை உணர்வியைக் கண்டறியுங்கள்"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"தொடங்கலாம்!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"விரலை கைரேகை உணர்வியின் மீது வைக்கவும். அதிர்வை உணர்ந்த பின், விரலை எடுக்கவும்."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"அருமை! இப்போது அதே செயல்முறையை மீண்டும் செய்யவும்."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"முதலில் பயன்படுத்திய அதே விரலை கைரேகை உணர்வியின் மீது வைக்கவும். அதிர்வை உணர்ந்த பின், விரலை எடுக்கவும்."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"கைரேகை சேர்க்கப்பட்டது!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"இந்த ஐகானைப் பார்க்கும்போதெல்லாம், அடையாளப்படுத்தலுக்காக அல்லது வாங்குதலை அங்கீகரிக்க, நீங்கள் கைரேகையைப் பயன்படுத்தலாம்."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"சேர்"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"அடுத்து"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"சாதனத்தை முறைமையாக்குவதை உறுதிசெய்ய, திறப்பதற்கான வடிவத்தை வரைய வேண்டும்."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"முறைமையாக்கவா?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"முறைமையாக்கச் செயல்முறையானது திரும்பப்பெற முடியாததாகும், நீங்கள் அதில் குறுக்கிட்டால், தரவை இழக்க நேரிடும். முறைமையாக்கம் செய்ய ஒரு மணிநேரம் அல்லது அதற்கு அதிகமான நேரம் எடுக்கும், அப்போது டேப்லெட் பலமுறை மீண்டும் தொடங்கலாம்."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"முறைமையாக்கச் செயல்முறையானது திரும்பப்பெற முடியாததாகும், நீங்கள் அதில் குறுக்கிட்டால், தரவை இழக்க நேரிடும். முறைமையாக்கம் செய்ய ஒரு மணிநேரம் அல்லது அதற்கு அதிகமான நேரம் எடுக்கும், அப்போது தொலைபேசி பலமுறை மீண்டும் தொடங்கலாம்."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"முகத்தால் திறத்தால்"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"குறைந்த பாதுகாப்பு, சோதனைக்குரியது"</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>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"கடவுச்சொல்"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"அதிகப் பாதுகாப்பு"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"தற்போதைய திரைப் பூட்டு"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"சாதனப் பாதுகாப்பு அம்சங்கள் இனி வேலை செய்யாது."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"நிர்வாகியால் முடக்கப்படும், முறைமையாக்கக் கொள்கை அல்லது நற்சான்றுக்கான சேமிப்பிடம்"</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_biometric_weak" msgid="3008473624490350142">"முகத்தால் திறத்தல்"</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="7579210814842056547">"திரைப் பூட்டு அமைத்ததும், அமைப்புகள் &gt; பாதுகாப்பு என்பதற்குச் சென்று கைரேகையை அமைக்கலாம்."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"திரைப் பூட்டை முடக்கு"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"திறப்பதற்கான வடிவத்தை அகற்று"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"திறக்கும் பின்னை அகற்று"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"கடவுச்சொல்லில் குறைந்தது ஒரு எழுத்து இருக்க வேண்டும்."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"கடவுச்சொல் குறைந்தது ஒரு இலக்கம் இருக்க வேண்டும்."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"கடவுச்சொல்லில் குறைந்தது ஒரு எழுத்துக்குறி இருக்க வேண்டும்."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"கடவுச்சொல்லில் குறைந்தது 1 எழுத்தாவது இருக்க வேண்டும்."</item>
-    <item quantity="other" msgid="8186027808415585970">"கடவுச்சொல்லில் குறைந்தது %d எழுத்துகளாவது இருக்க வேண்டும்."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"கடவுச்சொல்லில் குறைந்தது 1 சிற்றெழுத்தாவது இருக்க வேண்டும்."</item>
-    <item quantity="other" msgid="2693910942679679225">"கடவுச்சொல்லில் குறைந்தது %d சிற்றெழுத்துகளாவது இருக்க வேண்டும்."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"கடவுச்சொல்லில் குறைந்தது 1 பேரெழுத்து இருக்க வேண்டும்."</item>
-    <item quantity="other" msgid="3030801209112209245">"கடவுச்சொல்லில் குறைந்தது %d பேரெழுத்துகள் இருக்க வேண்டும்."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"கடவுச்சொல்லில் குறைந்தது 1 எண் இலக்கமாவது இருக்க வேண்டும்."</item>
-    <item quantity="other" msgid="4703982391407595924">"கடவுச்சொல்லில் குறைந்தது %d எண் இலக்கங்கள் இருக்க வேண்டும்."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"கடவுச்சொல்லில் குறைந்தது 1 சிறப்பு குறியீடு இருக்க வேண்டும்."</item>
-    <item quantity="other" msgid="1221290525051187757">"கடவுச்சொல்லில் குறைந்தது %d சிறப்பு குறியீடுகள் இருக்க வேண்டும்."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"கடவுச்சொல்லில் குறைந்தது 1 எழுத்து அல்லாத குறி இருக்க வேண்டும்."</item>
-    <item quantity="other" msgid="3952508584649046404">"கடவுச்சொல்லில் குறைந்தது %d எழுத்து அல்லாத குறிகள் இருக்க வேண்டும்."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">கடவுச்சொல்லில் குறைந்தது %d எழுத்துகள் இருக்க வேண்டும்.</item>
+      <item quantity="one">கடவுச்சொல்லில் குறைந்தது 1 எழுத்து இருக்க வேண்டும்.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">கடவுச்சொல்லில் குறைந்தது %d சிற்றெழுத்துகள் இருக்க வேண்டும்.</item>
+      <item quantity="one">கடவுச்சொல்லில் குறைந்தது 1 சிற்றெழுத்து இருக்க வேண்டும்.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">கடவுச்சொல்லில் குறைந்தது %d பேரெழுத்துகள் இருக்க வேண்டும்.</item>
+      <item quantity="one">கடவுச்சொல்லில் குறைந்தது 1 பேரெழுத்து இருக்க வேண்டும்.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">கடவுச்சொல்லில் குறைந்தது %d எண் இலக்கங்கள் இருக்க வேண்டும்.</item>
+      <item quantity="one">கடவுச்சொல்லில் குறைந்தது 1 எண் இலக்கம் இருக்க வேண்டும்.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">கடவுச்சொல்லில் குறைந்தது %d சிறப்பு குறியீடுகள் இருக்க வேண்டும்.</item>
+      <item quantity="one">கடவுச்சொல்லில் குறைந்தது 1 சிறப்பு குறியீடு இருக்க வேண்டும்.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">கடவுச்சொல்லில் குறைந்தது %d எழுத்து அல்லாத குறிகள் இருக்க வேண்டும்.</item>
+      <item quantity="one">கடவுச்சொல்லில் குறைந்தது 1 எழுத்து அல்லாத குறி இருக்க வேண்டும்.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"சாதன நிர்வாகி சமீபத்திய கடவுச்சொல்லைப் பயன்படுத்துவதை அனுமதிக்கமாட்டார்."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"இலக்கங்களை ஏறுவரிசைப்படுத்துவது, இறக்குவரிசைப்படுத்துவது அல்லது மீண்டும் வரிசைப்படுத்துவது தடுக்கப்பட்டுள்ளது"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"சரி"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"இணை"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"இணை"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ரத்துசெய்"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"இணைத்தலானது உங்கள் தொடர்புகள், அழைப்பு வரலாறுக்கான அணுகலை வழங்குகிறது."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைய முடியவில்லை."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"தவறான பின் அல்லது கடவுச்சொல் காரணமாக <xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க முடியவில்லை."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க முடியவில்லை."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இணைப்பதை நிராகரித்தது."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"இருப்பிடத்தைத் துல்லியமாக அறிவதை மேம்படுத்த, பயன்பாடுகளும் சேவைகளும் புளூடூத் முடக்கத்தில் இருக்கும்போது கூட, புளூடூத் சாதனங்களுக்காக ஸ்கேன் செய்யும். இதை <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_specific_profiles_title" msgid="6952214406025825164">"இதனுடன் இணை..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"மீடியா ஆடியோ"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"மொபைல் ஆடியோ"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"கோப்பு இடமாற்றம்"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"உள்ளீட்டுச் சாதனம்"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"இணைய அணுகல்"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"தொடர்புப் பகிர்தல்"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"தொடர்புப் பகிர்தலுக்குப் பயன்படுத்து"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"இணைய இணைப்பு பகிர்தல்"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"செய்திக்கான அணுகல்"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"மீடியா ஆடியோவுடன் இணைக்கப்பட்டது"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"மொபைல் ஆடியோவுடன் இணைக்கப்பட்டது"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"கோப்பைப் பரிமாற்றும் சேவையகத்துடன் இணைக்கப்பட்டது"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"வரைபடத்துடன் இணைக்கப்பட்டது"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"கோப்பு இடமாற்றும் சேவையகத்துடன் இணைக்கப்படவில்லை"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"உள்ளீட்டுச் சாதனத்துடன் இணைக்கப்பட்டது"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"மீடியாவின் ஆடியோவிற்குப் பயன்படுத்து"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"மொபைல் ஆடியோவைப் பயன்படுத்து"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"கோப்பு பரிமாற்றத்திற்காகப் பயன்படுத்து"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"உள்ளீட்டுக்குப் பயன்படுத்து"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"இணைய அணுகலுக்காகப் பயன்படுத்து"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"வரைபடத்திற்குப் பயன்படுத்து"</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_assistant_title" msgid="2553267316621598101">"வைஃபை அசிஸ்டண்ட்"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"வைஃபை அசிஸ்டண்ட் மூலம் இணைக்கப்பட்டது"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"திரையை அனுப்பு"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"வைஃபையை முடக்குகிறது…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"பிழை"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"விமானப் பயன்முறையில்"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"நெட்வொர்க்குகளுக்கு ஸ்கேன் செய்யப்படவில்லை"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"நெட்வொர்க் அறிவிப்பு"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"பொதுவான நெட்வொர்க் கிடைக்கும் போது அறிவி"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"வேகம் குறைந்த இணைப்புகளைத் தவிர்"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"சிறப்பான இணைய இணைப்பைப் பெறும் வரை வைஃபை நெட்வொர்க்கைப் பயன்படுத்தாதே"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"நல்ல இணைய இணைப்பு கொண்ட நெட்வொர்க்குகளை மட்டும் பயன்படுத்து"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"எப்போதும் ஸ்கேன் செய்"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"எப்போதும் தேட அனுமதி"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"வைஃபை முடக்கப்பட்டிருந்தாலும் கூட Google இடச் சேவையும், பிற பயன்பாடுகளும் நெட்வொர்க்குகளைத் தேட அனுமதி"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"பொது வைஃபையைத் தானாக பயன்படுத்து"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"உயர் தரமான பொது வைஃபை நெட்வொர்க்குகள் கண்டறியப்படும்போது, தானாக அவற்றுடன் இணைப்பதற்கு வைஃபை அசிஸ்டண்ட்டை அனுமதி"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"அசிஸ்டண்ட்டைத் தேர்வுசெய்க"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"சான்றிதழ்களை நிறுவு"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"இருப்பிடத்தைத் துல்லியமாக அறிவதற்கு மேம்படுத்த மற்றும் பிற காரணங்களுக்காக, வைஃபை முடக்கத்தில் இருக்கும்போதும் Google மற்றும் பிற பயன்பாடுகள் அருகிலுள்ள நெட்வொர்க்குகளை ஸ்கேன் செய்யலாம். இவ்வாறு செய்ய வேண்டாம் என நீங்கள் விரும்பினால், எப்போதும் கிடைக்கும் மேம்பட்ட &gt; ஸ்கேனிங் என்பதற்குச் செல்லவும்."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"வைஃபை முடக்கத்தில் இருக்கும்போதும் அருகிலுள்ள நெட்வொர்க்குகளைப் பயன்பாடுகள் ஸ்கேன் செய்யலாம். இவ்வாறு செய்ய வேண்டாம் என நீங்கள் விரும்பினால், எப்போதும் கிடைக்கும் மேம்பட்ட &gt; ஸ்கேனிங் என்பதற்குச் செல்லவும்."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"இருப்பிடத்தைத் துல்லியமாக அறிவதை மேம்படுத்த, பயன்பாடுகளும் சேவைகளும் வைஃபை முடக்கத்தில் இருக்கும்போது கூட, வைஃபை நெட்வொர்க்குகளுக்காக ஸ்கேன் செய்யும். இதை <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="5340097010842405981">"மீண்டும் காட்டாதே"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"உறக்கநிலையில் வைஃபையை இயக்கு"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"உறக்கத்தின் போது வைஃபையை இயக்குதல்"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"வேறொரு நெட்வொர்க்கைச் சேர்"</string>
     <string name="wifi_more" msgid="3195296805089107950">"மேலும்"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"தானியங்கு அமைவு (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"அமைப்பை முடிக்க, டேப்லெட்டிற்கு வைஃபை அணுகல் வேண்டும். அமைத்த பிறகு, செல்லுலார் தரவு மற்றும் வைஃபை இடையே மாறலாம்."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"மேம்பட்ட விருப்பங்கள்"</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="5940801028985255304">"உங்கள் ரூட்டரில் உள்ள வைஃபை பாதுகாப்பு அமைப்பு பொத்தானை அழுத்தவும். இது \"WPS\" என அழைக்கப்படும் அல்லது இந்தக் குறியீடு இருக்கும்:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"உங்கள் ரூட்டரில் உள்ள வைஃபை பாதுகாப்பு அமைப்பு பொத்தானை அழுத்தவும். இது \"WPS\" என அழைக்கப்படும் அல்லது இந்தச் சின்னத்துடன் குறிக்கப்பட்டிருக்கும்:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"உங்கள் வைஃபை ரூட்டரில் pin <xliff:g id="NUMBER">%1$s</xliff:g> ஐ உள்ளிடவும். அமைவு முடிய இரண்டு நிமிடங்கள் வரை ஆகலாம்."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS வெற்றியானது. நெட்வொர்க்குடன் இணைக்கிறது…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"வைஃபை நெட்வொர்க் <xliff:g id="NETWORK_NAME">%s</xliff:g> உடன் இணைக்கப்பட்டது"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"உள்ளமைவு AP அலைவரிசை"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(மாற்றப்படாதவை)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(குறிப்பிடப்படாதது)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"சேமிக்கப்பட்டது"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"முடக்கப்பட்டது"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP உள்ளமைவில் தோல்வி"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"வைஃபை இணைப்பில் தோல்வி"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"அங்கீகரிப்புச் சிக்கல்"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"தொடர்பு எல்லையில் இல்லை"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"இணைய அணுகல் இல்லை, மீண்டும் தானாக இணையாது."</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_security_none" msgid="7985461072596594400">"ஏதுமில்லை"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"இந்த நெட்வொர்க்கில் இணைய அணுகல் இல்லை. பயன்படுத்தவா?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"இந்த நெட்வொர்க்கை மீண்டும் உறுதிப்படுத்தக் கேட்காதே"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"இணை"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"நெட்வொர்க்குடன் இணைக்க முடியவில்லை"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"மறந்துவிடு"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK கையடக்க வைஃபை ஹாட்ஸ்பாட்"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<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_mode_title" msgid="2164073796253284289">"அழைப்புக்கான முன்னுரிமை"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"வைஃபை அழைப்புப் பயன்முறை"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"வைஃபைக்கு முன்னுரிமை"</item>
+    <item msgid="5267397515594230396">"செல்லுலாருக்கு முன்னுரிமை"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"வைஃபை அழைப்பு இயக்கத்தில் இருக்கும் போது, முன்னுரிமை மற்றும் வலிமையாக இருக்கிற சிக்னலைப் பொறுத்து வைஃபை நெட்வொர்க்குகள் அல்லது மொபைல் நிறுவன நெட்வொர்க்குக்கு அழைப்புகளை உங்கள் ஃபோன் திசைதிருப்பும். இந்த அம்சத்தை இயக்குவதற்கு முன், கட்டணங்கள் மற்றும் பிற விவரங்கள் குறித்து உங்கள் மொபைல் நிறுவனத்திடமிருந்து தெரிந்துகொள்ளவும்."</string>
     <string name="home_settings" msgid="212375129455718176">"முகப்பு"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"தோற்றம்"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ஒலி"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"தீம்"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"வெளிர்"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"அடர்"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"தானியங்கு"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"விருப்ப சிம் கார்டை மாற்றவா?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"உங்கள் சாதனத்தில் <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">
-    <item quantity="one" msgid="4840607930166101114">"சிம் பின் குறியீடு தவறானது, உங்கள் சாதனத்தைத் திறக்க, உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ளும் முன், மேலும் <xliff:g id="NUMBER">%d</xliff:g> முறை முயற்சிக்கலாம்."</item>
-    <item quantity="other" msgid="77103619544346451">"சிம் பின் குறியீடு தவறானது, மேலும் <xliff:g id="NUMBER">%d</xliff:g> முறை முயற்சிக்கலாம்."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">சிம்மின் பின் குறியீடு தவறானது, உங்களிடம் <xliff:g id="NUMBER_1">%d</xliff:g> முயற்சிகள் மீதமுள்ளன.</item>
+      <item quantity="one">சிம்மின் பின் குறியீடு தவறானது, மேலும் <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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"பயன்பாடுகள் (பயன்பாட்டுத் தரவு &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_media_misc_usage" msgid="235452944021647124">"மற்றவை"</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="default" msgid="6915293408836853020">"SD கார்டை அகற்று"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"பொருத்து"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"வெளியேற்று"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"அழி &amp; மீட்டமை"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"அழித்து, அகச் சேமிப்பகமாக மீட்டமை"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB கணினி இணைப்பு"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB கணினி இணைப்பு"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"இவ்வாறு இணை"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"கேமரா மென்பொருளைப் பயன்படுத்தி நீங்கள் படங்களை அனுப்பவும், மேலும் MTP ஆதரிக்காத கணினிகளில் எந்தக் கோப்புகளையும் பரிமாற்றவும் உதவுகிறது."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"கோப்பு பரிமாற்றக் கருவிகளை நிறுவு"</string>
+    <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_external_title" msgid="2723851748972673696">"அகற்றப்படக்கூடிய சேமிப்பகம்"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> காலி (மொத்தம் <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> பொருத்தப்பட்டது"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>ஐ மீட்டமைக்க முடியவில்லை"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"சேமிப்பகத்திற்கு மறுபெயரிடவும்"</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="3677827796634199714"><b>"<xliff:g id="NAME_0">^1</xliff:g>ஐ வெளியேற்றும்போது, அதில் சேமித்த பயன்பாடுகள் வேலை செய்வதை நிறுத்தும், அதில் சேமித்த மீடியா கோப்புகள் மீண்டும் அதைச் செருகும் வரை கிடைக்காது."</b>" \n\n<xliff:g id="NAME_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_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_next" msgid="2774557300531702572">"அழி &amp; மீட்டமை"</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="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g>ஐ மீட்டமைக்கும்போது, அதை அகற்ற வேண்டாம்."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"புதிய சேமிப்பகத்திற்கு நகர்த்துக"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"புதிய <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="5035719146373359329"><b>"இந்தச் செயலுக்கு <xliff:g id="TIME">^1</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="8641916179067596592">"நகர்த்தும்போது: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ஐ நகர்த்தவும்"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"நகர்த்தும்போது <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="battery_status_title" msgid="9159414319574976203">"பேட்டரி நிலை"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"பேட்டரி நிலை"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNகள்"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"நெட்வொர்க் அமைப்புகள் மீட்டமைப்பு"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"பின்வருபவை உட்பட எல்லா நெட்வொர்க் அமைப்புகளும் மீட்டமைக்கப்படும்:\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="4874737348054213767">"எல்லா நெட்வொர்க் அமைப்புகளையும் மீட்டமைக்கவா? இதைச் செயல்தவிர்க்க முடியாது!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"அமைப்புகளை மீட்டமை"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"மீட்டமைக்கவா?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"நெட்வொர்க் அமைப்புகள் மீட்டமைக்கப்பட்டன"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"சாதனத்தை மீட்டமை"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"தரவின் ஆரம்பநிலை மீட்டமைப்பு"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"டேப்லெட்டில் உள்ள எல்லா தரவையும் அழி"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"மொபைலில் உள்ள எல்லா தரவையும் அழி"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"இது, உங்கள் டேப்லெடின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள எல்லா தரவையும் அழித்துவிடும், இவற்றில் உள்ளடங்குவன:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"அமைப்பு மற்றும் பயன்பாட்டுத் தரவு, மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்டப் பயன்பாடுகள்"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"இது, உங்கள் மொபைலின் "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"இசை அல்லது படங்கள் போன்று SD கார்டில் உள்ள எல்லா தரவையும் அழி"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"டேப்லெட்டை மீட்டமை"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"மொபைலை மீட்டமை"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"உங்களின் தனிப்பட்ட எல்லா தகவல் மற்றும் பதிவிறக்கப்பட்ட பயன்பாடுகள் எல்லாவற்றையும் அழிக்கவா? நீங்கள் இந்தச் செயலை மீட்டமைக்க முடியாது!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"உங்களின் தனிப்பட்ட தகவல் மற்றும் பதிவிறக்கப்பட்ட பயன்பாடுகள் எல்லாவற்றையும் அழிக்கவா? இதைச் செயல்தவிர்க்க முடியாது!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"எல்லாவற்றையும் அழி"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ஆரம்பநிலைத் தரவு மீட்டமைவை உறுதிப்படுத்துவதற்கு, திறப்பதற்கான வடிவத்தை நீங்கள் வரைய வேண்டும்."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"System Clear சேவை இல்லை என்பதால் மீட்டமைவைச் செயற்படுத்தப்படவில்லை."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"மீட்டமைக்கவா?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"இவருக்கு ஆரம்பநிலை மீட்டமைவு இல்லை"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB சேமிப்பிடத்தை அழித்து, அதில் சேமிக்கப்பட்ட எல்லா கோப்புகளையும் நீக்கவா? இந்தச் செயலை நீங்கள் மாற்றியமைக்க முடியாது!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD கார்டை அழித்து, அதில் சேமிக்கப்பட்ட எல்லா கோப்புகளையும் நீக்கவா? இந்தச் செயலை நீங்கள் மாற்றியமைக்க முடியாது!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"எல்லாவற்றையும் அழி"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"நீங்கள் USB சேமிப்பிடத்தை அழிக்க விரும்புவதை உறுதிப்படுத்துவதற்கு சாதனத்தைத் திறப்பதற்கான வடிவத்தை வரைய வேண்டும்."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"நீங்கள் SD கார்டை அழிக்க விரும்புவதை உறுதிப்படுத்துவதற்கு, திறப்பதற்கான வடிவத்தை நீங்கள் வரைய வேண்டும்."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"உதவி"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"செல்லுலார் நெட்வொர்க்குகள்"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"மொபைல் திட்டம்"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"இயல்புநிலை 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"இருப்பிடப் பயன்முறை"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"இடத்தைக் கண்டறிய GPS, வைஃபை மற்றும் செல்லுலார் நெட்வொர்க்குகளைப் பயன்படுத்தவும்"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"இடத்தைக் கண்டறிய, வைஃபை மற்றும் செல்லுலார் நெட்வொர்க்குகளைப் பயன்படுத்தவும்"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"உங்கள் இருப்பிடத்தைக் கண்டறிய, GPS ஐப் பயன்படுத்தவும்"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"இருப்பிடத்தைக் கண்டறிய, GPSஐப் பயன்படுத்தவும்"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"ஸ்கேன் செய்தல்"</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="2070686681074461301">"வைஃபை முடக்கத்தில் இருக்கும்போது கூட, வைஃபை நெட்வொர்க்குகள் உள்ளனவா என்று ஸ்கேன் செய்ய பயன்பாடுகளையும் சேவைகளையும் அனுமதித்து, இருப்பிட அறிதலை மேம்படுத்தவும்"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"புளூடூத் ஸ்கேன் செய்தல்"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"புளூடூத் முடக்கத்தில் இருக்கும்போது கூட, புளூடூத் சாதனங்களுக்காக ஸ்கேன் செய்ய முறைமை சேவைகளை அனுமதிப்பதன் மூலம், இருப்பிட அறிதலை மேம்படுத்தவும்"</string>
     <string name="location_network_based" msgid="6010456018401296590">"வைஃபை &amp; செல்லுலார் நெட்வொர்க் இடம்"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"உங்கள் இருப்பிடத்தை விரைவாகக் கணிக்கும் வகையில் பயன்பாடுகள், Google இன் இருப்பிடச் சேவையைப் பயன்படுத்தலாம். அநாமதேய இருப்பிடத் தரவு சேகரிக்கப்பட்டு Google க்கு அனுப்பப்படும்."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"வைஃபை மூலம் இருப்பிடம் கண்டறியப்பட்டது"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"திரைப் பாதுகாப்பு"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"தொடர, சாதனத்தின் திறப்பு வடிவத்தைப் பயன்படுத்தவும்."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"தொடர, சாதனத்தின் பின்னை உள்ளிடவும்."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"தொடர, சாதனக் கடவுச்சொல்லை உள்ளிடவும்."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"தவறான PIN"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"தவறான கடவுச்சொல்"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"தவறான வடிவம்"</string>
+    <string name="lock_settings_title" msgid="4213839087748988686">"சாதனப் பாதுகாப்பு"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"திறக்கும் வடிவத்தை மாற்று"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"திறப்பதற்கான பின்னை மாற்று"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"சேமித்த வடிவத்தை உறுதிப்படுத்தவும்"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"மீண்டும் முயற்சிக்கவும்:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"பல தவறான முயற்சிகள்!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> நிமிடங்கள் கழித்து முயற்சிக்கவும்."</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="manageapplications_settings_title" msgid="7041951105633616745">"பயன்பாடுகளை நிர்வகி"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"நிறுவப்பட்ட பயன்பாடுகளை நிர்வகி மற்றும் அகற்று"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"சேமிப்பிடத்தின் பயன்பாடு"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"பயன்பாடுகள் பயன்படுத்திய சேமிப்பிடத்தைக் காட்டு"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"இயங்கும் சேவைகள்"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"டேப்லெட் தகவல்"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"மொபைலில் தகவல்"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"பேட்டரி தகவல்"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"உடனடி தொடக்கம்"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"பயன்பாடுகளைத் துவக்க விசைப்பலகைக் குறுக்குவழிகளை அமைக்கவும்"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"பயன்பாட்டை ஒதுக்கு"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"குறுக்குவழி இல்லை"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"தேடல் + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"அழி"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) க்கான உங்கள் குறுக்குவழி அழிக்கப்படும்."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"சரி"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ரத்துசெய்"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"பயன்பாடுகள்"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"குறுக்குவழிகள்"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"கோப்பில் உள்ள எல்லா புளூடூத் HCI தொகுதிகளையும் படமெடு"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM திறத்தல்"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"பூட்லோடரைத் திறக்க அனுமதி"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"பின்னை உள்ளிடவும்"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM திறப்பை இயக்க, சாதனத்தின் பின்னை உள்ளிடவும்"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM திறத்தலை அனுமதிக்கவா?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"எச்சரிக்கை: இந்த அமைப்பு இயக்கப்பட்டிருக்கும்போது, சாதன பாதுகாப்பு அம்சங்கள் இந்தச் சாதனத்தில் இயங்காது."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"லாகர் பஃபர் அளவுகள்"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"லாக் பஃபர் ஒன்றிற்கு லாகர் அளவுகளைத் தேர்வுசெய்க"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"போலி இருப்பிடங்களை அனுமதி"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"போலி இருப்பிடங்களை அனுமதி"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"காட்சி பண்புக்கூறு சோதனையை இயக்கு"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"நெட்வொர்க்கிங்"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"வயர்லெஸ் காட்சிக்கான சான்றிதழ்"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"வைஃபை அதிவிவர நுழைவை இயக்கு"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ஒத்துழைக்காத வைஃபையிலிருந்து செல்லுலாருக்கு மாறு"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"எப்போதும் வைஃபை ரோமிங் ஸ்கேன்களை அனுமதி"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"அதிகாரப்பூர்வ DHCP க்ளையன்ட்டைப் பயன்படுத்து"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"வயர்லெஸ் காட்சி சான்றுக்கான விருப்பங்களைக் காட்டு"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wifi நுழைவு அளவை அதிகரித்து, வைஃபை தேர்வியில் ஒவ்வொன்றிற்கும் SSID RSSI ஐ காட்டுக"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"இயக்கப்பட்டதும், வைஃபை சிக்னல் குறையும் போது, வைஃபை முழுமையாக ஒத்துழைக்காமல் இருப்பதால் செல்லுலாரின் தரவு இணைப்புக்கு மாறும்"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"இடைமுகத்தில் உள்ள ட்ராஃபிக் தரவின் அளவைப் பொறுத்து வைஃபை ரோமிங் ஸ்கேன்களை அனுமதி/அனுமதிக்காதே"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"லாகர் பஃபர் அளவுகள்"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"லாக் பஃபர் ஒன்றிற்கு லாகர் அளவுகளைத் தேர்வுசெய்க"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB உள்ளமைவைத் தேர்ந்தெடுக்கவும்"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB உள்ளமைவைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"போலி இருப்பிடங்களை அனுமதி"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"போலி இருப்பிடங்களை அனுமதி"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"காட்சி பண்புக்கூறு சோதனையை இயக்கு"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"புதிய Android DHCP க்ளையன்ட்டிற்குப் பதிலாக, Lollipop இலிருந்து DHCP க்ளையன்ட்டைப் பயன்படுத்தவும்."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB பிழைத்திருத்தத்தை அனுமதிக்கவா?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB பிழைத்திருத்தம் மேம்படுத்தல் நோக்கங்களுக்காக மட்டுமே. அதை உங்கள் கணினி மற்றும் சாதனத்திற்கு இடையில் தரவை நகலெடுக்கவும், அறிவிப்பு இல்லாமல் உங்கள் சாதனத்தில் பயன்பாடுகளை நிறுவவும், பதிவு தரவைப் படிக்கவும் பயன்படுத்தவும்."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"நீங்கள் ஏற்கனவே அனுமதித்த எல்லா கணினிகளிலிருந்தும் USB பிழைத்திருத்தத்திற்கான அணுகலைத் திரும்பப்பெற வேண்டுமா?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"மெஜந்தா"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ஐப் பயன்படுத்தவா?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> செய்வது:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"அனுமதிக் கோரிக்கையைப் பயன்பாடு மறைப்பதால், அமைப்புகளால் உங்கள் பதிலைச் சரிபார்க்க முடியாது."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>ஐ இயக்கினால், தரவு மறையாக்கத்தை மேம்படுத்த சாதனம் திரைப் பூட்டைப் பயன்படுத்தாது."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"அணுகல்தன்மை சேவையை இயக்கியுள்ளதால், தரவு மறையாக்கத்தை மேம்படுத்த சாதனம் திரைப் பூட்டைப் பயன்படுத்தாது."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையை இயக்குவது தரவுக் குறியாக்கத்தைப் பாதிக்கும் என்பதால், வடிவத்தை நீங்கள் உறுதிப்படுத்த வேண்டும்."</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> பயன்பாடுகளின் முடிவு நேரம் <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<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_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_memory_status" msgid="4251599550196193093">"சாதன நினைவகம் தற்போது <xliff:g id="MEMSTATE">%1$s</xliff:g> இல் உள்ளது"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"சராசரி RAM பயன்பாடு"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"அதிகபட்ச RAM பயன்பாடு"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"செயல்கள்"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"சேவைகள்"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"கால அளவு"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"நினைவக விவரங்கள்"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"முறைமையை மறை"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"கீழுள்ள இயல்புநிலை அமைப்பு பயன்பாட்டின் அமைப்புகளை மேலெழுதும்"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"இயல்புநிலை அமைப்பு"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"இயல்புநிலை இன்ஜின்"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"பேசப்படும் உரைக்குப் பயன்படுத்தப்படும் பேச்சு இணைப்பாக்கல் இன்ஜினை அமைக்கிறது"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"பேசும் உரைக்குப் பயன்படுத்த, பேச்சு இணைப்பாக்கல் இன்ஜினை அமைக்கவும்"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"பேச்சு வீதம்"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"பேசப்படும் உரையின் வேகம்"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ஒலித்திறன்"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"உங்கள் நற்சான்றின் நிறுவலை உறுதிசெய்வதற்கு, திறப்பதற்கான வடிவத்தை வரைய வேண்டும்."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"நற்சான்று சேமிப்பிடத்திற்கான கடவுச்சொல்லை உள்ளிடவும்."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"தற்போதைய கடவுச்சொல்:"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"எனது தரவைக் காப்புப் பிரதியெடு"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"பயன்பாட்டுத் தரவு, வைஃபை கடவுச்சொற்கள் மற்றும் Google சேவையகங்களுக்கான பிற அமைப்புகளைக் காப்புப் பிரதியெடு"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"மாற்று கணக்கு"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"தற்போது எந்தக் கணக்கும் காப்புப் பிரதி எடுக்கப்பட்ட தரவைச் சேமிப்பதில்லை"</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="5355557151569037197">"காப்புப்பிரதி சேவை செயல்படவில்லை."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"இது உங்கள் சாதனக் கொள்கையால் அமைக்கப்பட்டுள்ளது."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"டெஸ்க்டாப் மாற்று கடவுச்சொல்"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"டெஸ்க்டாப்பின் மொத்த காப்புப் பிரதிகளும் தற்போது பாதுகாக்கப்படவில்லை"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"டெஸ்க்டாப்பின் முழுமையான காப்புப்பிரதிகளுக்கான கடவுச்சொல்லை மாற்றுவதற்கு அல்லது அகற்றுவதற்குத் தொடவும்"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"அனிமேஷன் மாற்றத்தின் அளவு"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"அனிமேட்டர் கால அளவு"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"இரண்டாம்நிலைக் காட்சிகளை உருவகப்படுத்து"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"பல-சாளரப் பயன்முறை"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"ஒரே நேரத்தில் திரையில் மேற்கொள்ளப்படும் பல செயல்பாடுகள்."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"பல-சாளரப் பயன்முறையை இயக்கவா?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"எச்சரிக்கை: சமீபத்திய பயன்பாடுகள் UI மூலமாக, திரையில் பல்வேறு செயல்பாடுகளை ஒரே நேரத்தில் நிகழ அனுமதிக்கும் இது முக்கியமான பரிசோதனைக்குரிய அம்சமாகும். இந்த அம்சத்தின் மூலமாகப் பயன்படுத்தும் போது சில பயன்பாடுகள் சிதைவடையலாம் அல்லது சரியாகச் செயல்படாமல் போகலாம்."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"பயன்பாடுகள்"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"செயல்பாடுகளை வைத்திருக்காதே"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"இதிலிருந்து பயனர் வெளியேறியதும் ஒவ்வொரு செயல்பாட்டையும் நீக்கு"</string>
@@ -2195,7 +2251,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="718192651887726259">"கூடுதல் பயனர்களை உருவாக்கி, சாதனத்தைப் பிறருடன் பகிரலாம். ஒவ்வொரு பயனருக்கும், அவர்களுக்குச் சொந்தமான பயன்பாடுகள், வால்பேப்பர், மேலும் பலவற்றைத் தனிப்பயனாக்கத் தனி இடம் இருக்கும். ஒவ்வொருவருக்கும் பயன்படக்கூடிய வைஃபை போன்ற சாதன அமைப்புகளையும் அவர்கள் சரிசெய்யலாம்.\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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"ஃபோன் அழைப்புகளை அனுமதி"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"ஃபோன் அழைப்புகளையும், 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="440218975766968124">"ஃபோன் அழைப்புகளை அனுமதிக்கவா?"</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_sms_confirm_title" msgid="188164598768941316">"ஃபோன் அழைப்புகளையும், SMSஐயும் அனுமதிக்கவா?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"அழைப்பும் 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="application_restrictions" msgid="8207332020898004394">"பயன்பாடுகளையும் உள்ளடக்கத்தையும் அனுமதி"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"வரையறைகளுடனான பயன்பாடுகள்"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"பயன்பாட்டிற்கான அமைப்புகளை விரிவுபடுத்து"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"இந்தப் பயன்பாடு வரையறுக்கப்பட்ட சுயவிவரங்களில் ஆதரிக்கப்படாது"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"வைஃபை நெட்வொர்க் இணைப்பு"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"உரை செய்தி செய்தியிடல் செய்திகள் செய்தி அனுப்புதல்"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"செல்லுலார் செல் கேரியர் வயர்லெஸ் டேட்டா 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"வைஃபை வை-ஃபை அழைப்பு அழைத்தல்"</string>
     <string name="keywords_home" msgid="3626170808219458848">"துவக்கி"</string>
     <string name="keywords_display" msgid="6709007669501628320">"திரை டச்ஸ்கிரீன்"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ஒளிமங்கல் திரை டச்ஸ்கிரீன் பேட்டரி"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ஒளிமங்கல் திரை டச்ஸ்கிரீன் பேட்டரி"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"பின்னணி தனிப்பட்ட தனிப்பயனாக்கு காட்சி"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"அடர் தீம் இரவுப் பயன்முறை திரையை மங்கலாக்கல் ஒளிர்வை எதிர்மறையாக்கல்"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"பின்னணி தனிப்படுத்து தனிப்பயனாக்கு திரை"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"உரை அளவு"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"பரிமாற்றம்"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"அனுப்புதல் வெளிப்பாடு"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"இடம் டிஸ்க் வட்டு இயக்ககம் சாதனம் பயன்பாடு"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"பவர் பயன்பாடு சார்ஜ்"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"உச்சரிப்பு அகராதி எழுத்துச்சரிபார்ப்பு தன்னியக்க திருத்தம்"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"கணக்கு"</string>
     <string name="keywords_users" msgid="4673901601478559100">"வரம்பிடல் வரம்பு வரம்பிட்டது"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"உரை திருத்தம் சரிசெய் ஒலி அதிர்வு தானியங்கு மொழி சைகை பரிந்துரை பரிந்துரைப்பு தீம் வன்மொழி சொல் வகை ஈமோஜி சர்வதேசம்"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"முன்விருப்பத்தேர்வுகளை இயல்புநிலைக்கு மீட்டமை"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"அவசர ice பயன்பாடு இயல்பு"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"ஆப்ஸ் பதிவிறக்கு பயன்பாடுகள் முறைமை"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"பயன்பாடுகள் அனுமதிகள் பாதுகாப்பு"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"பயன்பாடுகள் இயல்பு"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ஸ்லைடு கடவுச்சொல் வடிவம் pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"வைஃபை NFC குறியை அமை"</string>
     <string name="write_tag" msgid="8571858602896222537">"எழுது"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"குறுக்கீடுகள்"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"அழைப்பு, அறிவிப்பின் போது"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"எப்போதும் தெரிவி"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"முக்கியமானவற்றை மட்டும் அனுமதி"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"தெரிவிக்காதே"</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_option_important_interruptions" msgid="3903928008177972500">"முதன்மை மட்டும்"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"அலாரங்கள் மட்டும்"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"குறுக்கீடுகள் வேண்டாம்"</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="ringtone_title" msgid="5379026328015343686">"மொபைலின் ரிங்டோன்"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"இயல்புநிலை அறிவிப்பு ரிங்டோன்"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"அழைப்புகளுக்கும் அதிர்வுறு"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"அதிர்வு"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"அறிவிப்பு அணுகல்"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"பயன்பாடுகளால் அறிவிப்புகளைப் படிக்க முடியாது"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d பயன்பாடு அறிவிப்புகளைப் படிக்கலாம்"</item>
-    <item quantity="other" msgid="980049191810249052">"%d பயன்பாடுகள் அறிவிப்புகளைப் படிக்கலாம்"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d பயன்பாடுகள் அறிவிப்புகளைப் படிக்கலாம்</item>
+      <item quantity="one">%d பயன்பாடு அறிவிப்புகளைப் படிக்கலாம்</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"அறிவிப்பு கவனிப்பான்கள் எதுவும் நிறுவப்படவில்லை."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> ஐ இயக்கவா?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"முறைமை அல்லது நிறுவப்பட்ட எந்தப் பயன்பாட்டின் மூலமும் இடுகையிடப்பட்ட எல்லா அறிவிப்புகளையும் <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ஆல் படிக்க முடியும், இதில் தொடர்பு பெயர்கள் மற்றும் உங்களுக்கு அனுப்பிய செய்திகளின் உரை போன்ற தனிப்பட்டத் தகவலும் உள்ளடங்கலாம். மேலும் இது, அறிவிப்புகளையும் அல்லது அதில் உள்ள தொடு செயல் பொத்தான்களையும் நிராகரிக்கலாம்."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"நிபந்தனை வழங்குநர்கள்"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"பயன்பாடுகள் எதுவும் நிபந்தனைகளை வழங்கவில்லை"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d பயன்பாடு நிபந்தனைகளை வழங்குகிறது"</item>
-    <item quantity="other" msgid="358057362115673258">"%d பயன்பாடுகள் நிபந்தனைகளை வழங்குகின்றன"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"நிபந்தனை வழங்குநர்கள் எதுவும் நிறுவப்படவில்லை."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> ஐ இயக்கவா?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"தொந்தரவு செய்யாதே பயன்முறையில், <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ஆல் முடிவு நிலைகளைச் சேர்க்க முடியும்."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"தடு"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"எல்லாம் தடு"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"இந்தப் பயன்பாட்டிலிருந்து எப்போதும் அறிவிப்புகளைக் காட்டாதே"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"முன்னுரிமை"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"பட்டியலின் முதலில் அறிவிப்புகளைக் காட்டுவதுடன், சாதனத்தில் முக்கிய அறிவிப்புகளை அமைக்கும் போது மட்டும் வரும்படி செய்யவும்"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"முக்கியமானவை"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"சாதனம் பூட்டப்பட்டிருக்கும் போது, இந்தப் பயன்பாட்டிலிருந்து வரும் முக்கியமான உள்ளடக்க அறிவிப்புகளை மறை"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"முன்னுரிமையாகக் கருது"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"தொந்தரவு செய்யாதே என்பதில் முன்னுரிமை மட்டும் என அமைக்கப்பட்டிருக்கும் போது, இந்தப் பயன்பாட்டின் அறிவிப்புகள் கேட்கப்படும்"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"பார்க்க அனுமதி"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"சில அறிவிப்புகளை நடப்பு திரையில் சற்று இழுத்துவிடுவதன் மூலம், இந்தப் பயன்பாடு அவற்றைத் தனிப்படுத்தும்"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"முக்கியமான உள்ளடக்கத்தை மறை"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"இந்தச் சாதனம் பூட்டப்பட்டிருக்கும்போது, தனிப்பட்ட தகவலை வெளிப்படுத்தக்கூடிய இந்தப் பயன்பாட்டின் அறிவிப்புகளின் உள்ளடக்கத்தை மறைக்கும்."</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="zen_mode_default_option" msgid="6940069025071935243">"இதை முடக்கும்வரை"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"முக்கிய அறிவிப்புகள்"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"செயலற்ற நேரம்"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"நாட்கள்"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ஏதுமில்லை"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"குறுக்கீடுகளுக்கு அனுமதியுண்டு"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"முதன்மை மட்டும்"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ஏதுமில்லை"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"தன்னியக்கம்"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"தானாகவே இயக்கு"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"விதியின் பெயர்"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"விதியைச் சேர்"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"விதியை நீக்கு"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<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="3201273040477861538">"விதியைத் திட்டமிடு"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"விதி இல்லை."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"எப்போதும் வேண்டாம்"</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_from" msgid="1033337300289871697">"இவரிடமிருந்து அழைப்புகள்/செய்திகள்"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"எவரிடம் இருந்தும்"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"தொடர்புகளிலிருந்து மட்டும்"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"நட்சத்திரமிட்ட தொடர்புகளிலிருந்து மட்டும்"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"நிகழ்வுகளும் நினைவூட்டல்களும்"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"அலாரங்கள் எப்போதும் குறுக்கீடுகளில் முதன்மையானவை"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"அலாரங்கள்"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"நினைவூட்டல்கள்"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"நிகழ்வுகள்"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"தேர்ந்தெடுக்கப்பட்ட அழைப்பாளர்கள்"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"மீண்டும் மீண்டும் அழைப்பவர்கள்"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g> நிமிடங்களுக்குள் இரண்டாவது முறையாக அதே எண்ணிலிருந்து அழைப்பு வந்தால், அனுமதி"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"தானாகவே இயக்கு"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"எப்போதும் வேண்டாம்"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"அடுத்த நாள் <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> அல்லது அலாரத்திற்கு முன்"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"அடுத்த நாள் <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_interruptions_voice_title" msgid="855256211259132964">"குறுக்கீடுகள்"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"அழைப்புகளும் அறிவிப்புகளும் வரும்போது"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"எப்போது குறுக்கிடலாம்?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"கால அளவு:"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"எப்போதும் குறுக்கிடு"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"முடக்கத்தில்,எல்லாம்,ஒவ்வொன்றும்"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"முதன்மையானவற்றை மட்டும் அனுமதி"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"அலாரங்களை மட்டும் அனுமதி"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"குறுக்கிடாதே"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"காலவரையின்றி"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> நிமிடங்கள்</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> நிமிடம்</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"முதன்மை அறிவிப்புகள் மட்டும் (காலவரையின்றி) என மாற்று"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> வரை, <xliff:g id="DURATION">%1$d</xliff:g> நிமிடங்களுக்கு முதன்மை அறிவிப்புகள் மட்டும் என மாற்றவும்</item>
+      <item quantity="one"> <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> வரை, ஒரு நிமிடத்திற்கு முதன்மை அறிவிப்புகள் மட்டும் என மாற்றவும்</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g> வரை, ஒரு மணிநேரத்திற்கு முதன்மை அறிவிப்புகள் மட்டும் என மாற்றவும்</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"அலாரங்கள் மட்டும் (காலவரையின்றி) என மாற்று"</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>
+      <item quantity="one"><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"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> வரை, <xliff:g id="DURATION">%1$d</xliff:g> மணிநேரத்திற்கு அலாரங்கள் மட்டும் என மாற்றவும்</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> வரை, ஒரு மணிநேரத்திற்கு அலாரங்கள் மட்டும் என மாற்றவும்</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"குறுக்கிட வேண்டாம் (கால வரையின்றி) என மாற்று"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g> வரை, ஒரு நிமிடத்திற்கு குறுக்கிட வேண்டாம் என மாற்றவும்</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> வரை, <xliff:g id="DURATION">%1$d</xliff:g> மணிநேரத்திற்கு குறுக்கிட வேண்டாம் என மாற்றவும்</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> வரை, ஒரு மணிநேரத்திற்கு குறுக்கிட வேண்டாம் என மாற்றவும்</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"எப்போதும் குறுக்கிடு என மாற்று"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"எப்போதும்"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"பயன்பாட்டு அறிவிப்புகள்"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"அறிவிப்பு அமைப்பு"</string>
     <string name="device_feedback" msgid="3238056036766293294">"சாதனம் பற்றி கருத்தை அனுப்பு"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"இயல்பாகத் துவங்கு"</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="app_launch_domain_links_title" msgid="458956710410857777">"டொமைன் இணைப்புகள்"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"டொமைன் URLகளைத் திறத்தல்"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"டொமைன் URLகளை நேரடியாகத் திறக்கப் பயன்பாட்டை அனுமதிக்கும்"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"ஆதரிக்கப்படும் டொமைன் URLகள்"</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="410824961149037234">"அக நினைவகம்"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"புற நினைவகம்"</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="notifications_enabled" msgid="6983396130566021385">"இயக்கத்தில்"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"தடைசெய்"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"முக்கியமானவை"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"முன்னுரிமை"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"முன்னுரிமை &amp; முக்கியமானவை"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> அனுமதிகள் வழங்கப்பட்டன</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> அனுமதி வழங்கப்பட்டது</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> / <xliff:g id="COUNT_3">%d</xliff:g> அனுமதிகள் வழங்கப்பட்டன</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> அனுமதி வழங்கப்பட்டது</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"சில இயல்புநிலைகள் அமைக்கப்பட்டன"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"இயல்புநிலைகள் எதுவும் அமைக்கப்படவில்லை"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"எல்லா பயன்பாடுகளும்"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"இயக்கப்பட்டவை"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"தனிப்பட்டவை"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"பணியிடம்"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"தடுக்கப்பட்டவை"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"முன்னுரிமை"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"முக்கியமானவை"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"டொமைன் URLகளுடன்"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"நிர்வாகியால் முடக்கப்பட்டது"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"மேம்பட்டவை"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"அறியப்படாத பயன்பாடு"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"சுயவிவரத்தைத் தேர்வுசெய்யவும்"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"பயன்பாட்டு அனுமதிகள்"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"கூடுதல் அனுமதிகள் வழங்கப்பட்ட பயன்பாடுகள்: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"அனுமதிக்கப்படும் பயன்பாடுகள்: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"டொமைன் URLகள்"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"எந்த டொமைன் URLஐயும் திறக்காது"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\'ஐ மட்டும் திறக்கும்"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' மற்றும் தொடர்புடைய URLகளைத் திறக்கும்"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகள், அவற்றின் டொமைன் URLகளைத் திறக்கலாம்</item>
+      <item quantity="one">ஒரு பயன்பாடு, தனது டொமைன் URLகளைத் திறக்கலாம்</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"அறியப்படவில்லை"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"இயல்பு பயன்பாடுகள்"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"உலாவி பயன்பாடு"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"இயல்பு உலாவி இல்லை"</string>
+    <string name="default_app" msgid="6864503001385843060">"(இயல்பு)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"பயன்பாட்டுச் சேமிப்பகம்"</string>
 </resources>
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te-rIN/arrays.xml
index cb09f6f..daf575c 100644
--- a/res/values-te-rIN/arrays.xml
+++ b/res/values-te-rIN/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"పుష్ బటన్"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"మైక్రోఫోన్‌ను మ్యూట్ చేయండి/అన్‌మ్యూట్ చేయండి"</item>
     <item msgid="1148142988678569310">"ప్రాజెక్ట్ మీడియా"</item>
     <item msgid="9130014005474445273">"VPNని సక్రియం చేయండి"</item>
+    <item msgid="1165192162975045562">"వాల్‌పేపర్ వ్రాయండి"</item>
+    <item msgid="7129487923652967258">"నిర్మాణానికి సహాయం"</item>
+    <item msgid="1069023208100114540">"స్క్రీన్‌షాట్‌కు సహాయం"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"స్థానం"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"మైక్రోఫోన్‌ను మ్యూట్ చేయండి/అన్‌మ్యూట్ చేయండి"</item>
     <item msgid="5906017727368097853">"ప్రాజెక్ట్ మీడియా"</item>
     <item msgid="2486614710846178542">"VPNని సక్రియం చేయండి"</item>
+    <item msgid="5586547561693629602">"వాల్‌పేపర్ వ్రాయండి"</item>
+    <item msgid="32794179825485062">"నిర్మాణానికి సహాయం"</item>
+    <item msgid="7872852746938272552">"స్క్రీన్‌షాట్‌కు సహాయం"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"తక్కువ సేపు"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"తక్కువ"</item>
     <item msgid="4212263919458209842">"క్లిష్టం"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ఆఫ్‌లో ఉంది"</item>
-    <item msgid="5656544177755411222">"పరిమిత అంతరాయాలు"</item>
-    <item msgid="8735337502532332056">"సున్నా అంతరాయాలు"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"సాధారణం"</item>
     <item msgid="866544120205026771">"మధ్యస్థం"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"గులాబీ"</item>
     <item msgid="6131821495505931173">"ఎరుపు"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (మీడియా బదిలీ ప్రోటోకాల్)"</item>
+    <item msgid="8856820259201251036">"PTP (చిత్రం బదిలీ ప్రోటోకాల్)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB ఈథర్‌నెట్)"</item>
+    <item msgid="2686051673589572111">"ఆడియో మూలం"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 3d8fe0c..13c6f88 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"అనుమతించు"</string>
     <string name="deny" msgid="6947806159746484865">"తిరస్కరించు"</string>
     <string name="device_info_default" msgid="7847265875578739287">"తెలియదు"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"మీరు ఇప్పుడు డెవలపర్ కావడానికి <xliff:g id="STEP_COUNT">%1$d</xliff:g> అడుగు దూరంలో ఉన్నారు."</item>
-    <item quantity="other" msgid="6722953419953594148">"మీరు ఇప్పుడు డెవలపర్ కావడానికి <xliff:g id="STEP_COUNT">%1$d</xliff:g> అడుగుల దూరంలో ఉన్నారు."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">మీరు ఇప్పుడు డెవలపర్ కావడానికి <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> అడుగుల దూరంలో ఉన్నారు.</item>
+      <item quantity="one">మీరు ఇప్పుడు డెవలపర్ కావడానికి <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> అడుగు దూరంలో ఉన్నారు.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"మీరు ఇప్పుడు డెవలపర్!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"అవసరం లేదు, మీరు ఇప్పటికే డెవలపర్‌గా ఉన్నారు."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"వైర్‌లెస్ &amp; నెట్‌వర్క్‌లు"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS ద్వారా SMSను ఆఫ్ చేయండి"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS నమోదును ప్రారంభించడం అవసరం"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS నమోదును ఆపివేయడం అవసరం"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE సదుపాయం గల ఫ్లాగ్‌ను ఆన్ చేయండి"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE సదుపాయం గల ఫ్లాగ్‌ను ఆఫ్ చేయండి"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ర్యామ్ డంప్‌ను ప్రారంభించండి"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ర్యామ్ డంప్‌ను ఆపివేయండి"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"సిమ్ చిరునామా పుస్తకాన్ని వీక్షించండి"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"కనెక్ట్ చేయబడింది"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"కనెక్ట్ చేయబడింది (ఫోన్‌ కాదు)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"కనెక్ట్ చేయబడింది (మీడియా కాదు)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"కనెక్ట్ చేయబడింది (సందేశ ప్రాప్యత లేదు)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"కనెక్ట్ చేయబడింది (ఫోన్ లేదా మీడియా కాకుండా)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"డిస్‌కనెక్ట్ చేయబడింది"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"డిస్‌కనెక్ట్ చేస్తోంది..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"కనెక్ట్ చేస్తోంది..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"జత చేస్తోంది..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"పేరులేని బ్లూటూత్ పరికరం"</string>
     <string name="progress_scanning" msgid="192587958424295789">"శోధించడం"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"సమీపంలో బ్లూటూత్ పరికరాలు ఏవీ కనుగొనబడలేదు."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"స్వీకరించబడిన ఫైల్‌లను చూపు"</string>
     <string name="device_picker" msgid="4978696506172252813">"బ్లూటూత్ పరికరాన్ని ఎంచుకోండి"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"బ్లూటూత్ అనుమతి అభ్యర్థన"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"అనువర్తనం బ్లూటూత్‌ను ప్రారంభించాలనుకుంటుంది."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"అనువర్తనం ఈ పరికరంలో బ్లూటూత్‌ను ఆన్ చేయాలనుకుంటోంది."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"అనువర్తనం మీ టాబ్లెట్‌ను ఇతర బ్లూటూత్ పరికరాలకు <xliff:g id="TIMEOUT">%1$d</xliff:g> సెకన్లు కనిపించేలా చేయాలనుకుంటుంది."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"అనువర్తనం మీ ఫోన్‌ను ఇతర బ్లూటూత్ పరికరాలకు <xliff:g id="TIMEOUT">%1$d</xliff:g> సెకన్లు కనిపించేలా చేయాలనుకుంటుంది."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"అనువర్తనం మీ టాబ్లెట్‌ను ఇతర బ్లూటూత్ పరికరాలకు కనిపించేలా చేయాలనుకుంటుంది. మీరు దీన్ని బ్లూటూత్ సెట్టింగ్‌ల్లో తర్వాత మార్చవచ్చు."</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"రద్దు చేయి"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"కొనసాగించు"</string>
     <string name="okay" msgid="1997666393121016642">"సరే"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"అవును"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"కాదు"</string>
-    <string name="forget" msgid="7267115980248732932">"విస్మరించు"</string>
+    <string name="forget" msgid="1400428660472591263">"విస్మరించు"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"ముఖం సరిపోలికను మెరుగుపరచండి"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"క్రియాశీలత తనిఖీ"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"అన్‌లాక్ చేస్తున్నప్పుడు కన్ను మూసి తెరవాలి"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, సిమ్ కార్డు లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయి"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయండి"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"పాస్‌వర్డ్‌లు"</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="3453670509485083962">"జోడించు"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"స్క్రీన్ లాక్"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"వేలిముద్ర సెటప్"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"మీ స్క్రీన్‌ను అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను నిర్ధారించడం కోసం మీ వేలిముద్రను ఉపయోగించడానికి, మేము వీటిని చేయాలి: \n\n✓ మీ బ్యాకప్ స్క్రీన్ లాక్ పద్ధతిని సెటప్ చేయాలి \n\n✓ మీ వేలిముద్రను జోడించాలి"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"సెన్సార్‌ని కనుగొనండి"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"మీ ఫోన్ వెనుకవైపున వేలిముద్ర సెన్సార్‌ని గుర్తించండి."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"ప్రారంభిద్దాం!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"మీ వేలిని వేలిముద్ర సెన్సార్‌పై ఉంచండి. మీరు వైబ్రేషన్‌ని అనుభూతి చెందిన తర్వాత తీసివేయండి."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"అద్భుతం! మళ్లీ చేయండి."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"అదే వేలిని వేలిముద్ర సెన్సార్‌పై ఉంచండి మరియు మీరు వైబ్రేషన్‌ని అనుభూతి చెందిన తర్వాత తీసివేయండి."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"వేలిముద్ర జోడించబడిం.!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"మీకు ఈ చిహ్నం కనిపించినప్పుడల్లా, మీరు గుర్తింపు కోసం లేదా కొనుగోలు ప్రామాణీకరణ కోసం మీ వేలిముద్రను ఉపయోగించవచ్చు."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"జోడించు"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"తదుపరి"</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>
@@ -360,7 +372,6 @@
     <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_encrypt" msgid="736289627726831055">"మీరు మీ పరికర గుప్తీకరణను నిర్ధారించడానికి మీ అన్‌లాక్ నమూనాను గీయాల్సి ఉంటుంది."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"గుప్తీకరించాలా?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"గుప్తీకరణ చర్య స్థిరమైనది మరియు మీరు దీనికి అంతరాయం కలిగిస్తే, డేటాను కోల్పోతారు. గుప్తీకరణకు గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది, ఈ సమయంలో టాబ్లెట్ అనేకసార్లు పునఃప్రారంభించబడుతుంది."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"గుప్తీకరణ చర్య తిరిగి రద్దు చేయలేనిది మరియు మీరు దీనికి అంతరాయం కలిగిస్తే, డేటాను కోల్పోతారు. గుప్తీకరణకు గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది, ఈ సమయంలో ఫోన్ అనేకసార్లు పునఃప్రారంభించబడుతుంది."</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"ముఖంతో అన్‌లాక్"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"తక్కువ భద్రత, ప్రయోగాత్మకం"</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>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"పాస్‌వర్డ్"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"అధిక భద్రత"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"ప్రస్తుత స్క్రీన్ లాక్"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"పరికర రక్షణ లక్షణాలు ఇకపై పని చేయవు."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"నిర్వాహకులు, గుప్తీకరణ విధానం లేదా ఆధారాల నిల్వ ద్వారా నిలిపివేయబడింది"</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_biometric_weak" msgid="3008473624490350142">"ముఖంతో అన్‌లాక్"</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="7579210814842056547">"మీరు స్క్రీన్ లాక్‌ను సెటప్ చేసిన తర్వాత, సెట్టింగ్‌లు &gt; భద్రతలో మీ వేలిముద్రను కూడా సెటప్ చేయవచ్చు."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"స్క్రీన్ లాక్‌ను ఆఫ్ చేయి"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"అన్‌లాక్ నమూనాను తీసివేయండి"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"అన్‌లాక్ పిన్‌ను తీసివేయండి"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం ఒక అక్షరాన్ని కలిగి ఉండాలి."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం ఒక అంకెను కలిగి ఉండాలి."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం ఒక చిహ్నాన్ని కలిగి ఉండాలి."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం 1 అక్షరాన్ని కలిగి ఉండాలి."</item>
-    <item quantity="other" msgid="8186027808415585970">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం %d అక్షరాలను కలిగి ఉండాలి."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం 1 లోయర్‌కేస్ అక్షరాన్ని కలిగి ఉండాలి."</item>
-    <item quantity="other" msgid="2693910942679679225">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం %d లోయర్‌కేస్ అక్షరాలను కలిగి ఉండాలి."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం 1 అప్పర్‌కేస్ అక్షరాన్ని కలిగి ఉండాలి."</item>
-    <item quantity="other" msgid="3030801209112209245">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం %d అప్పర్‌కేస్ అక్షరాలను కలిగి ఉండాలి."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం 1 సంఖ్యాత్మక అంకెను కలిగి ఉండాలి."</item>
-    <item quantity="other" msgid="4703982391407595924">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం 1 సంఖ్యాత్మక అంకెలను కలిగి ఉండాలి."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం 1 ప్రత్యేక చిహ్నాన్ని కలిగి ఉండాలి."</item>
-    <item quantity="other" msgid="1221290525051187757">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం %d ప్రత్యేక చిహ్నాలను కలిగి ఉండాలి."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం 1 అక్షరేతర గుర్తును కలిగి ఉండాలి."</item>
-    <item quantity="other" msgid="3952508584649046404">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం %d అక్షరేతర గుర్తులను కలిగి ఉండాలి."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం %d అక్షరాలు ఉండాలి.</item>
+      <item quantity="one">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం 1 అక్షరం ఉండాలి.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం %d లోయర్‌కేస్ అక్షరాలు ఉండాలి.</item>
+      <item quantity="one">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం 1 లోయర్‌కేస్ అక్షరం ఉండాలి.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం %d అప్పర్‌కేస్ అక్షరాలు ఉండాలి.</item>
+      <item quantity="one">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం 1 అప్పర్‌కేస్ అక్షరం ఉండాలి.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం %d సంఖ్యాత్మక అంకెలు ఉండాలి.</item>
+      <item quantity="one">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం 1 సంఖ్యాత్మక అంకె ఉండాలి.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం %d ప్రత్యేక చిహ్నాలు ఉండాలి.</item>
+      <item quantity="one">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం 1 ప్రత్యేక చిహ్నం ఉండాలి.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం %d అక్షరేతర గుర్తులు ఉండాలి.</item>
+      <item quantity="one">పాస్‌వర్డ్‌లో తప్పనిసరిగా కనీసం 1 అక్షరేతర గుర్తు ఉండాలి.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"పరికర నిర్వాహికి ఇటీవలి పాస్‌వర్డ్‌ను ఉపయోగించడానికి అనుమతించదు."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"అంకెల ఆరోహణ, అవరోహణ లేదా పునరావృత క్రమం నిషిద్ధం"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"సరే"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"జత చేయి"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"జత చేయి"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"రద్దు చేయి"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"జత చేయడం వలన కనెక్ట్ చేయబడినప్పుడు మీ పరిచయాలకు మరియు కాల్ చరిత్రకు ప్రాప్యతను మంజూరు చేస్తుంది."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>తో జత చేయడం సాధ్యపడలేదు."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"పిన్‌ లేదా పాస్‌కీ చెల్లని కారణంగా <xliff:g id="DEVICE_NAME">%1$s</xliff:g>తో జత చేయడం సాధ్యపడలేదు."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>తో కమ్యూనికేట్ చేయడం సాధ్యపడదు."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> జత చేయడాన్ని తిరస్కరించింది."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి, అనువర్తనాలు మరియు సేవలు బ్లూటూత్ ఆఫ్‌లో ఉన్నప్పటికీ బ్లూటూత్ పరికరాల కోసం స్కాన్ చేస్తాయి. మీరు దీన్ని <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_specific_profiles_title" msgid="6952214406025825164">"దీనికి కనెక్ట్ చేయి…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"మీడియా ఆడియో"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ఫోన్ ఆడియో"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ఫైల్ బదిలీ"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ఇన్‌పుట్ పరికరం"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ఇంటర్నెట్ ప్రాప్యత"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"పరిచయ భాగస్వామ్యం"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"పరిచయ భాగస్వామ్యం కోసం ఉపయోగించు"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"సందేశ ప్రాప్యత"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"మీడియా ఆడియోకు కనెక్ట్ చేయబడింది"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ఫోన్ ఆడియోకు కనెక్ట్ చేయబడింది"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ఫైల్ బదిలీ సర్వర్‌కు కనెక్ట్ చేయబడింది"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"మ్యాప్‌కు కనెక్ట్ చేయబడింది"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ఫైల్ బదిలీ సర్వర్‌కు కనెక్ట్ చేయబడలేదు"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ఇన్‌పుట్ పరికరానికి కనెక్ట్ చేయబడింది"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"మీడియా ఆడియో కోసం ఉపయోగించు"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ఫోన్ ఆడియో కోసం ఉపయోగించు"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ఫైల్ బదిలీ కోసం ఉపయోగించు"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ఇన్‌పుట్ కోసం ఉపయోగించు"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ఇంటర్నెట్ ప్రాప్యత కోసం ఉపయోగించు"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"మ్యాప్ కోసం ఉపయోగించు"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi సహాయకం"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi సహాయకం ద్వారా కనెక్ట్ చేయబడింది"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"ప్రసారం స్క్రీన్"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fiని ఆపివేస్తోంది…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"లోపం"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ఎయిర్‌ప్లైన్ మోడ్‌లో"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"నెట్‌వర్క్‌ల కోసం స్కాన్ చేయడం సాధ్యపడదు"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"నెట్‌వర్క్ నోటిఫికేషన్"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"పబ్లిక్ నెట్‌వర్క్ అందుబాటులో ఉన్నప్పుడు తెలియజేయి"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"బలహీన కనెక్షన్‌లను నివారించు"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Wi‑Fi నెట్‌వర్క్ ఉత్తమ ఇంటర్నెట్ కనెక్షన్‌ను కలిగి ఉంటే మినహా ఉపయోగించవద్దు"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ఉత్తమ ఇంటర్నెట్ కనెక్షన్ ఉన్న నెట్‌వర్క్‌లను మాత్రమే ఉపయోగించు"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"స్కానింగ్‌ను ఎల్లప్పుడూ అందుబాటులో ఉంచు"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"ఎల్లప్పుడూ స్కాన్ చేయడాన్ని అనుమతించు"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi‑Fi ఆఫ్‌లో ఉన్నప్పటికీ నెట్‌వర్క్‌ల కోసం స్కాన్ చేయడానికి Google స్థాన సేవ మరియు ఇతర అనువర్తనాలను అనుమతించు"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"స్వయంచాలకంగా బహిరంగ Wi‑Fiని ఉపయోగించు"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi‑Fi సహాయకం అధిక నాణ్యమైనవిగా గుర్తించిన బహిరంగ నెట్‌వర్క్‌లకు స్వయం. కనెక్ట్ కావడానికి అనుమతించండి"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"సహాయకాన్ని ఎంచుకోండి"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ప్రమాణపత్రాలను ఇన్‌స్టాల్ చేయి"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి మరియు ఇతర ప్రయోజనాల దృష్ట్యా, Google మరియు ఇతర అనువర్తనాలు Wi-Fi ఆఫ్‌లో ఉన్నప్పటికీ, నెట్‌వర్క్‌ల కోసం అనువర్తనాలు స్కాన్ చేయవచ్చు. మీరు ఇలా జరగకూడదనుకుంటే, అధునాతనం &gt; స్కానింగ్‌ ఎల్లప్పుడూ అందుబాటులో ఉంచుకు వెళ్లండి."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi ఆఫ్‌లో ఉన్నప్పటికీ సమీపంలోని నెట్‌వర్క్‌ల కోసం అనువర్తనాలు స్కాన్ చేయవచ్చు. మీరు ఇలా జరగకూడదనుకుంటే, అధునాతనం &gt; స్కానింగ్‌ ఎల్లప్పుడూ అందుబాటులో ఉంచుకు వెళ్లండి."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి, అనువర్తనాలు మరియు సేవలు Wi‑Fi ఆఫ్‌లో ఉన్నప్పటికీ 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="5340097010842405981">"మళ్లీ చూపవద్దు"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"మరో నెట్‌వర్క్‌ను జోడించు"</string>
     <string name="wifi_more" msgid="3195296805089107950">"మరిన్ని"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"స్వయంచాలక సెటప్ (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"సెటప్‌ను పూర్తి చేయడానికి, మీ టాబ్లెట్ Wi‑Fiకి ప్రాప్యత చేయాలి. సెటప్ చేసిన తర్వాత, మీరు సెల్యులార్ డేటా మరియు Wi‑Fiల మధ్య మార్చవచ్చు."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"అధునాతన ఎంపికలు"</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="5940801028985255304">"మీ రూటర్‌లో Wi‑Fi సురక్షిత సెటప్ బటన్‌ను నొక్కండి. దీన్ని \"WPS\" అని పిలవవచ్చు లేదా ఇది ఈ చిహ్నాన్ని కలిగి ఉండవచ్చు:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"మీ రూటర్‌లో 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_complete" msgid="2388138550456729134">"WPS విజయవంతమైంది. నెట్‌వర్క్‌కు కనెక్ట్ చేస్తోంది…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi‑Fi నెట్‌వర్క్ <xliff:g id="NETWORK_NAME">%s</xliff:g>కు కనెక్ట్ చేయబడింది"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"AP బ్యాండ్‌ని కాన్ఫిగర్ చేయండి"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(మార్చబడనివి)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(పేర్కొనబడనివి)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"సేవ్ చేయబడింది"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"నిలిపివేయబడింది"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP కాన్ఫిగరేషన్ వైఫల్యం"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi కనెక్షన్ వైఫల్యం"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ప్రామాణీకరణ సమస్య"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"పరిధిలో లేదు"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"ఇంటర్నెట్ ప్రాప్యత కనుగొనబడలేదు, స్వయంచాలకంగా మళ్లీ కనెక్ట్ చేయబడదు."</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_security_none" msgid="7985461072596594400">"ఏదీ లేదు"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"ఈ నెట్‌వర్క్‌కు ఇంటర్నెట్ ప్రాప్యత లేదు. ఈ నెట్‌వర్క్‌ను ఏదేమైనా ఉపయోగించాలా?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ఈ నెట్‌వర్క్ కోసం మళ్లీ అడగవద్దు"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"కనెక్ట్ చేయి"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"నెట్‌వర్క్‌కు కనెక్ట్ చేయడం విఫలమైంది"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"విస్మరించు"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK పోర్టబుల్ Wi‑Fi హాట్‌స్పాట్"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> పోర్టబుల్ Wi‑Fi హాట్‌స్పాట్"</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_mode_title" msgid="2164073796253284289">"కాలింగ్ ప్రాధాన్యత"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi కాలింగ్ మోడ్"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fiకి ప్రాధాన్యత"</item>
+    <item msgid="5267397515594230396">"సెల్యులార్‌కి ప్రాధాన్యత"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Wi-Fi కాలింగ్ ఆన్‌లో ఉన్నప్పుడు, మీ ఫోన్ మీ ప్రాధాన్యత మరియు ఏ సిగ్నల్ సామర్థ్యం ఎక్కువగా ఉంది వంటి అంశాల ఆధారంగా Wi-Fi నెట్‌వర్క్‌లు లేదా మీ క్యారియర్ నెట్‌వర్క్ ద్వారా కాల్‌లు వెళ్లేలా చేస్తుంది. ఈ లక్షణాన్ని ఆన్ చేయడానికి ముందు, రుసుములు మరియు ఇతర వివరాల గురించి తెలుసుకోవడానికి మీ క్యారియర్‌ను సంప్రదించండి."</string>
     <string name="home_settings" msgid="212375129455718176">"హోమ్"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ప్రదర్శన"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ధ్వని"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"థీమ్"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"తేలికపాటి కాంతి"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"ముదురు రంగు"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"స్వయంచాలకం"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"ప్రాధాన్య SIM కార్డ్ నవీకరిం.?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"మీ పరికరంలో <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM మాత్రమే ఉంది. మీరు సెల్యులార్ డేటా, కాల్‌లు మరియు SMS సందేశాల కోసం ఈ SIMను ఉపయోగించాలనుకుంటున్నారా?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"సిమ్ పిన్ కోడ్ చెల్లదు మీరు తప్పనిసరిగా మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ క్యారియర్‌ను ఇప్పుడు సంప్రదించాలి."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"సిమ్ పిన్ కోడ్ చెల్లదు, మీరు మీ పరికరాన్ని అన్‌లాక్ చేయడానికి తప్పనిసరిగా మీ క్యారియర్‌ను సంప్రదించడానికి ముందు మీకు <xliff:g id="NUMBER">%d</xliff:g> ప్రయత్నం మిగిలి ఉంది."</item>
-    <item quantity="other" msgid="77103619544346451">"సిమ్ పిన్ కోడ్ చెల్లదు, మీకు <xliff:g id="NUMBER">%d</xliff:g> ప్రయత్నాలు మిగిలి ఉన్నాయి."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM PIN కోడ్ చెల్లదు, మీకు <xliff:g id="NUMBER_1">%d</xliff:g> ప్రయత్నాలు మిగిలి ఉన్నాయి.</item>
+      <item quantity="one">SIM PIN కోడ్ చెల్లదు, మీరు మీ పరికరాన్ని అన్‌లాక్ చేయడానికి తప్పనిసరిగా మీ క్యారియర్‌ను సంప్రదించడానికి ముందు మీకు <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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"అనువర్తనాలు (అనువర్తన డేటా &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_media_misc_usage" msgid="235452944021647124">"నానావిధమైనవి"</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="default" msgid="6915293408836853020">"SD కార్డు‌ను అన్‌మౌంట్ చేయి"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"మౌంట్ చేయి"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"తొలగించు"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"తొలగించు &amp; ఫార్మాట్ చేయి"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"తొలగించు &amp; అంతర్గత నిల్వగా ఫార్మాట్ చేయి"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB కంప్యూటర్ కనెక్షన్"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB కంప్యూటర్ కనెక్షన్"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"ఇలా కనెక్ట్ చేయండి"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"కెమెరా సాఫ్ట్‌వేర్‌ను ఉపయోగించి ఫోటోలను బదిలీ చేయడానికి మరియు MTPకి మద్దతివ్వని కంప్యూటర్‌ల్లో ఏవైనా ఫైల్‌లను బదిలీ చేయడానికి మిమ్మల్ని అనుమతిస్తుంది"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ఫైల్-బదిలీ సాధనాలను ఇన్‌స్టాల్ చేయి"</string>
+    <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_external_title" msgid="2723851748972673696">"తీసివేయదగిన నిల్వ"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ఖాళీ (మొత్తం <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> మౌంట్ చేయబడింది"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g>ని ఫార్మాట్ చేయలేకపోయింది"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"నిల్వ పేరు మార్చండి"</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="3677827796634199714"><b>"మీరు ఈ <xliff:g id="NAME_0">^1</xliff:g>ను తొలగించినప్పుడు, దీనిలో నిల్వ చేసిన అనువర్తనాలు పని చేయకుండా ఆగిపోతాయి మరియు దీనిలో నిల్వ చేసిన మీడియా ఫైల్‌లు దీన్ని తిరిగి చొప్పించే వరకు అందుబాటులో లేకుండాపోతాయి."</b>" \n\nఈ <xliff:g id="NAME_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_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_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="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g>ని ఫార్మాట్ చేస్తున్నప్పుడు మధ్యలో తీసివేయవద్దు."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"డేటాను కొత్త నిల్వకు తరలించండి"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"మీరు మీ ఫోటోలను, ఫైల్‌లను మరియు అనువర్తన డేటాను ఈ కొత్త <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="5035719146373359329"><b>"తరలించడానికి సుమారు <xliff:g id="TIME">^1</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="8641916179067596592">"తరలించే సమయంలో: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ని తరలించండి"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<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="4288580957960820740">"తరలించే సమయంలో <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="battery_status_title" msgid="9159414319574976203">"బ్యాటరీ స్థితి"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"బ్యాటరీ స్థాయి"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNలు"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేయి"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"దీని వలన వీటితో సహా అన్ని నెట్‌వర్క్ సెట్టింగ్‌లు రీసెట్ చేయబడతాయి:\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="4874737348054213767">"అన్ని నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేయాలా? మీరు ఈ చర్యను తిరిగి రద్దు చేయలేరు!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"సెట్టింగ్‌లను రీసెట్ చేయి"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"రీసెట్ చేయాలా?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"నెట్‌వర్క్ సెట్టింగ్‌లు రీసెట్ చేయబడ్డాయి"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"పరికరాన్ని రీసెట్ చేయి"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ఫ్యాక్టరీ డేటా రీసెట్ చేయి"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"టాబ్లెట్‌లో మొత్తం డేటాను ఎరేజ్ చేస్తుంది"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"ఫోన్‌లో మొత్తం డేటాను ఎరేజ్ చేస్తుంది"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ఇందువలన మీ టాబ్లెట్ యొక్క "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా, మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన అనువర్తనాలు"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ఇందువలన మీ ఫోన్ "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD కార్డు‌లో సంగీతం లేదా ఫోటోల వంటి మొత్తం డేటాను ఎరేజ్ చేయి"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"టాబ్లెట్‌ను రీసెట్ చేయి"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ఫోన్‌ను రీసెట్ చేయి"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"మీ మొత్తం వ్యక్తిగత సమాచారాన్ని మరియు అన్ని డౌన్‌లోడ్ చేయబడిన అనువర్తనాలను ఎరేజ్ చేయాలా? మీరు ఈ చర్యను రద్దు చేయలేరు!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"మీ వ్యక్తిగత సమాచారం మరియు డౌన్‌లోడ్ చేసిన అనువర్తనాలు అన్నింటినీ తొలగించాలా? మీరు ఈ చర్యను తిరిగి రద్దు చేయలేరు!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ప్రతిదాన్ని ఎరేజ్ చేయి"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"మీరు ఫ్యాక్టరీ డేటా రీసెట్‌ను నిర్ధారించడానికి మీ అన్‌లాక్ నమూనాను గీయాల్సి ఉంటుంది."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"సిస్టమ్ క్లియర్ సేవ అందుబాటులో లేనందున రీసెట్ చేయడం అమలు కాలేదు."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"రీసెట్ చేయాలా?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ఈ వినియోగదారుకి ఫ్యాక్టరీ రీసెట్ అందుబాటులో లేదు"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB నిల్వలో నిల్వ చేసిన అన్ని ఫైల్‌లను తొలగిస్తూ, దాన్ని ఎరేజ్ చేయాలా? మీరు ఈ చర్యను రద్దు చేయలేరు!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD కార్డు‌లో నిల్వ చేసిన అన్ని ఫైల్‌లను తొలగిస్తూ దాన్ని ఎరేజ్ చేయాలా? మీరు ఈ చర్యను రద్దు చేయలేరు!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ప్రతిదీ ఎరేజ్ చేయి"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"మీరు USB నిల్వను ఎరేజ్ చేయాలనుకుంటున్నారని నిర్ధారించడానికి మీరు మీ అన్‌లాక్ నమూనాను గీయాల్సి ఉంటుంది."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"మీరు SD కార్డును ఎరేజ్ చేయాలనుకుంటున్నట్లు నిర్ధారించడానికి మీ అన్‌లాక్ నమూనాను గీయాల్సి ఉంటుంది."</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"సహాయం"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"సెల్యులార్ నెట్‌వర్క్‌లు"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"మొబైల్ ప్లాన్"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"డిఫాల్ట్ 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>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"స్థానం మోడ్"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"స్థానాన్ని గుర్తించడానికి GPS, Wi‑Fi, మరియు సెల్యులార్ నెట్‌వర్క్‌లను ఉపయోగించండి"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"స్థానాన్ని గుర్తించడానికి Wi‑Fi మరియు సెల్యులార్ నెట్‌వర్క్‌లను ఉపయోగించండి"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"మీ స్థానాన్ని గుర్తించడానికి GPSని ఉపయోగించండి"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"స్థానాన్ని గుర్తించడానికి GPSని ఉపయోగించండి"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"స్కానింగ్"</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="2070686681074461301">"Wi‑Fi ఆఫ్‌లో ఉన్నప్పటికీ Wi‑Fi నెట్‌వర్క్‌ల కోసం స్కాన్ చేయడానికి అనువర్తనాలు మరియు సేవలను అనుమతించడం ద్వారా స్థానాన్ని మెరుగుపరుస్తుంది"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"బ్లూటూత్ స్కానింగ్"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"బ్లూటూత్ ఆఫ్‌లో ఉన్నప్పటికీ బ్లూటూత్ పరికరాల కోసం స్కాన్ చేయడానికి సిస్టమ్ సేవలను అనుమతించడం ద్వారా స్థానాన్ని మెరుగుపరుస్తుంది"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; సెల్యులార్ నెట్‌వర్క్ స్థానం"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"మీ స్థానాన్ని వేగవంతంగా అంచనా వేయడం కోసం Google స్థాన సేవను ఉపయోగించడానికి అనువర్తనాలను అనుమతించండి. అనామక స్థాన డేటా సేకరించబడుతుంది మరియు Googleకు పంపబడుతుంది."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"స్థానం Wi‑Fi ద్వారా గుర్తించబడింది"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"స్క్రీన్ భద్రత"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"కొనసాగడానికి మీ పరికరం నమూనాను ఉపయోగించండి."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"కొనసాగడానికి మీ పరికరం PINను నమోదు చేయండి."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"కొనసాగడానికి మీ పరికరం పాస్‌వర్డ్‌ను నమోదు చేయండి."</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN తప్పు"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"పాస్‌వర్డ్ తప్పు"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"నమూనా తప్పు"</string>
+    <string name="lock_settings_title" msgid="4213839087748988686">"పరికర భద్రత"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"అన్‌లాక్ నమూనాను మార్చు"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"అన్‌లాక్ పిన్‌ను మార్చండి"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"సేవ్ చేసిన నమూనాను నిర్ధారించండి"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"మళ్లీ ప్రయత్నించండి:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"చాలా ఎక్కువ చెల్లని ప్రయత్నాలు చేసారు!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> సెకన్లలో మళ్లీ ప్రయత్నించండి."</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="manageapplications_settings_title" msgid="7041951105633616745">"అనువర్తనాలను నిర్వహించు"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలను నిర్వహించు మరియు తీసివేయి"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"నిల్వ వినియోగం"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"అనువర్తనాల ద్వారా ఉపయోగించబడిన నిల్వను వీక్షించండి"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"అమలులో ఉన్న సేవలు"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"టాబ్లెట్ సమాచారం"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ఫోన్ సమాచారం"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"బ్యాటరీ సమాచారం"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"శీఘ్ర ప్రారంభం"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"అనువర్తనాలను ప్రారంభించడానికి కీబోర్డ్ సత్వరమార్గాలను సెట్ చేయండి"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"అనువర్తనాన్ని కేటాయించండి"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"సత్వరమార్గం లేదు"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"శోధన + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"క్లియర్ చేయండి"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) కోసం మీ సత్వరమార్గం క్లియర్ చేయబడుతుంది."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"సరే"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"రద్దు చేయి"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"అనువర్తనాలు"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"సత్వరమార్గాలు"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ఫైల్‌లో అన్ని బ్లూటూత్ HCI ప్యాకెట్‌లను క్యాప్చర్ చేయి"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM అన్‌లాకింగ్"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"బూట్‌లోడర్ అన్‌లాక్ కావడానికి అనుమతించు"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"మీ PINను నమోదు చేయండి"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM అన్‌లాక్‌ను ప్రారంభించడానికి మీ పరికరం PINను నమోదు చేయండి"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM అన్‌లాకింగ్‌ను అనుమతించాలా?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"హెచ్చరిక: ఈ సెట్టింగ్ ఆన్ చేయబడినప్పుడు పరికరం రక్షణ లక్షణాలు ఈ పరికరంలో పని చేయవు."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"లాగర్ బఫర్ పరిమాణాలు"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"లాగ్ బఫర్‌కి లాగర్ పరిమా. ఎంచుకోండి"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"అనుకృత స్థానాలను అనుమతించు"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"అనుకృత స్థానాలను అనుమతించు"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"వీక్షణ లక్షణ పర్యవేక్షణను ప్రారంభించు"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"నెట్‌వర్కింగ్"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"వైర్‌లెస్ ప్రదర్శన ప్రమాణీకరణ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi విశదీకృత లాగింగ్‌ను ప్రారంభించండి"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi నుండి సెల్యులార్‌కి తీవ్ర ఒత్తిడితో మారడం"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi సంచార స్కాన్‌లను ఎల్లప్పుడూ అనుమతించు"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"లెగసీ DHCP క్లయింట్‌ను ఉపయోగించు"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"వైర్‌లెస్ ప్రదర్శన ప్రమాణపత్రం కోసం ఎంపికలను చూపు"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi ఎంపికలో SSID RSSI ప్రకారం చూపబడే Wi‑Fi లాగింగ్ స్థాయిని పెంచండి"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ప్రారంభించబడినప్పుడు, Wi‑Fi సిగ్నల్ బలహీనంగా ఉంటే డేటా కనెక్షన్‌ను సెల్యులార్‌కి మార్చేలా Wi‑Fiపై మరింత తీవ్ర ఒత్తిడి కలుగుతుంది"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"ఇంటర్‌ఫేస్‌లో ఉండే డేటా ట్రాఫిక్ పరిమాణం ఆధారంగా Wi‑Fi సంచార స్కాన్‌లను అనుమతించు/నిరాకరించు"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"లాగర్ బఫర్ పరిమాణాలు"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"లాగ్ బఫర్‌కి లాగర్ పరిమా. ఎంచుకోండి"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB కాన్ఫిగరేషన్‌ని ఎంచుకోండి"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB కాన్ఫిగరేషన్‌ని ఎంచుకోండి"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"అనుకృత స్థానాలను అనుమతించు"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"అనుకృత స్థానాలను అనుమతించు"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"వీక్షణ లక్షణ పర్యవేక్షణను ప్రారంభించు"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"కొత్త Android DHCP క్లయింట్‌కి బదులుగా Lollipop నుండి DHCP క్లయింట్‌ను ఉపయోగించండి."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB డీబగ్గింగ్‌ను అనుమతించాలా?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB డీబగ్గింగ్ అనేది అభివృద్ధి ప్రయోజనాల కోసం మాత్రమే ఉద్దేశించబడింది. మీ కంప్యూటర్ మరియు మీ పరికరం మధ్య డేటాను కాపీ చేయడానికి, నోటిఫికేషన్ లేకుండా మీ పరికరంలో అనువర్తనాలను ఇన్‌స్టాల్ చేయడానికి మరియు లాగ్ డేటాను చదవడానికి దీన్ని ఉపయోగించండి."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"మీరు గతంలో ప్రామాణీకరించిన అన్ని కంప్యూటర్‌ల నుండి USB డీబగ్గింగ్‌కు ప్రాప్యతను ఉపసంహరించాలా?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"మెజెంటా"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఉపయోగించాలా?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ఇవి చేయాల్సి ఉంటుంది:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"అనుమతి అభ్యర్థనకు ఒక అనువర్తనం అడ్డు తగులుతున్నందున సెట్టింగ్‌లు మీ ప్రతిస్పందనను ధృవీకరించలేకపోయాయి."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"మీరు <xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్ చేస్తే, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"మీరు ప్రాప్యత సేవను ఆన్ చేసినందున, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా గుప్తీకరణ ప్రభావితమవుతుంది, కనుక మీరు మీ నమూనాను నిర్ధారించడం అవసరం."</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TIME">%2$s</xliff:g>లో <xliff:g id="TYPE">%1$s</xliff:g> అనువర్తనాలు"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<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_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_memory_status" msgid="4251599550196193093">"పరికర మెమరీ ప్రస్తుతం <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"సగటు RAM వినియోగం"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"గరిష్ట RAM వినియోగం"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"ప్రాసెస్‌లు"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"సేవలు"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"వ్యవధి"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"మెమరీ వివరాలు"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"సిస్టమ్ దాచు"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"దిగువ డిఫాల్ట్ సెట్టింగ్‌లు అనువర్తన సెట్టింగ్‌లను భర్తీ చేస్తాయి"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"డిఫాల్ట్ సెట్టింగ్‌లు"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"డిఫాల్ట్ ఇంజిన్"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"చదివి వినిపించే వచనం కోసం ఉపయోగించాల్సిన ప్రసంగ సమన్వయ ఇంజిన్‌ను సెట్ చేస్తుంది"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"ప్రసంగ రూప వచనం కోసం ఉపయోగించడానికి ప్రసంగ సమన్వయ ఇంజిన్‌ను సెట్ చేయండి"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"ప్రసంగం రేట్"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"వచనాన్ని చదివి వినిపించాల్సిన వేగం"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"పిచ్"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"మీరు ఆధారాల ఇన్‌స్టాలేషన్‌ను నిర్ధారించడానికి మీ అన్‌లాక్ నమూనాను గీయాల్సి ఉంటుంది."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ఆధారాల నిల్వ కోసం పాస్‌వర్డ్‌ను టైప్ చేయండి."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"ప్రస్తుత పాస్‌వర్డ్:"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"ప్రస్తుతం ఏ ఖాతా బ్యాకప్ చేయబడిన డేటాను నిల్వ చేయడం లేదు"</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="5355557151569037197">"బ్యాకప్ సేవ నిష్క్రియంగా ఉంది."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"ఇది మీ పరికరం విధానం ద్వారా సెట్ చేయబడింది."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"డెస్క్‌టాప్ బ్యాకప్ పాస్‌వర్డ్"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"డెస్క్‌టాప్ పూర్తి బ్యాకప్‌లు ప్రస్తుతం రక్షించబడలేదు"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"డెస్క్‌టాప్ పూర్తి బ్యాకప్‌ల కోసం పాస్‌వర్డ్‌ను మార్చడానికి లేదా తీసివేయడానికి తాకండి"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"పరివర్తన యానిమేషన్ ప్రమాణం"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"యానిమేటర్ వ్యవధి ప్రమాణం"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"ప్రత్యామ్నాయ ప్రదర్శనలను అనుకరించండి"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"బహుళ-విండో మోడ్"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"ఒకే సమయంలో స్క్రీన్‌లో బహుళ కార్యాచరణలు."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"బహుళ-విండో మోడ్‌ను ప్రారంభించాలా?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"హెచ్చరిక: ఇది ఇటీవలి అనువర్తనాల UI ద్వారా ఒకే సమయంలో స్క్రీన్‌లో బహుళ కార్యాచరణలను అనుమతించే అత్యంత ప్రయోగాత్మక లక్షణం. ఈ లక్షణంతో ఉపయోగించినప్పుడు కొన్ని అనువర్తనాలు క్రాష్ కావచ్చు లేదా సరిగ్గా పని చేయకపోవచ్చు."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"అనువర్తనాలు"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"కార్యాచరణలను ఉంచవద్దు"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ప్రతి కార్యాచరణను వినియోగదారు నిష్క్రమించిన వెంటనే తొలగించండి"</string>
@@ -2195,7 +2251,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="718192651887726259">"మీరు అదనపు వినియోగదారులను సృష్టించడం ద్వారా ఈ పరికరాన్ని ఇతర వ్యక్తులతో భాగస్వామ్యం చేయగలరు. ప్రతి వినియోగదారుకు వారికంటూ స్వంత స్థలం ఉంటుంది, కనుక వారు వారి స్వంత అనువర్తనాలు, వాల్‌పేపర్ మొదలైనవాటిని అనుకూలీకరించగలరు. వినియోగదారులు ప్రతి ఒక్కరినీ ప్రభావితం చేసే 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"ఫోన్ కాల్‌లను అనుమతించండి"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"ఫోన్ కాల్‌లు, 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="440218975766968124">"ఫోన్ కాల్‌లను అనుమతించాలా?"</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_sms_confirm_title" msgid="188164598768941316">"ఫోన్ కాల్‌లను మరియు SMSను అనుమతించాలా?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"కాల్ మరియు 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="application_restrictions" msgid="8207332020898004394">"అనువర్తనాలు మరియు కంటెంట్‌ను అనుమతించండి"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"పరిమితులు గల అనువర్తనాలు"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"అనువర్తన సెట్టిం. విస్తరింపజేయి"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"పరిమితం చేయబడిన ప్రొఫైల్‌ల్లో ఈ అనువర్తనానికి మద్దతు లేదు"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"వైఫై వై-ఫై నెట్‌వర్క్ కనెక్షన్"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"వచన సందేశం వచనం పంపడం సందేశాలు సందేశం పంపడం"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"సెల్యులార్ సెల్ క్యారియర్ వైర్‌లెస్ డేటా 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi కాల్ కాలింగ్"</string>
     <string name="keywords_home" msgid="3626170808219458848">"లాంచర్"</string>
     <string name="keywords_display" msgid="6709007669501628320">"స్క్రీన్‌లో టచ్‌స్క్రీన్ భాగం"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"కాంతివిహీన స్క్రీన్ టచ్‌స్క్రీన్ బ్యాటరీ"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"కాంతివిహీన స్క్రీన్ టచ్‌స్క్రీన్ బ్యాటరీ"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"నేపథ్యం వ్యక్తిగతీకరించు అనుకూలీకరించు ప్రదర్శించు"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ముదురు రంగు థీమ్ రాత్రి మోడ్ కాంతిహీన స్క్రీన్ విలోమ ప్రకాశం"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"నేపథ్యం వ్యక్తిగతీకరించు అనుకూలీకరించు డిస్‌ప్లే"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"వచన పరిమాణం"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ప్రాజెక్ట్"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"ప్రదర్శన ప్రసారం"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"స్థలం డిస్క్ హార్డ్ డిస్క్ పరికరం వినియోగం"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"పవర్ వినియోగం ఛార్జ్"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"అక్షరక్రమం నిఘంటువు అక్షరక్రమ తనిఖీ స్వీయ-దిద్దుబాటు"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"ఖాతా"</string>
     <string name="keywords_users" msgid="4673901601478559100">"పరిమితి పరిమితం చేయి పరిమితం చేయబడింది"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"వచన దిద్దుబాటు దిద్దుబాటు చేయి ధ్వని వైబ్రేట్ స్వయంచాలకం భాష సంజ్ఞ సూచించు సూచన థీమ్ అభ్యంతరకరమైన పదం రకం ఎమోజీ అంతర్జాతీయం"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"రీసెట్ ప్రాధాన్యతలు డిఫాల్ట్"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"అత్యవసర ice అనువర్తనం డిఫాల్ట్"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"అనువర్తనాలు డౌన్‌లోడ్ అనువర్తనాలు సిస్టమ్"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"అనువర్తనాల అనుమతుల భద్రత"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"డిఫాల్ట్‌గా ఉన్న అనువర్తనాలు"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"స్లయిడ్ చేయడం పాస్‌వర్డ్ నమూనా పిన్"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ట్యాగ్‌ను సెటప్ చేయండి"</string>
     <string name="write_tag" msgid="8571858602896222537">"వ్రాయి"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"అంతరాయాలు"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"కాల్‌లు మరియు నోటిఫికేషన్‌లు వచ్చినప్పుడు"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"ఎల్లప్పుడూ అంతరాయం కలిగించు"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ప్రాధాన్య అంతరాయాలను మాత్రమే అనుమతించు"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"అంతరాయం కలిగించవద్దు"</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_option_important_interruptions" msgid="3903928008177972500">"ప్రాధాన్యత మాత్రమే"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"అలారాలు మాత్రమే"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"అంతరాయాలు ఉండకూడదు"</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="ringtone_title" msgid="5379026328015343686">"ఫోన్ రింగ్‌టోన్"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"డిఫాల్ట్ నోటిఫికేషన్ రింగ్‌టోన్"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"కాల్‌ల కోసం వైబ్రేట్ కూడా చేయి"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"వైబ్రేట్"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"నోటిఫికేషన్ ప్రాప్యత"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"అనువర్తనాలు నోటిఫికేషన్‌లను చదవలేవు"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d అనువర్తనం నోటిఫికేషన్‌లను చదవగలదు"</item>
-    <item quantity="other" msgid="980049191810249052">"%d అనువర్తనాలు నోటిఫికేషన్‌లను చదవగలవు"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d అనువర్తనాలు నోటిఫికేషన్‌లను చదవగలవు</item>
+      <item quantity="one">%d అనువర్తనం నోటిఫికేషన్‌లను చదవగలదు</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"నోటిఫికేషన్ శ్రోతలు ఇన్‌స్టాల్ చేయబడలేదు."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g>ను ప్రారంభించాలా?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"సిస్టమ్ లేదా ఏదైనా ఇన్‌స్టాల్ చేయబడిన అనువర్తనం ద్వారా పోస్ట్ చేయబడిన అన్ని నోటిఫికేషన్‌లను అనగా పరిచయ పేర్లు మరియు మీకు పంపబడిన సందేశాల్లోని వచనం వంటి వ్యక్తిగత సమాచారాన్ని కలిగి ఉండే వాటన్నింటినీ <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> చదవగలుగుతుంది. అలాగే ఇది ఈ నోటిఫికేషన్‌లను తీసివేయగలుగుతుంది లేదా వాటిలోని చర్య బటన్‌లను తాకగలుగుతుంది."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"షరతు ప్రదాతలు"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"అనువర్తనాలు ఏవీ షరతులను అందించవు"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d అనువర్తనం షరతులను అందిస్తుంది"</item>
-    <item quantity="other" msgid="358057362115673258">"%d అనువర్తనాలు షరతులను అందిస్తాయి"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"షరతు ప్రదాతలు ఇన్‌స్టాల్ చేయబడలేదు."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g>ను ప్రారంభించాలా?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> అంతరాయం కలిగించవద్దు మోడ్‌కు నిష్క్రమణ షరతులను జోడించగలుగుతుంది."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"అనువర్తనాలను లోడ్ చేస్తోంది..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"బ్లాక్ చేయి"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"అన్నింటినీ బ్లాక్ చేయండి"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ఈ అనువర్తనం నుండి నోటిఫికేషన్‌లను ఎప్పుడూ చూపవద్దు"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"ప్రాధాన్యత"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"నోటిఫికేషన్‌లను జాబితా ఎగువ చూపు మరియు పరికరాన్ని ప్రాధాన్య అంతరాయాలకు మాత్రమే అనే ఎంపికకి సెట్ చేసినప్పుడు వాటిని స్వీకరించు"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"ముఖ్యం"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"పరికరాన్ని లాక్ చేసినప్పుడు, ఏదైనా ముఖ్యమైన కంటెంట్‌ని ఈ అనువర్తన నోటిఫికేషన్‌ల నుండి దాచు"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"ప్రాధాన్యంగా పరిగణించండి"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"అంతరాయం కలిగించవద్దుని ప్రాధాన్యం మాత్రమేకి సెట్ చేసినప్పుడు ఈ అనువర్తన నోటిఫికేషన్‌ల కోసం శబ్దం వినిపించేలా చేస్తుంది"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"నోటిఫికేషన్ కనిపించడాన్ని అనుమతించండి"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"నిర్దిష్ట నోటిఫికేషన్‌లను ప్రస్తుత స్క్రీన్‌‌లోని వీక్షణకి సంక్షేపంగా స్లైడ్ చేయడం ద్వారా వాటిని ప్రాధాన్యంగా చూపడానికి ఈ అనువర్తనాన్ని అనుమతిస్తుంది"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"అతి ముఖ్యమైన కంటెంట్‌ను దాచండి"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"పరికరం లాక్ చేయబడినప్పుడు, ఈ అనువర్తన నోటిఫికేషన్‌ల్లో ప్రైవేట్ సమాచారాన్ని బహిర్గతం చేసే కంటెంట్‌ను దాస్తుంది"</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="zen_mode_default_option" msgid="6940069025071935243">"మీరు దీన్ని ఆఫ్ చేసేవరకు"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"ప్రాధాన్య అంతరాయాలు"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"వృథా సమయం"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"రోజులు"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ఏదీ లేదు"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"అంతరాయాలు అనుమతించబడ్డాయి"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ప్రాధాన్యత మాత్రమే"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ఏదీ వద్దు"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"స్వయంచాలితం"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"స్వయంచాలకంగా ఆన్ చేయి"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"నిబంధన పేరు"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"నిబంధనను జోడించు"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"నిబంధనను తొలగించు"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<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="3201273040477861538">"షెడ్యూల్ నిబంధన"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"నిబంధన కనుగొనబడలేదు."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ఎప్పటికీ వద్దు"</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_from" msgid="1033337300289871697">"వీరి నుండి కాల్‌లు/సందేశాలు"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ఎవరైనా"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"పరిచయాలు మాత్రమే"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"నక్షత్రం ఉన్న పరిచయాలు మాత్రమే"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"ఈవెంట్‌లు మరియు రిమైండర్‌లు"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"అలారాలు ఎల్లప్పుడూ ప్రాధాన్య అంతరాయాలుగా పరిగణించబడతాయి"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"అలారాలు"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"రిమైండర్‌లు"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ఈవెంట్‌లు"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ఎంచుకున్న కాలర్‌లు"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"పునరావృత కాలర్‌లను అనుమతించు"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ఒకే వ్యక్తి <xliff:g id="MINUTES">%d</xliff:g> నిమిషం వ్యవధిలో రెండవసారి కాల్ చేస్తే, దాన్ని అనుమతిస్తుంది"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"స్వయంచాలకంగా ఆన్ చేయి"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ఎప్పటికీ వద్దు"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> తదుపరి రోజు"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> లేదా ఏదైనా మునుపు అలారం"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"అంతరాయాలు"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"కాల్‌లు మరియు నోటిఫికేషన్‌లు వచ్చినప్పుడు"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"మీకు ఎప్పుడు అంతరాయం కలిగించాలని కోరుకుంటున్నారు?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"ఎంతసేపు?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"ఎల్లప్పుడూ అంతరాయం కలిగించు"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ఆఫ్ చేయి,అన్ని,ప్రతిదీ"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"ప్రాధాన్య అంతరాయాలను మాత్రమే అనుమతించు"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"అలారాలు మాత్రమే అనుమతించు"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"అంతరాయం కలిగించవద్దు"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"నిరవధికంగా"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> నిమిషాలు</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> నిమిషం</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"నిరవధికంగా ప్రాధాన్య నోటిఫికేషన్‌లు మాత్రమే ఎంపికకు మార్చుతుంది"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_0">%2$s</xliff:g> వరకు ప్రాధాన్య నోటిఫికేషన్‌లు మాత్రమే ఎంపికకు మారుతుంది</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g> వరకు ప్రాధాన్య నోటిఫికేషన్‌లు మాత్రమే ఎంపికకు మారుతుంది</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"నిరవధికంగా అలారాలు మాత్రమే ఎంపికకు మార్చుతుంది"</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>
+      <item quantity="one">ఒక నిమిషం పాటు అనగా <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"><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_0">%2$s</xliff:g> వరకు అలారాలు మాత్రమే ఎంపికకు మారుతుంది</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"నిరవధికంగా అంతరాయం కలిగించవద్దు ఎంపికకు మార్చుతుంది"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g> వరకు అంతరాయం కలిగించవద్దు ఎంపికకు మారుతుంది</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_0">%2$s</xliff:g> వరకు అంతరాయం కలిగించవద్దు ఎంపికకు మారుతుంది</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ఎల్లప్పుడూ అంతరాయం కలిగించు ఎంపికకు మార్చుతుంది"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ఎప్పటికీ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"అనువర్తన నోటిఫికేషన్‌లు"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"నోటిఫికేషన్ సెట్టింగ్‌లు"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ఈ పరికరం గురించి అభిప్రాయం పంపండి"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"డిఫాల్ట్‌గా ప్రారంభించండి"</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="app_launch_domain_links_title" msgid="458956710410857777">"డొమైన్ లింక్‌లు"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"డొమైన్ URLలను తెరవగలిగేవి"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"డొమైన్ URLలను నేరుగా తెరవడానికి అనువర్తనాన్ని అనుమతిస్తుంది"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"మద్దతు ఉన్న డొమైన్‌ల URLలు"</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="410824961149037234">"అంతర్గత మెమరీ"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"బాహ్య మెమరీ"</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="notifications_enabled" msgid="6983396130566021385">"ఆన్‌లో ఉన్నాయి"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"బ్లాక్ చేయబడి ఉన్నాయి"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"ముఖ్యం"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"ప్రాధాన్యత"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"ప్రాధాన్యత &amp; ముఖ్యం"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> అనుమతులు మంజూరయ్యాయి</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> అనుమతి మంజూరైంది</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g>లో <xliff:g id="COUNT_2">%d</xliff:g> అనుమతులు మంజూరు చేయబడ్డాయి</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>లో <xliff:g id="COUNT_0">%d</xliff:g> అనుమతి మంజూరు చేయబడింది</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"కొన్ని డిఫాల్ట్‌లు సెట్ చేయబడ్డాయి"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"డిఫాల్ట్‌లు ఏవీ సెట్ చేయబడలేదు"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"అన్ని అనువర్తనాలు"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"ప్రారంభించబడినవి"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"వ్యక్తిగతం"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"కార్యాలయం"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"బ్లాక్ చేయబడినవి"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ప్రాధాన్యత"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"ముఖ్యం"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"డొమైన్ URLలు కలిగి ఉన్నవి"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"నిర్వాహకుని ద్వారా నిలిపివేయబడింది"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"అధునాతనం"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"తెలియని అనువర్తనం"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ప్రొఫైల్‌ను ఎంచుకోండి"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"అనువర్తన అనుమతులు"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>లో <xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనాలకు అదన. ప్రాప్యత అనుమతించబడింది"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>లో <xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనాలు అనుమతించబడ్డాయి"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"డొమైన్ URLలు"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"ఏ డొమైన్ URLను తెరవదు"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' తెరవగలిగేవి"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' మరియు సంబంధిత URLలను తెరవగలిగేవి"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> అనువర్తనాలు వాటి డొమైన్ URLలను తెరవగలవు</item>
+      <item quantity="one">ఒక అనువర్తనం దాని డొమైన్ URLలను తెరవగలదు</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"గుర్తించలేదు"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"డిఫాల్ట్ అనువర్తనాలు"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"బ్రౌజర్ అనువర్తనం"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"డిఫాల్ట్ బ్రౌజర్ లేదు"</string>
+    <string name="default_app" msgid="6864503001385843060">"(డిఫాల్ట్)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"అనువర్తనాల నిల్వ"</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 48af783..a434181 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ปุ่มกด"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"ปิด/เปิดเสียงไมโครโฟน"</item>
     <item msgid="1148142988678569310">"สื่อของโครงการ"</item>
     <item msgid="9130014005474445273">"เปิดใช้งาน VPN"</item>
+    <item msgid="1165192162975045562">"เขียนวอลเปเปอร์"</item>
+    <item msgid="7129487923652967258">"สนับสนุนโครงสร้าง"</item>
+    <item msgid="1069023208100114540">"สนับสนุนภาพหน้าจอ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ตำแหน่ง"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"ปิด/เปิดเสียงไมโครโฟน"</item>
     <item msgid="5906017727368097853">"สื่อของโครงการ"</item>
     <item msgid="2486614710846178542">"เปิดใช้งาน VPN"</item>
+    <item msgid="5586547561693629602">"เขียนวอลเปเปอร์"</item>
+    <item msgid="32794179825485062">"สนับสนุนโครงสร้าง"</item>
+    <item msgid="7872852746938272552">"สนับสนุนภาพหน้าจอ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"สั้น"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"ต่ำ"</item>
     <item msgid="4212263919458209842">"วิกฤต"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ปิด"</item>
-    <item msgid="5656544177755411222">"การรบกวนที่จำกัด"</item>
-    <item msgid="8735337502532332056">"การรบกวนเป็นศูนย์"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ปกติ"</item>
     <item msgid="866544120205026771">"ปานกลาง"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"ชมพู"</item>
     <item msgid="6131821495505931173">"แดง"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (โปรโตคอลการโอนสื่อ)"</item>
+    <item msgid="8856820259201251036">"PTP (โปรโตคอลการโอนรูปภาพ)"</item>
+    <item msgid="216135047298423770">"RNDIS (อีเทอร์เน็ต USB)"</item>
+    <item msgid="2686051673589572111">"แหล่งที่มาของเสียง"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 5fb0116..4f7636b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"อนุญาต"</string>
     <string name="deny" msgid="6947806159746484865">"ปฏิเสธ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ไม่ทราบ"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"คุณเหลืออีกเพียง <xliff:g id="STEP_COUNT">%1$d</xliff:g> ขั้นตอนเพื่อเป็นนักพัฒนาซอฟต์แวร์"</item>
-    <item quantity="other" msgid="6722953419953594148">"คุณเหลืออีกเพียง <xliff:g id="STEP_COUNT">%1$d</xliff:g> ขั้นตอนเพื่อเป็นนักพัฒนาซอฟต์แวร์"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">คุณกำลังจะได้เป็นนักพัฒนาซอฟต์แวร์ในอีก <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ขั้นตอน</item>
+      <item quantity="one">คุณกำลังจะได้เป็นนักพัฒนาซอฟต์แวร์ในอีก <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ขั้นตอน</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ตอนนี้คุณเป็นนักพัฒนาซอฟต์แวร์แล้ว!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ไม่จำเป็น คุณเป็นนักพัฒนาซอฟต์แวร์อยู่แล้ว"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ระบบไร้สายและเครือข่าย"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"ปิดการรับส่ง SMS ผ่าน IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"จำเป็นต้องเปิดการลงทะเบียน IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"จำเป็นต้องปิดการลงทะเบียน IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"เปิดการตั้งค่าสถานะที่จัดสรรแล้วของ VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"ปิดการตั้งค่าสถานะที่จัดสรรแล้วของ VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"เปิดการดัมพ์หน่วยความจำระบบของ LTE"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"ปิดการดัมพ์หน่วยความจำระบบของ LTE"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"ดูสมุดที่อยู่ของซิม"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"เชื่อมต่อแล้ว"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"เชื่อมต่อแล้ว (ยกเว้นเสียงโทรศัพท์)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"เชื่อมต่อแล้ว (ยกเว้นเสียงสื่อ)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"เชื่อมต่อแล้ว (ไม่มีการเข้าถึงข้อความ)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"เชื่อมต่อ (ยกเว้นเสียงโทรศัพท์หรือสื่อ)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ตัดการเชื่อมต่อ"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"กำลังตัดการเชื่อมต่อ..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"กำลังเชื่อมต่อ…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"กำลังกำหนดค่าอุปกรณ์ให้ตรงกัน..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"อุปกรณ์บลูทูธที่ไม่มีชื่อ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"กำลังค้นหา"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ไม่พบอุปกรณ์บลูทูธในบริเวณใกล้เคียง"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"แสดงไฟล์ที่ได้รับ"</string>
     <string name="device_picker" msgid="4978696506172252813">"เลือกอุปกรณ์บลูทูธ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"คำขออนุญาตใช้บลูทูธ"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"แอปพลิเคชันต้องการเปิดบลูทูธ"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"แอปต้องการเปิดบลูทูธสำหรับอุปกรณ์นี้"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นแท็บเล็ตของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"ยกเลิก"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ต่อไป"</string>
     <string name="okay" msgid="1997666393121016642">"ตกลง"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ใช่"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"ไม่"</string>
-    <string name="forget" msgid="7267115980248732932">"ไม่จำ"</string>
+    <string name="forget" msgid="1400428660472591263">"ไม่จำ"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"ปรับปรุงการจับคู่ใบหน้า"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"การตรวจสอบความมีชีวิตชีวา"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"ต้องกะพริบตาในขณะที่ปลดล็อก"</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_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>
@@ -348,34 +336,57 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"รหัสผ่าน"</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="2876073029767953111">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปที่ดาวน์โหลดและข้อมูลของแอปนั้น สื่อ และไฟล์อื่นๆ หลังจากที่คุณเข้ารหัสแท็บเล็ตแล้ว ในกรณีที่คุณตั้งค่าล็อกหน้าจอไว้ (ที่เป็นรูปแบบ, PIN ตัวเลข หรือรหัสผ่าน) คุณจะต้องปลดล็อกหน้าจอเพื่อถอดรหัสแท็บเล็ตทุกครั้งที่เปิดเครื่อง วิธีการถอดรหัสอีกวิธีหนึ่งคือการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมด\n\nการเข้ารหัสจะใช้เวลาอย่างน้อย 1 ชั่วโมง คุณต้องดำเนินการเมื่อแท็บเล็ตมีแบตเตอรี่ที่ชาร์จแล้วและเสียบปลั๊กไว้ตลอดขั้นตอนนี้ หากคุณขัดจังหวะการทำงาน ข้อมูลบางส่วนหรือทั้งหมดจะหายไป"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปที่ดาวน์โหลดและข้อมูลของแอปนั้น สื่อ และไฟล์อื่นๆ หลังจากที่คุณเข้ารหัสโทรศัพท์แล้ว ในกรณีที่คุณตั้งค่าล็อกหน้าจอไว้ (ที่เป็นรูปแบบ, PIN ตัวเลข หรือรหัสผ่าน) คุณจะต้องปลดล็อกหน้าจอเพื่อถอดรหัสโทรศัพท์ทุกครั้งที่เปิดเครื่อง วิธีการถอดรหัสอีกวิธีหนึ่งคือการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมด\n\nการเข้ารหัสจะใช้เวลาอย่างน้อย 1 ชั่วโมง คุณต้องดำเนินการเมื่อโทรศัพท์มีแบตเตอรี่ที่ชาร์จแล้วและเสียบปลั๊กไว้ตลอดขั้นตอนนี้ หากคุณขัดจังหวะการทำงาน ข้อมูลบางส่วนหรือทั้งหมดจะหายไป"</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="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="3453670509485083962">"เพิ่ม"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ล็อกหน้าจอ"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"การตั้งค่าลายนิ้วมือ"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"หากต้องการใช้ลายนิ้วมือเพื่อปลดล็อกหน้าจอหรือยืนยันการซื้อ เราจำเป็นต้อง: \n\n✓ ตั้งค่าวิธีการล็อกหน้าจอสำรอง \n\n✓ เพิ่มลายนิ้วมือของคุณ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ค้นหาเซ็นเซอร์"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ค้นหาเซ็นเซอร์ลายนิ้วมือที่ด้านหลังโทรศัพท์"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"มาเริ่มต้นกันเลย!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"วางนิ้วมือบนเซ็นเซอร์ลายนิ้วมือ แล้วยกขึ้นหลังจากที่คุณรู้สึกว่ามีการสั่น"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"เยี่ยม! ทำซ้ำเลย"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"วางนิ้วมือเดียวกันบนเซ็นเซอร์ลายนิ้วมือและยกขึ้นหลังจากที่คุณรู้สึกว่ามีการสั่น"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"เพิ่มลายนิ้วมือแล้ว!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"เมื่อใดก็ตามที่คุณเห็นไอคอนนี้ คุณสามารถใช้ลายนิ้วมือเพื่อระบุตัวตนหรือเพื่ออนุญาตการซื้อได้"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"เพิ่ม"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ถัดไป"</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="2876073029767953111">"คุณสามารถเข้ารหัสความปลอดภัยให้บัญชี การตั้งค่า แอปที่ดาวน์โหลดและข้อมูลของแอปนั้น สื่อ และไฟล์อื่นๆ หลังจากที่คุณเข้ารหัสความปลอดภัยให้แท็บเล็ตแล้ว ในกรณีที่คุณตั้งค่าล็อกหน้าจอไว้ (ที่เป็นรูปแบบ, PIN ตัวเลข หรือรหัสผ่าน) คุณจะต้องปลดล็อกหน้าจอเพื่อถอดรหัสแท็บเล็ตทุกครั้งที่เปิดเครื่อง วิธีการถอดรหัสอีกวิธีหนึ่งคือการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมด\n\nการเข้ารหัสความปลอดภัยจะใช้เวลาอย่างน้อย 1 ชั่วโมง คุณต้องดำเนินการเมื่อแท็บเล็ตมีแบตเตอรี่ที่ชาร์จแล้วและเสียบปลั๊กไว้ตลอดขั้นตอนนี้ หากคุณขัดจังหวะการทำงาน ข้อมูลบางส่วนหรือทั้งหมดจะหายไป"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"คุณสามารถเข้ารหัสความปลอดภัยให้บัญชี การตั้งค่า แอปที่ดาวน์โหลดและข้อมูลของแอปนั้น สื่อ และไฟล์อื่นๆ หลังจากที่คุณเข้ารหัสความปลอดภัยแล้ว ในกรณีที่คุณตั้งค่าล็อกหน้าจอไว้ (ที่เป็นรูปแบบ, PIN ตัวเลข หรือรหัสผ่าน) คุณจะต้องปลดล็อกหน้าจอเพื่อถอดรหัสโทรศัพท์ทุกครั้งที่เปิดเครื่อง วิธีการถอดรหัสอีกวิธีหนึ่งคือการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมด\n\nการเข้ารหัสความปลอดภัยจะใช้เวลาอย่างน้อย 1 ชั่วโมง คุณต้องดำเนินการเมื่อโทรศัพท์มีแบตเตอรี่ที่ชาร์จแล้วและเสียบปลั๊กไว้ตลอดขั้นตอนนี้ หากคุณขัดจังหวะการทำงาน ข้อมูลบางส่วนหรือทั้งหมดจะหายไป"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"เข้ารหัสความปลอดภัยให้แท็บเล็ต"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"เข้ารหัสความปลอดภัย"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"ชาร์จแบตเตอรี่และลองอีกครั้ง"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"เสียบที่ชาร์จของคุณ แล้วลองอีกครั้ง"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ไม่มี PIN หรือรหัสผ่านล็อกหน้าจอ"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"คุณต้องตั้งค่า PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอก่อนจึงจะเริ่มการเข้ารหัสได้"</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"คุณจำเป็นต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันการเข้ารหัสอุปกรณ์"</string>
-    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"เข้ารหัสหรือไม่"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"คุณต้องตั้งค่า PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอก่อนจึงจะเริ่มการเข้ารหัสความปลอดภัยได้"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"เข้ารหัสความปลอดภัยไหม"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"การเข้ารหัสนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาอย่างน้อยหนึ่งชั่วโมง โดยในระหว่างนั้น แท็บเล็ตจะรีสตาร์ทหลายครั้ง"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"การเข้ารหัสนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาอย่างน้อยหนึ่งชั่วโมง โดยในระหว่างนั้น โทรศัพท์จะรีสตาร์ทหลายครั้ง"</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_final_desc" product="default" msgid="5682944380460921880">"การเข้ารหัสความปลอดภัยนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาอย่างน้อยหนึ่งชั่วโมง โดยในระหว่างนั้น โทรศัพท์จะรีสตาร์ทหลายครั้ง"</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"กำลังเข้ารหัสความปลอดภัย"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"รอสักครู่ขณะกำลังเข้ารหัสความปลอดภัยให้แท็บเล็ตของคุณ เสร็จสมบูรณ์ไปแล้ว <xliff:g id="PERCENT">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"รอสักครู่ขณะกำลังเข้ารหัสความปลอดภัยให้คุณ เสร็จสมบูรณ์ไปแล้ว <xliff:g id="PERCENT">^1</xliff:g>%"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"โปรดรอสักครู่ขณะเข้ารหัสความปลอดภัยให้แท็บเล็ต เหลืออีก <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"โปรดรอสักครู่ขณะเข้ารหัสความปลอดภัย เหลืออีก <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"ปิดแท็บเล็ตแล้วเปิดอีกครั้งเพื่อปลดล็อก"</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ปิดโทรศัพท์แล้วเปิดอีกครั้งเพื่อปลดล็อก"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"คำเตือน: ระบบจะล้างข้อมูลในอุปกรณ์หลังจากปลดล็อกไม่สำเร็จอีก <xliff:g id="COUNT">^1</xliff:g> ครั้ง!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"พิมพ์รหัสผ่านของคุณ"</string>
-    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"การเข้ารหัสไม่สำเร็จ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในแท็บเล็ตได้อีกต่อไป\n\nในการใช้งานแท็บเล็ตต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าแท็บเล็ตหลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในโทรศัพท์ได้อีกต่อไป\n\nในการใช้งานโทรศัพท์ต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าโทรศัพท์หลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"การเข้ารหัสความปลอดภัยไม่สำเร็จ"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"การเข้ารหัสความปลอดภัยถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในแท็บเล็ตได้อีกต่อไป\n\nในการใช้งานแท็บเล็ตต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าแท็บเล็ตหลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"การเข้ารหัสความปลอดภัยถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในโทรศัพท์ได้อีกต่อไป\n\nในการใช้งานโทรศัพท์ต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าโทรศัพท์หลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"การถอดรหัสล้มเหลว"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="3775740783651700375">"รหัสผ่านที่คุณป้อนถูกต้อง แต่ปรากฏว่ามีข้อมูลเสียหาย \n\nหากต้องการใช้แท็บเล็ตต่อ คุณต้องรีเซ็ตเครื่องเป็นค่าเริ่มต้นจากโรงงาน เมื่อคุณตั้งค่าแท็บเล็ตหลังรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลที่ได้สำรองไว้ในบัญชี Google ได้"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="6898436151871328007">"รหัสผ่านที่คุณป้อนถูกต้อง แต่ปรากฏว่ามีข้อมูลเสียหาย \n\nหากต้องการใช้โทรศัพท์ต่อ คุณต้องรีเซ็ตเครื่องเป็นค่าเริ่มต้นจากโรงงาน เมื่อคุณตั้งค่าโทรศัพท์หลังรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลที่ได้สำรองไว้ในบัญชี Google ได้"</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"ความปลอดภัยระดับต่ำ เป็นการทดลอง"</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_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="current_screen_lock" msgid="4104091715420072219">"การล็อกหน้าจอปัจจุบัน"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานอีกต่อไป"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ปิดใช้งานโดยผู้ดูแลระบบ นโยบายการเข้ารหัส หรือที่จัดเก็บข้อมูลรับรอง"</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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_password" msgid="1203938057264146610">"รหัสผ่าน"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"เมื่อคุณได้ตั้งค่าการล็อกหน้าจอแล้ว คุณยังสามารถตั้งค่าลายนิ้วมือได้ในการตั้งค่า &gt; ความปลอดภัย"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ปิดการล็อกหน้าจอ"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"นำรูปแบบการปลดล็อกออก"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"นำ PIN ปลดล็อกออก"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"รหัสผ่านจะต้องมีตัวอักษรอย่างน้อยหนึ่งตัว"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"รหัสผ่านจะต้องมีตัวเลขอย่างน้อยหนึ่งหลัก"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"รหัสผ่านจะต้องมีสัญลักษณ์อย่างน้อยหนึ่งอย่าง"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"รหัสผ่านต้องมีตัวอักษรอย่างน้อย 1 ตัว"</item>
-    <item quantity="other" msgid="8186027808415585970">"รหัสผ่านต้องมีตัวอักษรอย่างน้อย %d ตัว"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"รหัสผ่านต้องมีอักษรตัวพิมพ์เล็กอย่างน้อย 1 ตัว"</item>
-    <item quantity="other" msgid="2693910942679679225">"รหัสผ่านต้องมีอักษรตัวพิมพ์เล็กอย่างน้อย %d ตัว"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"รหัสผ่านต้องมีอักษรตัวพิมพ์ใหญ่อย่างน้อย 1 ตัว"</item>
-    <item quantity="other" msgid="3030801209112209245">"รหัสผ่านต้องมีอักษรตัวพิมพ์ใหญ่อย่างน้อย %d ตัว"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"รหัสผ่านต้องมีตัวเลขอย่างน้อย 1 ตำแหน่ง"</item>
-    <item quantity="other" msgid="4703982391407595924">"รหัสผ่านต้องมีตัวเลขอย่างน้อย %d ตำแหน่ง"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"รหัสผ่านต้องมีสัญลักษณ์พิเศษอย่างน้อย 1 ตัว"</item>
-    <item quantity="other" msgid="1221290525051187757">"รหัสผ่านต้องมีสัญลักษณ์พิเศษอย่างน้อย %d ตัว"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"รหัสผ่านต้องมีอักขระที่ไม่ใช่ตัวอักษรอย่างน้อย 1 ตัว"</item>
-    <item quantity="other" msgid="3952508584649046404">"รหัสผ่านต้องมีอักขระที่ไม่ใช่ตัวอักษรอย่างน้อย %d ตัว"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">รหัสผ่านต้องมีตัวอักษรอย่างน้อย %d ตัว</item>
+      <item quantity="one">รหัสผ่านต้องมีตัวอักษรอย่างน้อย 1 ตัว</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">รหัสผ่านต้องมีอักษรตัวพิมพ์เล็กอย่างน้อย %d ตัว</item>
+      <item quantity="one">รหัสผ่านต้องมีอักษรตัวพิมพ์เล็กอย่างน้อย 1 ตัว</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">รหัสผ่านต้องมีอักษรตัวพิมพ์ใหญ่อย่างน้อย %d ตัว</item>
+      <item quantity="one">รหัสผ่านต้องมีอักษรตัวพิมพ์ใหญ่อย่างน้อย 1 ตัว</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">รหัสผ่านต้องมีตัวเลขอย่างน้อย %d ตัว</item>
+      <item quantity="one">รหัสผ่านต้องมีตัวเลขอย่างน้อย 1 ตัว</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">รหัสผ่านต้องมีสัญลักษณ์พิเศษอย่างน้อย %d ตัว</item>
+      <item quantity="one">รหัสผ่านต้องมีสัญลักษณ์พิเศษอย่างน้อย 1 ตัว</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">รหัสผ่านต้องมีอักขระที่ไม่ใช่ตัวอักษรอย่างน้อย %d ตัว</item>
+      <item quantity="one">รหัสผ่านต้องมีอักขระที่ไม่ใช่ตัวอักษรอย่างน้อย 1 ตัว</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"ผู้ดูแลอุปกรณ์ไม่อนุญาตให้ใช้รหัสผ่านที่เพิ่งใช้ไป"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ห้ามมิให้มีการเรียงจากน้อยไปมาก จากมากไปน้อย หรือเรียงลำดับตัวเลขที่ซ้ำกัน"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ตกลง"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"กำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"จับคู่อุปกรณ์"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ยกเลิก"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"การจับคู่อุปกรณ์จะให้สิทธิ์การเข้าถึงที่อยู่ติดต่อและประวัติการโทรเมื่อเชื่อมต่อแล้ว"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"ไม่สามารถจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ไม่สามารถจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ได้เพราะ PIN หรือรหัสผ่านไม่ถูกต้อง"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ไม่สามารถเชื่อมต่อกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"การกำหนดค่าอุปกรณ์ให้ตรงกันถูกปฏิเสธโดย <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"ไม่สามารถเชื่อมต่อกับ <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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการจะสแกนหาอุปกรณ์บลูทูธแม้ในเวลาที่ปิดบลูทูธ คุณสามารถเปลี่ยนแปลงคุณลักษณะนี้ได้ใน<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_specific_profiles_title" msgid="6952214406025825164">"เชื่อมต่อกับ…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"เสียงสื่อ"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"เสียงโทรศัพท์"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"การถ่ายโอนไฟล์"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"อุปกรณ์อินพุต"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"การเข้าถึงอินเทอร์เน็ต"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"การแชร์รายชื่อผู้ติดต่อ"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"ใช้สำหรับการแชร์รายชื่อผู้ติดต่อ"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"การแชร์การเชื่อมต่ออินเทอร์เน็ต"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"การเข้าถึงข้อความ"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"เชื่อมต่อกับระบบเสียงของสื่อแล้ว"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"เชื่อมต่อกับระบบเสียงของโทรศัพท์แล้ว"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"เชื่อมต่อกับเซิร์ฟเวอร์สำหรับโอนไฟล์แล้ว"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"เชื่อมต่อกับแผนที่แล้ว"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ไม่ได้เชื่อมต่อกับเซิร์ฟเวอร์สำหรับโอนไฟล์"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"เชื่อมต่อกับอุปกรณ์อินพุตแล้ว"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ใช้สำหรับระบบเสียงของสื่อ"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ใช้สำหรับระบบเสียงของโทรศัพท์"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ใช้สำหรับการโอนไฟล์"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ใช้สำหรับการป้อนข้อมูล"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ใช้การเข้าถึงอินเทอร์เน็ต"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ใช้สำหรับแผนที่"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"เชื่อมต่อผ่านตัวช่วย Wi-Fi อยู่"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"ส่งหน้าจอ"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"กำลังปิด WiFi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"ข้อผิดพลาด"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ในโหมดใช้งานบนเครื่องบิน"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ไม่สามารถสแกนหาเครือข่าย"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"การแจ้งเตือนของเครือข่าย"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"แจ้งเตือนเมื่อใดก็ตามที่เครือข่ายสาธารณะพร้อมใช้งาน"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"หลีกเลี่ยงการเชื่อมต่อที่สัญญาณไม่แรงพอ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"อย่าใช้เครือข่าย WiFi หากไม่มีการเชื่อมต่ออินเทอร์เน็ตที่ดีเพียงพอ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ใช้เครือข่ายที่มีการเชื่อมต่ออินเทอร์เน็ตสัญญาณแรงเท่านั้น"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"ใช้การสแกนได้เสมอ"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"อนุญาตให้สแกนได้เสมอ"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"ให้บริการตำแหน่งของ Google และแอปอื่นๆ สามารถสแกนหาเครือข่ายได้ แม้ว่า Wi-Fi จะปิดอยู่"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ใช้ Wi-Fi แบบเปิดโดยอัตโนมัติ"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"ให้ Wi‑Fi Assistant เชื่อมต่อโดยอัตโนมัติเพื่อเปิดเครือข่ายที่กำหนดไว้เป็นแบบคุณภาพสูง"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"เลือกผู้ช่วย"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ติดตั้งใบรับรอง"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"เพื่อปรับปรุงความแม่นยำของตำแหน่งและเพื่อวัตถุประสงค์อื่น Google และแอปอื่นๆ อาจสแกนหาเครือข่ายใกล้เคียงแม้ในเวลาที่ปิด WiFi หากคุณไม่ต้องการให้สิ่งนี้เกิดขึ้น ให้ไปที่ ขั้นสูง &gt; การสแกนพร้อมใช้งานตลอดเวลา"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"แอปอาจสแกนหาเครือข่ายใกล้เคียง แม้ในเวลาที่ปิด WiFi หากคุณไม่ต้องการให้สิ่งนี้เกิดขึ้น ให้ไปที่ ขั้นสูง &gt; การสแกนพร้อมใช้งานตลอดเวลา"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการจะสแกนหาเครือข่าย Wi‑Fi แม้ในเวลาที่ปิด 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="5340097010842405981">"ไม่ต้องแสดงข้อความนี้อีก"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"เปิด WiFi ระหว่างที่อยู่ในโหมดสลีป"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"เปิด Wi-Fi ระหว่างอยู่ในโหมดสลีป"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"เพิ่มเครือข่ายอื่น"</string>
     <string name="wifi_more" msgid="3195296805089107950">"เพิ่มเติม"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"การตั้งค่าอัตโนมัติ (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"หากต้องการตั้งค่าให้เสร็จสิ้น แท็บเล็ตของคุณจะต้องมีสิทธิ์เข้าถึง Wi-Fi โดยหลังจากตั้งค่าแล้ว คุณสามารถสลับระหว่างข้อมูลมือถือและ Wi-Fi ได้"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"ตัวเลือกขั้นสูง"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"ตั้งค่าการป้องกัน WiFi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"กำลังเริ่มต้น WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"กดปุ่ม \"ตั้งค่าการป้องกัน WiFi\" บนเราเตอร์ของคุณ ปุ่มนี้อาจมีชื่อว่า \"WPS\" หรือมีสัญลักษณ์นี้อยู่ด้วย:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"กดปุ่ม \"ตั้งค่าการป้องกัน Wi-Fi\" บนเราเตอร์ของคุณ ปุ่มนี้อาจมีชื่อว่า \"WPS\" หรือมีสัญลักษณ์นี้กำกับอยู่ด้วย:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"ป้อน PIN <xliff:g id="NUMBER">%1$s</xliff:g> บนเราเตอร์ WiFi ของคุณ การตั้งค่าอาจใช้เวลาถึงสองนาทีจึงจะเสร็จสิ้น"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS สำเร็จแล้ว กำลังเชื่อมต่อกับเครือข่าย…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"เชื่อมต่อกับเครือข่าย WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g> แล้ว"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"กำหนดค่าคลื่นความถี่ AP"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ไม่เปลี่ยน)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ไม่ได้ระบุ)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"บันทึกแล้ว"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"ปิดอยู่"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"การกำหนดค่า IP ล้มเหลว"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"การเชื่อมต่อ Wi-Fi ล้มเหลว"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ปัญหาในการตรวจสอบสิทธิ์"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"ไม่อยู่ในพื้นที่ให้บริการ"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"ไม่พบการเข้าถึงอินเทอร์เน็ต ระบบจะไม่เชื่อมต่อใหม่โดยอัตโนมัติ"</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_security_none" msgid="7985461072596594400">"ไม่มี"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"เครือข่ายนี้ไม่มีการเข้าถึงอินเทอร์เน็ต ยืนยันที่จะใช้เครือข่ายนี้ไหม"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"ไม่ต้องถามอีกสำหรับเครือข่ายนี้"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"เชื่อมต่อ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ไม่สามารถเชื่อมต่อกับเครือข่าย"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ไม่จำ"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Wi-Fi ฮอตสปอต AndroidAP WPA2 PSK แบบพกพา"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> WiFi ฮอตสปอตแบบพกพา"</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_mode_title" msgid="2164073796253284289">"ค่ากำหนดในการโทร"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"โหมดการโทรผ่าน Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"ต้องการใช้ Wi-Fi"</item>
+    <item msgid="5267397515594230396">"ต้องการใช้เครือข่ายมือถือ"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"เมื่อเปิดการโทรผ่าน Wi-Fi โทรศัพท์จะสามารถวางเส้นทางสายเรียกผ่านเครือข่าย Wi-Fi หรือเครือข่ายของผู้ให้บริการของคุณได้ ทั้งนี้ขึ้นอยู่กับค่ากำหนดของคุณและสัญญาณฝั่งที่แรงกว่า โปรดสอบถามค่าธรรมเนียมและรายละเอียดอื่นๆ กับผู้ให้บริการก่อนที่จะเปิดคุณลักษณะนี้"</string>
     <string name="home_settings" msgid="212375129455718176">"หน้าแรก"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
     <string name="sound_settings" msgid="5534671337768745343">"เสียง"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"ธีม"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"สีสว่าง"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"สีมืด"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"อัตโนมัติ"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"อัปเดตซิมการ์ดที่ต้องการไหม"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> เป็นเพียงซิมเดียวในอุปกรณ์ของคุณ คุณต้องการใช้ซิมนี้สำหรับข้อมูลมือถือ การโทร และข้อความ SMS ไหม"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"รหัส PIN ของซิมไม่ถูกต้อง ตอนนี้คุณต้องติดต่อผู้ให้บริการเพื่อปลดล็อกอุปกรณ์ของคุณ"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"รหัส PIN ของซิมไม่ถูกต้อง คุณสามารถพยายามได้อีก <xliff:g id="NUMBER">%d</xliff:g> ครั้งก่อนที่จะต้องติดต่อผู้ให้บริการเพื่อปลดล็อกอุปกรณ์ของคุณ"</item>
-    <item quantity="other" msgid="77103619544346451">"รหัส PIN ของซิมไม่ถูกต้อง คุณพยายามได้อีก <xliff:g id="NUMBER">%d</xliff:g> ครั้ง"</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">รหัส PIN ของซิมไม่ถูกต้อง คุณพยายามได้อีก <xliff:g id="NUMBER_1">%d</xliff:g> ครั้ง</item>
+      <item quantity="one">รหัส PIN ของซิมไม่ถูกต้อง คุณพยายามได้อีก <xliff:g id="NUMBER_0">%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="default" msgid="475872867864762157">"สถานะโทรศัพท์"</string>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"แอป (ข้อมูลแอปและเนื้อหาสื่อ)"</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_dcim_usage" msgid="558887013613822577">"ภาพ วิดีโอ"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"เสียง (เพลง เสียงเรียกเข้า และอื่นๆ)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"เบ็ดเตล็ด"</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="default" msgid="6915293408836853020">"ยกเลิกการต่อเชื่อมการ์ด SD"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"ต่อเชื่อม"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"นำอุปกรณ์ออก"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"ลบและจัดรูปแบบ"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"ลบและจัดรูปแบบเป็นที่เก็บภายใน"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"การเชื่อมต่อ USB ของคอมพิวเตอร์"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"การเชื่อมต่อ USB ของคอมพิวเตอร์"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"เชื่อมต่อแบบ"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"ช่วยให้คุณถ่ายโอนไฟล์สื่อบน Windows ได้ หรือใช้ Android File Transfer สำหรับ Mac (ดูที่ www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"กล้องถ่ายรูป (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"ช่วยให้คุณถ่ายโอนภาพได้โดยใช้ซอฟต์แวร์กล้องถ่ายรูปและถ่ายโอนไฟล์ใด ๆ บนคอมพิวเตอร์ที่ไม่สนับสนุน MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ติดตั้งเครื่องมือถ่ายโอนไฟล์"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"ให้แอปพลิเคชันที่รองรับ MIDI ทำงานกับซอฟต์แวร์ MIDI ผ่าน USB บนคอมพิวเตอร์ของคุณ"</string>
     <string name="storage_other_users" msgid="808708845102611856">"ผู้ใช้รายอื่นๆ"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ที่เก็บข้อมูลอุปกรณ์"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ที่เก็บข้อมูลแบบถอดได้"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"ว่าง <xliff:g id="FREE">%1$s</xliff:g> (ทั้งหมด <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"ต่อเชื่อม<xliff:g id="NAME">%1$s</xliff:g>แล้ว"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"ไม่สามารถต่อเชื่อม<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="4161722509712992231">"ไม่สามารถนำ<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="8343688274191391889">"ไม่สามารถจัดรูปแบบ<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"เปลี่ยนชื่อที่เก็บข้อมูล"</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="3677827796634199714"><b>"เมื่อคุณนำ <xliff:g id="NAME_0">^1</xliff:g> นี้ออก แอปที่จัดเก็บไว้จะหยุดทำงาน และจะไม่พบไฟล์สื่อที่จัดเก็บไว้จนกว่าจะมีการใส่การ์ด SD นี้เข้าไปอีกครั้ง"</b>" \n\nโดย <xliff:g id="NAME_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_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_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="1259216693690378749">"ไม่ต้องนำ <xliff:g id="NAME">^1</xliff:g> ออกขณะฟอร์แมต"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ย้ายข้อมูลไปที่จัดเก็บข้อมูลใหม่"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"คุณสามารถย้ายรูปภาพ ไฟล์ และข้อมูลแอปไปยัง <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="5035719146373359329"><b>"การย้ายจะใช้เวลาประมาณ <xliff:g id="TIME">^1</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="8641916179067596592">"ระหว่างการย้าย: \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หากต้องการย้ายรูปภาพ ไฟล์ และข้อมูลแอปมายังอุปกรณ์นี้ ให้ไปที่การตั้งค่า &amp;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="236043946721254139">"การย้าย <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="4288580957960820740">"ห้ามนำ <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="battery_status_title" msgid="9159414319574976203">"สถานะแบตเตอรี่"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ระดับแบตเตอรี่"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"รีเซ็ตการตั้งค่าเครือข่าย"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"การดำเนินการนี้จะรีเซ็ตการตั้งค่าเครือข่ายทั้งหมด รวมถึง:\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="4874737348054213767">"รีเซ็ตการตั้งค่าเครือข่ายทั้งหมดใช่ไหม คุณจะไม่สามารถยกเลิกการทำงานนี้ได้!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"รีเซ็ตการตั้งค่า"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"รีเซ็ตไหม"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"รีเซ็ตการตั้งค่าเครือข่ายแล้ว"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"รีเซ็ตอุปกรณ์"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"รีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"ลบข้อมูลทั้งหมดบนแท็บเล็ต"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"ลบข้อมูลทั้งหมดบนโทรศัพท์"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของแท็บเล็ตของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ลบข้อมูลทั้งหมดในการ์ด SD เช่น เพลงหรือรูปภาพ"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"รีเซ็ตแท็บเล็ต"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"รีเซ็ตโทรศัพท์"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"ลบข้อมูลส่วนบุคคลและแอปพลิเคชันที่ดาวน์โหลดของคุณทั้งหมดหรือไม่ คุณไม่สามารถย้อนกลับการทำงานนี้ได้!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"ลบข้อมูลส่วนบุคคลและแอปที่ดาวน์โหลดทั้งหมดใช่ไหม คุณไม่สามารถยกเลิกการทำงานนี้ได้!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ลบทุกอย่าง"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"ไม่มีการรีเซ็ตเนื่องจากบริการล้างข้อมูลระบบไม่พร้อมใช้งาน"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"รีเซ็ตหรือไม่"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"การรีเซ็ตเป็นค่าจากโรงงานไม่สามารถใช้ได้สำหรับผู้ใช้รายนี้"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"ลบที่จัดเก็บข้อมูล USB ซึ่งจะเป็นการลบไฟล์ทั้งหมดที่จัดเก็บอยู่ในนั้นหรือไม่ คุณไม่สามารถกลับการทำงานนี้ได้!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"ต้องการลบการ์ด SD ซึ่งจะเป็นการลบไฟล์ทั้งหมดที่จัดเก็บไว้หรือไม่ คุณไม่สามารถย้อนกลับการทำงานนี้ได้!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ลบทุกอย่าง"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันว่าคุณต้องการลบที่จัดเก็บข้อมูล USB"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันว่าคุณต้องการลบการด์ SD"</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ความช่วยเหลือ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"เครือข่ายมือถือ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"แผนบริการอุปกรณ์เคลื่อนที่"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"แอป 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> เป็นแอป SMS ของคุณแทน <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> เป็นแอป SMS ของคุณไหม"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"โหมดตำแหน่ง"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ใช้ GPS, Wi-Fi และเครือข่ายมือถือเพื่อระบุตำแหน่ง"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ใช้ Wi-Fi และเครือข่ายมือถือเพื่อระบุตำแหน่ง"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ใช้ GPS เพื่อหาตำแหน่งของคุณ"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ใช้ GPS เพื่อระบุตำแหน่ง"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"การสแกน"</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="2070686681074461301">"ปรับปรุงตำแหน่งโดยอนุญาตให้แอปและบริการสแกนหาเครือข่าย Wi‑Fi แม้ในเวลาที่ปิด Wi‑Fi"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"การสแกนหาบลูทูธ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"ปรับปรุงตำแหน่งโดยให้บริการของระบบสแกนหาอุปกรณ์บลูทูธ แม้ในเวลาที่ปิดบลูทูธ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ตำแหน่ง Wi-Fi และเครือข่าย"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ให้แอปต่างๆ ใช้บริการระบุตำแหน่งของ Google เพื่อระบุตำแหน่งโดยประมาณของคุณรวดเร็วยิ่งขึ้น โดยจะมีการรวบรวมและส่งข้อมูลตำแหน่งที่ไม่ระบุชื่อให้ Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ตำแหน่งที่กำหนดโดย WiFi"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"ความปลอดภัยของหน้าจอ"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"ใช้รูปแบบอุปกรณ์ของคุณเพื่อดำเนินการต่อ"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"ป้อน PIN อุปกรณ์ของคุณเพื่อดำเนินการต่อ"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"ป้อนรหัสผ่านอุปกรณ์ของคุณเพื่อดำเนินการต่อ"</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_need_to_unlock" msgid="757935356911054465">"ยืนยันรูปแบบที่บันทึก"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"ลองอีกครั้ง:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"ลองผิดหลายครั้งมากเกินไป!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"ลองใหม่อีกครั้งใน <xliff:g id="NUMBER">%d</xliff:g> วินาที"</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="manageapplications_settings_title" msgid="7041951105633616745">"จัดการแอปพลิเคชัน"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"จัดการและนำแอปพลิเคชันที่ติดตั้งไว้ออก"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"การใช้ที่เก็บข้อมูล"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"ดูที่จัดเก็บข้อมูลที่แอปพลิเคชันใช้"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"บริการที่ทำงานอยู่"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ข้อมูลแท็บเล็ต"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ข้อมูลโทรศัพท์"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"ข้อมูลแบตเตอรี่"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"การเริ่มใช้งานด่วน"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"ตั้งค่าแป้นพิมพ์ลัดเพื่อเริ่มใช้งานแอปพลิเคชัน"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"กําหนดแอปพลิเคชัน"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"ไม่มีทางลัด"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"ค้นหา + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"ล้างข้อมูล"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"ทางลัดของคุณสำหรับ <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) จะถูกล้าง"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ตกลง"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ยกเลิก"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"แอปพลิเคชัน"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"ทางลัดของ"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"บันทึกแพ็คเก็ตบลูทูธ HCI ทั้งหมดในไฟล์"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"การปลดล็อก OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"อนุญาตให้ปลดล็อกตัวโหลดการเปิดเครื่อง"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"ป้อน PIN ของคุณ"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"ป้อน PIN ของอุปกรณ์เพื่อเปิดใช้การปลดล็อก OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"อนุญาตการปลดล็อก OEM ไหม"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"คำเตือน: คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานบนอุปกรณ์นี้ขณะที่การตั้งค่านี้เปิดอยู่"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ขนาดบัฟเฟอร์ของ Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"เลือกขนาด Logger ต่อบัฟเฟอร์ไฟล์บันทึก"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"อนุญาตให้จำลองตำแหน่ง"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"อนุญาตให้จำลองตำแหน่ง"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"เปิดใช้การตรวจสอบแอตทริบิวต์มุมมอง"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"เครือข่าย"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"การรับรองการแสดงผลแบบไร้สาย"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"เปิดใช้การบันทึกรายละเอียด Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"สลับ Wi‑Fi เป็นมือถือเมื่อสัญญาณอ่อน"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"ใช้การสแกน Wi-Fi ข้ามเครือข่ายเสมอ"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"ใช้ไคลเอ็นต์ DHCP เดิม"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"แสดงตัวเลือกสำหรับการรับรองการแสดงผล แบบไร้สาย"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"เพิ่มระดับการบันทึก Wi‑Fi แสดงต่อ SSID RSSI ในตัวเลือก Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"เมื่อเปิดใช้แล้ว Wi-Fi จะส่งผ่านการเชื่อมต่อข้อมูลไปยังเครือข่ายมือถือในทันทีที่พบสัญญาณ Wi-Fi อ่อน"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"อนุญาต/ไม่อนุญาตการสแกน Wi-Fi ข้ามเครือข่าย ตามปริมาณข้อมูลการเข้าชมที่ปรากฏในอินเทอร์เฟซ"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"ขนาดบัฟเฟอร์ของ Logger"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"เลือกขนาด Logger ต่อบัฟเฟอร์ไฟล์บันทึก"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"เลือกการกำหนดค่า USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"เลือกการกำหนดค่า USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"อนุญาตให้จำลองตำแหน่ง"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"อนุญาตให้จำลองตำแหน่ง"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"เปิดใช้การตรวจสอบแอตทริบิวต์มุมมอง"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ใช้ไคลเอ็นต์ DHCP จาก Lollipop แทนไคลเอ็นต์ DHCP ใหม่บน Android"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"อนุญาตให้แก้ไขข้อบกพร่อง USB หรือไม่"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"การแก้ไขข้อบกพร่อง USB มีไว้เพื่อการพัฒนาเท่านั้น ให้ใช้การแก้ไขนี้เพื่อคัดลอกข้อมูลระหว่างคอมพิวเตอร์และอุปกรณ์ ติดตั้งแอปพลิเคชันบนอุปกรณ์โดยไม่มีการแจ้งเตือน และอ่านข้อมูลบันทึก"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"ยกเลิกการเข้าถึงเพื่อแก้ปัญหา USB จากคอมพิวเตอร์ทุกเครื่องที่คุณได้ให้สิทธิ์ก่อนหน้านี้หรือไม่"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"ม่วงแดง"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"ใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ใช่ไหม"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ต้องการที่จะ"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"เนื่องจากแอปหนึ่งได้บดบังคำขอสิทธิ์ ระบบจึงไม่สามารถยืนยันคำตอบของคุณสำหรับการตั้งค่าได้"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"หากคุณเปิด <xliff:g id="SERVICE">%1$s</xliff:g> อุปกรณ์ของคุณจะไม่ใช้ล็อกหน้าจอเพื่อปรับปรุงการเข้ารหัสข้อมูล"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"เนื่องจากคุณเปิดบริการความสามารถในการเข้าถึง อุปกรณ์ของคุณจะไม่ใช้ล็อกหน้าจอเพื่อปรับปรุงการเข้ารหัสข้อมูล"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"คุณต้องยืนยันรูปแบบ เนื่องจากการเปิด <xliff:g id="SERVICE">%1$s</xliff:g> จะส่งผลต่อการเข้ารหัสข้อมูล"</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"แอป <xliff:g id="TYPE">%1$s</xliff:g> ในช่วง <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"ใช้ <xliff:g id="USEDRAM">%1$s</xliff:g> จาก <xliff:g id="TOTALRAM">%2$s</xliff:g> ในช่วง <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</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_memory_status" msgid="4251599550196193093">"ขณะนี้หน่วยความจำอุปกรณ์มีสถานะ <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"การใช้ RAM เฉลี่ย"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"การใช้ RAM สูงสุด"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"ระบบปฏิบัติการ Android"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"กระบวนการ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"บริการ"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ระยะเวลา"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"รายละเอียดหน่วยความจำ"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"ซ่อนระบบ"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"การตั้งค่าเริ่มต้นด้านล่างนี้จะแทนที่การตั้งค่าแอปพลิเคชัน"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"การตั้งค่าเริ่มต้น"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"เครื่องมือเริ่มต้น"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"ตั้งค่าโปรแกรมสังเคราะห์เสียงพูดให้ใช้สำหรับคำพูด"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"ตั้งค่าให้ใช้ระบบการสังเคราะห์เสียงพูดสำหรับข้อความที่พูด"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"ความเร็วของคำพูด"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"ความเร็วในการพูดข้อความ"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ความสูง-ต่ำของเสียง"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"คุณจำเป็นต้องวาดรูปแบบการปลดล็อกของคุณเพื่อยืนยันการติดตั้งข้อมูลรับรอง"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"พิมพ์รหัสผ่านสำหรับที่เก็บข้อมูลรับรอง"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"รหัสผ่านปัจจุบัน:"</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"สำรองข้อมูลของฉัน"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"สำรองข้อมูลแอปพลิเคชัน รหัสผ่าน WiFi และการตั้งค่าอื่นๆ ลงในเซิร์ฟเวอร์ของ Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"บัญชีข้อมูลสำรอง"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"ไม่มีบัญชีใดในปัจจุบันที่จัดเก็บข้อมูลที่สำรองไว้"</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="5355557151569037197">"บริการสำรองข้อมูลไม่มีการใช้งาน"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"ค่านี้ตั้งโดยนโยบายด้านอุปกรณ์ของคุณ"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"รหัสผ่านการสำรองข้อมูลในเดสก์ท็อป"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"การสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อป ไม่ได้รับการป้องกันในขณะนี้"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"แตะเพื่อเปลี่ยนหรือลบรหัสผ่านสำหรับการสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อป"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"อัตราการสลับภาพเคลื่อนไหว"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"ความเร็วตามผู้สร้างกำหนด"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"จำลองจอแสดงผลที่สอง"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"โหมดหลายหน้าต่าง"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"หลายกิจกรรมบนหน้าจอในเวลาเดียวกัน"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"เปิดใช้โหมดหลายหน้าต่างไหม"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"คำเตือน: นี่เป็นคุณลักษณะทดลองขั้นสูงซึ่งอนุญาตให้หลายกิจกรรมอยู่บนหน้าจอในเวลาเดียวกันผ่าน UI ของแอปล่าสุด บางแอปอาจมีข้อขัดข้องหรือทำงานไม่ถูกต้องเมื่อใช้กับคุณลักษณะนี้"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"แอปพลิเคชัน"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"ไม่เก็บกิจกรรม"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ล้างทุกกิจกรรมทันทีที่ผู้ใช้ออกไป"</string>
@@ -2195,7 +2251,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="718192651887726259">"คุณสามารถแชร์อุปกรณ์นี้กับผู้อื่นได้โดยการสร้างผู้ใช้เพิ่มเติม ผู้ใช้แต่ละคนจะมีพื้นที่ของตนเองซึ่งสามารถปรับใช้กับแอป วอลล์เปเปอร์ และอื่นๆ ของตนเอง ผู้ใช้สามารถปรับการตั้งค่าของอุปกรณ์ เช่น 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"อนุญาตการโทร"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"อนุญาตการโทรและ SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"เปิดโทรศัพท์"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"เปิดโทรศัพท์และ SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"นำผู้ใช้ออก"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"ต้องการอนุญาตการโทรใช่ไหม"</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_sms_confirm_title" msgid="188164598768941316">"ต้องการอนุญาตการโทรและ SMS ใช่ไหม"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"ระบบจะแชร์ประวัติการโทรและ SMS กับผู้ใช้รายนี้"</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="application_restrictions" msgid="8207332020898004394">"อนุญาตแอปและเนื้อหา"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"แอปพลิเคชันที่มีข้อจำกัด"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ขยายการตั้งค่าของแอปพลิเคชัน"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"แอปนี้ไม่ได้รับการสนับสนุนในโปรไฟล์ที่ถูกจำกัด"</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">"WiFi และมือถือ"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"อนุญาตให้แก้ไขการตั้งค่า WiFi และมือถือ"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"บลูทูธ"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"การเชื่อมต่อเครือข่าย wifi wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ข้อความ การส่งข้อความ ข้อความ การส่งข้อความ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"มือถือ ผู้ให้บริการมือถือ ไร้สาย ข้อมูล 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"WiFi Wi-Fi โทร การโทร"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"หน้าจอ หน้าจอสัมผัส"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"หน้าจอสลัว หน้าจอสัมผัส แบตเตอรี่"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"หน้าจอสลัว หน้าจอสัมผัส แบตเตอรี่"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"พื้นหลัง ปรับเปลี่ยนในแบบของคุณ กำหนดค่า หน้าจอ"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ธีมสีมืด โหมดกลางคืน หน้าจอสลัว สลับความสว่าง"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"พื้นหลัง ปรับเปลี่ยนในแบบของคุณ กำหนดค่า การแสดงผล"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ขนาดข้อความ"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ฉาย"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"ฉายการส่ง"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ที่ว่าง ดิสก์ ฮาร์ดไดร์ฟ อุปกรณ์ การใช้"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"พลังงาน การใช้ ชาร์จ"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"การสะกด พจนานุกรม ตรวจการสะกด แก้ไขอัตโนมัติ"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"บัญชี"</string>
     <string name="keywords_users" msgid="4673901601478559100">"การจำกัด จำกัด ถูกจำกัด"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"การแก้ไขข้อความ แก้ไข เสียง สั่น อัตโนมัติ ภาษา ท่าทางสัมผัส แนะนำ คำแนะนำ ธีม คำที่ไม่เหมาะสม พิมพ์ อีโมจิ นานาชาติ"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"รีเซ็ตค่ากำหนดเป็นค่าเริ่มต้น"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"ค่าเริ่มต้นของแอป ICE ฉุกเฉิน"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"แอป ดาวน์โหลด แอปพลิเคชัน ระบบ"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ความปลอดภัยในการอนุญาตแอป"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"แอป ค่าเริ่มต้น"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"เลื่อน รหัสผ่าน รูปแบบ PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ตั้งค่าแท็ก NFC สำหรับ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"เขียน"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"เสียงแทรก"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"เมื่อมีสายเรียกเข้าหรือการแจ้งเตือน"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"รบกวนได้เสมอ"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"อนุญาตเฉพาะเรื่องสำคัญเท่านั้น"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ห้ามรบกวน"</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_option_important_interruptions" msgid="3903928008177972500">"เฉพาะเรื่องสำคัญ"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"เฉพาะปลุกเท่านั้น"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"ไม่มีการรบกวน"</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="ringtone_title" msgid="5379026328015343686">"เสียงเรียกเข้า"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"เสียงเรียกเข้าเริ่มต้นสำหรับการแจ้งเตือน"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"สั่นเมื่อมีสายเรียกเข้าด้วย"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"สั่น"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"การเข้าถึงการแจ้งเตือน"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"แอปไม่สามารถอ่านการแจ้งเตือน"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d แอปสามารถอ่านการแจ้งเตือนได้"</item>
-    <item quantity="other" msgid="980049191810249052">"%d แอปสามารถอ่านการแจ้งเตือนได้"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d แอปสามารถอ่านการแจ้งเตือนได้</item>
+      <item quantity="one">%d แอปสามารถอ่านการแจ้งเตือนได้</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"ไม่มีตัวฟังการแจ้งเตือนติดตั้งอยู่"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"ต้องการเปิดใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ไหม"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> จะสามารถอ่านการแจ้งเตือนทั้งหมดที่โพสต์โดยระบบหรือแอปใดๆ ที่ติดตั้ง ซึ่งอาจรวมถึงข้อมูลส่วนบุคคล เช่น ชื่อติดต่อและข้อความที่ส่งถึงคุณ นอกจากนี้ยังจะสามารถที่จะปิดการแจ้งเตือนดังกล่าวหรือแตะปุ่มการทำงานภายในตัว"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"ผู้ให้บริการเงื่อนไข"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ไม่มีแอปที่ให้บริการเงื่อนไข"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d แอปให้บริการเงื่อนไข"</item>
-    <item quantity="other" msgid="358057362115673258">"%d แอปให้บริการเงื่อนไข"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"ไม่มีการติดตั้งผู้ให้บริการเงื่อนไข"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"ต้องการเปิดใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ไหม"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> จะสามารถเพิ่มเงื่อนไขการออกไปยังโหมด \"ห้ามรบกวน\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"กำลังโหลดแอป..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"บล็อก"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"บล็อกทั้งหมด"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ไม่ต้องแสดงการแจ้งเตือนจากแอปนี้"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"สำคัญ"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"แสดงการแจ้งเตือนที่ด้านบนของรายการ และให้แสดงรายการแจ้งเตือนใหม่ๆ เสมอเมื่ออุปกรณ์ใช้โหมด \"เฉพาะเรื่องสำคัญเท่านั้น\""</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"ละเอียดอ่อน"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"เมื่ออุปกรณ์ล็อกอยู่ ให้ซ่อนเนื้อหาที่ละเอียดอ่อนจากการแจ้งเตือนของแอปนี้"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"จัดให้เป็น \"เรื่องสำคัญ\""</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"ให้การแจ้งเตือนของแอปนี้ส่งเสียง เมื่อตั้งค่า \"ห้ามรบกวน\" เป็น \"เฉพาะเรื่องสำคัญเท่านั้น\""</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"อนุญาตการเหลือบมอง"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ให้แอปนี้เน้นการแจ้งเตือนบางอย่างโดยเลื่อนการแจ้งเตือนเข้าไปในมุมมองบนหน้าจอปัจจุบันเล็กน้อย"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"ซ่อนเนื้อหาที่ละเอียดอ่อน"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"เมื่ออุปกรณ์ล็อกอยู่ ให้ซ่อนเนื้อหาในการแจ้งเตือนของแอปนี้ที่อาจแสดงข้อมูลส่วนตัว"</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="zen_mode_default_option" msgid="6940069025071935243">"จนกว่าคุณจะปิดฟังก์ชันนี้"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"เรื่องสำคัญ"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ช่วงเวลาเครื่องไม่ทำงาน"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"วัน"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ไม่มี"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"อนุญาตให้ขัดจังหวะ"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ลำดับความสำคัญสูงเท่านั้น"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ไม่มี"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"ระบบอัตโนมัติ"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"เปิดโดยอัตโนมัติ"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"ชื่อกฎ"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"เพิ่มกฎ"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ลบกฎ"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"ลบกฎ \"<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="3201273040477861538">"กฎที่มีกำหนดการ"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"ไม่พบกฎ"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ไม่ใช้เลย"</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_from" msgid="1033337300289871697">"สาย/ข้อความจาก"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ใครก็ได้"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"เฉพาะรายชื่อติดต่อ"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"เฉพาะรายชื่อติดต่อที่ติดดาว"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"กิจกรรมและการแจ้งเตือน"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"เสียงปลุกสามารถดังแทรกขึ้นมาได้เสมอ"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"การปลุก"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"การเตือนความจำ"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"กิจกรรม"</string>
+    <string name="zen_mode_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_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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> วันถัดไป"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> หรือเมื่อถึงเวลาตั้งปลุกก่อน"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"เสียงแทรก"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"เมื่อมีสายเรียกเข้าหรือการแจ้งเตือน"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"คุณต้องการรับการแจ้งเตือนเมื่อใด"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"โปรดระบุระยะเวลา"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"มีเสียงแทรกได้เสมอ"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"ปิด,ทั้งหมด,ทุกอย่าง"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"อนุญาตเฉพาะเรื่องสำคัญเท่านั้น"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"อนุญาตเฉพาะการปลุก"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"ห้ามรบกวน"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"ไม่มีกำหนด"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> นาที</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> นาที</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"เปลี่ยนเป็นการแจ้งเตือนเฉพาะเรื่องสำคัญโดยไม่มีกำหนด"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">เปลี่ยนเป็นการแจ้งเตือนเฉพาะเรื่องสำคัญเป็นเวลา <xliff:g id="DURATION">%1$d</xliff:g> นาทีจนถึงเวลา <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">เปลี่ยนเป็นการแจ้งเตือนเฉพาะเรื่องสำคัญเป็นเวลา 1 นาทีจนถึงเวลา <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">เปลี่ยนเป็นการแจ้งเตือนเฉพาะเรื่องสำคัญเป็นเวลา <xliff:g id="DURATION">%1$d</xliff:g> ชั่วโมง (จนถึงเวลา <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">เปลี่ยนเป็นการแจ้งเตือนเฉพาะเรื่องสำคัญเป็นเวลา 1 ชั่วโมงจนถึงเวลา <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"เปลี่ยนเป็นเฉพาะปลุกเท่านั้นโดยไม่มีกำหนด"</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>
+      <item quantity="one">เปลี่ยนเป็นเฉพาะปลุกเท่านั้นเป็นเวลา 1 นาทีจนถึงเวลา <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">เปลี่ยนเป็นเฉพาะปลุกเท่านั้นเป็นเวลา <xliff:g id="DURATION">%1$d</xliff:g> ชั่วโมงจนถึงเวลา <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">เปลี่ยนเป็นเฉพาะปลุกเท่านั้นเป็นเวลา 1 ชั่วโมงจนถึงเวลา <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"เปลี่ยนเป็นห้ามรบกวนโดยไม่มีกำหนด"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">เปลี่ยนเป็นห้ามรบกวนเป็นเวลา <xliff:g id="DURATION">%1$d</xliff:g> นาที (จนถึงเวลา <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">เปลี่ยนเป็นห้ามรบกวนเป็นเวลา 1 นาทีจนถึงเวลา <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">เปลี่ยนเป็นห้ามรบกวนเป็นเวลา <xliff:g id="DURATION">%1$d</xliff:g> ชั่วโมงจนถึงเวลา <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">เปลี่ยนเป็นห้ามรบกวนเป็นเวลา 1 ชั่วโมงจนถึงเวลา <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"เปลี่ยนเป็นรบกวนได้เสมอ"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ตลอดไป"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"การแจ้งเตือนของแอป"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"การตั้งค่าการแจ้งเตือน"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ส่งความคิดเห็นเกี่ยวกับอุปกรณ์นี้"</string>
@@ -2492,7 +2609,7 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ใช้มุมมองแนวนอน"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ใช้การวางแนวเดิม"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"ข้อมูล IMEI"</string>
-    <string name="encryption_interstitial_header" msgid="5790264941172726485">"การเข้ารหัส"</string>
+    <string name="encryption_interstitial_header" msgid="5790264941172726485">"การเข้ารหัสความปลอดภัย"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ต่อไป"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"นอกจากนี้คุณยังสามารถปกป้องอุปกรณ์เครื่องนี้เพิ่มเติมโดยกำหนดให้ต้องป้อน PIN ก่อนที่อุปกรณ์จะเริ่มต้นขึ้น อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงเสียงเตือนได้จนกว่าอุปกรณ์จะเริ่มต้นขึ้น \n\nซึ่งจะช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย"</string>
     <string name="encryption_interstitial_message_pattern" msgid="2944051427890104942">"นอกจากนี้คุณยังสามารถปกป้องอุปกรณ์เครื่องนี้เพิ่มเติมโดยกำหนดให้ต้องป้อนรูปแบบก่อนที่อุปกรณ์จะเริ่มต้นขึ้น อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงเสียงเตือนได้จนกว่าอุปกรณ์จะเริ่มต้นขึ้น \n\nซึ่งจะช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"เริ่มใช้งานตามค่าเริ่มต้น"</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="app_launch_domain_links_title" msgid="458956710410857777">"ลิงก์โดเมน"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"เปิด URL โดเมน"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"อนุญาตให้แอปเปิด URL โดเมนได้โดยตรง"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL โดเมนที่สนับสนุน"</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="410824961149037234">"หน่วยความจำภายใน"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"หน่วยความจำภายนอก"</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="storage_used" msgid="7128074132917008743">"ที่จัดเก็บข้อมูลที่ใช้ไป"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"เปิด"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"บล็อก"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"ความละเอียดอ่อน"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"ลำดับความสำคัญ"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"ลำดับความสำคัญและความละเอียดอ่อน"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other">มอบสิทธิ์ <xliff:g id="COUNT_1">%d</xliff:g> รายการ</item>
+      <item quantity="one">มอบสิทธิ์ <xliff:g id="COUNT_0">%d</xliff:g> รายการ</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">อนุญาต <xliff:g id="COUNT_2">%d</xliff:g> จาก <xliff:g id="COUNT_3">%d</xliff:g> รายการแล้ว</item>
+      <item quantity="one">อนุญาต <xliff:g id="COUNT_0">%d</xliff:g> จาก <xliff:g id="COUNT_1">%d</xliff:g> รายการแล้ว</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"ตั้งค่าเริ่มต้นไว้บางส่วน"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"ไม่ได้ตั้งค่าเริ่มต้น"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"แอปทั้งหมด"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"เปิดใช้แล้ว"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"ส่วนตัว"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"งาน"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ถูกบล็อก"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ความสำคัญสูง"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"ละเอียดอ่อน"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ที่มี URL โดเมน"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"ปิดใช้โดยผู้ดูแลระบบ"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"ขั้นสูง"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"แอปที่ไม่รู้จัก"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"เลือกโปรไฟล์"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"สิทธิ์ของแอป"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"อนุญาตการเข้าถึงเพิ่มเติมให้แอป <xliff:g id="COUNT_0">%d</xliff:g> จาก <xliff:g id="COUNT_1">%d</xliff:g> แอปแล้ว"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"อนุญาต <xliff:g id="COUNT_0">%d</xliff:g> จาก <xliff:g id="COUNT_1">%d</xliff:g> แอปแล้ว"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL โดเมน"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"ไม่เปิด URL โดเมนใดๆ"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"เปิด \"<xliff:g id="DOMAIN">%s</xliff:g>\""</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"เปิด \"<xliff:g id="DOMAIN">%s</xliff:g>\" และ URL ที่เกี่ยวข้อง"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> แอปสามารถเปิด URL โดเมนของตัวเอง</item>
+      <item quantity="one">1 แอปสามารถเปิด URL โดเมนของตัวเอง</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"ไม่รู้จัก"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"แอปเริ่มต้น"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"แอปเบราว์เซอร์"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"ไม่มีเบราว์เซอร์เริ่มต้น"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ค่าเริ่มต้น)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"พื้นที่เก็บแอป"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index bdc7b38..baad023 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"button na Push"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"i-mute/i-unmute ang mikropono"</item>
     <item msgid="1148142988678569310">"i-project ang media"</item>
     <item msgid="9130014005474445273">"i-activate ang VPN"</item>
+    <item msgid="1165192162975045562">"write wallpaper"</item>
+    <item msgid="7129487923652967258">"assist structure"</item>
+    <item msgid="1069023208100114540">"assist screenshot"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasyon"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"I-mute/i-unmute ang mikropono"</item>
     <item msgid="5906017727368097853">"I-project ang media"</item>
     <item msgid="2486614710846178542">"I-activate ang VPN"</item>
+    <item msgid="5586547561693629602">"Write wallpaper"</item>
+    <item msgid="32794179825485062">"Assist structure"</item>
+    <item msgid="7872852746938272552">"Assist screenshot"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Maikli"</item>
@@ -399,7 +408,7 @@
   </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Huwag kailanman suriin"</item>
-    <item msgid="6042769699089883931">"Suriin lang para sa nilalamang DRM"</item>
+    <item msgid="6042769699089883931">"Suriin lang para sa DRM content"</item>
     <item msgid="9174900380056846820">"Palaging suriin"</item>
   </string-array>
   <string-array name="hdcp_checking_summaries">
@@ -452,8 +461,8 @@
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"I-off"</item>
-    <item msgid="675719912558941285">"Draw non-rectangular clip region in blue"</item>
-    <item msgid="1064373276095698656">"Highlight tested drawing commands in green"</item>
+    <item msgid="675719912558941285">"Iguhit ang non-rectangular clip region sa asul"</item>
+    <item msgid="1064373276095698656">"I-higlight nang berde ang tested drawing commands"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Naka-off"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"mababa"</item>
     <item msgid="4212263919458209842">"kritikal"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Naka-off"</item>
-    <item msgid="5656544177755411222">"Mga limitadong pagkagambala"</item>
-    <item msgid="8735337502532332056">"Zero na pagkagambala"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Katamtaman"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Pink"</item>
     <item msgid="6131821495505931173">"Pula"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media Transfer Protocol)"</item>
+    <item msgid="8856820259201251036">"PTP (Picture Transfer Protocol)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Pinagmulan ng Audio"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 470edee..4707af3 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Payagan"</string>
     <string name="deny" msgid="6947806159746484865">"Tanggihan"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Hindi Kilala"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> (na) hakbang na lang ang layo mo mula sa pagiging isang developer."</item>
-    <item quantity="other" msgid="6722953419953594148">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> (na) hakbang na lang ang layo mo mula sa pagiging isang developer."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> hakbang na lang, magiging developer ka na.</item>
+      <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> na hakbang na lang, magiging developer ka na.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Isa ka nang developer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Hindi na kailangan, isa ka nang developer."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless &amp; mga network"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"I-off ang SMS sa IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Kinakailangan ang pag-on sa pagpaparehistro ng IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Kinakailangan ang pag-off sa pagpaparehistro ng IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"I-on ang flag na naka-provision sa VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"I-off ang flag na naka-provision sa VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"I-on ang lte ram dump"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"I-off ang lte ram dump"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Tingnan ang address book ng SIM"</string>
@@ -76,7 +78,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Imbakan na USB"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD card"</string>
-    <string name="battery_info_status_label" msgid="8109155295509700309">"Katayuan ng baterya:"</string>
+    <string name="battery_info_status_label" msgid="8109155295509700309">"Status ng baterya:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Plug ng power:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Sukatan ng baterya:"</string>
     <string name="battery_info_level_label" msgid="8706526709307788737">"Antas ng baterya:"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Pagbo-broadcast"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Huwag paganahin ang profile?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Hindi nito papaganahin ang:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Mula:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Konektado"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Nakakonekta (walang telepono)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Nakakonekta (walang media)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Nakakonekta (walang access sa mensahe)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Nakakonekta (walang telepono o media)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Hindi nakakonekta"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Nadidiskonekta..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Kumukonekta…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pinapares…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Walang pangalang Bluetooth na device"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Naghahanap"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Wala nakita Bluetooth device sa kalapit."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ipakita ang mga natanggap na file"</string>
     <string name="device_picker" msgid="4978696506172252813">"Pumili ng Bluetooth device"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Kahilingan sa pahintulot ng bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Gustong i-on ng isang app ang Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Gustong i-ON ng isang app ang Bluetooth para sa device na ito."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong telepono sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong tablet. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD card"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Mga setting ng proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Kanselahin"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"KANSELAHIN"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"MAGPATULOY"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"OO"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"HINDI"</string>
-    <string name="forget" msgid="7267115980248732932">"KALIMUTAN"</string>
+    <string name="forget" msgid="1400428660472591263">"Kalimutan"</string>
+    <string name="save" msgid="879993180139353333">"I-save"</string>
+    <string name="done" msgid="6942539184162713160">"Tapos na"</string>
     <string name="settings_label" msgid="1626402585530130914">"Mga Setting"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Mga Setting"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Shortcut ng Mga Setting"</string>
@@ -325,13 +316,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Pag-uri-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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Pahusayin ang pagtutugma ng mukha"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Pagsusuri sa liveness"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Hilingin ang pagkurap ng mata habang ina-unlock"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Awtomatikong nagla-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_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>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Ipakita impo ng may-ari sa naka-lock na screen"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Ipakita ang info ng may-ari sa lock screen"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info ng may-ari"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"I-enable ang widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Na-disable ng administrator"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng imbakan ng kredensyal"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng imbakan ng kredensyal"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mga Password"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Pamahalaan fingerprint"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gamit fingerprint para"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Magdagdag"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"lock ng screen"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprint ang naka-enroll</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> na fingerprint ang naka-enroll</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Setup ng fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Upang magamit ang iyong fingerprint upang i-unlock ang iyong screen o kumpirmahin ang mga pagbili, kakailanganin naming: \n\n✓ I-set up ang iyong backup na paraan ng pag-lock ng screen \n\n✓ Idagdag ang iyong fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Hanapin ang sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Hanapin ang fingerprint sensor sa likod ng iyong telepono."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Pangalan"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"I-delete"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Magsimula na tayo!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Ilagay ang iyong daliri sa sensor ng fingerprint. Iangat kapag may naramdaman kang pag-vibrate."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Mahusay! Ulitin ito."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Ilagay ang parehong daliri sa sensor ng fingerprint at iangat ito kapag may naramdaman kang pag-vibrate."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Naidagdag fingerprint!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kapag nakikita mo ang icon na ito, maaari mong gamitin ang iyong fingerprint para sa pagkakakilanlan o upang pahintulutan ang isang pagbili."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Magdagdag"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Susunod"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Pag-encrypt"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"I-encrypt ang tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"I-encrypt ang telepono"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"I-plug in ang iyong charger at subukang muli."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Walang PIN o password sa pag-lock ng screen"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Kailangan mong magtakda ng PIN o password ng lock screen bago ka makakapagsimula sa pag-encrypt."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-e-encrypt sa iyong device."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"I-encrypt?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Hindi na mababawi ang pagpapatakbo ng pag-encrypt at kung aantalahin mo ito, maiwawala mo ang data. Tumatagal ang pag-encrypt nang isang oras o higit pa, kung kailan magre-restart ang tablet nang ilang beses."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Hindi na mababawi ang pagpapatakbo ng pag-encrypt at kung aantalahin mo ito, mawawalan ka ng data. Tumatagal ang pag-encrypt nang isang oras o higit pa, kung kailan magre-restart ang telepono nang ilang beses."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Mag-swipe"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Walang seguridad"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Mababang seguridad, pang-eksperimento"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Pattern"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Katamtamang seguridad"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Katamtaman hanggang mataas na seguridad"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mataas na seguridad"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Kasalukuyang lock ng screen"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Hindi na gagana ang mga feature sa proteksyon ng device."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Hindi pinagana ng administrator, patakaran sa pag-encrypt, o storage ng kredensyal"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Wala"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Mag-swipe"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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="7579210814842056547">"Kapag nakapag-set up ka na ng lock ng screen, maaari mo ring i-set up ang iyong fingerprint sa Mga Setting &gt; Seguridad."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"I-off ang lock ng screen"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Alisin ang naka-unlock na pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Alisin ang naka-unlock na PIN"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Dapat na maglaman ng hindi bababa sa isang titik ang password."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Dapat na maglaman ng hindi bababa sa isang digit ang password."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Dapat na maglaman ng hindi bababa sa isang simbolo ang password."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Dapat na maglaman ang password ng hindi bababa sa 1 titik."</item>
-    <item quantity="other" msgid="8186027808415585970">"Dapat na maglaman ng hindi bababa sa %d (na) titik ang password."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Dapat na maglaman ng hindi bababa sa 1 lowercase na titik ang password."</item>
-    <item quantity="other" msgid="2693910942679679225">"Dapat na maglaman ng hindi bababa sa %d (na) lowercase na titik ang password."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Dapat na maglaman ng hindi bababa sa 1 uppercase na titik ang password."</item>
-    <item quantity="other" msgid="3030801209112209245">"Dapat na maglaman ng hindi bababa sa %d (na) uppercase na titik ang password."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Dapat na maglaman ng hindi bababa sa 1 numerical na digit ang password."</item>
-    <item quantity="other" msgid="4703982391407595924">"Dapat na maglaman ng hindi bababa sa %d (na) numerical na digit ang password."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Dapat na maglaman ng hindi bababa sa 1 espesyal na simbolo ang password."</item>
-    <item quantity="other" msgid="1221290525051187757">"Dapat na maglaman ng hindi bababa sa %d (na) espesyal na simbolo ang password."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Dapat na maglaman ng hindi bababa sa 1 character na hindi titik ang password."</item>
-    <item quantity="other" msgid="3952508584649046404">"Dapat na maglaman ng hindi bababa sa %d (na) character na hindi titik ang password."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Dapat na maglaman ang password ng kahit %d titik lang.</item>
+      <item quantity="other">Dapat na maglaman ang password ng kahit %d na titik lang.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Dapat na maglaman ang password ng kahit %d maliit na titik lang.</item>
+      <item quantity="other">Dapat na maglaman ang password ng kahit %d na maliit na titik lang.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Dapat na maglaman ang password ng kahit %d malaking titik lang.</item>
+      <item quantity="other">Dapat na maglaman ang password ng kahit %d na malaking titik lang.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Dapat na maglaman ang password ng kahit %d digit lang.</item>
+      <item quantity="other">Dapat na maglaman ang password ng kahit %d na digit lang.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Dapat na maglaman ang password ng kahit %d espesyal na simbolo lang.</item>
+      <item quantity="other">Dapat na maglaman ang password ng kahit %d na espesyal na simbolo lang.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Dapat na maglaman ang password ng kahit %d character lang na hindi titik.</item>
+      <item quantity="other">Dapat na maglaman ang password ng kahit %d na character lang na hindi titik.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Hindi pinapayagan ng administrator ng device ang paggamit ng kamakailang password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Ipinagbabawal ang pataas, pababa o paulit-ulit na pagkakasunud-sunod ng mga digit"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Upang makipagpares sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Tiyaking ipinapakita nito ang passkey na ito:&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">"Mula sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Makipagpares sa device na ito?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Upang ipares sa:<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>Mag-type dito:<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>, pagkatapos ay pindutin ang Return o Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pares"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"IPARES"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Kanselahin"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Nagbibigay ang pagpapares ng access sa iyong mga contact at history ng tawag kapag nakakonekta."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Hindi maipares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Hindi maipares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g> dahil sa maling PIN o passkey."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Hindi magawang makipag-ugnay sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Tinanggihan ng <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ang pagpapares."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Hindi makakonekta sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Mag-scan para sa mga device"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"I-refresh"</string>
@@ -515,16 +518,8 @@
     <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 Bluetooth, maaari makipag-ugnayan device mo sa iba kalapit Bluetooth device."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Upang pahusayin ang katumpakan ng lokasyon, magsa-scan ang mga app at serbisyo para sa mga Bluetooth device, kahit na naka-off ang Bluetooth. Maaari mo itong baguhin sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pagsa-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Kumonekta sa…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio ng media"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio ng telepono"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Paglilipat ng file"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Device sa pag-input"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Access sa internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Pagbabahagi ng contact"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Gamitin para sa pagbabahagi ng contact"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Pagbabahagi ng koneksyon sa internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Access sa Mensahe"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Maaalis sa pagkakakonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa audio ng media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Maaalis ang koneksyon ng <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa handsfree na audio."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Maaalis sa pagkakakonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa device ng input."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Gamitin para sa"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Palitan ng pangalan"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Payagan dumarating lipat file"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Konektado sa media audio"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Nakakonekta sa audio ng telepono"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Nakakonekta sa server sa paglilipat ng file"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Nakakonekta sa mapa"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Hindi konektado sa server ng paglipat ng file"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Nakakonekta sa device ng input"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Konektado sa device sa Internet access"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Pagbahagi lokal koneksyon sa Internet sa device"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gamitin para sa media audio"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Ginagamit para sa audio ng telepono"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Ginagamit para sa paglilipat ng file"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gamitin para sa input"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gamitin para sa pag-access sa Internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gamitin para sa mapa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Mga Setting ng Dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gumamit ng dock para sa audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Bilang speaker phone"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para sa musika at media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Tandaan ang mga setting"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Nakakonekta sa pamamagitan ng Wi‑Fi assistant"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"I-cast ang screen"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"I-cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"I-enable ang wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Walang nakitang mga kalapit na device."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Kumokonekta"</string>
@@ -570,15 +552,17 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Kalimutan"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Tapos na"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Pangalan"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Payagan ang palitan ng data kapag dumikit ang tablet sa isa pang device"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Payagan ang pagpapalitan ng data kapag nadikit ang telepono sa isa pang device"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Handa nang maglipat ng nilalaman ng app sa pamamagitan ng NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Handa nang maglipat ng content ng app sa pamamagitan ng NFC"</string>
     <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="6981652347448777459">"Kapag in-on ang tampok na ito, maaari mong i-beam ang nilalaman ng app sa isa pang device na may kakayahan sa NFC sa pamamagitan ng paghawak sa mga device nang magkalapit. Halimbawa, maaari mong i-beam ang mga pahina sa Browser, video sa YouTube, contact sa People, at higit pa.\n\nPaglapitin lamang ang mga device (karaniwang magkatalikuran) at pagkatapos ay pindutin ang iyong screen. Tinutukoy ng app kung ano ang nabi-beam."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Kapag in-on ang feature na ito, maaari mong i-beam ang content ng app sa isa pang device na may kakayahan sa NFC sa pamamagitan ng paghawak sa mga device nang magkalapit. Halimbawa, maaari mong i-beam ang mga page sa Browser, video sa YouTube, contact sa People, at higit pa.\n\nPaglapitin lamang ang mga device (karaniwang magkatalikuran) at pagkatapos ay pindutin ang iyong screen. Tinutukoy ng app kung ano ang nabi-beam."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Pagtuklas sa serbisyo ng network"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Payagan ang apps sa iba pang mga device na tumuklas ng apps sa device na ito"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Ino-off ang Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Nasa Airplane mode"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Hindi makapag-scan ng mga network"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notification ng network"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Mag-notify tuwing may available na pampublikong network"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Iwasan ang mahihinang koneksyon"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Huwag gumamit ng Wi-Fi network maliban kung mayroon itong mahusay na koneksyon sa Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Gamit lang ng network na may maayos na koneksyon sa Internet"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Palaging available ang pag-scan"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Palaging payagan ang pag-i-scan"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Hayaang mag-scan ng mga network ang serbisyo sa lokasyon ng Google at iba pang mga app, kahit na naka-off ang Wi-Fi"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Awtomatikong gamitin ang bukas na Wi‑Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Hayaan ang Wi‑Fi assistant na awtomatikong kumonekta sa bukas na network na mataas ang kalidad."</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Pumili ng assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Mag-install ng mga certificate"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Upang mapahusay ang katumpakan ng lokasyon at para sa iba pang mga layunin, maaaring mag-scan ang Google at ang iba pang app kung may mga network sa malapit, kahit na naka-off ang Wi-Fi. Kung hindi mo ito gustong mangyari, pumunta sa Advanced &gt; Palaging available ang pag-scan."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Maaaring mag-scan ang apps kung may mga network sa malapit, kahit na naka-off ang Wi-Fi. Kung hindi mo ito gustong mangyari, pumunta sa Advanced &gt; Palaging available ang pag-scan."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Upang pahusayin ang katumpakan ng lokasyon, magsa-scan ang mga app at serbisyo para sa mga Wi‑Fi network, kahit na naka-off ang Wi‑Fi. Maaari mo itong baguhin sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pagsa-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Huwag ipakitang muli"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Panatilihing naka-on ang Wi-Fi habang naka-sleep"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Naka-on ang Wi-Fi sa sleep"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Magdagdag ng isa pang network"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Higit pa"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Awtomatikong setup (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Upang makumpleto ang pag-setup, kailangan ng iyong tablet ng access sa Wi-Fi. Pagkatapos ng pag-setup, maaari kang magpalipat-lipat sa pagitan ng cellular data at Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Mga advanced na opsyon"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Protektadong Setup ng Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Sinisimulan ang WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Pindutin ang button na Protektadong Setup ng Wi-Fi sa iyong router. Maaaring tinatawag itong \"WPS\" o naglalaman ng simbolong ito:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Pindutin ang button ng Wi‑Fi Protected Setup sa iyong router. Maaaring tinatawag itong \"WPS\" o may marka ng simbolong ito:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Ilagay ang pin na <xliff:g id="NUMBER">%1$s</xliff:g> sa iyong Wi-Fi router. Maaaring tumagal nang hanggang dalawang minuto bago makumpleto ang pag-setup."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"Nagtagumpay ang WPS. Kumokonekta sa network…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Nakakonekta sa Wi‑Fi network na <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous na pagkakakilanlan"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Password"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Ipakita ang password"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Config 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">"Mga setting ng IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(di-nabago)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(di-tukoy)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Na-save"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Hindi Pinagana"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Pagkabigo ng Configuration ng IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Pagkabigo ng Koneksyon sa WiFi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema sa pagpapatotoo"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Wala sa sakop"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Walang Natukoy na Access sa Internet, hindi awtomatikong muling kumonekta."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Available ang WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Available ang WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ilagay ang iyong password sa network"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Wala"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Mag-sign in upang kumonekta?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"Kinakailangan ka ng <xliff:g id="APP_NAME">%1$s</xliff:g> na mag-sign in online bago ka makakakonekta sa network."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KUMONEKTA"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Walang access sa Internet ang network na ito. Gamitin pa rin ang network na ito?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Huwag nang tanungin muli sa network na ito"</string>
     <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>
@@ -704,7 +679,7 @@
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Hindi nakakonekta sa Wi-Fi network na ito ang tablet."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Hindi nakakonekta ang device na ito sa Wi‑Fi network na ito."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Hindi nakakonekta sa Wi-Fi network na ito ang telepono."</string>
-    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Mga naka-save na network"</string>
+    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Naka-save na networks"</string>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced na Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Frequency band ng Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tukuyin ang sakop ng frequency ng pagpapatakbo"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK portable Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portable na Wi‑Fi 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_mode_title" msgid="2164073796253284289">"Kagustuhan sa pagtawag"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi calling mode"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Mas gusto ang Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Mas gusto ang cellular"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tunog"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ayusin ang liwanag ng screen"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"I-optimize ang antas ng brightness para sa available na ilaw"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Liwanag"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Madilim"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Awtomatiko"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pag-off ng screen"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"I-update ang gustong SIM card?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"Ang <xliff:g id="NEW_SIM">%1$s</xliff:g> ay ang nag-iisang SIM sa iyong device. Gusto mo bang gamitin ang SIM na ito para sa cellular data, mga tawag at mensaheng SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Maling PIN code ng SIM, dapat ka nang makipag-ugnay sa iyong carrier upang i-unlock ang iyong device."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Maling PIN code ng SIM, mayroon kang <xliff:g id="NUMBER">%d</xliff:g> (na) natitirang pagsubok bago ka dapat makipag-ugnay sa iyong carrier upang i-unlock ang iyong device."</item>
-    <item quantity="other" msgid="77103619544346451">"Maling PIN code ng SIM, mayroon kang <xliff:g id="NUMBER">%d</xliff:g> (na) natitirang pagsubok."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Maling SIM PIN code, <xliff:g id="NUMBER_1">%d</xliff:g> subok na lang bago ka makipag-ugnayan sa carrier mo upang i-unlock ang device.</item>
+      <item quantity="other">Maling SIM PIN code, <xliff:g id="NUMBER_1">%d</xliff:g> subok na lang bago ka makipag-ugnayan sa carrier mo upang i-unlock ang device.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Nabigo ang operasyon ng SIM PIN!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Katayuan ng tablet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Katayuan ng telepono"</string>
@@ -882,11 +874,11 @@
     <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">"Katayuan"</string>
+    <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Katayuan"</string>
-    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Katayuan ng baterya, network, at iba pang impormasyon"</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status ng baterya, network, at iba pang impormasyon"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Numero ng telepono, signal, atbp."</string>
-    <string name="storage_settings" msgid="4211799979832404953">"Imbakan"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Storage"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Mga setting ng imbakan"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"I-unmount ang imbakan na USB, tingnan ang available na imbakan"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"I-unmount ang SD card, tingnan ang available na imbakan"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Available (read-only)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Kabuuang espasyo"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Kinakalkula..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (data ng app &amp; nilalaman ng media)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Mga app at data ng app"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Mga Download"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Mga larawan, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musika, mga ringtone, mga podcast, atbp.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Iba pang mga file"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Naka-cache na data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount nabahagi imbakan"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"I-unmount ang SD card"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Nagaganap ang pag-unmount"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Nauubusan na ang puwang ng storage"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Maaaring hindi gumana nang tama ang ilang paggana ng system, gaya ng pag-sync. Subukang magbakante ng puwang sa pamamagitan ng pagtanggal o pag-unpin ng mga item, gaya ng apps o nilalaman ng media."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Palitan ang pangalan"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"I-mount"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"I-eject"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Burahin at i-format"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Burahin at i-format internal storage"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Koneksyon ng computer ng USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Koneksyon ng computer ng USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Kumonekta bilang"</string>
@@ -962,9 +959,49 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Hinahayaan kang maglipat ng mga media file sa Windows, o ang paggamit ng Android File Transfer sa Mac (tingnan ang www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Hinahayaan kang maglipat ng mga larawan gamit ang software ng camera, at maglipat ng anumang mga file sa mga computer na hindi sumusuporta sa MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"I-install ang mga tool sa paglipat ng file"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Hinahayaan ang mga application na na-enable ng MIDI na gumana sa pamamagitan ng USB gamit ang MIDI software sa iyong computer."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Iba pang mga user"</string>
-    <string name="battery_status_title" msgid="9159414319574976203">"Katayuan ng baterya"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Storage ng device"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Naaalis na storage"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ang libre (Kabuuan <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Na-mount na ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Hindi ma-mount ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Na-eject na nang ligtas ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Hindi ma-eject nang ligtas ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"Na-format na ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Hindi ma-format ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Palitan ang pangalan ng storage"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Pagkatapos ng pagfo-format, maaari mong gamitin ang <xliff:g id="NAME_0">^1</xliff:g> na ito sa iba pang mga device. \n\nBuburahin ang lahat ng data sa <xliff:g id="NAME_1">^1</xliff:g> na ito. Isaalang-alang muna ang pagba-back up. \n\n"<b>"I-back up ang mga larawan &amp; at iba pang media"</b>" \nIlipat ang iyong mga media file sa alternatibong storage sa device na ito, o ilipat ang mga ito sa isang computer gamit ang USB cable. \n\n"<b>"I-back up ang mga app"</b>" \nAng lahat ng app na nakaimbak sa <xliff:g id="NAME_6">^1</xliff:g> na ito ay ia-uninstall at buburahin ang data ng mga ito. Upang mapanatili ang mga app na ito, ilipat ang mga ito sa alternatibong storage sa device na ito."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Kapag na-eject mo ang <xliff:g id="NAME_0">^1</xliff:g> na ito, hihinto sa paggana ang mga app na nakaimbak dito, at hindi magiging available ang mga media file na nakaimbak dito hanggang sa muli itong mailagay."</b>" \n\nAng <xliff:g id="NAME_1">^1</xliff:g> na ito ay naka-format na gumana lang sa device na ito. Hindi ito gagana sa anumang iba pang device."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"I-set up ang iyong <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gamitin bilang portable na storage"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Para sa paglilipat ng mga larawan at iba pang media sa pagitan ng mga device."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Gamitin bilang internal storage"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Para lang sa pag-iimbak ng kahit ano sa device na ito, kabilang ang mga app at larawan. Nangangailangan ng pagfo-format na pumipigil sa paggana nito sa iba pang mga device."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"I-format bilang internal storage"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Kinakailangan nitong ma-format ang <xliff:g id="NAME_0">^1</xliff:g> upang gawin itong secure. \n\nPagkatapos ng pagfo-format, ang <xliff:g id="NAME_1">^1</xliff:g> na ito ay gagana lang sa device na ito. \n\n"<b>"Binubura ng pagfo-format ang lahat ng data na kasalukuyang nakaimbak sa <xliff:g id="NAME_2">^1</xliff:g>."</b>" Upang maiwasang mawala ang data, isaalang-alang ang pagba-back up dito."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Burahin at i-format"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Pino-format ang <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Huwag alisin ang <xliff:g id="NAME">^1</xliff:g> habang nagfo-format ito."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Maglipat ng data sa bagong storage"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Maaari mong ilipat ang iyong mga larawan, file at data ng app sa bagong <xliff:g id="NAME">^1</xliff:g> na ito. \n\nAng paglilipat ay magtatagal ng humigit-kumulang <xliff:g id="TIME">^2</xliff:g> at magbabakante ng <xliff:g id="SIZE">^3</xliff:g> sa internal storage. Hindi gagana ang ilang app habang isinasagawa ito."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Maglipat ngayon"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Maglipat sa ibang pagkakataon"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Maglipat ng data ngayon"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Ang paglilipat ay magtatagal ng humigit-kumulang <xliff:g id="TIME">^1</xliff:g>. Magbabakante ito ng <xliff:g id="SIZE">^2</xliff:g> sa internal storage."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Ilipat"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Naglilipat ng data…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Habang naglilipat: \n• Huwag alisin ang <xliff:g id="NAME">^1</xliff:g>. \n• Hindi gagana nang tama ang ilang app. \n• Panatilihing naka-charge ang device."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"Nakahanda na ang <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Nakahanda na ang iyong <xliff:g id="NAME">^1</xliff:g> na gamitin sa mga larawan at iba pang media."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Gumagana ang iyong bagong <xliff:g id="NAME">^1</xliff:g>. \n\nUpang maglipat ng mga larawan, file at data ng app patungo sa device na ito, pumunta sa Mga Setting &gt; Storage."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Ilipat ang <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Tatagal lang ng ilang sandali ang paglilipat ng <xliff:g id="APP">^1</xliff:g> at ng data nito sa <xliff:g id="NAME_0">^2</xliff:g>. Hindi mo magagamit ang app hanggang sa matapos ang paglilipat. \n\nHuwag alisin ang <xliff:g id="NAME_1">^2</xliff:g> habang naglilipat."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Inililipat ang <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Huwag alisin ang <xliff:g id="NAME">^1</xliff:g> habang naglilipat. \n\nHindi magiging available ang <xliff:g id="APP">^2</xliff:g> app sa device na ito hanggang sa matapos ang paglilipat."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Kanselahin ang paglilipat"</string>
+    <string name="battery_status_title" msgid="9159414319574976203">"Status ng baterya"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Antas ng baterya"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Mga APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"I-edit ang access point"</string>
@@ -987,14 +1024,14 @@
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP o CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"Uri ng APN"</string>
-    <string name="apn_protocol" msgid="3272222921649348640">"protocol ng APN"</string>
-    <string name="apn_roaming_protocol" msgid="3386954381510788422">"Protocal sa roaming ng APN"</string>
+    <string name="apn_protocol" msgid="3272222921649348640">"Protocol ng APN"</string>
+    <string name="apn_roaming_protocol" msgid="3386954381510788422">"Protocol sa roaming ng APN"</string>
     <string name="carrier_enabled" msgid="407655861175280806">"Pagpapagana/hindi pagpapagana ng APN"</string>
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Pinagana ang APN"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Hindi pinagana ang APN"</string>
-    <string name="bearer" msgid="594270280031923558">"Maydala"</string>
+    <string name="bearer" msgid="594270280031923558">"Bearer"</string>
     <string name="mvno_type" msgid="2543253857818336421">"Uri ng MVNO"</string>
-    <string name="mvno_match_data" msgid="4560671695220540466">"Halaga ng MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO value"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Tanggalin ang APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Bagong APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"I-save"</string>
@@ -1004,13 +1041,18 @@
     <string name="error_apn_empty" msgid="6056233831214537267">"Hindi maaaring walang laman ang APN."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Dapat na 3 digit ang field na MCC."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Dapat na 2 o 3 digit ang field ng MNC."</string>
-    <string name="restore_default_apn" msgid="8178010218751639581">"Ipinapanumbalik ang default na mga setting ng APN"</string>
+    <string name="restore_default_apn" msgid="8178010218751639581">"Nire-restore ang default na mga setting ng APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"I-reset sa default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Nakumpleto ang pag-reset sa default na mga setting ng APN."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"I-reset ang mga network setting"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Ire-reset nito ang lahat ng network setting, kabilang ang:\n\n"<li>"Wi‑Fi"</li>\n<li>"Cellular data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"I-reset ang mga setting"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"I-reset ang lahat ng network setting? Hindi mo maaaring i-undo ang pagkilos na ito!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"I-reset ang mga setting"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"I-reset?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Na-reset na ang mga network setting"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"I-reset ang device"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"I-reset ang data ng factory"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Binubura ang lahat ng data sa tablet"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Binubura ang lahat ng data sa telepono"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na 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="9165016501623540228">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na storage"</b>" ng iyong telepono, 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_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Burahin ang lahat ng data sa SD card, gaya ng musika o mga larawan"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"I-reset ang tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"I-reset ang telepono"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Burahin ang lahat ng iyong personal na impormasyon at na-download na apps? Hindi mo mababawi ang pagkilos na ito!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Burahin ang lahat ng iyong personal na impormasyon at na-download na app? Hindi mo maaaring i-undo ang pagkilos na ito!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Burahin ang lahat"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Kailangan mong iguhit ang iyong pattern ng pag-unlock upang magkumpirma ng factory data reset."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Walang isinagawang pag-reset dahil hindi available ang serbisyong System Clear."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"I-reset?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Hindi available ang factory reset para sa user na ito"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Burahin ang USB storage, na tinatanggal ang lahat ng file na nakaimbak doon? Hindi mo mababawi ang pagkilos na ito!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Burahin ang SD card, na tinatanggal ang lahat ng file na nakaimbak doon? Hindi mo mababawi ang pagkilos na ito!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Burahin ang lahat"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Dapat mong iguhit ang iyong pattern ng pag-unlock upang kumpirmahin na nais mong burahin ang USB storage."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Kailangan mong iguhit ang iyong pattern ng pag-unlock upang kumpirmahin na nais mong burahin ang SD card."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Mga setting ng tawag"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"I-set up ang voicemail, pagpasa ng tawag, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Pag-tether sa USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Tulong"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mga cellular network"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Default na SMS app"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS app"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Palitan ang SMS app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gamitin ang <xliff:g id="NEW_APP">%1$s</xliff:g> sa halip na ang <xliff:g id="CURRENT_APP">%2$s</xliff:g> bilang iyong SMS app?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gamitin ang <xliff:g id="NEW_APP">%s</xliff:g> bilang iyong SMS app?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode ng lokasyon"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gumamit ng GPS, Wi‑Fi at mga cellular network upang matukoy ang lokasyon"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gumamit ng Wi-Fi at cellular network upang matukoy ang lokasyon"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gamitin ang GPS upang matukoy ang iyong lokasyon"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gamitin ang GPS upang matukoy ang lokasyon"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Pagsa-scan"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Nagsa-scan"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Pagsa-scan para sa Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Pahusayin ang lokasyon sa pamamagitan ng pagpapahintulot sa mga app at serbisyo na mag-scan para sa mga Wi-Fi network, kahit na naka-off ang Wi-Fi"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Pagsa-scan para sa Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Pahusayin ang lokasyon sa pamamagitan ng pagpapahintulot sa mga serbisyo ng system na mag-scan para sa mga Bluetooth device, kahit na naka-off ang Bluetooth"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasyon ng Wi-Fi at cellular network"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ipagamit sa apps ang serbisyo ng lok. ng Google para mabilis na itantya ang iyong lok.  Kokolektahin at ipapadala sa Google ang mga di alam na data ng lok."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Natukoy ng Wi-Fi ang lokasyon"</string>
@@ -1131,7 +1176,7 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Lisensya ng System WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Mga Wallpaper"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Mga provider ng koleksyon ng imahe na galing sa satellite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
-    <string name="settings_license_activity_title" msgid="7553683406244228650">"Mga lisensya ng bukas na pinagmumulan"</string>
+    <string name="settings_license_activity_title" msgid="7553683406244228650">"Mga lisensya ng open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"May problema sa pag-load ng mga lisensya."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Naglo-load…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Impormasyon sa kaligtasan"</string>
@@ -1150,12 +1195,16 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Naitakda ang password"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Naitakda ang PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Itinakda ang pattern"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Seguridad ng screen"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Gamitin ang iyong pattern sa device upang magpatuloy."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Ilagay ang iyong PIN sa device upang magpatuloy."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Ilagay ang iyong password sa device upang magpatuloy."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Seguridad ng device"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Baguhin ang naka-unlock na pattern"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Baguhin ang naka-unlock na PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kumpirmahin ang naka-save na pattern"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Subukang muli:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Kunin ang naka-unlock pattern"</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_incorrect_too_short" msgid="1348234155120957561">"Pagdugtungin ang hindi bababa sa <xliff:g id="NUMBER">%d</xliff:g> (na) tuldok. Subukang muli."</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Itakda ang naka-unlock na pattern"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Baguhin ang naka-unlock na pattern"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Paano kumuha ng isang naka-unlock na pattern"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Masyadong maraming maling pagtatangka!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Subukang muli sa loob ng <xliff:g id="NUMBER">%d</xliff:g> (na) segundo."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Masyadong maraming maling pagsubok. Subukang muli sa loob ng <xliff:g id="NUMBER">%d</xliff:g> (na) segundo."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Hindi naka-install ang application sa iyong telepono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pamahalaan ang apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pamahalaan at alisin ang naka-install na apps"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Pag-uri-uriin ayon sa laki"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Pakita tumatakbo serbisyo"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Ipakita na-cache proseso"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"I-reset kagustuhan sa app"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"I-reset ang gusto sa app?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ire-reset nito ang lahat ng kagustuhan para sa:\n\n "<li>"Naka-disable na apps"</li>\n" "<li>"Mga naka-disable na notification ng app"</li>\n" "<li>"Mga default na application para sa mga pagkilos"</li>\n" "<li>"Mga paghihigpit sa data sa background para sa apps"</li>\n" "<li>"Anumang mga paghihigpit sa pahintulot"</li>\n\n" Hindi ka mawawalan ng anumang data ng app."</string>
@@ -1290,7 +1339,7 @@
     <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"Hindi mailipat ang app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ninanais na lokasyon sa pag-install"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Baguhin ang ninanais na lokasyon ng pag-install para sa bagong apps"</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Huwag paganahin built-in app?"</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"I-disable ang built-in app?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Kung hindi mo papaganahin ang isang built-in na app, maaaring hindi kumilos nang tama ang iba pang apps."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Tanggalin ang data at huwag paganahin ang app?"</string>
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Kung hindi mo papaganahin ang isang built-in na app, maaaring hindi gumana nang maayos ang iba pang apps. Matatanggal din ang iyong data."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Pagpapagana ng app"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Gumagana"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Hindi pa nagamit)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Walang default na Apps."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Paggamit ng imbakan"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Tingnan ang storage na ginagamit ng apps"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Mga tumatakbong serbisyo"</string>
@@ -1332,7 +1382,7 @@
     <string name="no_services" msgid="7133900764462288263">"Hindi aktibo"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Mga Serbisyo"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Mga Proseso"</string>
-    <string name="service_stop" msgid="6369807553277527248">"Huminto"</string>
+    <string name="service_stop" msgid="6369807553277527248">"Ihinto"</string>
     <string name="service_manage" msgid="1876642087421959194">"Mga Setting"</string>
     <string name="service_stop_description" msgid="9146619928198961643">"Sinimulan ng app nito ang serbisyong ito. Ang pagpigil dito ay maaaring magsanhi na mabigo ang app."</string>
     <string name="heavy_weight_stop_description" msgid="2979218727598321095">"Hindi mapahinto nang ligtas ang app na ito. Kung ihihinto mo ito, maaaring mawala mo ang ilan sa iyong kasalukuyang gawa."</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Impormasyon ng tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Impormasyon ng telepono"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Impormasyon ng baterya"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Mabilis na paglunsad"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Magtakda ng mga shortcut ng keyboard upang maglunsad ng apps"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Magtalaga ng app"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Walang shortcut"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Maghanap + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"I-clear"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Ang iyong shortcut para sa <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) ay maki-clear."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Kanselahin"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apps"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Mga Shortcut"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Pag-input ng teksto"</string>
     <string name="input_method" msgid="5434026103176856164">"Paraan ng input"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Kasalukuyang Keyboard"</string>
@@ -1424,7 +1463,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Mga setting ng keyboard ng onscreen"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Pisikal na keyboard"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Mga setting ng pisikal na keyboard"</string>
-    <string name="development_settings_title" msgid="215179176067683667">"Mga opsyon ng nag-develop"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Mga opsyong ng developer"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Magtakda ng mga pagpipilian para sa pagbuo ng app"</string>
     <string name="development_settings_not_available" msgid="4308569041701535607">"Hindi available ang mga pagpipilian ng developer para sa user na ito"</string>
     <string name="vpn_settings_not_available" msgid="956841430176985598">"Hindi available ang mga setting ng VPN para sa user na ito"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"I-capture ang lahat ng bluetooth HCI packet sa isang file"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Pag-a-unlock ng OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Payagan na ma-unlock ang bootloader"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Ilagay ang iyong PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ilagay ang PIN ng iyong device upang ma-enable ang pag-unlock na OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Payagan ang pag-a-unlock ng OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"BABALA: Hindi gagana ang mga feature sa pagprotekta sa device sa device na ito habang naka-on ang setting na ito."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Mga laki ng buffer ng Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pumili laki Logger kada log buffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Payagan ang mga kunwaring lokasyon"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Payagan ang mga kunwaring lokasyon"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"I-enable ang pagsisiyasat sa attribute na view"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Networking"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification ng wireless display"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"I-enable ang Pagla-log sa Wi‑Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresibong paglipat ng Wi‑Fi sa Cellular"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Palaging payagan ang Mga Pag-scan sa Roaming ng Wi‑Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Gumamit ng legacy na DHCP client"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Ipakita ang mga opsyon para sa certification ng wireless display"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Pataasin ang antas ng Wi‑Fi logging, ipakita sa bawat SSID RSSI sa Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Kapag naka-enable, mas magiging agresibo ang Wi‑Fi sa paglipat ng koneksyon ng data sa Cellular, kapag mahina ang signal ng Wi‑Fi"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Payagan/Huwag payagan ang Mga Pag-scan sa Roaming ng Wi‑Fi batay sa dami ng trapiko ng data na mayroon sa interface"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Mga laki ng buffer ng Logger"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pumili laki Logger kada log buffer"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Pumili ng USB Configuration"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Pumili ng USB Configuration"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"I-enable ang pagsisiyasat sa attribute na view"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gamitin ang DHCP client mula sa Lollipop sa halip na ang bagong Android DHCP client."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Payagan ang pag-debug ng USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ang pag-debug ng USB ay nilalayon para sa mga layuning pagpapabuti lamang. Gamitin ito upang kumopya ng data sa pagitan ng iyong computer at iyong device, mag-install ng apps sa iyong device nang walang notification, at magbasa ng data ng log."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Bawiin ang access sa pag-debug ng USB mula sa lahat ng computer na dati mong pinahintulutan?"</string>
@@ -1504,7 +1551,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Shortcut sa pagiging naa-access"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"I-on"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"I-off"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kapag naka-on ang tampok na ito, mabilis mong mapapagana ang mga tampok ng accessibility sa dalawang hakbang:\n\nHakbang 1: Pindutin nang matagal ang power button hanggang sa may marinig kang tunog o maramdamang vibration.\n\nHakbang 2: Pindutin nang matagal gamit ang dalawang daliri hanggang sa makarinig ka ng kumpirmasyong audio.\n\nKung marami ang user ng device, pansamantalang pinapagana ng paggamit sa shortcut na ito sa lock screen ang accessibility hanggang sa ma-unlock ang device."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kapag naka-on ang feature na ito, mabilis mong mapapagana ang mga accessibility feature sa dalawang hakbang:\n\nHakbang 1: Pindutin nang matagal ang power button hanggang sa may marinig kang tunog o maramdamang vibration.\n\nHakbang 2: Pindutin nang matagal gamit ang dalawang daliri hanggang sa makarinig ka ng kumpirmasyong audio.\n\nKung marami ang user ng device, pansamantalang pinapagana ng paggamit sa shortcut na ito sa lock screen ang accessibility hanggang sa ma-unlock ang device."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Malaking teksto"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text na high contrast"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pag-magnify ng screen"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Gumamit ng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Kailangan ng <xliff:g id="SERVICE">%1$s</xliff:g> na:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Dahil pinipigilan ng isang app ang kahilingan ng pahintulot, hindi ma-verify ng Mga Setting ang iyong tugon."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Kung io-on mo ang <xliff:g id="SERVICE">%1$s</xliff:g>, hindi gagamitin ng iyong device ang lock ng iyong screen upang pahusayin ang pag-encrypt ng data."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Dahil nag-on ka ng serbisyo sa accessibility, hindi gagamitin ng iyong device ang lock ng iyong screen upang pahusayin ang pag-encrypt ng data."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Dahil nakakaapekto ang pag-o-on ng <xliff:g id="SERVICE">%1$s</xliff:g> sa pag-encrypt ng data, kailangan mong kumpirmahin ang iyong pattern."</string>
@@ -1627,7 +1675,7 @@
     <string name="awake" msgid="387122265874485088">"Device ng oras ng paggising"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na nasa oras"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na nasa oras"</string>
-    <string name="history_details_title" msgid="3608240585315506067">"Mga detalye ng kasaysayan"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Mga detalye ng history"</string>
     <string name="details_title" msgid="3792801565213935385">"Gamitin ang mga detalye"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gamitin ang mga detalye"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Isaayos ang paggamit ng power"</string>
@@ -1699,17 +1747,23 @@
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Awtomatikong i-on"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Hindi Kailanman"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s na lang ang natitirang baterya"</string>
-    <string name="process_stats_summary_title" msgid="1144688045609771677">"Mga Istatistika ng Proseso"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Stats ng Proseso"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Mahahalagang istatistika tungkol sa mga tumatakbong proseso"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memory na ginamit"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apps tapos na sa <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> ng <xliff:g id="TOTALRAM">%2$s</xliff:g> ang nagamit sa loob ng <xliff:g id="TIMEDURATION">%3$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">"Naka-cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Kasalukuyang <xliff:g id="MEMSTATE">%1$s</xliff:g> ang memory ng device"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Average na paggamit ng RAM"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximum na paggamit ng RAM"</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">"Mga Cache"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Ginagamit na RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Ginagamit na RAM (background)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Oras ng paggana"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Mga Proseso"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Mga Serbisyo"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tagal"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Mga detalye ng memory"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 oras"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 araw"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Ipakita ang system"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Itago ang system"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gamitin ang Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Uri ng mga stats"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Background"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Pinapatungan ng default na mga setting sa ibaba ang mga setting ng app"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Mga default na setting"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Default na engine"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Itinatakda ang speech synthesis engine upang magamit para sa tekstong sinasabi"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Itakda ang speech synthesis engine upang gamitin para sa sinasalitang text"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Rate ng pagsasalita"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Bilis ng pagsambit sa teksto"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
@@ -1822,11 +1877,10 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Software lang"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Hindi available ang mga kredensyal para sa user na ito"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-install ng kredensyal."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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 nilalaman?"</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 imbakan ng kredensyal."</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"I-back up ang aking data"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Mag-back up ng data ng app, mga password ng Wi-Fi, at iba pang mga setting sa mga server ng Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"I-back up ang account"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Walang account ang kasalukuyang nag-iimbak ng na-back up na data"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Isama ang data ng app"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Awtomatikong pagbalik"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Kapag muling ini-install ang isang app, ipanumbalik ang mga na-back up na setting at data"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Hindi aktibo ang backup na serbisyo."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Itinatakda ito ng iyong patakaran sa device."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Password ng pag-backup ng desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Kasalukuyang hindi pinoprotektahan ang mga buong pag-backup ng desktop"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Pindutin upang baguhin o alisin ang password para sa mga buong pag-backup ng desktop"</string>
@@ -1990,7 +2042,7 @@
     <string name="strict_mode" msgid="1938795874357830695">"Pinagana ang istriktong mode"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"I-flash screen pag gawa app ng haba takbo sa una thread"</string>
     <string name="pointer_location" msgid="6084434787496938001">"Lokasyon ng pointer"</string>
-    <string name="pointer_location_summary" msgid="840819275172753713">"Overlay ng screen nagpapakita ng touch data"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Overlay ng screen na nagpapakita ng touch data"</string>
     <string name="show_touches" msgid="1356420386500834339">"Ipakita ang mga pagpindot"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Ipakita ang visual na feedback para sa mga pagpindot"</string>
     <string name="show_screen_updates" msgid="5470814345876056420">"Ipakita update sa surface"</string>
@@ -2003,7 +2055,7 @@
     <string name="disable_overlays" msgid="2074488440505934665">"Wag paganahin HW overlay"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Laging gamitin ang GPU para sa screen compositing"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Gayahin ang color space"</string>
-    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Paganahin trace ng OpenGL"</string>
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"I-enable ang OpenGL traces"</string>
     <string name="use_awesomeplayer" msgid="1583337008516364226">"Gamitin ang AwesomePlayer (di na ginagamit)"</string>
     <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Gamitin ang AwesomePlayer sa halip na NuPlayer sa karamihan ng media playback"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"I-disable USB audio routing"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Scale ng animation sa paglipat"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scale tagal ng animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"I-simulate, ika-2 display"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Multi-window mode"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Maraming aktibidad sa screen nang sabay-sabay."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"I-enable ang multi-window mode?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"BABALA: Isa itong ganap na pang-eksperimentong feature na nagbibigay-daan sa pagsasabay-sabay ng maraming aktibidad sa screen sa pamamagitan ng UI ng Mga kamakailang app. Maaaring mag-crash ang ilang app o hindi gumana nang ayos kapag ginamit sa feature na ito."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Huwag magtago ng mga aktibidad"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Sirain ang bawat aktibidad sa sandaling iwan ito ng user"</string>
@@ -2140,7 +2196,7 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Kanselahin"</string>
     <string name="vpn_save" msgid="4233484051644764510">"I-save"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Kumonekta"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"I-edit ang profile sa VPN"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"I-edit ang profile ng VPN"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Kumonekta sa <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Idagdag ang profile sa VPN"</string>
@@ -2154,13 +2210,13 @@
     <string name="vpn_missing_cert" msgid="7972907102570411501">"May nawawalang certificate. Paki-edit ang 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">"Hindi pinagana"</string>
-    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Paganahin"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"I-disable"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Enable"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Alisin"</string>
-    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Paganahin ang CA certificate ng system?"</string>
-    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Huwag paganahin ang CA certificate ng system?"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"I-enable ang CA certificate system?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"I-disable ang CA certificate system?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Permanenteng alisin ang CA certificate ng user?"</string>
-    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Pang-check ng pagbabaybay"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Spell checker"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"I-type ang iyong kasalukuyang buong backup na password dito"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Mag-type ng bagong password dito para sa mga buong pag-backup"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Muling i-type ang iyong bagong buong backup na password dito"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Pinaghihigpitang profile"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Magdagdag ng bagong user?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"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 sarili niyang mga app, wallpaper at iba pa. Maaari ding isaayos ng mga user ang mga setting ng device gaya 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_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>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Alisin ang bisita?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Ide-delete ang lahat ng app at data sa session na ito."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Alisin"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Payagan ang mga tawag sa telepono"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Payagan ang mga tawag sa telepono at SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"I-on ang mga pagtawag sa telepono"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"I-on ang mga pagtawag sa telepono at SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Alisin ang user"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Payagan ang mga tawag sa telepono?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"I-on ang mga pagtawag sa telepono?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Ibabahagi ang history ng pagtawag sa user na ito."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Payagan ang mga tawag sa telepono at SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Ibabahagi sa user na ito ang history ng pagtawag at SMS."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"I-on ang mga pagtawag sa telepono at SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Ibabahagi sa user na ito ang history ng pagtawag at SMS."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Payagan ang apps at nilalaman"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Mga application na may mga paghihigpit"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Palawakin ang mga setting para sa application"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"I-RENAME"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Magtakda ng mga paghihigpit sa app"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kinokontrol ng <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Hindi sinusuportahan ang app na ito sa mga pinaghihigpitang profile"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Maa-access ng app na ito ang iyong mga account"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Maa-access ng app na ito ang iyong mga account. Kinokontrol ng <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi at Mobile"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Payagan ang pagbago sa mga setting ng Wi‑Fi at Mobile"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message pagte-text mga mensahe pagmemensahe"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellular cell carrier wireless na data 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi tawag pagtawag"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen na touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"i-dim ang screen touchscreen baterya"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"i-dim ang screen touchscreen baterya"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background i-personalize i-customize ang display"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"madilim tema night mode i-dim screen invert liwanag"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"background i-personalize i-customize display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"laki ng text"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyekto"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"pag-cast ng proyekto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espasyo disk hard drive device paggamit"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"paggamit ng baterya i-charge"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"pagbabaybay diksyunaryo spellcheck auto-correct"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"paghihigpit paghigpitan pinaghigpitan"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"pagwawasto ng text tama tunog i-vibrate awtomatiko wika galaw magmungkahi suhestyon tema nakakapanakit na salita i-type emoji international"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"i-reset ang mga kagustuhan sa default"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"default na ice app na pang-emergency"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"system ng mga application ng pag-download ng mga app"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"seguridad ng mga pahintulot sa mga app"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"default ng mga app"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"i-slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"I-set up ang Tag ng NFC sa Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Magsulat"</string>
@@ -2386,19 +2449,20 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume ng alarm"</string>
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Mga Paggambala"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Kapag dumating ang mga tawag at notification"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Palaging manggambala"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Payagan lang ang mga may priyoridad na paggambala"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Huwag manggambala"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priyoridad lang pinapayagan"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Mga awtomatikong panuntunan"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priyoridad lang"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Mga alarm lang"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Walang pagkaantala"</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="ringtone_title" msgid="5379026328015343686">"Ringtone ng telepono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Default na ringtone sa notification"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Mag-vibrate din para sa tawag"</string>
     <string name="notification_section_header" msgid="95661783916799134">"Notification"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse na ilaw ng notification"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Kapag naka-lock ang device"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ipakita ang lahat ng nilalaman ng notification"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Itago ang sensitibong nilalaman ng notification"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ipakita ang lahat ng content ng notification"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Itago ang sensitibong content ng notification"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ganap na huwag magpakita ng mga notification"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kapag naka-lock ang device, paano mo gustong maipakita ang mga notification?"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Mga notification sa app"</string>
@@ -2416,65 +2480,118 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Mag-vibrate"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Access sa notification"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Hindi makakapagbasa ng mga notification ang apps"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app ang makakapagbasa ng mga notification"</item>
-    <item quantity="other" msgid="980049191810249052">"%d (na) apps ang makakapagbasa ng mga notification"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d app ang makakapagbasa ng mga notification</item>
+      <item quantity="other">%d na app ang makakapagbasa ng mga notification</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Walang mga naka-install na notification listener."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Paganahin ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Mababasa ng <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ang lahat ng notification na na-post ng system o ng anumang naka-install na app, na maaaring may kasamang personal na impormasyon tulad ng mga pangalan ng contact at teksto ng mga mensaheng ipinadala sa iyo. Magagawa din nitong i-dismiss ang mga notification na ito o pumindot ng mga button ng pagkilos sa loob ng mga ito."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Mga provider ng kundisyon"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Walang app ang nagbibigay ng mga kundisyon"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"Nagbibigay ang %d app ng mga kundisyon"</item>
-    <item quantity="other" msgid="358057362115673258">"Nagbibigay ang %d (na) app ng mga kundisyon"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Walang naka-install na mga provider ng kundisyon."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"I-enable ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Magagawa ng <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> na magdagdag ng mga kundisyon sa paglabas sa mode na Huwag istorbohin."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"I-block"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"I-block lahat"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Huwag kailanman magpakita ng mga notification mula sa app na ito"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Priyoridad"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Magpakita ng mga notification sa itaas ng listahan at hayaan lang na magpatuloy ang mga ito kapag ang device ay nakatakda lang magkaroon ng mga priyoridad na pagkaantala"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Sensitibo"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Kapag naka-lock ang device, itago ang anumang sensitibong content mula sa mga notification ng app na ito"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Ituring na priyoridad"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Marinig ang mga notification ng app na ito kapag nakatakda sa May priyoridad lang ang Huwag istorbohin"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Payagan ang pagpi-peek"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Hayaan ang app na ito na bigyang-diin ang ilang notification sa pamamagitan ng pag-slide sa mga ito nang panandalian sa view sa kasalukuyang screen"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Itago ang sensitibong content"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Kapag naka-lock ang device, itago ang content sa mga notification ng app na ito na maaaring magsiwalat ng pribadong impormasyon"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Naka-block"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priyoridad"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitibo"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tapos na"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Hanggang sa i-off mo ito"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Mga may priyoridad na paggambala"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Walang serbisyo"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Mga Araw"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Wala"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Pinapayagan ang mga pagkaantala"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Priyoridad lang"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Wala"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Pag-automate"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Awtomatikong i-on"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Pangalan ng panuntunan"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Magdagdag ng panuntunan"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"I-delete ang panuntunan"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"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>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Hindi alam"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"I-configure ang panuntunan"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Panuntunan sa iskedyul"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Hindi nahanap ang panuntunan."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Mga Araw"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Wala"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Araw-araw"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Hindi Kailanman"</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> hanggang <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Mga Tawag"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mga Mensahe"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Mga tawag/mensahe mula kay"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Sinuman"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Mga contact lang"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Mga naka-star na contact lang"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Mga kaganapan at paalala"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Ang mga alarm ay palaging mga may priyoridad na paggambala"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Mga Alarm"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Mga Paalala"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Mga Kaganapan"</string>
+    <string name="zen_mode_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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Mga Weeknight"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Oras ng pagsisimula"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Oras ng pagtatapos"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sa susunod na araw"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> o anumang alarm dati"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sa susunod na araw o anumang alarm dati"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sa susunod na araw"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Mga Paggambala"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Kapag may dumating na mga tawag at notification"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kailan mo gustong maabala?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Gaano katagal?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Palaging manggambala"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"naka-off,lahat"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Payagan lang ang mga may priyoridad na paggambala"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Payagan lang ang mga alarm"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Huwag manggambala"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Walang tiyak na katapusan"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minuto</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na minuto</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> oras</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na oras</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Gawing mga priyoridad na notification lang nang walang tiyak na katapusan"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Gawing mga priyoridad na notification lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> minuto hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Gawing mga priyoridad na notification lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na minuto hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Gawing mga priyoridad na notification lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> oras (hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Gawing mga priyoridad na notification lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na oras (hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Gawing mag-a-alarm lang nang walang tiyak na katapusan"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Gawing mag-a-alarm lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> minuto (hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Gawing mag-a-alarm lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na minuto (hanggang <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">Gawing mag-a-alarm lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> oras hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Gawing mag-a-alarm lang sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na oras hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Gawing huwag mang-abala nang walang tiyak na katapusan"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Gawing huwag mang-abala sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> minuto (hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Gawing huwag mang-abala sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na minuto (hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Gawing huwag mang-abala sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> oras hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Gawing huwag mang-abala sa loob ng <xliff:g id="DURATION">%1$d</xliff:g> na oras hanggang <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Gawing palaging mang-abala"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"habambuhay"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notification sa app"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mga setting ng notification"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"Magpadala ng feedback tungkol sa device na ito"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Magpadala ng feedback tungkol sa device"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ilagay ang PIN ng administrator"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Naka-on"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Naka-off"</string>
@@ -2487,7 +2604,7 @@
     <string name="managed_user_title" msgid="8101244883654409696">"Profile sa trabaho"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Pang-eksperimento)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kapag inikot ang device"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ikutin ang mga nilalaman ng screen"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"ikutin ang mga content ng screen"</string>
     <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Manatili sa portrait na view"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manatili sa landscape na view"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manatili sa kasalukuyang oryentasyon"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Impormasyon ng IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Kaugnay na impormasyon ng 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="2184141780491382435">"Ilunsad bilang default"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> ang nagamit sa <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Mga link ng domain"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Buksan ang Mga URL ng Domain"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Payagan ang app na direktang buksan ang Mga URL ng Domain"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Mga sinusuportahang URL ng domain"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Iba pang mga default"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> ang nagamit sa <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"internal na memory"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"external na memory"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Internal na storage"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"External na storage"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Paggamit ng data ng app"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> nagamit mula <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Ginamit na storage"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Naka-on"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"I-block"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Sensitibo"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Priyoridad"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Priyoridad &amp; Sensitibo"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> pahintulot ang ibinigay</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na pahintulot ang ibinigay</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> ng <xliff:g id="COUNT_3">%d</xliff:g> pahintulot ang ibinigay</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> ng <xliff:g id="COUNT_3">%d</xliff:g> na pahintulot ang ibinigay</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"May nakatakdang ilang default"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Walang nakatakdang mga default"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Lahat ng app"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Naka-enable"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Trabaho"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Na-block"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priyoridad"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitibo"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"May mga URL ng domain"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Na-disable ng administrator"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Hindi kilalang app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Pumili ng Profile"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Mga pahintulot sa app"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Pinapayagan ang karagdagang access sa <xliff:g id="COUNT_0">%d</xliff:g> sa <xliff:g id="COUNT_1">%d</xliff:g> app"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Pinapayagan ang <xliff:g id="COUNT_0">%d</xliff:g> sa <xliff:g id="COUNT_1">%d</xliff:g> (na) app"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Mga URL ng Domain"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Hindi nagbubukas ng anumang URL ng domain"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Binubuksan ang \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Binubuksan ang \'<xliff:g id="DOMAIN">%s</xliff:g>\' at ang mga kaugnay na URL"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app ang maaaring magbukas ng mga URL ng domain ng mga ito</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> na app ang maaaring magbukas ng mga URL ng domain ng mga ito</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Hindi nakilala"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Mga Default na App"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser app"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Walang default na Browser"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Default)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Storage ng mga app"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index f0f29f7..ab4bcde 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Düğme"</item>
@@ -152,12 +155,12 @@
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Her zaman"</item>
-    <item msgid="844721238536786870">"Yalnızca prize takıldığında"</item>
+    <item msgid="844721238536786870">"Yalnızca prize takılıyken"</item>
     <item msgid="1986753720941888596">"Hiçbir zaman"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Her zaman"</item>
-    <item msgid="7433294150916905997">"Yalnızca prize takıldığında"</item>
+    <item msgid="7433294150916905997">"Yalnızca prize takılıyken"</item>
     <item msgid="1390404486722375028">"Hiçbir zaman"</item>
   </string-array>
   <string-array name="data_usage_data_range">
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"mikrofonu kapat/aç"</item>
     <item msgid="1148142988678569310">"medya yansıtma"</item>
     <item msgid="9130014005474445273">"VPN\'yi etkinleştir"</item>
+    <item msgid="1165192162975045562">"yazı duvar kağıdı"</item>
+    <item msgid="7129487923652967258">"yardım yapısı"</item>
+    <item msgid="1069023208100114540">"yardım ekran görüntüsü"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Konum"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Mikrofonu kapat/aç"</item>
     <item msgid="5906017727368097853">"Medya yansıtma"</item>
     <item msgid="2486614710846178542">"VPN\'yi etkinleştir"</item>
+    <item msgid="5586547561693629602">"Yazı duvar kağıdı"</item>
+    <item msgid="32794179825485062">"Yardım yapısı"</item>
+    <item msgid="7872852746938272552">"Yardım ekranı"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kısa"</item>
@@ -345,7 +354,7 @@
     <item msgid="7247838127505318669">"Sans-serif sabit aralıklı"</item>
     <item msgid="4478414822462359763">"Serif"</item>
     <item msgid="7502451783483660829">"Serif sabit aralıklı"</item>
-    <item msgid="639503332147461010">"Klasik"</item>
+    <item msgid="639503332147461010">"Gayriresmî"</item>
     <item msgid="7967169925231332424">"Bitişik el yazısı"</item>
     <item msgid="561832997193039673">"Küçük boyutlu büyük harfler"</item>
   </string-array>
@@ -371,7 +380,7 @@
     <item msgid="8342334626783983353">"%100"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Uygulama varsayılanlarını kullan"</item>
+    <item msgid="7009918361545506251">"Uygulama varsayılanı"</item>
     <item msgid="1770533843436933500">"Siyah üzerine beyaz"</item>
     <item msgid="758587126802411846">"Beyaz üzerine siyah"</item>
     <item msgid="1495307195241623402">"Siyah üzerine sarı"</item>
@@ -379,23 +388,23 @@
     <item msgid="7169235156349580064">"Özel"</item>
   </string-array>
   <string-array name="select_logd_size_titles">
-    <item msgid="3100534874529240291">"64 K"</item>
-    <item msgid="505611754508988476">"256 K"</item>
-    <item msgid="6361286924268716397">"1 M"</item>
-    <item msgid="6405203239560695266">"4 M"</item>
-    <item msgid="3025431211013424097">"16 M"</item>
+    <item msgid="3100534874529240291">"64 KB"</item>
+    <item msgid="505611754508988476">"256 KB"</item>
+    <item msgid="6361286924268716397">"1 MB"</item>
+    <item msgid="6405203239560695266">"4 MB"</item>
+    <item msgid="3025431211013424097">"16 MB"</item>
   </string-array>
   <string-array name="select_logd_size_lowram_titles">
-    <item msgid="524799395770610154">"64 K"</item>
-    <item msgid="3534782711045262344">"256 K"</item>
-    <item msgid="8085867209202153403">"1 M"</item>
+    <item msgid="524799395770610154">"64 KB"</item>
+    <item msgid="3534782711045262344">"256 KB"</item>
+    <item msgid="8085867209202153403">"1 MB"</item>
   </string-array>
   <string-array name="select_logd_size_summaries">
-    <item msgid="7346595473588765019">"Günlük arabelleği başına 64 K"</item>
-    <item msgid="2822309747675758628">"Günlük arabelleği başına 256 K"</item>
-    <item msgid="6699306198357496731">"Günlük arabelleği başına 1 M"</item>
-    <item msgid="5748528643937500349">"Günlük arabelleği başına 4 M"</item>
-    <item msgid="1978629051085111592">"Günlük arabelleği başına 16 M"</item>
+    <item msgid="7346595473588765019">"Günlük arabelleği başına 64 KB"</item>
+    <item msgid="2822309747675758628">"Günlük arabelleği başına 256 KB"</item>
+    <item msgid="6699306198357496731">"Günlük arabelleği başına 1 MB"</item>
+    <item msgid="5748528643937500349">"Günlük arabelleği başına 4 MB"</item>
+    <item msgid="1978629051085111592">"Günlük arabelleği başına 16 MB"</item>
   </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Hiçbir zaman denetleme"</item>
@@ -452,7 +461,7 @@
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Kapalı"</item>
-    <item msgid="675719912558941285">"Dikdörtgen olmayan mavi renkte kırpma bölgesi çiz"</item>
+    <item msgid="675719912558941285">"Dikdörtgen olm. kırpma bölgesini mavi çiz"</item>
     <item msgid="1064373276095698656">"Test edilmiş çizim komutlarını yeşille vurgula"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"düşük"</item>
     <item msgid="4212263919458209842">"kritik düzeyde düşük"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Kapalı"</item>
-    <item msgid="5656544177755411222">"Sınırlı kesilme"</item>
-    <item msgid="8735337502532332056">"Sıfır kesilme"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Orta"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Pembe"</item>
     <item msgid="6131821495505931173">"Kırmızı"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Medya Aktarım Protokolü)"</item>
+    <item msgid="8856820259201251036">"PTP (Resim Aktarım Protokolü)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Ses Kaynağı"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 407a01f..f904ff8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"İzin ver"</string>
     <string name="deny" msgid="6947806159746484865">"Reddet"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Bilinmiyor"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Geliştirici olmanıza <xliff:g id="STEP_COUNT">%1$d</xliff:g> adım kaldı."</item>
-    <item quantity="other" msgid="6722953419953594148">"Geliştirici olmanıza <xliff:g id="STEP_COUNT">%1$d</xliff:g> adım kaldı."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Geliştirici olmanıza <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> adım kaldı.</item>
+      <item quantity="one">Geliştirici olmanıza <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> adım kaldı.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Artık siz bir geliştiricisiniz!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Gerekli değil, siz zaten bir geliştiricisiniz."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Kablosuz ve ağlar"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"IMS üzerinden SMS\'i kapat"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS kaydını gerektirmeyi aç"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS kaydını gerektirmeyi kapat"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE temel hazırlık işaretini aç"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE temel hazırlık işaretini kapat"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram dökümünü aç"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram dökümünü kapat"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM adres defterini görüntüle"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Yayınlama"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil devre dışı bırakılsın mı?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Şu devre dışı bırakılacak:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu cihazdan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Bağlandı"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Bağlandı (telefon yok)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Bağlandı (medya yok)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Bağlı (mesaj erişimi yok)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Bağlandı (telefon veya medya yok)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Bağlantı kesildi"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Bağlantı kesiliyor…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Bağlanıyor…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Eşleştiriliyor…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Adsız Bluetooth cihazı"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Arıyor"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Yakınlarda Bluetooth cihazı bulunamadı."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Alınan dosyaları göster"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth cihazı seçin"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth izin isteği"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Bir uygulama Bluetooth\'u açmak istiyor."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Bir uygulama bu cihaz için Bluetooth\'u AÇMAK istiyor."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Bir uygulama, tabletinizi <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazlarına görünebilir yapmak istiyor."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Bir uygulama, telefonunuzu <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazlarına görünebilir yapmak istiyor."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Bir uygulama tabletinizi diğer Bluetooth cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
@@ -205,7 +198,7 @@
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"Bağlantı noktası alanını tamamlamanız gerekir."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ana makine alanı boşsa, bağlantı noktası alanı boş olmalıdır."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Yazdığınız bağlantı noktası geçerli değil."</string>
-    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy\'yi tarayıcı kullanıyor, ancak diğer uygulamalar tarafından kullanılamayabilir."</string>
+    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy, tarayıcı tarafından kullanılır, ancak diğer uygulamalar tarafından kullanılamayabilir."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL\'si: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Konum:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Komşu CID:"</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD kart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy ayarları"</string>
     <string name="cancel" msgid="6859253417269739139">"İptal"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"İPTAL"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"DEVAM"</string>
     <string name="okay" msgid="1997666393121016642">"TAMAM"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"EVET"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"HAYIR"</string>
-    <string name="forget" msgid="7267115980248732932">"UNUT"</string>
+    <string name="forget" msgid="1400428660472591263">"Unut"</string>
+    <string name="save" msgid="879993180139353333">"Kaydet"</string>
+    <string name="done" msgid="6942539184162713160">"Bitti"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ayarlar"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ayarlar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Ayarlar kısayolu"</string>
@@ -292,10 +283,10 @@
     <string name="calls_title" msgid="3544471959217176768">"Çağrılar"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS iletileri"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Hücresel ağ üzerinden veri kullanımına izin verin"</string>
-    <string name="allow_data_usage_title" msgid="2238205944729213062">"Dolaşımda veri kullanımına izin ver"</string>
+    <string name="allow_data_usage_title" msgid="2238205944729213062">"Dolaşımdayken veri kullanımına izin ver"</string>
     <string name="roaming" msgid="3596055926335478572">"Veri dolaşımı"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Dolaşırken veri hizmetlerine bağlan"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Dolaşırken veri hizmetlerine bağlan"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Dolaşımdayken veri hizmetlerine bağlan"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Dolaşımdayken veri hizmetlerine bağlan"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Veri dolaşımı kapalıyken ana ağınızdan ayrıldığınız için veri bağlantısını kaybettiniz."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Açın"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Veri dolaşımına izin verdiğinizde, yüksek miktarda dolaşım ücretleri ödeyebilirsiniz!"</string>
@@ -325,12 +316,9 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Saat dilimine göre sırala"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tarih"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Saat"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Yüz eşlemeyi iyileştir"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Canlılık denetimi"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Kilit açma sırasında göz kırpma gerektir"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Otomatik olarak kilitle"</string>
-    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Uykuya geçtikten <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sonra"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> tarafından kilit açık tutulmadığı sürece uyku moduna geçtikten sonra <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Uyku moduna geçtikten <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sonra"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> tarafından kilit açık tutulmadığı sürece uyku moduna geçtikten <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sonra"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Kilitli ekranda sahip bilgilerini göster"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Cihaz sahibinin bilgileri"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Widget\'ları etkinleştir"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Şifreler"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Parmak izi"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Parmak izi yönetimi"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Parmak izi kullanımı:"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Ekle"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ekran kilidi"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> parmak izi kayıtlı</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> parmak izi kayıtlı</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Parmak izi ayarlandı"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Ekranınızın kilidini açmak veya satın alma işlemlerini onaylamak üzere parmak izinizi kullanabilmeniz için şunları yapmamız gerekir: \n\n✓ Yedek ekran kilidi yönteminizi ayarlamak \n\n✓ Parmak izinizi eklemek"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensörü bulun"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Telefonunuzun arkasındaki parmak izi sensörünü bulun."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Ad"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Tamam"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Sil"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Başlayalım!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Parmağınızı parmak izi sensörünün üzerine koyun. Bir titreşim hissettikten sonra kaldırın."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Harika! Şimdi tekrarlayın."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Aynı parmağınızı parmak izi sensörünün üzerine koyun ve bir titreşim hissettikten sonra parmağınızı kaldırın."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Parmak izi eklendi!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bu simgeyi her gördüğünüzde, bir satın alma işlemini tanımlamak veya satın alma işlemine onay vermek için parmak izinizi kullanabilirsiniz."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Ekle"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Sonraki"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Şifreleme"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tableti şifrele"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefonu şifreleme"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Şarj cihazınızı takıp tekrar deneyin."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekran kilitleme PIN\'i veya şifresi yok"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Şifrelemeyi başlatabilmek için öncelikle ekran kilitleme PIN\'i veya şifresi ayarlamanız gerekir."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Cihazınızın şifrelenmesini onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Şifrelensin mi?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Şifreleme işlemi geri döndürülemez ve şifreleme sırasında işlemi durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve tablet bu süre içinde birkaç kez yeniden başlatılır."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Şifreleme işlemi geri döndürülemez ve şifreleme sırasında işlemi durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve telefon bu süre içinde birkaç kez yeniden başlatılır."</string>
@@ -389,24 +400,23 @@
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"Yüz Tanıma Kilidi sizi göremezse, kilidi nasıl açmak istersiniz?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Yok"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
-    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Hızlıca kaydır"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Hızlıca kaydırma"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Güvenlik yok"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Yüz Tanıma Kilidi"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Düşük güvenlik, deneysel"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Şekil"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Orta düzey güvenlik"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Orta-yüksek düzey güvenlik"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Şifre"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Yüksek düzey güvenlik"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Geçerli ekran kilidi"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Cihaz koruma özellikleri artık çalışmayacak."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Devre dışı bırakıldı"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Hiçbiri"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Hızlıca kaydırın"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Yüz Tanıma Kilidi"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Desen"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Şifre"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Ekran kilidi ayarladığınızda, Ayarlar ve Güvenlik bölümünden ayrıca parmak izinizi de ayarlayabilirsiniz."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Ekran kilidini kapat"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Kilit açma desenini kaldır"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Kilit açma PIN\'ini kaldır"</string>
@@ -417,7 +427,7 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilit açma şifresini değiştir"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Şifre en az %d karakter olmalıdır"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN en az %d basamaklı olmalıdır"</string>
-    <string name="lockpassword_press_continue" msgid="122706614386757182">"İşlem tamamlandığında Devam düğmesine basın"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"İşlem tamamlandığında Devam Et düğmesine basın"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Devam Et"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Şifre <xliff:g id="NUMBER">%d</xliff:g> karakterden kısa olmalıdır."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN en çok <xliff:g id="NUMBER">%d</xliff:g> basamaklı olmalıdır."</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Şifre en az bir harf içermelidir."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Şifre en az bir rakam içermelidir."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Şifre en az bir sembol içermelidir."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Şifre en az 1 harf içermelidir."</item>
-    <item quantity="other" msgid="8186027808415585970">"Şifre en az %d harf içermelidir."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Şifre en az 1 küçük harf içermelidir."</item>
-    <item quantity="other" msgid="2693910942679679225">"Şifre en az %d küçük harf içermelidir."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Şifre en az 1 büyük harf içermelidir."</item>
-    <item quantity="other" msgid="3030801209112209245">"Şifre en az %d büyük harf içermelidir."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Şifre en az 1 rakam içermelidir."</item>
-    <item quantity="other" msgid="4703982391407595924">"Şifre en az %d rakam içermelidir."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Şifre en az 1 özel sembol içermelidir."</item>
-    <item quantity="other" msgid="1221290525051187757">"Şifre en az %d özel sembol içermelidir."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Şifre, harf olmayan en az 1 karakter içermelidir."</item>
-    <item quantity="other" msgid="3952508584649046404">"Şifre, harf olmayan en az %d karakter içermelidir."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Şifre en az %d harf içermelidir.</item>
+      <item quantity="one">Şifre en az 1 harf içermelidir.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Şifre en az %d küçük harf içermelidir.</item>
+      <item quantity="one">Şifre en az 1 küçük harf içermelidir.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Şifre en az %d büyük harf içermelidir.</item>
+      <item quantity="one">Şifre en az 1 büyük harf içermelidir.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Şifre en az %d rakam içermelidir.</item>
+      <item quantity="one">Şifre en az 1 rakam içermelidir.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Şifre en az %d özel sembol içermelidir.</item>
+      <item quantity="one">Şifre en az 1 özel sembol içermelidir.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Şifre, harf olmayan en az %d karakter içermelidir.</item>
+      <item quantity="one">Şifre, harf olmayan en az 1 karakter içermelidir.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Cihaz yöneticisi yakın zamanda kullanılan bir şifreye izin vermiyor."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Artan, azalan veya tekrar eden rakam dizisi yasaktır"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Tamam"</string>
@@ -476,19 +486,12 @@
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN, harfler veya simgeler içerir"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Genellikle 0000 veya 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Bu PIN\'i diğer cihazda da yazmanız gerekebilir."</string>
-    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Bu passkey kodunu diğer cihazda da girmeniz gerekebilir."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Şu cihazla eşleştirmek için:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu passkey kodunun göründüğünden emin olun:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Bu parolayı diğer cihazda da girmeniz gerekebilir."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Şu cihazla eşleştirmek için:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu parolanın göründüğünden emin olun:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Kaynak:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bu cihaz ile eşlensin mi?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşleştirmek için cihaz üzerinde <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> yazarak Return veya Enter tuşuna basın."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Eşleştir"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"EŞLEŞTİR"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"İptal"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Eşleme işlemi, bağlantı kurulduğunda kişilerinize ve çağrı geçmişine erişim izni verir."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirilemedi."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN veya Passkey kodu yanlış olduğundan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirilemedi"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile iletişim kurulamıyor."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Eşleştirme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tarafından reddedildi."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> adlı cihaza bağlanılamadı."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Cihazları tara"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Yenile"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Gelişmiş"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Gelişmiş Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth açık olduğunda, cihazınız yakındaki Bluetooth cihazlarla iletişim kurabilir."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Uygulamalar ve hizmetler, konum doğruluğunu iyileştirmek için Bluetooth kapalı bile olsa Bluetooth cihazları tarayacaktır. Bu ayarı, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tarama ayarlarından<xliff:g id="LINK_END_1">LINK_END</xliff:g> değiştirebilirsiniz."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Bağlan…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medya sesi"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon sesi"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Dosya aktarımı"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Giriş cihazı"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"İnternet erişimi"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kişi paylaşma"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Kişi paylaşmak için kullan"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"İnternet bağlantısı paylaşımı"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Mesaj Erişimi"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> medya ses profilinden ayrılacak."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> eller serbest ses profilinden ayrılacak."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> giriş cihazından ayrılacak."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Şunun için kullan:"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Yeniden adlandır"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Gelen dosya aktarmlrn izin ver"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Medya sesine bağlanıldı"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon sesine bağlandı"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Dosya aktarım sunucusuna bağlandı"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"MAP\'ye bağlı"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Dosya aktarım sunucusuna bağlanmadı"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Giriş cihazına bağlı"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"İnternet erişimi için cihaza bağlandı"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Cihazla yerel Intrnt bağlantısını paylaşıyor"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Medya sesi için kullan"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Telefon sesi için kullan"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Dosya aktarımı için kullan"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Giriş için kullan"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"İnternet erişimi için kullan"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"MAP için kullan"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Yuva Ayarları"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Ses öğesi için yuvayı kullan"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon hoparlörü olarak"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Müzik ve medya için"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ayarları anımsa"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Kablosuz bağlantı yardımcısıyla bağlandı"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Yayınlama ekranı"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Yayınlama"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Kablosuz görüntülemeyi etkinleştir"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Yakınlarda cihaz bulunamadı."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Bağlanılıyor"</string>
@@ -566,15 +548,17 @@
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kullanımda"</string>
     <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Kullanılamıyor"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ekran ayarları"</string>
-    <string name="wifi_display_options_title" msgid="5740656401635054838">"Kablosuz ekran seçenekleri"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Kablosuz görüntüleme seçenekleri"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Unut"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Bitti"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Ad"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Uygulama içeriği NFC ile aktarılmaya hazır"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC ile uygulama içeriği aktarmaya hazır"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Kapalı"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC kapalı olduğundan kullanılamıyor"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Kablosuz kapatılıyor…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Hata"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Uçak modunda"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ağlar taranamıyor"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Ağ bildirimi"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Herkese açık bir ağ kullanılabilir olduğunda bilgi alın"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Kötü bağlantılardan kaçın"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"İ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="wifi_scan_always_available" msgid="3470564139944368030">"Tarama her zaman kullanılabilir"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Taramaya her zaman izin ver"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Kablosuz özelliği kapalıyken dahi Google\'ın konum hizmetinin ve diğer uygulamaların ağları taramasına izin verin"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Açık Kablosuz bağlantıyı otomatik kullan"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Bir Kablosuz bağlantı yardımcısı, yüksek kaliteli olduğu belirlenen açık ağlara otomatik bağlansın"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Yardımcı seçin"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifika yükle"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Konum doğruluğunu iyileştirmek için ve diğer amaçlarla, Google ve diğer uygulamalar, Kablosuz kapalı olduğunda dahi yakınlardaki ağları tarayabilir. Bunu istemiyorsanız, Gelişmiş &gt; Tarama her zaman kullanılabilir seçeneğine gidin."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Uygulamalar, Kablosuz bağlantı kapalı olduğunda dahi yakınlardaki ağları tarayabilir. Bunu istemiyorsanız, Gelişmiş &gt; Tarama her zaman kullanılabilir seçeneğine gidin."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Uygulamalar ve hizmetler, konum doğruluğunu iyileştirmek için kablosuz özelliği kapalı olsa bile kablosuz ağları tarayacaktır. Bu ayarı <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tarama ayarlarından<xliff:g id="LINK_END_1">LINK_END</xliff:g> değiştirebilirsiniz."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Bir daha gösterme"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Uykudayken Kablosuz\'u açık tut"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Uykudayken Kablosuz açık"</string>
@@ -621,7 +600,7 @@
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Düğmesi"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Diğer seçenekler"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin Girişi"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Kablosuz Doğrudan"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Kablosuz Dğrdn Bğlnt"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tara"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gelişmiş"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ağa bağlan"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Başka bir ağ ekle"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Diğer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Otomatik kurulum (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Kurulumun tamamlanabilmesi için tabletinizin Kablosuz\'a erişmesi gerekmektedir. Kurulumdan sonra, hücresel veri ile Kablosuz arasında geçiş yapabilirsiniz."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Gelişmiş seçenekler"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Kablosuz Korumalı Kurulum"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS başlatılıyor…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Yönlendiricinizdeki Kablosuz Korumalı Kurulum düğmesine basın. \"WPS\" yazıyor olabilir veya şu simgeyi içerebilir:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Yönlendiricinizdeki Kablosuz Korumalı Kurulum düğmesine basın. \"WPS\" olarak adlandırılmış veya şu simgeyle gösteriliyor olabilir:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Kablosuz yönlendiricinizde <xliff:g id="NUMBER">%1$s</xliff:g> pin kodunu girin. Kurulum işleminin tamamlanması iki dakika kadar sürebilir."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS başarılı oldu. Ağa bağlanılıyor…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlanıldı"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonim kimlik"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Şifre"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Şifreyi göster"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Erişim Noktası Bandı Yapılandırması"</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 ayarları"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(değişmedi)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(belirtilmemiş)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Kaydedildi"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Devre dışı"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Yapılandırması Hatası"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Kablosuz Bağlantı Hatası"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Kimlik doğrulama sorunu"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Kapsama alanı dışında"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"İnternet Erişimi algılanmadı, otomatik olarak tekrar bağlanmayacak."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS kullanılabilir"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS kullanılabilir)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ağ şifrenizi girin"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Yok"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Konum bilgisinin doğruluğunu artırmak ve diğer amaçlar için, <xliff:g id="APP_NAME">%1$s</xliff:g> Kablosuz bağlantı kapalı olduğunda bile ağ tarama işlevini açmak istiyor.\n\nTarama yapmak isteyen tüm uygulamaların bu işlevi kullanmalarına izin veriyor musunuz?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Bu özelliği kapatmak için taşma menüsünde Gelişmiş seçeneğine gidin."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"İzin ver"</string>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Bağlanmak için oturum açılsın mı?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g>, ağa bağlanmadan önce çevrimiçinde oturum açmanızı gerektiriyor."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"BAĞLAN"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Bu ağın İnternet erişimi yok. Yine de bu ağ kullanılsın mı?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Bu ağ için bir daha sorma"</string>
     <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>
@@ -721,9 +696,9 @@
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"0 ile 32 arasında bir ağ önek uzunluğu yazın."</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">"Geçit"</string>
+    <string name="wifi_gateway" msgid="163914742461092086">"Ağ geçidi"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Ağ önek uzunluğu"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Kablosuz Doğrudan"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Kablosuz Doğrudan Bağlnt"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Cihaz bilgileri"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Bu bağlantıyı hatırla"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Cihaz ara"</string>
@@ -744,13 +719,25 @@
     <string name="wifi_hotspot_checkbox_text_summary" msgid="3800646230853724318">"Kablosuz ağ sağlamak için hücresel bağlantı kullanın"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot açılıyor…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot kapatılıyor…"</string>
-    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Taşınabilir ortak erişim noktası <xliff:g id="NETWORK_SSID">%1$s</xliff:g> etkin"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Taşınabilir hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> etkin"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Taşınabilir Kablosuz hotspot"</string>
     <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="5618031116920832182">"AndroidAP WPA2 PSK taşınabilir Kablosuz hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> taşınabilir Kablosuz 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_mode_title" msgid="2164073796253284289">"Çağrı tercihi"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Kablosuz çağrı modu"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Kablosuz bağlantı tercih edildi"</item>
+    <item msgid="5267397515594230396">"Hücresel ağ tercih edildi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Ana Ekran"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ekranın parlaklığını ayarla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Uyarlanan parlaklık"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Parlaklık düzeyini mevcut ışık koşullarına göre ayarla"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Açık Renkli"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Koyu Renkli"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Otomatik"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uyku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran kapanır"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Tercih edilen SIM kart güncellensin mi?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g>, cihazınızdaki tek SIM karttır. Hücresel veriler, çağrılar ve SMS iletileri için bu SIM kartı kullanmak ister misiniz?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Yanlış SIM PIN kodu. Cihazınızın kilidini açmak için artık operatörünüzle bağlantı kurmanız gerekiyor."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Yanlış SIM PIN kodu. Cihazının kilidini açmak için operatörünüzle bağlantı kurmak zorunda kalmadan önce <xliff:g id="NUMBER">%d</xliff:g> deneme hakkınız kaldı."</item>
-    <item quantity="other" msgid="77103619544346451">"Yanlış SIM PIN kodu. <xliff:g id="NUMBER">%d</xliff:g> deneme hakkınız kaldı."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Yanlış SIM PIN kodu, <xliff:g id="NUMBER_1">%d</xliff:g> deneme hakkınız kaldı.</item>
+      <item quantity="one">Yanlış SIM PIN kodu. Cihazınızın kilidini açmak için operatörünüzle bağlantı kurmak zorunda kalmadan önce <xliff:g id="NUMBER_0">%d</xliff:g> deneme hakkınız kaldı.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN işlemi başarısız oldu!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletin durumu"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefon durumu"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Kullanılabilir (salt okunur)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Toplam alan"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Hesaplanıyor..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Uygulamalar (uygulama verileri ve medya içeriği)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Uygulamalar ve uygulama verileri"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medya"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"İndirilenler"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Resimler, videolar"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Ses (müzik, zil sesleri vb...)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Çeşitli"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Diğer dosyalar"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Önbelleğe alınan veriler"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Payl dep birimnn bağl kes"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartının bağlantısını kes"</string>
@@ -955,15 +947,60 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Kaldırma işlemi devam ediyor"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Depolama alanı bitiyor"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Senkronizasyon gibi bazı sistem işlevleri doğru çalışmayabilir. Uygulamalar ve medya içerikleri gibi bazı öğelerin sabitleme işaretini kaldırarak veya öğeleri silerek yer açmayı deneyin."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Yeniden adlandır"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Ekle"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Çıkar"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Sil ve biçimlendir"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Sil ve dahili depolama olarak biçimlendir"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB bilgisayar bağlantısı"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB bilgisayar bağlantısı"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Şu şekilde bağlan:"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Medya cihazı (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows\'da ya da Mac üzerinde Android Dosya Aktarımı (www.android.com/filetransfer sayfasına bakın) ile medya dosyalarını aktarma olanağı sağlar"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows\'da ya da Android Dosya Aktarımı\'nı kullanarak Mac üzerinde (www.android.com/filetransfer sayfasına bakın) medya dosyalarını aktarma olanağı sağlar"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Kamera yazılımını kullanarak fotoğrafları ve MTP\'yi desteklemeyen bilgisayarlardaki her türlü dosyayı aktarmanıza olanak sağlar."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Dosya aktarma araçlarını yükle"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI özellikli uygulamaların bilgisayarınızda MIDI yazılımıyla USB üzerinden çalışmasına olanak verir."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Diğer kullanıcılar"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Depolama cihazları"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Çıkarılabilir depolama birimi"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> boş (Toplam <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> eklendi"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> eklenemedi"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> güvenli bir şekilde çıkarıldı"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> güvenli bir şekilde çıkarılamadı"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> biçimlendirildi"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> biçimlendirilemedi"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Depolama alanına yeni ad ver"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Biçimlendirdikten sonra, bu <xliff:g id="NAME_0">^1</xliff:g> birimini başka cihazlarda kullanabilirsiniz. \n\nBu <xliff:g id="NAME_1">^1</xliff:g> birimindeki veriler silinecektir. Önce yedeklemeyi düşünün. \n\n"<b>"Fotoğrafları ve diğer medyaları yedekleyin"</b>" \nMedya dosyalarınızı bu cihazdaki alternatif bir depolama birimine taşıyın veya USB kablosu kullanarak bir bilgisayara aktarın. \n\n"<b>"Uygulamaları yedekleyin"</b>" \nBu <xliff:g id="NAME_6">^1</xliff:g> biriminde depolanan tüm uygulamaların yüklemesi kaldırılacak ve verileri silinecektir. Bu uygulamaları korumak için bu cihazdaki farklı bir depolama birimine taşıyın."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Bu <xliff:g id="NAME_0">^1</xliff:g> birimini çıkardığınızda, tekrar takılana kadar içinde depolanmış olan uygulamalar artık çalışmaz ve depolanmış medya dosyaları ise kullanılamaz."</b>" \n\nBu <xliff:g id="NAME_1">^1</xliff:g> birimi sadece bu cihazda çalışacak şekilde biçimlendirilmiştir. Başka cihazlarda çalışmaz."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> cihazınızı kurun"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Taşınabilir bir depolama birimi kullanın"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Fotoğrafları ve diğer medyaları cihazlar arasında taşımak için."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Dahili depolama olarak kullanın"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Yalnızca bu cihaza öğe depolamak içindir (uygulamalar ve fotoğraflar dahil). Başka cihazlarda çalışmasını engelleyecek şekilde biçimlendirme gerekir."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Dahili depolama olarak biçimlen."</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Bu, <xliff:g id="NAME_0">^1</xliff:g> biriminin güvenli olması için biçimlendirilmesini gerektirir. \n\nBiçimlendirdikten sonra bu <xliff:g id="NAME_1">^1</xliff:g> birimi sadece bu cihazda çalışır. \n\n"<b>"Biçimlendirme işlemi <xliff:g id="NAME_2">^1</xliff:g> üzerinde depolanmış olan tüm bilgileri siler."</b>" Verilerin kaybolmaması için yedeklemeyi düşünün."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Sil ve biçimlendir"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> biçimlendiriliyor…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Biçimlendirilirken <xliff:g id="NAME">^1</xliff:g> birimini çıkarmayın."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Verileri yeni depol. birim. taşı"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Fotoğraflarınızı, dosyalarınızı ve uygulama verilerinizi bu yeni <xliff:g id="NAME">^1</xliff:g> birimine taşıyabilirsiniz. \n\nTaşıma işlemi yaklaşık <xliff:g id="TIME">^2</xliff:g> sürer ve dahili depolama biriminde <xliff:g id="SIZE">^3</xliff:g> yer açar. Bazı uygulamalar bu işlem sırasında çalışmaz."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Şimdi taşı"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Daha sonra taşı"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Verileri şimdi taşı"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Taşıma işlemi yaklaşık <xliff:g id="TIME">^1</xliff:g> sürer. Dahili depolamada <xliff:g id="SIZE">^2</xliff:g> yer açar."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Taşı"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Veriler taşınıyor…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Taşıma sırasında: \n• <xliff:g id="NAME">^1</xliff:g> birimini çıkarmayın. \n• Bazı uygulamalar düzgün çalışmaz. \n• Cihaz şarjlı olmalıdır."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> hazır"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> biriminiz fotoğraflar ve diğer medyalarla birlikte kullanılacak şekilde kuruldu."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Yeni <xliff:g id="NAME">^1</xliff:g> biriminiz çalışıyor. \n\nFotoğrafları, dosyaları ve uygulama verilerini bu cihaza taşımak için Ayarlar &gt; Depolama\'ya gidin."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> uygulamasını taşıyın"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> uygulamasını ve verilerini <xliff:g id="NAME_0">^2</xliff:g> birimine taşımak sadece birkaç saniye sürer. Taşıma işlemi tamamlanana kadar uygulamayı kullanamazsınız. \n\nTaşıma sırasında <xliff:g id="NAME_1">^2</xliff:g> birimini çıkarmayın."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> taşınıyor…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Taşıma sırasında <xliff:g id="NAME">^1</xliff:g> birimini çıkarmayın. \nTaşıma işlemi tamamlanana kadar bu cihazdaki \n<xliff:g id="APP">^2</xliff:g> uygulaması kullanılamaz."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Taşımayı iptal et"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Pil durumu"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Pil düzeyi"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN\'ler"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"Ağ ayarlarını sıfırla"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Bu işlemle, şunlar da dahil olmak üzere tüm ağ ayarlarınız sıfırlanacak:\n\n"<li>"Kablosuz ağ"</li>\n<li>"Hücresel 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="4874737348054213767">"Tüm ağ ayarlarınız sıfırlansın mı? Bu işlemi geri alamazsınız!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Ayarları sıfırla"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Sıfırlansın mı?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Ağ ayarları sıfırlandı"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Cihazı sıfırla"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrika verilerine sıfırla"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Tabletteki tüm verileri siler"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Telefondaki tüm verileri siler"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD kartındaki müzik ve fotoğraf gibi tüm verileri sil"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tableti sıfırla"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefonu sıfırla"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Tüm kişisel bilgilerinizi ve indirilen tüm uygulamaları silmek istiyor musunuz? Bu işlem geri döndürülemez!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Tüm kişisel bilgileriniz ve indirdiğiniz uygulamalar silinsin mi? Bu işlemi geri alamazsınız!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Her şeyi sil"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Fabrika verilerine sıfırlamayı onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Sistem Temizleme hizmeti kullanılamadığından sıfırlama yapılmadı."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Sıfırlansın mı?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Bu kullanıcı için fabrika ayarlarına sıfırlama işlevi kullanılamıyor"</string>
@@ -1043,24 +1084,22 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB bellek silinsin mi? Depolama biriminde saklanan tüm dosyalar silinir. Bu işlemi geri alamazsınız!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD kart silinsin mi? Burada saklanan tüm dosyalar silinir. Geri alınamaz!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Her şeyi sil"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB belleği silmek istediğinizi onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD kartı silmek istediğinizi onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Çağrı ayarları"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Sesli mesaj, çağrı yönlendirme ve bekletme, arayan kimliğini ayarla"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB internet paylaşımı"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Taşınabilir ortak erişim noktası"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth internet paylşm"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"İnternet paylşm oluşturma"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB tethering"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Taşınabilir 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="8356136101061143841">"Tethering ve taşnblr hotspot"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB bağlantısı"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB bağlandı, bağlantıyı kontrol edin"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Bağlandı"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"USB bellek kullanılırken tethering yapılamaz"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB bağlı değil"</string>
     <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Açmak için bağlanın"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB bağlantısı hatası"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth internet paylşm"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB tethering hatası"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth tethering"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Bu tabletin İnternet bağlantısı paylaşılıyor"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Bu telefonun İnternet bağlantısı paylaşılıyor"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Bu tabletin İnternet bağlantısını 1 cihaz paylaşıyor"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yardım"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Hücresel ağlar"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobil plan"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Varsayılan SMS uygulaması"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS uygulaması"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS uygulaması değiştirilsin mi?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="NEW_APP">%1$s</xliff:g>, SMS uygulamanız olarak <xliff:g id="CURRENT_APP">%2$s</xliff:g> yerine kullanılsın mı?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"SMS uygulamanız olarak <xliff:g id="NEW_APP">%s</xliff:g> kullanılsın mı?"</string>
@@ -1102,9 +1141,15 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Yüksek pil kullanımı"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Düşük pil kullanımı"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Konum modu"</string>
-    <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Konumu belirlemek için GPS, Kablosuz ve hücresel ağları kullanın"</string>
-    <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Konumu belirlemek için Kablosuz ve hücresel ağları kullanın"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Konumunuzu belirlemek için GPS kullanın"</string>
+    <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Konumu belirlemek için GPS, Kablosuz ve hücresel ağlar kullanılır"</string>
+    <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Konumu belirlemek için Kablosuz ve hücresel ağlar kullanılır"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Konumu belirlemek için GPS\'yi kullan"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Tarama"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Tarama"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Kablosuz taraması"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Kablosuz özelliği kapalı olsa bile kablosuz ağların uygulamalar ve hizmetler tarafından taranmasına izin vererek konum bilgisini iyileştirin"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth taraması"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Bluetooth kapalı bile olsa Bluetooth cihazların sistem hizmetleri tarafından taranmasına izin vererek konum bilgisini iyileştirin"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Kablosuz ve hücresel ağ konumu"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Uygulamalar konumunuzu daha hızlı tahmin edebilmek için Google\'ın konum bilgilerini kullanabilsin. Anonim konum bilgileri toplanıp Google\'a gönderilir."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Konum, Kablosuz tarafından belirlendi"</string>
@@ -1145,17 +1190,21 @@
     <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_passwords_dont_match" msgid="6850677112663979120">"Şifreler eşleşmiyor"</string>
-    <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN kodları eşleşmiyor"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN\'ler eşleşmiyor"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Seçimin kilidini açın"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Şifre ayarlandı"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN ayarlandı"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Desen ayarlandı"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Ekran güvenliği"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Devam etmek için cihazınızın desenini kullanın."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Devam etmek için cihazınızın PIN\'ini kullanın."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Devam etmek için cihazınızın şifresini girin."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Cihaz güvenliği"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Kilit açma desenini değiştir"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Kilit açma PIN\'ini değiştir"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kaydedilen deseni onayla"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tekrar deneyin:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Kilit açma deseni çiz"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Kilit açma deseni çizin"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Yardım için Menü\'ye basın."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Bitirdiğinizde parmağınızı kaldırın"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"En az <xliff:g id="NUMBER">%d</xliff:g> noktayı birleştirin. Tekrar deneyin."</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Kilit açma desenini ayarla"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Kilit açma desenini değiştir"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kilit açma deseni çizme yöntemi"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Çok fazla sayıda yanlış deneme yapıldı!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> saniye içinde yeniden deneyin."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Çok fazla yanlış giriş yapıldı. <xliff:g id="NUMBER">%d</xliff:g> saniye içinde tekrar deneyin."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Uygulama, telefonunuzda yüklü değil."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Uygulamaları yönet"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Yüklü uygulamaları yönet ve kaldır"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Boyuta göre sırala"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Çalışan hizmetleri göster"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Önbllğe alınan işlm göstr"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Acil durum uygulaması"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Uygulama tercihlerini sıfırla"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Uygulama tercihleri sıfırlansın mı?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Bu işlem şunlar için tüm tercihleri sıfırlayacaktır:\n\n "<li>"Devre dışı bırakılan uygulamalar"</li>\n" "<li>"Devre dışı bırakılan uygulama bildirimleri"</li>\n" "<li>"İşlemler için varsayılan uygulamalar"</li>\n" "<li>"Uygulamalar için arka plan veri kısıtlamaları"</li>\n" "<li>"Tüm izin kısıtlamaları"</li>\n\n" Hiçbir uygulama verisini kaybetmeyeceksiniz."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Uygulama çalışma ayarları"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Çalışıyor"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Hiç kullanılmadı)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Varsayılan uygulama yok."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Depolama kullanımı"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Uygulamalar tarafından kullanılan depolama alanını görüntüle"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Çalışan hizmetler"</string>
@@ -1326,7 +1376,7 @@
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Uygulamalar"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Boş"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"Kullanılan"</string>
-    <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"Önbelleğe alınanlar"</string>
+    <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"Önbelleğe alınan"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> RAM"</string>
     <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Çalışan uygulama"</string>
     <string name="no_services" msgid="7133900764462288263">"Etkin değil"</string>
@@ -1335,10 +1385,10 @@
     <string name="service_stop" msgid="6369807553277527248">"Durdur"</string>
     <string name="service_manage" msgid="1876642087421959194">"Ayarlar"</string>
     <string name="service_stop_description" msgid="9146619928198961643">"Bu hizmet, uygulaması tarafından başlatıldı. Hizmetin durdurulması uygulamanın başarısız olmasına neden olabilir."</string>
-    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"Bu uygulama güvenli bir şekilde durdurulamıyor. Durdurursanız, bazı mevcut işlerinizin kaybına neden olabilir."</string>
+    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"Bu uygulama güvenli bir şekilde durdurulamıyor. Durdurursanız, mevcut işlerinizin bir kısmını kaybedebilirsiniz."</string>
     <string name="background_process_stop_description" msgid="5034773197139654588">"Bu, tekrar gerekirse diye hâlâ çalışan eski bir uygulama işlemidir. Genellikle bunu durdurmanız gerekmez."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: şu anda kullanılıyor. Kontrol etmek için Ayarlar\'a dokunun."</string>
-    <string name="main_running_process_description" msgid="1130702347066340890">"Ana işlem kullanımda."</string>
+    <string name="main_running_process_description" msgid="1130702347066340890">"Kullanımda olan ana işlem."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g> hizmeti kullanımda."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Sağlayıcı <xliff:g id="COMP_NAME">%1$s</xliff:g> kullanımda."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Sis hiz durdrlsn mu?"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet bilgileri"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefon bilgileri"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Pil bilgileri"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Hızlı başlat"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Uygulama başlatma klavye kısayollarını ayarla"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Uygulama ata"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Kısayol yok"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Arama + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Temizle"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) için oluşturduğunuz kısayol silinecek."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Tamam"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"İptal"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Uygulamalar"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Kısayollar"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Metin girişi"</string>
     <string name="input_method" msgid="5434026103176856164">"Giriş yöntemi"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Geçerli Klavye"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bir dosyadaki tüm Bluetooth HCI paketlerini yakala"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM kilit açma"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Önyükleyicinin kilidinin açılmasına izin ver"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN kodunuzu girin"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM kilit açma özelliğini etkinleştirmek için cihazınızın PIN kodunu girin."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM kilit açmaya izin verilsin mi?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UYARI: Bu ayar açıkken cihaz koruma özellikleri bu cihazda çalışmayacaktır."</string>
-    <string name="wifi_display_certification" msgid="8611569543791307533">"Kablosuz ekran sertifikası"</string>
-    <string name="wifi_verbose_logging" msgid="4203729756047242344">"Kablosuz Ayrıntılı Günlük Kaydını etkinleştir"</string>
-    <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Kablosuz\'dan Hücresel Ağa agresif geçiş"</string>
-    <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Kablosuz Dolaşım Taramalarına daima izin ver"</string>
-    <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Kablosuz ekran sertifikası seçeneklerini göster"</string>
-    <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Kablosuz günlük kaydı seviyesini artırın. Kablosuz Seçici\'de her bir SSID RSSI için gösterin"</string>
-    <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Etkinleştirildiğinde, Kablosuz ağ sinyali zayıfken veri bağlantısının Hücresel ağa geçirilmesinde daha agresif olunur"</string>
-    <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Arayüzde mevcut veri trafiği miktarına bağlı olarak Kablosuz Dolaşım Taramalarına İzin Verin/Vermeyin"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Günlük Kaydedici arabellek boyutları"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Günlük arabelleği başına Günlük Kaydedici boyutlarını seçin"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Görünüm özelliği incelemeyi etkinleştir"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Ağ işlemleri"</string>
+    <string name="wifi_display_certification" msgid="8611569543791307533">"Kablosuz ekran sertifikası"</string>
+    <string name="wifi_verbose_logging" msgid="4203729756047242344">"Kablosuz Ayrıntılı Günlük Kaydını etkinleştir"</string>
+    <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Kablosuz\'dan Hücresel Ağa agresif geçiş"</string>
+    <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Kablosuz Dolaşım Taramalarına daima izin ver"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Eski DHCP istemcisini kullan"</string>
+    <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Kablosuz görüntüleme sertifikası seçeneklerini göster"</string>
+    <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Kablosuz günlük kaydı seviyesini artırın. Kablosuz Seçici\'de her bir SSID RSSI için gösterin"</string>
+    <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Etkinleştirildiğinde, Kablosuz ağ sinyali zayıfken veri bağlantısının Hücresel ağa geçirilmesinde daha agresif olunur"</string>
+    <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Arayüzde mevcut veri trafiği miktarına bağlı olarak Kablosuz Dolaşım Taramalarına İzin Verin/Vermeyin"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Günlük Kaydedici arabellek boyutları"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Günlük arabelleği başına Günlük Kaydedici boyutlarını seçin"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB Yapılandırmasını Seçin"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB Yapılandırmasını Seçin"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Görünüm özelliği incelemeyi etkinleştir"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Yeni Android DHCP istemcisi yerine Lollipop DHCP istemcisini kullanın."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB hata ayıklamasına izin verilsin mi?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB hata ayıklaması yalnızca geliştirme amaçlıdır. Verileri bilgisayarınızla cihazınız arasında kopyalamak, bildirim göndermeksizin uygulamaları cihazınıza yüklemek ve günlük verilerini okumak için kullanın."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Daha önce yetki verdiğiniz tüm bilgisayarların USB hata ayıklama erişimini iptal etmek istiyor musunuz?"</string>
@@ -1500,7 +1547,7 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"Ekran"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Altyazılar"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Büyüteç hareketleri"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Bu özellik açıldığında ekrana üç kez hafifçe dokunarak görüntüyü yakınlaştırabilir ve uzaklaştırabilirsiniz.\n\nYakınlaştırdığınızda şunları yapabilirsiniz\n"<ul><li>"Kaydırma: İki veya daha fazla parmağınızı ekranda sürükleyin."</li>\n<li>"Yakınlaştırrma düzeyini ayarlama: İki veya daha fazla parmağınızı birbirine yaklaştırın veya uzaklaştırın."</li></ul>\n\n"Ayrıca, üç kez hafifçe vurup parmağınızı basılı tutarak parmağınızın altındakini geçici olarak büyütebilirsiniz. Önceki duruma dönmek için parmağınızı kaldırın.\n\nNot: Üç kez hafifçe dokunarak büyütme özelliği klavye ve gezinme çubuğu hariç her yerde kullanılabilir."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Bu özellik açıldığında ekrana üç kez hafifçe dokunarak görüntüyü yakınlaştırabilir ve uzaklaştırabilirsiniz.\n\nYakınlaştırdığınızda şunları yapabilirsiniz\n"<ul><li>"Kaydırma: İki veya daha fazla parmağınızı ekranda sürükleyin."</li>\n<li>"Yakınlaştırrma düzeyini ayarlama: İki veya daha fazla parmağınızı birbirine yaklaştırın veya uzaklaştırın."</li></ul>\n\n"Ayrıca, üç kez hafifçe dokunup parmağınızı basılı tutarak parmağınızın altındakini geçici olarak büyütebilirsiniz. Önceki duruma dönmek için parmağınızı kaldırın.\n\nNot: Üç kez hafifçe dokunarak büyütme özelliği klavye ve gezinme çubuğu hariç her yerde kullanılabilir."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erişilebilirlik kısayolu"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Açık"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Kapalı"</string>
@@ -1522,9 +1569,9 @@
     <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> tarafından geçersiz kılındı"</string>
     <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"Devre dışı"</string>
     <string name="daltonizer_mode_monochromacy" msgid="8485709880666106721">"Tam renk körlüğü"</string>
-    <string name="daltonizer_mode_deuteranomaly" msgid="5475532989673586329">"Renk körlüğü (kırmızı yeşil)"</string>
-    <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Renk körlüğü (kırmızı yeşil)"</string>
-    <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Renk körlüğü (mavi sarı)"</string>
+    <string name="daltonizer_mode_deuteranomaly" msgid="5475532989673586329">"Yeşil renk körlüğü (kırmızı-yeşil)"</string>
+    <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Kırmızı renk körlüğü (kırmızı-yeşil)"</string>
+    <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Mavi renk körlüğü (mavi-sarı)"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ayarlar"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Açık"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Kapalı"</string>
@@ -1544,7 +1591,7 @@
     <string name="captioning_edge_color" msgid="3670094753735263238">"Kenar rengi"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"Kenar türü"</string>
     <string name="captioning_typeface" msgid="1826169240566563259">"Yazı tipi ailesi"</string>
-    <string name="captioning_preview_text" msgid="4067935959797375065">"Altyazılar şöyle görünecek"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Altyazılar böyle görünecek"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Varsayılan"</string>
     <string name="color_title" msgid="4258931051732243983">"Renk"</string>
@@ -1561,12 +1608,13 @@
     <string name="color_magenta" msgid="5059212823607815549">"Macenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> şunları gerektiriyor:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Bir uygulama bir izin isteğinin anlaşılmasını engellediğinden, Ayarlar, yanıtınızı doğrulayamıyor."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini açarsanız cihazınız veri şifrelemeyi geliştirmek için ekran kilidinizi kullanmaz."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Bir erişilebilirlik hizmetini açtığınız için cihazınız veri şifrelemeyi geliştirmek üzere ekran kilidinizi kullanmayacak."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini etkinleştirmek veri şifrelemesini etkileyeceğinden deseninizi doğrulamanız gerekmektedir."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini etkinleştirmek veri şifrelemesini etkileyeceğinden PIN\'inizi doğrulamanız gerekmektedir."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini etkinleştirmek veri şifrelemesini etkileyeceğinden şifrenizi doğrulamanız gerekmektedir."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"İşlemlerinizi izleyin"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"İşlemlerinizi izleme"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Bir uygulamayla etkileşim kurduğunuzda bildirim alın."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> durdurulsun mu?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Tamam\'a dokunulduğunda <xliff:g id="SERVICE">%1$s</xliff:g> durdurulur."</string>
@@ -1698,18 +1746,24 @@
     <string name="battery_saver" msgid="1426682272004907982">"Pil tasarrufu"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Otomatik olarak aç"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Hiçbir zaman"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"pil kullanıyor (%1$s)"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"pil %1$s düzeyine düştüğünde"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"İşlem İstatistikleri"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Meraklısı için, çalışan işlemlerle ilgili istatistikler"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Bellek kullanımı"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TIME">%2$s</xliff:g> süresince <xliff:g id="TYPE">%1$s</xliff:g> uygulamaları"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="TIMEDURATION">%3$s</xliff:g> boyunca <xliff:g id="USEDRAM">%1$s</xliff:g> / <xliff:g id="TOTALRAM">%2$s</xliff:g> kullanıldı"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Arka plan"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Ön plan"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Önbelleğe alındı"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Cihaz belleğinin mevcut durumu: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Ortalama RAM kullanımı"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimum RAM kullanımı"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Yerel"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Çekirdek"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"Z-RAM"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Önbellek"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Kullanılan RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Kullanılan RAM (arka plan)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Çalışma süresi"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"İşlemler"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Hizmetler"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Süre"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Bellek ayrıntıları"</string>
@@ -1726,11 +1780,12 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 saat"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 gün"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Sistem işlemlerini göster"</string>
-    <string name="menu_use_uss" msgid="467765290771543089">"Uss\'yi (Benzersiz Grup Büyüklüğü) kullan"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Sistemi gizle"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"USS\'yi kullan"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"İstatistik türü"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Arka plan"</string>
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Ön plan"</string>
-    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Önbelleğe alındı"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Önbelleğe alınanlar"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Ses girişi/çıkışı"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ses giriş/çıkış ayarları"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ses ile arama"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Aşağıdaki varsayılan ayarlar, uygulama ayarlarını geçersiz kılıyor"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Varsayılan ayarlar"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Varsayılan motor"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Konuşulan metin için kullanılacak konuşma sentezi motorunu ayarlar"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Konuşularak metin girmede kullanılacak konuşma sentezi motorunu ayarlayın"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Konuşma hızı"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Metnin konuşulduğu hız"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Perde"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Donanım destekli"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Yalnızca yazılım"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Bu kullanıcı için kimlik bilgileri kullanılamıyor"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kimlik bilgisi yüklemesini onaylamak için kilit açma desenini çizmeniz gerekiyor."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <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_default_summary" msgid="2436933224764745553">"Şu anda, yedeklenmiş verileri depolayan hiçbir hesap yok"</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ı ve diğer verileri geri yükle"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Yedekleme hizmeti etkin değil."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Bu, cihaz politikanız tarafından ayarlanır."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Masaüstü yedekleme şifresi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Masaüstü tam yedeklemeleri şu an korunmuyor"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Masaüstü tam yedeklemelerinin şifresini değiştirmek veya kaldırmak için dokunun"</string>
@@ -1981,7 +2033,7 @@
     <string name="select_application" msgid="5156029161289091703">"Uygulama seçin"</string>
     <string name="no_application" msgid="2813387563129153880">"Hiçbiri"</string>
     <string name="wait_for_debugger" msgid="1202370874528893091">"Hata ayıklayıcıyı bekle"</string>
-    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Hata ayıklanan uyg. çalıştırılmadan önce hata ayıklayıcının eklenmesini bekliyor"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Hata ayıklanan uygulama, çalıştırılmadan önce hata ayıklayıcının eklenmesini bekler"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Girdi"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Çizim"</string>
     <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Donanım hızlandırmalı oluşturma"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Geçiş animasyonu ölçeği"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animatör süre ölçeği"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"İkincil ekranları simule et"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Birden fazla pencere modu"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Ekranda aynı anda birden fazla etkinlik."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Birden fazla pencere modu etkinleştirilsin mi?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"UYARI: Bu, Son uygulamalar kullanıcı arayüzü aracılığıyla ekranda aynı anda birden fazla etkinliğe izin veren ileri düzeyde deneysel bir özelliktir. Bazı uygulamalar bu özellikle birlikte kullanıldığında kilitlenebilir veya düzgün çalışmayabilir."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Uygulamalar"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Etkinlikleri saklama"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Kullanıcının ayrıldığı her etkinliği hemen yok et"</string>
@@ -2130,13 +2186,13 @@
     <string name="vpn_show_options" msgid="7182688955890457003">"Gelişmiş seçenekleri göster"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS arama alan adları"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS sunucuları (ör. 8.8.8.8)"</string>
-    <string name="vpn_routes" msgid="3818655448226312232">"Rotalar yönlendiriliyor (ör. 10.0.0.0/8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Yönlendirme rotaları (ör. 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"Kullanıcı adı"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Şifre"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Hesap bilgilerini kaydet"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(kullanılmıyor)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(sunucuyu doğrulama)"</string>
-    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(sunucudan alındı)"</string>
+    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(sunucudan alınır)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"İptal"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Kaydet"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Bağlan"</string>
@@ -2163,7 +2219,7 @@
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Yazım denetleyici"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Buraya, mevcut tam yedekleme şifrenizi yazın"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Buraya, tam yedeklemeler için yeni bir şifre yazın"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Buraya mevcut tam yedekleme şifrenizi yeniden yazın"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Buraya yeni tam yedekleme şifrenizi yeniden yazın"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Yedekleme şifresi belirle"</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>
@@ -2171,7 +2227,7 @@
     <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">"Tamamlandı"</string>
+    <string name="done_button" msgid="1991471253042622230">"Tamam"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Ağ izleme"</string>
     <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"Bu cihaz, şu alan adı tarafından yönetiliyor:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nYöneticiniz, e-postalar, uygulamalar ve güvenli web siteleri dahil olmak üzere ağ etkinliğinizi izleme olanağına sahiptir.\n\nDaha fazla bilgi için yöneticinizle bağlantı kurun."</string>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"E-postalarınız, uygulamalarınız ve güvenli web siteleriniz dahil olmak üzere ağ etkinliğiniz üçüncü bir tarafça izlenebilir.\n\nCihazınızda yüklü güvenilir bir kimlik bilgisi bunu mümkün kılmaktadır."</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Kullanıcı"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Kısıtlı profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Yeni kullanıcı eklensin mi?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Bu cihazı, ek kullanıcılar oluşturarak başka kişilerle paylaşabilirsiniz. Her bir kullanıcının kendi uygulamaları, duvar kağıtları ve diğer öğeleriyle özelleştirebileceği kendi alanı olur. Kullanıcılar, Kablosuz bağlantı gibi herkesi etkileyen cihaz ayarlarını da yapabilirler.\n\nYeni bir kullanıcı eklediğinizde, bu kişinin kendi alanını ayarlaması gerekir.\n\nHerhangi bir kullanıcı, diğer tüm kullanıcılar için uygulamaları güncelleyebilir."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Ek kullanıcılar oluşturarak bu cihazı başkalarıyla paylaşabilirsiniz. Her kullanıcının uygulamalarla, duvar kağıdıyla ve başka ayarlarla özelleştirebileceği kendi alanı olur. Kullanıcılar ayrıca kablosuz ağ gibi herkesi etkileyen cihaz ayarlarını değiştirebilirler.\n\nYeni bir kullanıcı eklediğinizde, ilgili kişinin kendi alanını ayarlaması gerekir.\n\nHer kullanıcı diğer tüm kullanıcılar için uygulamaları güncelleyebilir."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Yeni bir kullanıcı eklediğinizde, bu kişinin kendi alanını ayarlaması gerekir.\n\nHerhangi bir kullanıcı, diğer tüm kullanıcılar için uygulamaları güncelleyebilir."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kullanıcı şimdi yapılandırılsın mı?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"İlgili kişinin cihazı almak ve kendi alanının kurulumunu yapmak için müsait olduğundan emin olun"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Misafir oturumu kaldırılsın mı?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Bu oturumdaki tüm uygulamalar ve veriler silinecek."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Kaldır"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Telefon çağrılarına izin ver"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Telefon çağrılarına ve SMS\'lere izin ver"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Telefon çağrılarını aç"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Telefon çağrılarını ve SMS\'i aç"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Kullanıcıyı kaldır"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Telefon çağrılarına izin verilsin mi?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Telefon çağrıları açılsın mı?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Çağrı geçmişi bu kullanıcıyla paylaşılacak."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Telefon çağrılarına ve SMS\'lere izin verilsin mi?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Çağrı ve SMS geçmişi bu kullanıcıyla paylaşılacak."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefon çağrıları ve SMS açılsın mı?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Çağrı ve SMS geçmişi bu kullanıcıyla paylaşılacak."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Uygulamalara ve içeriğe izin ver"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Kısıtlamalı uygulamalar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Uygulama ayarlarını genişlet"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"ADI DEĞİŞTİR"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Uygulama kısıtlamalarını ayarla"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> tarafından kontrol ediliyor"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Bu uygulama kısıtlanmış profillerde desteklenmez"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Bu uygulama hesaplarınıza erişebilir"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Bu uygulama, hesaplarınıza erişebilir. <xliff:g id="APP">%1$s</xliff:g> tarafından kontrol edilmektedir"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Kablosuz ve Mobil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Kablosuz ve Mobil ayarlarını değiştirmeye izin ver"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi kablosuz ağ bağlantısı"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"kısa mesaj yazma mesajlar mesajlaşma"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"hücresel hücre operatör kablosuz veri 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"kablosuz kablosuz çağrı telefon etme"</string>
     <string name="keywords_home" msgid="3626170808219458848">"başlatıcı"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekran dokunmatik ekran"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"karartma ekran dokunmatik ekran pil"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"karartma ekran dokunmatik ekran pil"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"arka plan kişiselleştirme özelleştirme ekran"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"karanlık tema gece modu karanlık ekran parlaklık dönüştürme"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"arka plan kişiselleştirme ekranı özelleştirme"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"metin boyutu"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proje"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"proje yayınlama"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"alan disk sabit sürücü cihaz kullanım"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"güç kullanım şarj"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"yazım sözlük yazım denetimi otomatik düzeltme"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"hesap"</string>
     <string name="keywords_users" msgid="4673901601478559100">"kısıtlama kısıtla kısıtlı"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"metin düzeltme düzelt ses titreşim otomatik dil hareket öner öneri tema rahatsız edici kelime türü emoji uluslararası"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"sıfırlama tercihler varsayılan"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"acil durum ice (acil durum gerektiğinde - adg) uygulaması varsayılanı"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"uygulama indirme uygulamalar sistem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"uygulama izinleri güvenliği"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"uygulama varsayılanı"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"kaydırma şifre desen pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Kablosuz NFC Etiketini ayarla"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yaz"</string>
@@ -2386,18 +2449,19 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm sesi düzeyi"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Zil sesi düzeyi"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirim sesi düzeyi"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Kesintiler"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Çağrı ve bildirim geldiğinde"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Her zaman kes"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Sadece öncelikli kesintilere izin ver"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Kesme"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Yalnızca öncelik şunlara izin verir"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Otomatik kurallar"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Yalnızca öncelikliler"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Yalnızca alarmlar"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Kesinti yok"</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="ringtone_title" msgid="5379026328015343686">"Telefon zil sesi"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Varsayılan bildirim zil sesi"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Çağrılarda ayrıca titret"</string>
     <string name="notification_section_header" msgid="95661783916799134">"Bildirim"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Bildirim ışığını yakıp söndür"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Cihaz kilitliyken"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tüm bildirim içeriklerini göster"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bildirim içeriğinin tamamını göster"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Hassas içerikli bildirimleri gizle"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Bildirimleri hiç gösterme"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Cihazınız kilitliyken bildirimlerin nasıl gösterilmesini istersiniz?"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Titreşim"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirim erişimi"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Uygulamalar bildirimleri okuyamaz"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d uygulama, bildirimleri okuyabilir"</item>
-    <item quantity="other" msgid="980049191810249052">"%d uygulama, bildirimleri okuyabilir"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d uygulama bildirimleri okuyabilir</item>
+      <item quantity="one">%d uygulama bildirimleri okuyabilir</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Bildirim dinleyici yüklü değil."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> etkinleştirilsin mi?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> sistem veya uygulama tarafından yayınlanan tüm bildirimleri okuyabilecektir. Bu bildirimler kişi adları ve size gönderilen iletilerin metinleri gibi kişisel bilgileri içerebilir. Ayrıca bu bildirimleri kapatabilecek veya içindeki işlem düğmelerine dokunabilecektir."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Koşul sağlayıcılar"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Hiçbir uygulama koşul sağlamıyor"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d uygulama koşul sağlıyor"</item>
-    <item quantity="other" msgid="358057362115673258">"%d uygulama koşul sağlıyor"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Hiçbir koşul sağlayıcı yüklü değil."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> etkinleştirilsin mi?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>, Rahatsız etmeyin moduna çıkış koşulları ekleyebilecektir."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Uygulamalar yükleniyor..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Engelle"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Tümünü engelle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Bu uygulamadan gelen bildirimleri asla gösterme"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Öncelik"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Bildirimleri listenin en üstünde göster ve cihazın sadece öncelikli kesintileri alacak şekilde ayarlanması durumunda da bildirimlere izin ver"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Hassas"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Cihaz kilitliyken, bu uygulamadan gelen bildirimlerdeki hassas içerikleri gizle"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Öncelikli olarak ele al"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Rahatsız etmeyin seçeneği yalnızca Öncelikli olarak ayarlandığında, bu uygulamanın bildirimlerinin duyulmasına izin verin"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Kısaca göz atmaya izin ver"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Bu uygulamanın, belirli bildirimleri, mevcut ekranın görünümüne kısa süre için kaydırarak vurgulamasına izin verin"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Hassas içeriği gizle"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Cihaz kilitlendiğinde, bu uygulamanın bildirimlerindeki gizli bilgileri görüntüleyebilecek içeriği gizleyin"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Engellendi"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Öncelik"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Hassas"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tamam"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Siz bunu kapatana kadar"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Öncelikli kesintiler"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Kesinti"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Gün"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Yok"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Kesintilere izin verilir"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Yalnızca öncelikli"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Yok"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Otomasyon"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Otomatik olarak aç"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Kural adı"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Kural ekle"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Kuralı sil"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<xliff:g id="RULE">%1$s</xliff:g>\" adlı kural silinsin mi?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Sil"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Kural türü"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Bilinmiyor"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Kural yapılandır"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Zamanlama kuralı"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Kural bulunamadı."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Gün"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Yok"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Her gün"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Hiçbir zaman"</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> ile <xliff:g id="END">%2$s</xliff:g> arası"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Çağrılar"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"İletiler"</string>
-    <string name="zen_mode_from" msgid="1033337300289871697">"Şuradan çağrılar/iletiler"</string>
+    <string name="zen_mode_from" msgid="1033337300289871697">"Şunlardan çağrılar/iletiler"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Herkes"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Yalnızca kişiler"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Yalnızca yıldızlı kişiler"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Etkinlikler ve hatırlatıcılar"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmlar her zaman öncelikli kesintilerdir"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmlar"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Hatırlatıcılar"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Etkinlikler"</string>
+    <string name="zen_mode_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_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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Hafta içi her gece"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Başlangıç zamanı"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Bitiş zamanı"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Ertesi gün <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> veya öncesinde herhangi bir alarm"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Ertesi gün saat <xliff:g id="FORMATTED_TIME">%s</xliff:g> veya öncesinde herhangi bir alarm"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Ertesi gün <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Kesintiler"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Çağrı ve bildirim geldiğinde"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Kesintinin ne zaman yapılmasını istiyorsunuz?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Ne kadar süre?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Her zaman kes"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"kapalı,tümü,her şey"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Sadece öncelikli kesintilere izin ver"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Yalnızca alarmlara izin ver"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Kesme"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Süresiz"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dakika</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dakika</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> saat</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> saat</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Süresiz olarak yalnızca öncelikli bildirimler seçeneğine değiştir"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> dakika için öncelikli bildirimler seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir dakika için öncelikli bildirimler seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> bir saat için öncelikli bildirimler seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir saat için öncelikli bildirimler seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Süresiz olarak yalnızca alarmlar seçeneğine değiştir"</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> dakika için yalnızca alarmlar seçeneğine geç (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir dakika için yalnızca alarmlar seçeneğine değiştir (şu saate kadar: <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"><xliff:g id="DURATION">%1$d</xliff:g> saat için yalnızca alarmlar seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir saat için yalnızca alarmlar seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Süresiz olarak kesme yok seçeneğine değiştir"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> dakika için kesinti yok moduna geç (şu saate kadar: <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir dakika için kesinti yok seçeneğine değiştir (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> saat için kesinti yok seçeneğine değiştir (şu saate kadar:<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Bir saat için kesinti yok seçeneğine geç (şu saate kadar: <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Her zaman kes seçeneğine değiştir"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"sonsuza kadar"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Uygulama bildirimleri"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihazla ilgili geri bildirim gönder"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI bilgileri"</string>
     <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="2184141780491382435">"Varsayılan olarak başlat"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> depolama biriminde <xliff:g id="SIZE">%1$s</xliff:g> kullanılıyor"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Alan bağlantıları"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Alan URL\'lerini aç"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Uygulamaya Alan URL\'lerini doğrudan açma izni ver"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Desteklenen alan URL\'leri"</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> depolama biriminde <xliff:g id="SIZE">%1$s</xliff:g> kullanılıyor"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"dahili bellek"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"harici bellek"</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>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> (<xliff:g id="DATE">%2$s</xliff:g> tarihinden beri)"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Kullanılan depolama alanı"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Etkin"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Devre dışı"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Hassas Olanlar"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Öncelikliler"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Öncelikliler ve Hassas Olanlar"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izin verildi</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> izin verildi</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">Toplam <xliff:g id="COUNT_3">%d</xliff:g> izinden <xliff:g id="COUNT_2">%d</xliff:g> tanesi onaylandı</item>
+      <item quantity="one">Toplam <xliff:g id="COUNT_1">%d</xliff:g> izinden <xliff:g id="COUNT_0">%d</xliff:g> tanesi onaylandı</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Bazı varsayılan tercihler ayarlandı"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Hiçbir varsayılan tercih ayarlanmadı"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Tüm uygulamalar"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Etkin olanlar"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Kişisel uygulamalar"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"İş uygulamaları"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Engellenenler"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Öncelikli olanlar"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Hassas olanlar"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Alan URL\'leri ile"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Yönetici tarafından devre dışı bırakıldı"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"İleri düzey"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Bilinmeyen uygulama"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profil Seçin"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Uygulama izinleri"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> uygulamaya ek erişim izni veriliyor"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> uygulamaya izin veriliyor"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Alan URL\'leri"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Hiçbir alan URL\'sini açma"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\"<xliff:g id="DOMAIN">%s</xliff:g>\" alanını açan"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\"<xliff:g id="DOMAIN">%s</xliff:g>\" alanını ve ilgili URL\'leri açan"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"> Bu alan URL\'lerini <xliff:g id="COUNT">%d</xliff:g> uygulama açabilir</item>
+      <item quantity="one">Bu alan URL\'lerini bir uygulama açabilir</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Tanınmadı"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Varsayılan Uygulamalar"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Tarayıcı uygulaması"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Varsayılan Tarayıcı yok"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Varsayılan)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Uygulama depolaması"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index b32c0ac..43c356b 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Кнопка Push"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"вимкнути або ввімкнути мікрофон"</item>
     <item msgid="1148142988678569310">"транслювати вміст"</item>
     <item msgid="9130014005474445273">"активувати VPN"</item>
+    <item msgid="1165192162975045562">"написаний фоновий малюнок"</item>
+    <item msgid="7129487923652967258">"допоміжна структура"</item>
+    <item msgid="1069023208100114540">"допоміжний знімок екрана"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Місцезнаходження"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Вимкнути або ввімкнути мікрофон"</item>
     <item msgid="5906017727368097853">"Транслювати вміст"</item>
     <item msgid="2486614710846178542">"Активувати VPN"</item>
+    <item msgid="5586547561693629602">"Написаний фоновий малюнок"</item>
+    <item msgid="32794179825485062">"Допоміжна структура"</item>
+    <item msgid="7872852746938272552">"Допоміжний знімок екрана"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Коротка"</item>
@@ -345,7 +354,7 @@
     <item msgid="7247838127505318669">"Моноширинний Sans-Serif"</item>
     <item msgid="4478414822462359763">"Serif"</item>
     <item msgid="7502451783483660829">"Моноширинний Serif"</item>
-    <item msgid="639503332147461010">"Випадковий шрифт"</item>
+    <item msgid="639503332147461010">"Неформальний шрифт"</item>
     <item msgid="7967169925231332424">"Курсив"</item>
     <item msgid="561832997193039673">"Зменшені великі букви"</item>
   </string-array>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"низький"</item>
     <item msgid="4212263919458209842">"критичний"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Вимкнено"</item>
-    <item msgid="5656544177755411222">"Обмежені перешкоди"</item>
-    <item msgid="8735337502532332056">"Нульові перешкоди"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Нормальний"</item>
     <item msgid="866544120205026771">"Середній"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Рожевий"</item>
     <item msgid="6131821495505931173">"Червоний"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (протокол передавання медіаданих)"</item>
+    <item msgid="8856820259201251036">"PTP (протокол передавання зображень)"</item>
+    <item msgid="216135047298423770">"RNDIS (Ethernet через USB)"</item>
+    <item msgid="2686051673589572111">"Джерело аудіо"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7d907bf..0c81e4f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -22,10 +22,12 @@
     <string name="allow" msgid="3349662621170855910">"Дозволити"</string>
     <string name="deny" msgid="6947806159746484865">"Заборонити"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Невідомо"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Щоб стати розробником, залишився лише <xliff:g id="STEP_COUNT">%1$d</xliff:g> крок."</item>
-    <item quantity="other" msgid="6722953419953594148">"Щоб стати розробником, залишилося лише стільки кроків: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Щоб стати розробником, залишився ще <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> крок.</item>
+      <item quantity="few">Щоб стати розробником, залишилося ще <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кроки.</item>
+      <item quantity="many">Щоб стати розробником, залишилося ще <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="header_category_wireless_networks" msgid="5110914332313954940">"Бездротові та дротові мережі"</string>
@@ -40,6 +42,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Вимкнути SMS в IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Потрібно ввімкнути реєстрацію IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Потрібно вимкнути реєстрацію IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Прапорець \"Ініціалізація VoLTE\" встановлено"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Прапорець \"Ініціалізація VoLTE\" знято"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Увімкнути дамп оперативної пам’яті LTE"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Вимкнути дамп оперативної пам’яті LTE"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Перегл. адрес. книгу SIM"</string>
@@ -135,16 +139,7 @@
     <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_connected" msgid="6038755206916626419">"Підключено"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Під’єднано (без телефону)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Під’єднано (без медіа-файлів)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Під’єднано (без доступу до повідомлень)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Під’єднано (без телефону чи медіа)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Роз’єднано"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Відключення..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Підключення…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Ств.пари..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Пристрій Bluetooth без імені"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Пошук"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Пристрої Bluetooth поблизу не знайдено."</string>
@@ -154,7 +149,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показати отримані файли"</string>
     <string name="device_picker" msgid="4978696506172252813">"Виберіть пристрій Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запит на дозвіл Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Програма хоче ввімкнути Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Додаток хоче ВВІМКНУТИ Bluetooth для цього пристрою."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Програма хоче зробити ваш планшетний ПК видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Програма хоче зробити ваш телефон видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Програма хоче зробити ваш планшетний ПК видимим для інших пристроїв Bluetooth. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
@@ -275,12 +270,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"СКАСУВАТИ"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"ПРОДОВЖИТИ"</string>
     <string name="okay" msgid="1997666393121016642">"ОК"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ТАК"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"НІ"</string>
-    <string name="forget" msgid="7267115980248732932">"ІГНОРУВАТИ"</string>
+    <string name="forget" msgid="1400428660472591263">"Ігнорувати"</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>
@@ -325,9 +318,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Покращити розпізнавання облич"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Перевірка на справжність"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Потрібно кліпнути очима, щоб розблокувати екран"</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_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>
@@ -348,6 +338,32 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Паролі"</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="3453670509485083962">"Додати"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"блокування екрана"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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="many">Зареєстровано <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_enroll_onboard_title" msgid="4735546436672054254">"Налаштування відбитка"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Щоб розблоковувати екран або підтверджувати покупки за допомогою цифрового відбитка: \n\n✓ виберіть резервний спосіб блокування екрана\n\n✓ додайте цифровий відбиток"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Знайдіть датчик"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Знайдіть датчик цифрових відбитків на задній панелі телефона."</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"Розпочнімо"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Приставте палець до датчика цифрових відбитків і заберіть його, коли відчуєте вібрацію."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Чудово! Повторіть."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Приставте той самий палець до датчика цифрових відбитків і заберіть його, коли відчуєте вібрацію."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Відбиток додано."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Цей значок означає, що ви можете підтвердити свою особу або покупку за допомогою цифрового відбитка."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Додати"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Далі"</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>
@@ -360,7 +376,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Підключіть зарядний пристрій і повторіть спробу."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Потрібно ввести PIN-код або пароль для блокування екрана"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Щоб почати шифрування, потрібно встановити PIN-код або пароль для блокування екрана."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Щоб підтвердити шифрування пристрою, намалюйте ключ розблокування."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Зашифрувати?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Операція шифрування незворотна. Якщо її перервати, ви втратите дані. Шифрування триває не менше години, протягом чого ваш планшетний ПК перезавантажиться декілька разів."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Операція шифрування незворотна. Якщо її перервати, ви втратите дані. Шифрування триває не менше години, протягом чого ваш телефон перезавантажиться декілька разів."</string>
@@ -391,22 +406,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"Фейсконтроль"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Низький рівень захисту, експеримент. функція"</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_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="current_screen_lock" msgid="4104091715420072219">"Поточне блокування екрана"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Функції захисту пристрою не працюватимуть."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Вимкнено адміністратором, правилом шифрування або сховищем облікових даних"</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_biometric_weak" msgid="3008473624490350142">"Фейсконтроль"</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_password" msgid="1203938057264146610">"Пароль"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Коли ви налаштуєте блокування екрана, можете додати цифровий відбиток у меню \"Налаштування\" &gt; \"Безпека\"."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Вимкнути блокув. екрана"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Видалити ключ розблок."</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Видал. PIN розблок."</string>
@@ -427,30 +441,42 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Пароль має містити принаймні одну букву."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Пароль має містити принаймні одну цифру."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Пароль має містити принаймні один символ."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Пароль має містити принаймні 1 літеру."</item>
-    <item quantity="other" msgid="8186027808415585970">"Пароль має містити принаймні стільки літер: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Пароль має містити принаймні 1 малу літеру."</item>
-    <item quantity="other" msgid="2693910942679679225">"Пароль має містити принаймні стільки малих літер: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Пароль має містити принаймні 1 велику літеру."</item>
-    <item quantity="other" msgid="3030801209112209245">"Пароль має містити принаймні стільки великих літер: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Пароль має містити принаймні 1 цифру."</item>
-    <item quantity="other" msgid="4703982391407595924">"Пароль має містити принаймні стільки цифр: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Пароль має містити принаймні 1 спеціальний символ."</item>
-    <item quantity="other" msgid="1221290525051187757">"Пароль має містити принаймні стільки спеціальних символів: %d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Пароль має містити принаймні 1 небуквений символ."</item>
-    <item quantity="other" msgid="3952508584649046404">"Пароль має містити принаймні стільки небуквених символів: %d."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Пароль має містити принаймні %d літеру.</item>
+      <item quantity="few">Пароль має містити принаймні %d літери.</item>
+      <item quantity="many">Пароль має містити принаймні %d літер.</item>
+      <item quantity="other">Пароль має містити принаймні %d літери.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Пароль має містити принаймні %d малу літеру.</item>
+      <item quantity="few">Пароль має містити принаймні %d малі літери.</item>
+      <item quantity="many">Пароль має містити принаймні %d малих літер.</item>
+      <item quantity="other">Пароль має містити принаймні %d малої літери.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Пароль має містити принаймні %d велику літеру.</item>
+      <item quantity="few">Пароль має містити принаймні %d великі літери.</item>
+      <item quantity="many">Пароль має містити принаймні %d великих літер.</item>
+      <item quantity="other">Пароль має містити принаймні %d великої літери.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Пароль має містити принаймні %d цифру.</item>
+      <item quantity="few">Пароль має містити принаймні %d цифри.</item>
+      <item quantity="many">Пароль має містити принаймні %d цифр.</item>
+      <item quantity="other">Пароль має містити принаймні %d цифри.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Пароль має містити принаймні %d спеціальний символ.</item>
+      <item quantity="few">Пароль має містити принаймні %d спеціальні символи.</item>
+      <item quantity="many">Пароль має містити принаймні %d спеціальних символів.</item>
+      <item quantity="other">Пароль має містити принаймні %d спеціального символу.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Пароль має містити принаймні %d небуквений символ.</item>
+      <item quantity="few">Пароль має містити принаймні %d небуквені символи.</item>
+      <item quantity="many">Пароль має містити принаймні %d небуквених символів.</item>
+      <item quantity="other">Пароль має містити принаймні %d небуквеного символу.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Адміністратор пристрою не дозволяє використовувати останній пароль."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Цифри в порядку зростання чи спадання та повторювані цифри заборонені"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +506,8 @@
     <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_accept" msgid="6163520056536604875">"Ств.пару"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ПІДКЛЮЧИТИСЯ"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Скасувати"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Якщо ви під’єднаєте інший пристрій, він матиме доступ до ваших контактів та історії дзвінків."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Не вдалося створити пару з пристроєм <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Не вдалося створити пару з пристроєм <xliff:g id="DEVICE_NAME">%1$s</xliff:g> через неправильний PIN-код чи ключ доступу."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Неможливо зв’язатися з пристроєм <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Створ. пари відхилено <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Не вдалося з’єднатися з пристроєм <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>
@@ -515,16 +534,8 @@
     <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="3719383048635344071">"Щоб точніше визначати місцеположення, додатки та сервіси шукають пристрої Bluetooth, навіть якщо Bluetooth вимкнено. Це можна змінити в <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>налаштуваннях сканування<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Підключ. до…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Звук медіа-файлів"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Звук телефону"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Передавання файлів"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Пристрій введення"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Доступ до Інтернету"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Надсилання контактів"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Використовувати для надсилання контактів"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Надання доступу до Інтернету"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Доступ до повідомлень"</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>
@@ -537,28 +548,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"Підключено до аудіоджерела"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Підключено до звуку телеф."</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Підключ. до сервера передачі файлів"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Під’єднано до карти"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Не підключ. до сервера передачі файлів"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Підключено до пристрою введ."</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Викор. для аудіоджер."</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Викор. для звуку тел."</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Викор. для перед. файлів"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Викор. для введ."</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Використовувати для доступу до Інтернету"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Використовувати для карти"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Під’єднано через Диспетчер Wi-Fi-з’єднання"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Транслювати екран"</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>
@@ -570,6 +568,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +593,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Вимкнення Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Помилка"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"У режимі польоту"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Неможливо здійснити сканування мереж"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Сповіщення мережі"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Сповіщати про доступність загальнодоступної мережі"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Уникати слабких з’єднань"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не використовувати мережу Wi-Fi, якщо немає стійкого з’єднання з Інтернетом"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Використовувати мережі зі стабільним з’єднанням з Інтернетом"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканування завжди доступне"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Завжди дозволяти сканування"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Дозволити службі локації Google та іншим додаткам сканувати мережі, навіть якщо Wi-Fi вимкнено"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Під’єднуватися до відкритих мереж Wi-Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Дозволити Wi‑Fi Assistant автоматично під’єднуватися до відкритих мереж із потужним сигналом"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Вибрати помічника"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Установити сертифікати"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей Google та інші програми можуть шукати мережі поблизу, навіть якщо Wi-Fi вимкнено. Щоб скасувати цей дозвіл, перейдіть у меню Розширені &gt; Сканування завжди доступне."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Програми можуть шукати мережі поблизу, навіть якщо Wi-Fi вимкнено. Щоб скасувати цей дозвіл, перейдіть у меню Розширені &gt; Сканування завжди доступне."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Щоб точніше визначати місцеположення, додатки та сервіси шукають мережі Wi‑Fi, навіть якщо 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="5340097010842405981">"Більше не показувати"</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>
@@ -635,11 +630,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Додати іншу мережу"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Більше"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авто-налаштування (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Щоб завершити налаштування, вашому планшету потрібен доступ до Wi-Fi. Після налаштування можна переключатися між мобільною мережею та Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Додаткові параметри"</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="5940801028985255304">"Натисніть кнопку \"Налаштування захищеної мережі Wi‑Fi\" на маршрутизаторі. Вона може називатися \"WPS\" або містити такий символ:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Натисніть на маршрутизаторі кнопку налаштування захищеної мережі Wi-Fi. Вона може називатися WPS або позначатися цим символом:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Введіть PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> на своєму маршрутизаторі Wi‑Fi. Налаштування може тривати не більше двох хвилин."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS запущено. Під’єднання до мережі..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Під’єднано до мережі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +659,15 @@
     <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="219415018348922629">"Вибір діапазону частот точки доступу"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Діапазон 2,4 ГГц"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Діапазон 5 ГГц"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Налаштування IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(незмін.)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(не вказано)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Збережено"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Вимкнено"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Помилка конфігурації IP-адреси"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Помилка з’єднання Wi-Fi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблема з автентифікацією"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Не в діапазоні"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Немає доступу до Інтернету. Спроба під’єднання не здійснюватиметься автоматично."</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_security_none" msgid="7985461072596594400">"Немає"</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>
@@ -686,6 +675,8 @@
     <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="1509171132175355674">"Ця мережа не має доступу до Інтернету. Усе одно ввійти в цю мережу?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Не запитувати знову для цієї мережі"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Підключ."</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Помилка під’єднання до мережі."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Видалити"</string>
@@ -751,8 +742,20 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Точка доступу Wi‑Fi AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Портативна точка доступу 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_mode_title" msgid="2164073796253284289">"Режим дзвінків"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Режим дзвінків через Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi за умовчанням"</item>
+    <item msgid="5267397515594230396">"Мобільна мережа за умовчанням"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"Якщо ввімкнути Wi-Fi, ваш телефон зможе спрямовувати дзвінки через мережі Wi-Fi або мережу вашого оператора, залежно від вибраних налаштувань і потужності сигналу мережі. Перш ніж увімкнути цю функцію, уточніть в оператора, скільки коштує ця послуга, та інші деталі."</string>
     <string name="home_settings" msgid="212375129455718176">"Головний екран"</string>
-    <string name="display_settings_title" msgid="1708697328627382561">"Відображ."</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Гучність"</string>
@@ -814,6 +817,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"Тема"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Світла"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Темна"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Автоматично"</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>
@@ -865,10 +873,12 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Змінити основну SIM-карту?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> – єдина SIM-карта у вашому пристрої. Використовувати її для мобільного Інтернету, дзвінків і SMS-повідомлень?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Неправильний PIN-код SIM-карти. Зв’яжіться зі своїм оператором, щоб розблокувати пристрій."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Неправильний PIN-код SIM-карти. У вас залишилась <xliff:g id="NUMBER">%d</xliff:g> спроба. Після цього потрібно буде зв’язатися з оператором, щоб розблокувати пристрій."</item>
-    <item quantity="other" msgid="77103619544346451">"Неправильний PIN-код SIM-карти. У вас залишилося стільки спроб: <xliff:g id="NUMBER">%d</xliff:g>."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Неправильний PIN-код SIM-карти. У вас залишилась <xliff:g id="NUMBER_1">%d</xliff:g> спроба.</item>
+      <item quantity="few">Неправильний PIN-код SIM-карти. У вас залишилося <xliff:g id="NUMBER_1">%d</xliff:g> спроби.</item>
+      <item quantity="many">Неправильний PIN-код SIM-карти. У вас залишилося <xliff:g id="NUMBER_1">%d</xliff:g> спроб.</item>
+      <item quantity="other">Неправильний PIN-код SIM-карти. У вас залишилося <xliff:g id="NUMBER_1">%d</xliff:g> спроби.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Помилка введення PIN-коду SIM-карти."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Стан пристрою"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Стан телефону"</string>
@@ -917,12 +927,12 @@
     <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="2348501997988663688">"Дані додатків і медіа-вміст"</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_dcim_usage" msgid="558887013613822577">"Фото, відео"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Аудіо (музика, сигнали дзвінка, подкасти тощо)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Інше"</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="default" msgid="6915293408836853020">"Відключ. карту SD"</string>
@@ -955,6 +965,11 @@
     <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_mount" msgid="1014683672493425425">"Підключити"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Вийняти"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Стерти та відформатувати"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Стерти та відформатувати як внутрішню пам’ять"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB-з’єднання комп’ютера"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-з’єднання комп’ютера"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Під’єднати як"</string>
@@ -962,8 +977,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Дозволяє передавати медіа-файли в ОС Windows або за допомогою програми Android File Transfer в ОС Mac (див. www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Дозволяє передавати фото за допомогою програмного забезпечення камери, а також передавати будь-які файли на комп’ютери, які не підтримують MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Установити інструменти передавання файлів"</string>
+    <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_external_title" msgid="2723851748972673696">"Знімний носій"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> безкоштовно (усього – <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"Пристрій <xliff:g id="NAME">%1$s</xliff:g> підключено"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Не вдалося підключити пристрій <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="4161722509712992231">"Не вдалося безпечно вийняти пристрій <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="8343688274191391889">"Не вдалося відформатувати носій <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Перейменувати пам’ять"</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="3677827796634199714"><b>"Коли ви виймете пристрій пам’яті <xliff:g id="NAME_0">^1</xliff:g>, додатки, які зберігаться на ньому, перестануть працювати, а медіафайли будуть недоступні, поки ви не вставите його знову."</b>" \n\n<xliff:g id="NAME_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_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_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="1259216693690378749">"Не виймайте пристрій пам’яті <xliff:g id="NAME">^1</xliff:g> під час форматування."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Перемістити дані в нове сховище"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Ви можете перемістити фотографії, файли та дані додатків на новий пристрій пам’яті (<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="5035719146373359329"><b>"Переміщення займе приблизно <xliff:g id="TIME">^1</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="8641916179067596592">"Під час переміщення дотримуйтеся вказівок нижче. \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_move_confirm_title" msgid="292782012677890250">"Перемістити додаток <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Переміщення додатка <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="4288580957960820740">"Не видаляйте <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="battery_status_title" msgid="9159414319574976203">"Стан акумулятора"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Рівень заряду акумулятора"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Точки доступу"</string>
@@ -1007,10 +1062,15 @@
     <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_network_title" msgid="4557113742173895074">"Скидання налаштувань мереж"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Відновляться всі налаштування мереж, зокрема: \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="4874737348054213767">"Скинути всі налаштування мереж? Цю дію не можна скасувати."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Скинути налаштування"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Скинути?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Налаштування мереж скинуто"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Скинути параметри пристрою"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Скидання налаштувань"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Видаляє всі дані в пристрої"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Видаляє всі дані в телефоні"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Це зітре всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшетного ПК, зокрема:\n\n"<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li>"."</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Буде видалено всі дані з "<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>
@@ -1024,9 +1084,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Стерти всі дані на карті SD, такі як музика чи фото."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Скинути пристр."</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Скинути налаштування"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Стерти всю особисту інформацію та завантажені програми? Цю дію не можна скасувати!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Стерти всю особисту інформацію та завантажені додатки? Цю дію не можна скасувати."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Видалити все"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Щоб підтвердити відновлення заводських налаштувань, потрібно намалювати ключ розблокування."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Скидання не виконано, оскільки служба очищення системи не доступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Скинути?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Цей користувач не може відновити заводські налаштування"</string>
@@ -1043,8 +1102,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Стерти носій USB, видаливши всі збережені на ньому файли? Цю дію не можна скасувати!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Стерти карту SD, видаливши всі збережені на ній файли? Цю дію не можна скасувати!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Видалити все"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Щоб підтвердити очищення носія USB, треба намалювати ключ розблокування."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Щоб підтвердити очищення карти SD, треба намалювати ключ розблокування."</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>
@@ -1076,7 +1133,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Довідка"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Мобільні мережі"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифний план"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Програма для 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="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">"Використовувати для SMS додаток <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
@@ -1104,7 +1161,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим локації"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Використовувати GPS, Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Використовувати Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Використовувати GPS для визначення місцезнаходження"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Використовувати GPS для визначення місцезнаходження"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Пошук"</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="2070686681074461301">"Щоб покращити точність визначення місцеположення, дозвольте додаткам і сервісам шукати мережі Wi‑Fi, навіть якщо Wi-Fi вимкнено"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Шукати пристрої Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Щоб покращити точність визначення місцеположення, дозвольте сервісам системи шукати пристрої Bluetooth, навіть якщо Bluetooth вимкнено"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Локація Wi‑Fi і моб. мереж"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Дозвольте програмам користуватися службою визначення місцезнаходження Google, щоб швидше оцінювати ваше місцезнаходження. Анонімна інформація про місцезнаходження збиратиметься та надсилатиметься в Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Місцезнаходження, визначене Wi-Fi"</string>
@@ -1150,11 +1213,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"Блокування екрана"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Щоб продовжити, введіть ключ пристрою."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Щоб продовжити, введіть PIN-код пристрою."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Щоб продовжити, введіть пароль пристрою."</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_need_to_unlock" msgid="757935356911054465">"Підтвердьте наявний ключ"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Повторити спробу:"</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>
@@ -1176,8 +1243,7 @@
     <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_header" msgid="819903817323783498">"Забагато неправильних спроб!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Спробуйте ще через <xliff:g id="NUMBER">%d</xliff:g> сек."</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="manageapplications_settings_title" msgid="7041951105633616745">"Керувати програмами"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Керувати встановленими програмами та видаляти їх"</string>
@@ -1228,6 +1294,7 @@
     <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>
@@ -1299,6 +1366,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Використання пам\'яті"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Переглянути пам’ять, яку використовують програми"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Запущені служби"</string>
@@ -1396,17 +1464,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Інф-ція про пристрій"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Інф-я тел-ну"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Інформація про акумулятор"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Швидкий запуск"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Встановлення комбінацій клавіш для запуску програм"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Призначити програму"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Немає ярлика"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Пошук + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Очистити"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Ваш ярлик для <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) буде видалено."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Скасувати"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Додатки"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Ярлики"</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>
@@ -1441,23 +1498,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Робити знімки всіх пакетів інтерфейсу Bluetooth у файлі"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Розблокування виробником"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Дозволити розблокування завантажувача"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Введіть PIN-код"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Щоб увімкнути розблокування OEM, введіть PIN-код пристрою"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Дозволити виробникові розблоковувати пристрій?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ЗАСТЕРЕЖЕННЯ. Функції захисту пристрою не працюватимуть, поки ввімкнено це налаштування."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Розміри буфера журналу"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Виберіть розміри буфера журналу"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Фіктивні місцезнаходження"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозв. фіктивні місцезн."</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Увімкнути оцінку атрибуції переглядів"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Мережі"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертифікація бездротового екрана"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Докладний запис у журнал Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Перемикатись із Wi-Fi на моб. мережу"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Завжди дозволяти Wi-Fi шукати роумінг"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Використовувати старий клієнт DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показати параметри сертифікації бездротового екрана"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Показувати в журналі RSSI для кожного SSID під час вибору Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Примусово перемикатися на мобільну мережу, коли сигнал Wi-Fi слабкий"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Дозволити чи заборонити Wi-Fi шукати роумінг на основі обсягу трафіку даних в інтерфейсі"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Розміри буфера журналу"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Виберіть розміри буфера журналу"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Вибрати конфігурацію USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Вибрати конфігурацію USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Фіктивні місцезнаходження"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозв. фіктивні місцезн."</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Увімкнути оцінку атрибуції переглядів"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Використовувати клієнт DHCP з Lollipop, а не новий клієнт DHCP з Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Дозвол. налагодж. USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Налагодження USB застосовується лише з метою розробки. Його можна використовувати для копіювання даних між комп’ютером і пристроєм, встановлення програм на вашому пристрої без сповіщення та читання даних журналу."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Скасувати доступ до налагодження USB для всіх комп’ютерів, які раніше отримали таке право?"</string>
@@ -1497,7 +1562,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Налаштування доступності"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Служби"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
-    <string name="accessibility_display_title" msgid="7610175687949675162">"Дисплей"</string>
+    <string name="accessibility_display_title" msgid="7610175687949675162">"Екран"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Субтитри"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жести збільшення"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Якщо цю функцію ввімкнено, масштаб можна змінювати, тричі торкнувшись екрана.\n\nУ збільшеному масштабі можна:\n"<ul><li>"панорамувати – проведіть принаймні двома пальцями по екрану;"</li>\n<li>"налаштовувати рівень масштабування – стисніть або розведіть принаймні два пальці."</li></ul>\n\n"Можна також тимчасово збільшувати вміст під пальцем – тричі торкніться й утримуйте. У такому збільшеному стані можна досліджувати різні частини екрана, пересуваючи палець. Підніміть палець, щоб повернутися до попереднього стану.\n\nПримітка. Потрійний дотик для збільшення працює всюди, окрім клавіатури та панелі навігації."</string>
@@ -1561,6 +1626,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Пурпуровий"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Використовувати <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Службі <xliff:g id="SERVICE">%1$s</xliff:g> потрібно:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Вашу відповідь не видно в Налаштуваннях, оскільки інший додаток загороджує запит на дозвіл."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Якщо ви ввімкнете службу <xliff:g id="SERVICE">%1$s</xliff:g>, дані на пристрої не захищатимуться екраном блокування."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Оскільки ви ввімкнули службу доступності, дані на пристрої не захищатимуться екраном блокування."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Оскільки ввімкнення служби <xliff:g id="SERVICE">%1$s</xliff:g> впливає на шифрування даних, потрібно підтвердити ключ."</string>
@@ -1702,14 +1768,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> програми за <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Використовувалося <xliff:g id="USEDRAM">%1$s</xliff:g> з <xliff:g id="TOTALRAM">%2$s</xliff:g> протягом <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</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_memory_status" msgid="4251599550196193093">"Поточний стан пам’яті пристрою: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Сер. використання оперативної пам’яті"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Макс. використання оперативної пам’яті"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"ОС Android"</string>
+    <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">"Динамічна оперативна пам’ять"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Кеші"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Використання оперативної пам’яті"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Використання оперативної пам’яті (фонове)"</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>
     <string name="mem_details_title" msgid="6548392825497290498">"Деталі пам’яті"</string>
@@ -1726,6 +1798,7 @@
     <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_hide_system" msgid="4106826741703745733">"Сховати системні процеси"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Використовувати USS (Unique Set Size)"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистики"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Фонові"</string>
@@ -1748,7 +1821,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Налаштування за умовчанням нижче замінюють налаштування програми"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Налашт-ня за умовч."</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Система за умовчанням"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Установлює систему синтезу мовл. для викор. в голос. тексті"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Налаштуйте систему синтезу мовлення"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Темп мовлення"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Швидкість відтворення тексту"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Вис. зв."</string>
@@ -1822,7 +1895,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"Щоб підтвердити встановлення облікових даних, потрібно намалювати ключ розблокування."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ввести пароль для сховища облікових даних."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Поточний пароль:"</string>
@@ -1847,12 +1919,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"Наразі жоден обліковий запис не зберігає резервних копій даних"</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="5355557151569037197">"Служба резервного копіювання неактивна."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Це налаштування встановлено політикою пристрою."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль резерв.копії на ПК"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Повні резервні копії на комп’ютері наразі не захищені"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Торкніться, щоб змінити чи видалити пароль для повного резервного копіювання на комп’ютер"</string>
@@ -2024,6 +2094,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Ступінь анімації переходу"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Тривалість анімації"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Імітувати додаткові екрани"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Багатоекранний режим"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Декілька одночасних дій на екрані."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Увімкнути багатоекранний режим?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ЗАСТЕРЕЖЕННЯ. Це експериментальна версія функції, завдяки якій можна одночасно виконувати декілька дій на екрані \"Останні додатки\". У цьому режимі деякі додатки можуть припиняти роботу або працювати неналежним чином."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Додатки"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не зберігати діяльність"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Знищувати кожну дію, щойно користувач припиняє її"</string>
@@ -2195,7 +2269,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="718192651887726259">"Цим пристроєм можуть користуватися кілька користувачів. Для цього потрібно створити додаткові профілі. Власник профілю може налаштувати його на свій смак, вибрати фоновий малюнок, установити потрібні додатки тощо. Користувачі також можуть налаштовувати певні параметри пристрою, які застосовуватимуться до решти користувачів, як-от налаштування 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>
@@ -2226,13 +2300,13 @@
     <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="8310589470979488255">"Дозволити телефонні дзвінки"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Дозволити телефонні дзвінки й SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Увімкнути телефонні дзвінки"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Увімкнути телефонні дзвінки й SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Видалити користувача"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Дозволити телефонні дзвінки?"</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_sms_confirm_title" msgid="188164598768941316">"Дозволити телефонні дзвінки й SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Цей користувач матиме доступ до історії викликів і SMS"</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="application_restrictions" msgid="8207332020898004394">"Дозволи для програм і вмісту"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Програми з обмеженнями"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Розгорнути налаштув. програм"</string>
@@ -2283,8 +2357,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"Ця програма не підтримується в обмежених профілях"</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>
@@ -2337,7 +2411,7 @@
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> дБм <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM-карти змінено."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Торкніться, щоб налаштувати"</string>
-    <string name="sim_pref_divider" msgid="6778907671867621874">"Найкраща SIM-карта для такого застосування:"</string>
+    <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>
     <string name="dashboard_title" msgid="5453710313046681820">"Налаштування"</string>
@@ -2349,13 +2423,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текстове повідомлення писати текстові повідомлення обмін повідомленнями"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"стільниковий мобільний оператор бездротові мережі дані 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi дзвінок телефонувати"</string>
     <string name="keywords_home" msgid="3626170808219458848">"панель запуску"</string>
     <string name="keywords_display" msgid="6709007669501628320">"сенсорний екран дисплея"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затемнити дисплей сенсорний екран акумулятор"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затемнити дисплей сенсорний екран акумулятор"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон персоналізувати налаштувати дисплей"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"темна тема нічний режим затемнити екран інвертувати яскравість"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"фон персоналізувати налаштувати дисплей"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"розмір шрифту"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"проект"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"трансляції екрана"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"місце на диску жорсткий диск використання пристрою"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"використання акумулятора зарядити"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"орфографічний словник перевірка правопису автоматичне виправлення"</string>
@@ -2372,6 +2448,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"обліковий запис"</string>
     <string name="keywords_users" msgid="4673901601478559100">"обмеження обмежувати обмежено"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"виправлення тексту виправити звук вібросигнал автоматично мова жест пропонувати пропозиція тема образливе слово ввести смайли emoji міжнародний"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"відновити параметри за умовчанням"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"додаток для екстрених викликів за умовчанням"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"додатки завантажити додаток системний"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"додатки дозволи безпека"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"додатки за умовчанням"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"провести пальцем пароль ключ PIN-код"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Налаштувати NFC-тег для Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записати"</string>
@@ -2386,11 +2467,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"Сповіщення"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Коли надходять дзвінки та сповіщення"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Завжди переривати"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Дозволити лише пріоритетні сповіщення"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не турбувати"</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_option_important_interruptions" msgid="3903928008177972500">"Лише пріоритетні"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Лише сигнали"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Без сповіщень"</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="ringtone_title" msgid="5379026328015343686">"Мелодія телефону"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Сигнал сповіщень за умовчанням"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Також вібросигнал для дзвінків"</string>
@@ -2416,62 +2498,133 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вібросигнал"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ до сповіщень"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Додатки не можуть читати сповіщення"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Програми, що можуть читати сповіщення: %d"</item>
-    <item quantity="other" msgid="980049191810249052">"Програми, що можуть читати сповіщення: %d"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d додаток може читати сповіщення</item>
+      <item quantity="few">%d додатки можуть читати сповіщення</item>
+      <item quantity="many">%d додатків можуть читати сповіщення</item>
+      <item quantity="other">%d додатка можуть читати сповіщення</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Служби читання сповіщень не встановлено."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Увімкнути <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> зможе читати всі сповіщення, надіслані системою або будь-якою встановленою програмою. У сповіщеннях може бути особиста інформація, зокрема імена контактів і текст отриманих повідомлень. Ця програма також зможе закривати сповіщення або активувати в них кнопки."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Додатки, які надають умови"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Немає додатків, які надають умови"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"Додаток %d надає умови"</item>
-    <item quantity="other" msgid="358057362115673258">"Додатки %d надають умови"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Не встановлено додатків, які надають умови."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Увімкнути <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> зможе додавати умови виходу для режиму \"Не турбувати\"."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Завантаження додатків…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Заблокувати"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Блокувати всі"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ніколи не показувати сповіщення з цього додатка"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Пріоритетні"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Показувати сповіщення вгорі списку та приймати їх, коли на пристрої вибрано параметр \"Лише пріоритетні сповіщення\""</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Конфіденційно"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Ховати конфіденційний вміст у сповіщеннях цього додатка, коли пристрій заблоковано"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Вважати пріоритетними"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Дозволити сигнал для сповіщень цього додатка, коли в режимі \"Не турбувати\" вибрано \"Лише пріоритетні\""</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Дозволити короткий показ"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Дозволити цьому додатку ненадовго виводити важливі сповіщення на поточний екран"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ховати конфіденційний вміст"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Коли пристрій заблоковано, ховати конфіденційний вміст сповіщень цього додатка"</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="zen_mode_default_option" msgid="6940069025071935243">"Доки ви не вимкнете"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Пріоритетні сповіщення"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Простій"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Дні"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Немає"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Сповіщення дозволено"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Лише пріоритетні"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Немає"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматизація"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Вмикати автоматично"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Назва правила"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Додати правило"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Видалити правило"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Видалити правило \"<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="3201273040477861538">"Указати правило"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Правило не знайдено."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ніколи"</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_from" msgid="1033337300289871697">"Дзвінки або повідомлення від користувача"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Усі"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Лише контакти"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Лише позначені контакти"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Події та нагадування"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Сигнали завжди є пріоритетними сповіщеннями"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Сигнали"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Нагадування"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Події"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Вибрані абоненти"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повторні вхідні виклики"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Дозволити звуковий сигнал, якщо та сама особа телефонує знову через <xliff:g id="MINUTES">%d</xliff:g> хв"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Вмикати автоматично"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ніколи"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"Наступного дня о <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"О <xliff:g id="FORMATTED_TIME">%s</xliff:g> або перед будь-яким сигналом"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Наступного дня о <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_interruptions_voice_title" msgid="855256211259132964">"Сповіщення"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Коли надходять дзвінки та сповіщення"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Коли вас можна турбувати?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Як довго?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Завжди сповіщати"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"вимкнути,усі,усе"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Дозволити лише пріоритетні сповіщення"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Дозволити лише сигнали"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Не турбувати"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Без обмежень"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> хвилина</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> хвилини</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> хвилин</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> хвилини</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Вибрати лише пріоритетні сповіщення без обмежень"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> хвилину до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> хвилини до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати лише пріоритетні сповіщення на <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>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> годину до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Вибрати лише пріоритетні сповіщення на <xliff:g id="DURATION">%1$d</xliff:g> години до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати лише пріоритетні сповіщення на <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>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Вибрати лише сигнали без обмежень"</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="few">Вибрати сигнали лише на <xliff:g id="DURATION">%1$d</xliff:g> хвилини до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати сигнали лише на <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>
+    </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="few">Вибрати сигнали лише на <xliff:g id="DURATION">%1$d</xliff:g> години до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати сигнали лише на <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>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Вибрати опцію \"Не турбувати\" без обмежень"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> хвилину до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> хвилини до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати опцію \"Не турбувати\" на <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>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> годину до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="few">Вибрати опцію \"Не турбувати\" на <xliff:g id="DURATION">%1$d</xliff:g> години до <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Вибрати опцію \"Не турбувати\" на <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>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Вибрати опцію \"Завжди надсилати\""</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"завжди"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Сповіщення додатків"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Надіслати відгук про цей пристрій"</string>
@@ -2512,4 +2665,69 @@
     <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="2184141780491382435">"Запускати за умовчанням"</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="app_launch_domain_links_title" msgid="458956710410857777">"Посилання на домени"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Відкривати URL-адреси домену"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Дозволити додатку відкривати URL-адреси домену"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Підтримувані URL-адреси доменів"</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="410824961149037234">"внутрішньої пам’яті"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"зовнішньої пам’яті"</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="notifications_enabled" msgid="6983396130566021385">"Увімкнено"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Заблокувати"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Конфіденційні"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Пріоритетні"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Пріоритетні та конфіденційні"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one">Надано <xliff:g id="COUNT_1">%d</xliff:g> дозвіл</item>
+      <item quantity="few">Надано <xliff:g id="COUNT_1">%d</xliff:g> дозволи</item>
+      <item quantity="many">Надано <xliff:g id="COUNT_1">%d</xliff:g> дозволів</item>
+      <item quantity="other">Надано <xliff:g id="COUNT_1">%d</xliff:g> дозволу</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one">Надано <xliff:g id="COUNT_2">%d</xliff:g> дозвіл із <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="few">Надано <xliff:g id="COUNT_2">%d</xliff:g> дозволи з <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many">Надано <xliff:g id="COUNT_2">%d</xliff:g> дозволів із <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="other">Надано <xliff:g id="COUNT_2">%d</xliff:g> дозволу з <xliff:g id="COUNT_3">%d</xliff:g></item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Налаштовано деякі значення за умовчанням"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Немає значень за умовчанням"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Усі додатки"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Увімкнені"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Особисті"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Робочі"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблоковані"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Пріоритетні"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Конфіденційні"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"З URL-адресами домену"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Вимкнено адміністратором"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Розширені налаштування"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Невідомий додаток"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Вибрати профіль"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Дозволи додатків"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Додатковий доступ мають стільки додатків: <xliff:g id="COUNT_0">%d</xliff:g> з <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Дозволено додатків: <xliff:g id="COUNT_0">%d</xliff:g> з <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL-адреси домену"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Не відкривати URL-адреси домену"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Відкривати <xliff:g id="DOMAIN">%s</xliff:g>"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Відкривати <xliff:g id="DOMAIN">%s</xliff:g> і пов’язані URL-адреси"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> додаток може відкривати URL-адреси свого домену</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> додатки можуть відкривати URL-адреси свого домену</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> додатків можуть відкривати URL-адреси свого домену</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> додатка можуть відкривати URL-адреси свого домену</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Не розпізнано"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Додатки за умовчанням"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Додаток веб-переглядача"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Немає веб-переглядача за умовчанням"</string>
+    <string name="default_app" msgid="6864503001385843060">"(За умовчанням)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Сховище додатків"</string>
 </resources>
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur-rPK/arrays.xml
index 159504b..e3d8e51 100644
--- a/res/values-ur-rPK/arrays.xml
+++ b/res/values-ur-rPK/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"پش بٹن"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"مائیکروفون کو خاموش کریں/اس کی آواز چلائیں"</item>
     <item msgid="1148142988678569310">"پروجیکٹ میڈیا"</item>
     <item msgid="9130014005474445273">"‏VPN کو فعال کریں"</item>
+    <item msgid="1165192162975045562">"لکھنے کا وال پیپر"</item>
+    <item msgid="7129487923652967258">"مدد کا ڈھانچہ"</item>
+    <item msgid="1069023208100114540">"مدد کا اسکرین شاٹ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"مقام"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"مائیکروفون کو خاموش کریں/اس کی آواز چلائیں"</item>
     <item msgid="5906017727368097853">"پروجیکٹ میڈیا"</item>
     <item msgid="2486614710846178542">"‏VPN کو فعال کریں"</item>
+    <item msgid="5586547561693629602">"لکھنے کا وال پیپر"</item>
+    <item msgid="32794179825485062">"مدد کا ڈھانچہ"</item>
+    <item msgid="7872852746938272552">"مدد کا اسکرین شاٹ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"مختصر"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"کم"</item>
     <item msgid="4212263919458209842">"اہم"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"آف"</item>
-    <item msgid="5656544177755411222">"محدود رکاوٹیں"</item>
-    <item msgid="8735337502532332056">"صفر رکاوٹیں"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"عام"</item>
     <item msgid="866544120205026771">"متوسط"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"گلابی"</item>
     <item msgid="6131821495505931173">"سرخ"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"‏MTP (میڈیا کی منتقلی کا پروٹوکول)"</item>
+    <item msgid="8856820259201251036">"‏PTP (تصویر کی منتقلی کا پروٹوکول)"</item>
+    <item msgid="216135047298423770">"‏RNDIS ‏(USB ایتھرنیٹ)‎"</item>
+    <item msgid="2686051673589572111">"آڈیو ماخذ"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 30c1204..a97c998 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"اجازت دیں"</string>
     <string name="deny" msgid="6947806159746484865">"رد کریں"</string>
     <string name="device_info_default" msgid="7847265875578739287">"نامعلوم"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT">%1$d</xliff:g> قدم دور ہیں۔"</item>
-    <item quantity="other" msgid="6722953419953594148">"اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT">%1$d</xliff:g> قدم دور ہیں۔"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> قدم دور ہیں۔</item>
+      <item quantity="one">اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> قدم دور ہیں۔</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"اب آپ ایک ڈیولپر ہیں!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"کوئی ضرورت نہیں ہے، آپ پہلے سے ہی ایک ڈیولپر ہیں۔"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"وائرلیس اور نیٹ ورکس"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"‏SMS کو IMS پر آف کریں"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"‏IMS رجسٹریشن آن کریں درکار ہے"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"‏IMS رجسٹریشن آف کرنے کی ضرورت ہے"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"‏VoLTE فرہم کردہ پرچم آن کریں"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"‏VoLTE فراہم کردہ پرچم آف کریں"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"‏lte ریم ڈمپ آن کریں"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"‏lte ریم ڈمپ آف کریں"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"‏SIM ایڈریس بک دیکھیں"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"مربوط"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"مربوط (کوئی فون نہیں ہے)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"مربوط (کوئی میڈیا نہیں ہے)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"مربوط (کسی پیغام تک رسائی نہیں ہے)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"مربوط (کوئی فون یا میڈیا نہیں ہے)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"منقطع"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"منقطع کیا جارہا ہے…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"مربوط ہو رہا ہے…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"جوڑا بنایا جا رہا ہے…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"بلا نام بلوٹوتھ آلہ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"تلاش کر رہا ہے"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"کوئی قریبی بلوٹوتھ آلات نہیں ملے۔"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"موصولہ فائلیں دکھائیں"</string>
     <string name="device_picker" msgid="4978696506172252813">"بلوٹوتھ آلہ منتخب کریں"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"بلوٹوتھ اجازت کی درخواست"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"ایک ایپ بلوٹوتھ آن کرنا چاہتی ہے۔"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"ایک ایپ اس آلہ کیلئے بلوٹوتھ آن کرنا چاہتی ہے۔"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"ایک ایپ <xliff:g id="TIMEOUT">%1$d</xliff:g> سیکنڈ کیلئے آپ کے ٹیبلٹ کو دیگر بلوٹوتھ آلات پر مرئی بنانا چاہتی ہے۔"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"ایک ایپ <xliff:g id="TIMEOUT">%1$d</xliff:g> سیکنڈ کیلئے آپ کے فون کو دیگر بلوٹوتھ آلات پر مرئی بنانا چاہتی ہے۔"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"ایک ایپ آپ کے ٹیبلٹ کو دیگر بلوٹوتھ آلات پر مرئی بنانا چاہتی ہے۔ آپ اسے بعد میں بلوٹوتھ کی ترتیبات میں تبدیل کر سکتے ہیں۔"</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"منسوخ کریں"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"جاری رکھیں"</string>
     <string name="okay" msgid="1997666393121016642">"ٹھیک ہے"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"ہاں"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"نہیں"</string>
-    <string name="forget" msgid="7267115980248732932">"بھول جائیں"</string>
+    <string name="forget" msgid="1400428660472591263">"بھول جائیں"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"چہرے کی مماثلت کو بہتر بنائیں"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"لائیونیس چیک"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"غیر مقفل کرتے وقت آنکھ کی جھپکی درکار ہوتی ہے"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"‏میرا مقام، اسکرین اَن لاک، SIM کارڈ لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"میرا مقام، اسکرین ان لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"پاس ورڈز"</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="3453670509485083962">"شامل کریں"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"اسکرین لاک"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"فنگر پرنٹ سیٹ اپ"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"آپ کی اسکرین کو غیر مقفل کرنے یا خریداریوں کی توثیق کرنے کیلئے آپ کے فنگر پرنٹ کا استعمال کرنے کیلئے، ہمیں یہ کرنے کی ضرورت ہوگی: \n\n✓ آپ کے بیک اپ اسکرین لاک کے طریقہ کو ترتیب دینا \n\n✓ آپ کا فنگر پرنٹ شامل کرنا"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"سینسر تلاش کریں"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"اپنے فون کی پشت پر فنگر پرنٹ سینسر کا پتا لگائیں۔"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"آئیے شروع کریں!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"اپنی انگلی فنگر پرنٹ سینسر پر رکھیں۔ وائبریشن محسوس کرنے کے بعد ہٹائیں۔"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"زبردست! اب دہرائیں۔"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"وہی انگلی فنگر پرنٹ سینسر پر رکھیں اور وائبریشن محسوس کرنے کے بعد ہٹائیں۔"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"فنگر پرنٹ شامل کیا!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"آپ کو جب بھی یہ آئیکن دکھائی دیتا ہے تو آپ شناخت کرنے یا خریداری کی توثیق کرنے کیلئے اپنا فنگر پرنٹ استعمال کر سکتے ہیں۔"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"شامل کریں"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"آگے جائیں"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"اپنا چارجر لگائیں اور دوبارہ کوشش کریں۔"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"‏کوئی لاک اسکرین PIN یا پاس ورڈ نہیں ہے"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"‏اس سے پہلے کہ آپ مرموز کاری شروع کر سکیں آپ کو اسکرین مقفل کرنے کا ایک PIN یا پاس ورڈ سیٹ کرنا ہوتا ہے۔"</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"آپ کو اپنے آلہ کی مرموز کاری کی توثیق کرنے کیلئے اپنا غیر مقفل کرنے کا پیٹرن ڈرا کرنے کی ضرورت ہے۔"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"مرموز کریں؟"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"مرموز کاری کا عمل ناقابل واپسی ہے اور اگر آپ اس میں خلل ڈالتے ہیں تو آپ ڈیٹا سے محروم ہوجائیں گے۔ مرموز کاری میں ایک گھنٹہ یا زیادہ وقت لگتا ہے، جس کے دوران فون کئی بار ری سٹارٹ ہوگا۔"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"مرموز کاری کا عمل ناقابل واپسی ہے اور اگر آپ اس میں خلل ڈالتے ہیں تو آپ ڈیٹا سے محروم ہوجائیں گے۔ مرموز کاری میں ایک گھنٹہ یا زیادہ وقت لگتا ہے، جس کے دوران فون کئی بار ری سٹارٹ ہوگا۔"</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"چہرے کے ذریعے غیر مقفل کرنا"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"کم سیکیورٹی، تجرباتی"</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_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="current_screen_lock" msgid="4104091715420072219">"موجودہ اسکرین لاک"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"آلہ کے تحفظ کی خصوصیات مزید کام نہیں کریں گی۔"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"منتظم، مرموز کاری کی پالیسی یا اسناد کے اسٹوریج کے ذریعے غیر فعال کردہ"</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_biometric_weak" msgid="3008473624490350142">"چہرے کے ذریعے غیر مقفل کرنا"</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_password" msgid="1203938057264146610">"پاس ورڈ"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"‏اسکرین لاک کو ترتیب دے دینے کے بعد، آپ ترتیبات ‎&lt;‎ سیکیورٹی میں اپنی فنگر پرنٹ کو ترتیب دے سکتے ہیں۔"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"اسکرین لاک کو آف کریں"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"غیر مقفل کرنے کا پیٹرن ہٹائیں"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"‏غیر مقفل کرنے کا PIN ہٹائیں"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"پاس ورڈ میں کم از کم ایک حرف ہونا ضروری ہے۔"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"پاس ورڈ میں کم از کم ایک ہندسہ ہونا ضروری ہے۔"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"پاس ورڈ میں کم از کم ایک علامت ہونی ضروری ہے۔"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"پاس ورڈ میں کم از کم 1 حرف ہونا ضروری ہے۔"</item>
-    <item quantity="other" msgid="8186027808415585970">"‏پاس ورڈ میں کم از کم ‎%d حروف ہونے ضروری ہیں۔"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"پاس ورڈ میں کم از کم 1 چھوٹا حرف ہونا ضروری ہے۔"</item>
-    <item quantity="other" msgid="2693910942679679225">"‏پاس ورڈ میں کم از کم ‎%d چھوٹے حروف ہونے ضروری ہیں۔"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"پاس ورڈ میں کم از کم 1 بڑا حرف ہونا ضروری ہے۔"</item>
-    <item quantity="other" msgid="3030801209112209245">"‏پاس ورڈ میں کم از کم ‎%d بڑے حروف ہونے ضروری ہیں۔"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"پاس ورڈ میں کم از کم 1 عددی ہندسہ ہونا ضروری ہے۔"</item>
-    <item quantity="other" msgid="4703982391407595924">"‏پاس ورڈ میں کم از کم ‎%d عددی ہندسے ہونے ضروری ہیں۔"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"پاس ورڈ میں کم از کم 1 خصوصی علامت ہونی ضروری ہے۔"</item>
-    <item quantity="other" msgid="1221290525051187757">"‏پاس ورڈ میں کم از کم ‎%d خصوصی علامات ہونی ضروری ہیں۔"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"پاسورڈ میں کم از کم ایک کیریکٹر ایسا ہونا چاہئے جو حرف نہ ہو۔"</item>
-    <item quantity="other" msgid="3952508584649046404">"‏پاسورڈ میں کم از کم ‎%d کیریکٹرز ایسے ہونے چاہئیں جو حروف نہ ہوں۔"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">‏پاس ورڈ میں کم از کم ‎%d حروف ہونے ضروری ہیں۔</item>
+      <item quantity="one">پاس ورڈ میں کم از کم 1 حرف ہونا ضروری ہے۔</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">‏پاس ورڈ میں کم از کم ‎%d چھوٹے حروف ہونے ضروری ہیں۔</item>
+      <item quantity="one">پاس ورڈ میں کم از کم 1 چھوٹا حرف ہونا ضروری ہے۔</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">‏ پاس ورڈ میں کم از کم ‎%d بڑے حروف ہونے ضروری ہیں۔</item>
+      <item quantity="one">پاس ورڈ میں کم از کم 1 بڑا حرف ہونا ضروری ہے۔</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">‏پاس ورڈ میں کم از کم ‎‎%d عددی ہندسے ہونے ضروری ہیں۔</item>
+      <item quantity="one">پاس ورڈ میں کم از کم 1 عددی ہندسہ ہونا ضروری ہے۔</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">‏پاس ورڈ میں کم از کم ‎%d خصوصی علامات ہونی ضروری ہیں۔</item>
+      <item quantity="one">پاس ورڈ میں کم از کم 1 خصوصی علامت ہونی ضروری ہے۔</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">‏پاس ورڈ میں کم از کم ‎%d ایسے کیرکٹرز ہونے ضروری ہیں جو حروف نہ ہوں۔</item>
+      <item quantity="one">پاس ورڈ میں کم از کم ایک ایسا کیرکٹر ہونا ضروری ہے جو حرف نہ ہو۔</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"آلے کا منتظم ایک حالیہ پاس ورڈ کا استعمال کرنے کی اجازت نہیں دیتا ہے۔"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ہندسوں کی صعودی، نزولی یا مکرر ترتیب منع ہے"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ٹھیک ہے"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"جوڑا بنائیں"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"جوڑا بنائیں"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"منسوخ کریں"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"منسلک ہونے پر جوڑا بنانے سے آپ کے رابطوں اور کال کی سرگزشت تک رسائی حاصل ہو جاتی ہے۔"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے ساتھ جوڑا نہیں بنا سکا۔"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"‏غلط PIN یا پاس کلید کی وجہ سے <xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے ساتھ جوڑا نہیں بنا سکا۔"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے ساتھ مواصلت نہیں ہو سکتی۔"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> نے جوڑا بنانے کو مسترد کر دیا۔"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"مقام کی درستگی کو بہتر بنانے کیلئے، بلوٹوتھ آف ہونے پر بھی ایپس اور سروسز بلوٹوتھ آلات اسکین کریں گی۔ آپ اس کو <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_specific_profiles_title" msgid="6952214406025825164">"اس سے مربوط ہوں…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"میڈيا آڈیو"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"فون آڈیو"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"فائل کی منتقلی"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ان پٹ آلہ"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"انٹرنیٹ تک رسائی"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"رابطہ کا اشتراک"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"رابطہ کے اشتراک کیلئے استعمال کریں"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"انٹرنیٹ کنکشن کا اشتراک کرنا"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"پیغام تک رسائی"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"میڈیا آڈیو سے مربوط"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"فون آڈیو سے مربوط"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"فائل منتقلی سرور سے مربوط ہو گیا ہے"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"نقشہ سے مربوط ہوگیا"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"فائل منتقلی سرور سے مربوط نہیں ہے"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ان پٹ آلہ سے مربوط"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"میڈیا آڈیو کیلئے استعمال کریں"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"فون آڈیو کیلئے استعمال کریں"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"فائل منتقل کرنے کیلئے استعمال کریں"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ان پٹ کیلئے استعمال"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"انٹرنیٹ رسائی کیلئے استعمال"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"نقشہ کیلئے استعمال کریں"</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_assistant_title" msgid="2553267316621598101">"‏Wi‑Fi اسسٹنٹ"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"‏Wi‑Fi اسسٹنٹ کے ذریعے منسلک ہے"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"کاسٹ اسکرین"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"‏Wi‑Fi آف ہو رہا ہے…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"خرابی"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ہوائی جہاز وضع میں"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"نیٹ ورکس کیلئے اسکین نہيں کر سکتے ہیں"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"نیٹ ورک کی اطلاع"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"جب بھی عوامی نیٹ ورک دستیاب ہو مطلع کریں"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"خراب کنکشن سے اجتناب کریں"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"‏Wi‑Fi نیٹ ورک کا تب تک استعمال نہ کریں جب تک ایک اچھا انٹرنیٹ کنکشن موجود نہ ہو"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"صرف اچھے انٹرنیٹ کنکشن والے نیٹ ورکس کا استعمال کریں"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"اسکین کرنا ہمیشہ دستیاب رہے"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"ہمیشہ اسکیننگ کی اجازت دیں"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"‏Google کی مقام کی سروس اور دوسری ایپس کو Wi-Fi آف ہونے پر بھی نیٹ ورکس اسکین کرنے دیں"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"‏عوامی Wi‑Fi خودکار طور پر استعمال کریں"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"‏Wi Fi اسسٹنٹ کو اعلی معیار کے عوامی نیٹ ورکس سے خودکار طور پر منسلک ہونے دیں"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"اسسٹنٹ منتخب کریں"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"سرٹیفکیٹس انسٹال کریں"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"‏مقام کی قطعیت کو بہتر بنانے اور دوسرے مقاصد کیلئے، Google اور دوسری ایپس Wi-Fi آف ہونے پر بھی قریبی نیٹ ورکس کو اسکین کرسکتی ہیں۔ اگر آپ نہیں چاہتے ہیں کہ ایسا ہوا تو جدید &gt; اسکیننگ ہمیشہ دستیاب ہے پر جائیں۔"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"‏Wi-Fi آف ہونے پر بھی ایپس قریبی نیٹ ورکس کو اسکین کرسکتی ہیں۔ اگر آپ نہیں چاہتے ہیں کہ ایسا ہوا تو جدید &gt; اسکیننگ ہمیشہ دستیاب ہے پر جائیں۔"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"‏مقام کی درستگی کو بہتر بنانے کیلئے، Wi‑Fi آف ہونے پر بھی ایپس اور سروسز 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="5340097010842405981">"دوبارہ نہ دکھائیں"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"کوئی دوسرا نیٹ ورک شامل کریں"</string>
     <string name="wifi_more" msgid="3195296805089107950">"مزید"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"‏خودکار سیٹ اپ (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"‏سیٹ اپ مکمل کرنے کیلئے، آپ کے ٹیبلیٹ کو Wi‑Fi تک رسائی درکار ہوتی ہے۔ سیٹ اپ کے بعد، آپ سیلولر ڈیٹا اور Wi‑Fi کے بیچ سوئچ کر سکتے ہیں۔"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"جدید ترین اختیارات"</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="5940801028985255304">"‏اپنے روٹر پر Wi‑Fi محفوظ کردہ سیٹ اپ کے بٹن کو دبائیں۔ اسے \"WPS\" کہا جاسکتا ہے یا اس میں یہ علامت ہوسکتی ہے:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"‏اپنے روٹر پر 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_complete" msgid="2388138550456729134">"‏WPS کامیاب رہا۔ نیٹ ورک سے مربوط ہو رہا ہے…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"‏Wi‑Fi نیٹ ورک <xliff:g id="NETWORK_NAME">%s</xliff:g> سے مربوط ہے"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"‏AP بینڈ کنفیگر کریں"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(غیر تبدیل شدہ)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(غیر متعینہ)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"محفوظ کردیا گیا"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"غیر فعال"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏IP کنفیگریشن کی ناکامی"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏WiFi کنکشن کی ناکامی"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"توثیق کا مسئلہ"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"رینج میں نہیں ہے"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"انٹرنیٹ تک کسی رسائی کا پتہ نہیں چلا، خود بخود دوبارہ منسلک نہیں ہوگا۔"</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_security_none" msgid="7985461072596594400">"کوئی نہیں"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"اس نیٹ ورک کو انٹرنیٹ تک رسائی نہیں ہے۔ بہر صورت اس نیٹ ورک کا استعمال کریں؟"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"اس نیٹ ورک کیلئے دوبارہ نہ پوچھیں"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"مربوط کریں"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"نیٹ ورک سے مربوط ہونے میں ناکام رہا"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"بھول جائیں"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"‏AndroidAP WPA2 PSK پورٹیبل Wi‑Fi ہاٹ سپاٹ"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"‏<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> پورٹیبل Wi‑Fi ہاٹ اسپاٹ"</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_mode_title" msgid="2164073796253284289">"کال کرنے کی ترجیح"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"‏Wi-Fi کالنگ کی وضع"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"‏Wi-Fi ترجیحی"</item>
+    <item msgid="5267397515594230396">"سیلولر ترجیحی"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"‏Wi-Fi کالنگ آن ہونے پر، آپ کا فون آپ کی ترجیح اور زیادہ مضبوط سگنل کی بنیاد پر کالز کا روٹ Wi-Fi یا آپ کے کیریئر نیٹ ورک کے ذریعہ کر سکتا ہے۔ اس خصوصیت کو آن کرنے سے پہلے، فیس اور دیگر تفصیلات کیلئے اپنے کیریئر سے رابطہ کریں۔"</string>
     <string name="home_settings" msgid="212375129455718176">"ہوم"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ڈسپلے"</string>
     <string name="sound_settings" msgid="5534671337768745343">"آواز"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"تھیم"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"‎%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"لائٹ"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"ڈارک"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"خودکار"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"‏ترجیحی SIM کارڈ اپ ڈیٹ کریں؟"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"‏<xliff:g id="NEW_SIM">%1$s</xliff:g> آپ کے آلے میں واحد SIM ہے۔ کیا آپ اس SIM کو سیلولر ڈیٹا، کالز اور SMS پیغامات کیلئے استعمال کرنا چاہتے ہیں؟"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"‏SIM کا غلط PIN اب آپ کو اپنا آلہ غیر مقفل کرنے کیلئے اپنے کیریئر سے رابطہ کرنا چاہیے۔"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"‏SIM کا غلط PIN کوڈ، اپنے آلے کو غیر مقفل کرنے کیلئے اپنے کیریئر سے رابطہ کرنے سے پہلے آپ کے پاس <xliff:g id="NUMBER">%d</xliff:g> کوشش باقی بچی ہے۔"</item>
-    <item quantity="other" msgid="77103619544346451">"‏SIM کا غلط PIN کوڈ، آپ کے پاس <xliff:g id="NUMBER">%d</xliff:g> کوششیں باقی ہیں۔"</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">‏غلط SIM PIN کوڈ، آپ کے پاس <xliff:g id="NUMBER_1">%d</xliff:g> کوششیں بچی ہیں۔</item>
+      <item quantity="one">‏غلط SIM PIN کوڈ، آپ کے پاس <xliff:g id="NUMBER_0">%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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"‏ایپس (ایپ کا ڈیٹا ‎اور‎ میڈیا کا مواد)"</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_dcim_usage" msgid="558887013613822577">"تصاویر، ویڈیوز"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"آڈیو (موسیقی، رنگ ٹونز، پوڈ کاسٹس وغیرہ)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"متفرقات"</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="default" msgid="6915293408836853020">"‏SD کارڈ ان ماؤنٹ کریں"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"ماؤنٹ کریں"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"خارج کریں"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"مٹائیں اور فارمیٹ کریں"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"بطور اندرونی اسٹوریج مٹائیں اور فارمیٹ کریں"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"‏USB کمپیوٹر کنکشن"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"‏USB کمپیوٹر کنکشن"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"مربوط ہوں بطور"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"‏کیمرا سافٹ ویئر کا استعمال کرکے آپ کو تصاویر منتقل کرنے اور کمپیوٹرز پر موجود کسی بھی ایسی فائل کو منتقل کرنے دیتا ہے جو MTP کا تعاون نہیں کرتی ہیں"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"فائل منتقل کرنے کے ٹولز انسٹال کریں"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"‏MIDI فعال کردہ ایپلیکیشنز کو آپ کے کمپیوٹر پر MIDI سافٹ ویئر کے ساتھ USB پر کام کرنے دیتا ہے۔"</string>
     <string name="storage_other_users" msgid="808708845102611856">"دوسرے صارفین"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"آلہ کا اسٹوریج"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"ہٹائے جانے قابل اسٹوریج"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> مفت (کُل <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> کو ماؤنٹ کر دیا گیا"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<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="4161722509712992231">"<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="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> کو فارمیٹ نہیں کیا جا سکا"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"اسٹوریج کا نام تبدیل کریں"</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="3677827796634199714">"‏"<b>"جب آپ اس <xliff:g id="NAME_0">^1</xliff:g> کو نکالیں گے تب اس پر اسٹور کردہ ایپس کام کرنا بند کر دیں گی اور اس پر اسٹور کردہ میڈیا فائلیں اس وقت تک دستیاب نہیں ہوں گی جب تک اسے دوبارہ داخل نہیں کر دیا جائے گا۔‎"</b>" \n\n‎اس <xliff:g id="NAME_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_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_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="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> کو فارمیٹ کیے جانے کے وقت اسے نہ ہٹائیں۔"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ڈیٹا نئے اسٹوریج میں منتقل کریں"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"‏آپ اپنی تصاویر، فائلیں اور ایپ ڈیٹا اس نئے <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="5035719146373359329"><b>"منتقلی میں تقریباً <xliff:g id="TIME">^1</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="8641916179067596592">"منتقلی کے دوران: \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_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> کو منتقل کریں"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"‏<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="4288580957960820740">"‏منتقلی کے دوران <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="battery_status_title" msgid="9159414319574976203">"بیٹری کا اسٹیٹس"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"بیٹری کی سطح"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"نیٹ ورک کی ترتیبات دوبارہ ترتیب دے دی گئیں"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"‏یہ نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دے گا، بشمول:\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="4874737348054213767">"نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ترتیبات دوبارہ ترتیب دیں"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"دوبارہ ترتیب دیں؟"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"نیٹ ورک کی ترتیبات کو دوبارہ ترتیب دیا گیا ہے"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"آلہ کو دوبارہ ترتیب دیں"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"فیکٹری ڈیٹا ری سیٹ"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"ٹیبلٹ پر موجود سبھی ڈیٹا کو حذف کر دیتا ہے"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"فون پر موجود سبھی ڈیٹا کو حذف کر دیتا ہے"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏یہ آپ کے ٹیبلٹ کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"‏یہ آپ کے فون کے "<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏SD کارڈ پر موجود سبھی ڈیٹا حذف کریں، جیسے موسیقی یا تصاویر"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ٹیبلٹ کو دوبارہ ترتیب دیں"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"فون کو دوبارہ ترتیب دیں"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"اپنی سبھی ذاتی معلومات اور ڈاؤن لوڈ کردہ ایپس کو حذف کریں؟ آپ اس عمل کو لوٹا نہیں سکتے ہیں!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"آپ کی سبھی ذاتی معلومات اور ڈاؤن لوڈ کردہ ایپس ہٹا دیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ہر چیز کو حذف کریں"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"آپ کو ایک فیکٹری ڈیٹا ری سیٹ کی توثیق کرنے کیلئے اپنا غیر مقفل کرنے کا پیٹرن ڈرا کرنے کی ضرورت ہے۔"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"کوئی ری سیٹ انجام نہیں دیا گیا کیونکہ سسٹم صاف کریں سروس دستیاب نہیں ہے۔"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"دوبارہ ترتیب دیں؟"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"اس صارف کیلئے فیکٹری ری سیٹ دستیاب نہیں ہے"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"‏USB اسٹوریج پر اسٹور کردہ سبھی فائلوں کو حذف کرتے ہوئے، اسے حذف کریں؟ آپ اس کارروائی کو لوٹا نہيں سکتے ہیں!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"‏SD کارڈ پر اسٹور کردہ سبھی فائلوں کو حذف کرتے ہوئے، اسے حذف کریں؟ آپ اس کارروائی کو لوٹا نہيں سکتے ہیں!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ہر چیز حذف کریں"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"‏اس بات کی توثیق کرنے کیلئے کہ آپ USB اسٹوریج کو صاف کرنا چاہتے ہیں، آپ کو اپنا غیر مقفل کرنے کا پیٹرن ڈرا کرنا ہوگا۔"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"‏اس بات کی توثیق کرنے کیلئے کہ آپ SD کارڈ صاف کرنا چاہتے ہیں، آپ کو اپنا غیر مقفل کرنے کا پیٹرن ڈرا کرنے کی ضرورت ہے۔"</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"مدد"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"سیلولر نیٹ ورکس"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"موبائل پلان"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"‏ڈیفالٹ 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">"‏<xliff:g id="NEW_APP">%s</xliff:g> کو اپنے SMS ایپ کے بطور استعمال کریں؟"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"مقام وضع"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏مقام کا تعین کرنے کیلئے GPS, Wi‑Fi اور سیلولر نیٹ ورکس کا استعمال کریں"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏مقام کا تعین کرنے کیلئے Wi‑Fi اور سیلولر نیٹ ورکس کا استعمال کریں"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"‏اپنے مقام کا تعین کرنے کیلئے GPS کا استعمال کریں"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏مقام کا تعین کرنے کیلئے GPS استعمال کریں"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"اسکیننگ"</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="2070686681074461301">"‏Wi‑Fi آف ہونے پر بھی ایپس اور سروسز کو Wi‑Fi نیٹ ورکس اسکین کرنے کی اجازت دے کر مقام کو بہتر بنائیں"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"بلوٹوتھ اسکیننگ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"بلوٹوتھ آف ہونے پر بھی سسٹم سروسز کو بلوٹوتھ آلات اسکین کرنے کی اجازت دے کر مقام کو بہتر بنائیں"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏Wi‑Fi و سیلولر نیٹ ورک کا مقام"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏اپنے مقام کا تیزی سے اندازہ لگانے کیلئے ایپس کو Google کی مقام کی سروس کا استعمال کرنے دیں۔ گمنام مقام کا ڈیٹا جمع کیا جائے گا اور Google کو بھیجا جائے گا۔"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏Wi‑Fi کے ذریعہ مقام کا تعین کیا گیا"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"اسکرین سیکیوریٹی"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"جاری رکھنے کیلئے اپنے آلے کا پیٹرن استعمال کریں۔"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"‏جاری رکھنے کیلئے اپنے آلے کا PIN درج کریں۔"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"جاری رکھنے کیلئے اپنے آلے کا پاس ورڈ درج کریں۔"</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_need_to_unlock" msgid="757935356911054465">"محفوظ کردہ پیٹرن کی توثیق کریں"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"دوبارہ کوشش کریں:"</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>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"کافی زیادہ غلط کوششیں کی گئیں!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> سیکنڈ میں دوبارہ کوشش کریں۔"</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="manageapplications_settings_title" msgid="7041951105633616745">"ایپس کا نظم کریں"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"انسٹال کردہ ایپس کا نظم کریں اور انہیں ہٹائیں"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"اسٹوریج استعمال"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"ایپس کے ذریعے استعمال کردہ اسٹوریج دیکھیں"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"چلنے والی سروسز"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ٹیبلٹ کی معلومات"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"فون کی معلومات"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"بیٹری کی معلومات"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"فوری شروعات"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"ایپس شروع کرنے کیلئے کی بورڈ شارٹ کٹس سیٹ کریں"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"ایپ تفویض کریں"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"کوئی شارٹ کٹ نہیں ہے"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"تلاش کریں + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"صاف کریں"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) کیلئے آپ کا شارٹ کٹ صاف کر دیا جائے گا۔"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ٹھیک ہے"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"منسوخ کریں"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"ایپس"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"شارٹ کٹس"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"‏سبھی بلوٹوتھ HCI کے پیکٹس ایک فائل میں قید کریں"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"‏OEM اَن لاکنگ"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"بوٹ لوڈر کو غیر مقفل ہونے کی اجازت دیں"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"‏اپنا PIN درج کریں"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"‏OEM اَن لاک کو فعال کرنے کیلئے اپنے آلے کا PIN درج کریں۔"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"‏OEM اَن لاکنگ کی اجازت دیں؟"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"انتباہ: یہ ترتیب آن ہونے پر آلہ کے تحفظ کی خصوصیات اس آلہ پر کام نہیں کریں گی۔"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"لاگر بفر کے سائز"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"فی لاگ بفر لاگر کے سائز منتخب کریں"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"فرضی مقامات کی اجازت دیں"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"فرضی مقامات کی اجازت دیں"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"منظر انتساب کے معائنہ کو فعال کریں"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"نیٹ ورکنگ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"وائرلیس ڈسپلے سرٹیفیکیشن"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏Wi‑Fi وربوس لاگنگ فعال کریں"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏جارحانہ Wi‑Fi سے سیلولر ہینڈ اوور"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"‏ہمیشہ Wi‑Fi روم اسکینز کی اجازت دیں"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"‏پرانا DHCP کلائنٹ استعمال کریں"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"وائرلیس ڈسپلے سرٹیفیکیشن کیلئے اختیارات دکھائیں"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"‏Wi‑Fi لاگنگ لیول میں اضافہ کریں، Wi‑Fi منتخب کنندہ میں فی SSID RSSI دکھائیں"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"‏فعال ہونے پر، جب Wi‑Fi سگنل کمزور ہوگا تو Wi‑Fi سیلولر پر ڈیٹا کنکشن بھیجنے کیلئے مزید جارحانہ کاروائی کرے گا۔"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"‏انٹرفیس پر موجود ڈیٹا ٹریفک کی مقدار کی بنیاد پر Wi‑Fi روم اسکینز کی اجازت دیں/اجازت نہ دیں"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"لاگر بفر کے سائز"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"فی لاگ بفر لاگر کے سائز منتخب کریں"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"‏USB کنفیگریشن منتخب کریں"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"‏USB کنفیگریشن منتخب کریں"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"فرضی مقامات کی اجازت دیں"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"فرضی مقامات کی اجازت دیں"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"منظر انتساب کے معائنہ کو فعال کریں"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"‏نئے Android DHCP کلائنٹ کی بجائے Lollipop کا DHCP کلائنٹ استعمال کریں۔"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏USB ڈیبگ کرنے کی اجازت دیں؟"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"‏USB ڈیبگ کرنا صرف ڈیولپمنٹ کے مقاصد کیلئے ہے۔ اپنے کمپیوٹر اور اپنے آلہ کے درمیان ڈیٹا کاپی کرنے کیلئے اسے استعمال کریں، بغیر اطلاع کے اپنے آلہ پر ایپس انسٹال کریں اور لاگ ڈیٹا پڑھیں۔"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"‏اپنے ذریعہ پہلے سے اجازت یافتہ سبھی کمپیوٹرز سے USB ڈیبگ کرنے کی رسائی کو کالعدم کریں؟"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"قرمزی"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> کا استعمال کریں؟"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> کو اس کی ضرورت ہے:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"چونکہ ایک ایپ اجازت کی درخواست کو مبہم کر رہی ہے، لہذا ترتیبات آپ کے جواب کی توثیق نہیں کر سکتی ہے۔"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"اگر آپ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرتے ہیں تو آپ کا آلہ ڈیٹا کی مرموزکاری کو بڑھانے کیلئے آپ کی اسکرین کا قفل استعمال نہیں کرے گا۔"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"چونکہ آپ نے حالت رسائی کی ایک سروس کو آن کیا ہے لہذا آپ کا آلہ ڈیٹا کی مرموزکاری کو بڑھانے کیلئے آپ کی اسکرین کا قفل استعمال نہیں کرے گا۔"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"کیونکہ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرنے سے ڈیٹا کی مرموز کاری پر اثر پڑتا ہے، آپ کو اپنے پیٹرن کی توثیق کرنے کی ضرورت ہے۔"</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TIME">%2$s</xliff:g> میں <xliff:g id="TYPE">%1$s</xliff:g> ایپس"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<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_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_memory_status" msgid="4251599550196193093">"آلہ کی میموری فی الحال <xliff:g id="MEMSTATE">%1$s</xliff:g> ہے"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"‏RAM کا اوسط استعمال"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"‏RAM کا زیادہ سے زیادہ استعمال"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"پروسیسز"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"سروسز"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"مدت"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"میموری کی تفصیلات"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"سسٹم چھپائیں"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ذیل کی ڈیفالٹ ترتیبات ایپ ترتیبات کی جگہ لے لیتی ہیں"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"ڈیفالٹ ترتیبات"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"ڈیفالٹ انجن"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"زبانی متن کے استعمال کیلئے اسپیچ سنتھیسس انجن کو سیٹ کرتا ہے"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"بولے ہوئے متن کیلئے استعمال کی جانے والی اسپیچ کی ترکیب کا انجن سیٹ کریں"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"اسپیچ کی شرح"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"متن بولے جانے کی رفتار"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"پچ"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"آپ کو اسنادات کی انسٹالیشن کی توثیق کرنے کیلئے اپنا غیر مقفل کرنے کا پیٹرن ڈرا کرنا ہوگا۔"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"اسناد اسٹوریج کیلئے پاس ورڈ ٹائپ کریں۔"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"موجودہ پاس ورڈ:"</string>
@@ -1847,12 +1901,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"فی الحال کوئی بھی اکاؤنٹ بیک اپ لیا گیا ڈیٹا اسٹور نہیں کر رہا ہے"</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="5355557151569037197">"بیک اپ سروس غیر فعال ہے۔"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"اسے آپ کے آلہ کی پالیسی کے ذریعے سیٹ کیا جاتا ہے۔"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ڈیسک ٹاپ کا بیک اپ پاس ورڈ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ڈیسک ٹاپ کے مکمل بیک اپس فی الحال محفوظ کیے ہوئے نہیں ہیں"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ڈیسک ٹاپ کے مکمل بیک اپس کیلئے پاس ورڈ کو تبدیل کرنے یا ہٹانے کیلئے ٹچ کریں"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"منتقلی اینیمیشن اسکیل"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"اینیمیٹر دورانیے کا پیمانہ"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"ثانوی ڈسپلیز کو تحریک دیں"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"ملٹی ونڈو وض‏ع"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"ایک ہی وقت میں اسکرین پر متعدد سرگرمیاں۔"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"ملٹی ونڈو وضع فعال کریں؟"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"‏وارننگ: یہ اعلی تجرباتی خصوصیت ہے جو حالیہ ایپس UI کے ذریعہ ایک ہی وقت میں اسکرین پر متعدد سرگرمیوں کی اجازت دیتی ہے۔ ہو سکتا ہے اس خصوصیت کے ساتھ استعمال کرنے پر کچھ ایپس کریش ہو جائیں یا وہ درست طریقہ سے کام نہ کریں۔"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"ایپس"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"سرگرمیوں کو نہ رکھیں"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"صارف کے کسی سرگرمی کو چھوڑتے ہی اسے تباہ کر دیں"</string>
@@ -2195,7 +2251,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="718192651887726259">"‏آپ اضافی صارفین بنا کر دوسرے لوگوں کے ساتھ اس آلہ کا اشتراک کر سکتے ہیں۔ ہر صارف کے پاس اپنی جگہ ہوتی ہے، جسے وہ خود اپنی ایپس، وال پیپر وغیرہ کے ساتھ حسب ضرورت بنا سکتے ہیں۔ صارفین 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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"فون کالز کی اجازت دیں"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"‏فون کالز اور SMS کی اجازت دیں"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"فون کالز آن کریں"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"‏فون کالز اور SMS آن کریں"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"صارف کو ہٹائیں"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"فون کالز کی اجازت دیں؟"</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_sms_confirm_title" msgid="188164598768941316">"‏فون کالز اور SMS کی اجازت دیں؟"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"‏کال اور SMS کی سرگزشت کا اس صارف کے ساتھ اشتراک کیا جائے گا۔"</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="application_restrictions" msgid="8207332020898004394">"ایپس اور مواد کی اجازت دیں"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"پابندیوں والی ایپلیکیشنز"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ایپ کیلئے ترتیبات پھیلائیں"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"یہ ایپ محدود پروفائلز میں تعاون یافتہ نہیں ہے"</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>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi wi-fi نیٹ ورک کنکشن"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"متنی پیغام پیغام بھیجنا پیغام رسانی"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏سیلولر سیل کیریئر وائرلیس ڈیٹا 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"‏wifi wi-fi کال کالنگ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"لانچر"</string>
     <string name="keywords_display" msgid="6709007669501628320">"اسکرین ٹچ اسکرین"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"مدھم اسکرین ٹچ اسکرین بیٹری"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"مدھم اسکرین ٹچ اسکرین بیٹری"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"پس منظر ذاتی نوعیت کا بنائیں حسب ضرورت بنائیں ڈسپلے"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ڈارک تھیم رات کی وضع مدھم اسکرین چمک تبدیل کریں"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"پس منظر ذاتی نوعیت کا بنائیں حسب ضرورت بنائیں ڈسپلے"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"متن کا سائز"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"پروجیکٹ"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"پروجیکٹ کاسٹ"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"اسپیس ڈسک ہارڈ ڈرائیو آلہ کا استعمال"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"پاور کے استعمال کا چارج"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ہجے لغت ہجے چیک خودکار طور پر درست کریں"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"اکاؤنٹ"</string>
     <string name="keywords_users" msgid="4673901601478559100">"پابندی پابندی لگائیں پابندی عائد کردہ"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"‏متن کی اصلاح آواز درست کریں وائبریٹ کریں خودکار زبان اشارہ تجویز کریں تجویز تھیم ناگوار لفظ ٹائپ کریں emoji بین الاقوامی"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"ترجیحات کو ڈیفالٹ پر دوبارہ ترتیب دیں"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"ہنگامی آئس ایپ ڈیفالٹ"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"ایپس ایپلیکیشنز سسٹم ڈاؤن لوڈ کرتی ہیں"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ایپس کی اجازتوں کی سیکیورٹی"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ڈیفالٹ ایپس"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"‏سلائیڈ پاس ورڈ پیٹرن pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏Wi-Fi NFC ٹیگ ترتیب دیں"</string>
     <string name="write_tag" msgid="8571858602896222537">"تحریر کریں"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"مداخلتیں"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"جب کالز اور اطلاعات موصول ہوں"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"ہمیشہ مداخلت کریں"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"صرف ترجیحی مداخلتوں کو اجازت دیں"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"مداخلت نہ کریں"</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_option_important_interruptions" msgid="3903928008177972500">"صرف ترجیحی"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"صرف الارمز"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"کوئی مداخلتیں نہیں"</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="ringtone_title" msgid="5379026328015343686">"فون رنگ ٹون"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"اطلاع کا ڈیفالٹ رنگ ٹون"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"کالز کیلئے وائبریٹ بھی کرے"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"وائبریٹ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"اطلاع تک رسائی"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ایپس اطلاعات نہیں پڑھ سکتی ہیں"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for manage_notification_access_summary_nonzero:one (8344183614159211585) -->
-    <!-- String.format failed for translation -->
-    <!-- no translation found for manage_notification_access_summary_nonzero:other (980049191810249052) -->
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">‏‎%d ایپس اطلاعات پڑھ سکتی ہیں</item>
+      <item quantity="one">‏‎%d ایپ اطلاعات پڑھ سکتی ہے</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"کوئی نوٹیفکیشن لسنرز انسٹال نہیں ہیں۔"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> کو فعال کریں؟"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> سسٹم یا کسی بھی انسٹال کردہ ایپ کے ذریعے شائع کردہ سبھی اطلاعات کو پڑھ سکے گا، جس میں ذاتی معلومات شامل ہو سکتی ہے، جیسے کہ رابطوں کے نام اور آپ کو بھیجے گئے پیغامت کا متن۔ یہ ان اطلاعات کو برخاست یا ان میں موجود کارروائی کے بٹنز کو ٹچ بھی کر سکے گا۔"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"شرط فراہم کنندگان"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"کوئی ایپس شرائط فراہم نہیں کرتی ہیں"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"‏%d ایپ شرائط فراہم کرتی ہے"</item>
-    <item quantity="other" msgid="358057362115673258">"‏%d ایپس شرائط فراہم کرتی ہیں"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"کوئی شرائط فراہم کنندگان انسٹال نہیں ہیں۔"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> کو فعال کریں؟"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ڈسٹرب نہ کریں وضع میں باہر نکلنے کی شرائط شامل کر سکے گا۔"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ایپس لوڈ ہو رہی ہیں…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"مسدود کریں"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"سبھی کو مسدود کریں"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"اس ایپ سے کبھی بھی اطلاعات نہ دکھائیں"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"ترجیح"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"اطلاعات کو فہرست کے اوپر دکھائیں اور جب آلہ صرف ترجیحی مداخلتوں پر سیٹ ہو تو انہیں آتے رہنے دیں"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"حساس"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"جب آلہ مقفل ہو جائے تو کسی بھی حساس مواد کو اس ایپ کی اطلاعات سے چھپا دیں"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"ترجیح کے بطور خیال کریں"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"جب ڈسٹرب نہ کریں صرف ترجیحی پر سیٹ ہو تو اس ایپ کی اطلاعات کی آواز سنائی دینے دیں"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"جھانکنے کی اجازت دیں"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"موجودہ اسکرین پر کچھ اطلاعات کو تھوڑی دیر کیلئے منظر میں سلائیڈ کرکے اس ایپ کو ان پر توجہ مرکوز کرنے دیں"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"حساس مواد چھپائیں"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"جب آلہ مقفل ہو تو اس ایپ کی ان اطلاعات میں مواد چھپائیں جو نجی معلومات ظاہر کر سکتی ہوں"</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="zen_mode_default_option" msgid="6940069025071935243">"جب تک آپ اسے آف نہ کر دیں"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"ترجیحی مداخلتیں"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ڈاؤن ٹائم"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"دن"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"کوئی نہیں"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"مداخلتوں کی اجازت ہے"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"صرف ترجیحی"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"کوئی نہیں"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"آٹومیشن"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"خود کار طور پر آن کریں"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"اصول کا نام"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"اصول شامل کریں"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"اصول حذف کریں"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"\"<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="3201273040477861538">"شیڈول کا اصول"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"اصول نہیں ملا۔"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">"، "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"کبھی نہیں"</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_from" msgid="1033337300289871697">"کالز/پیغامات منجانب"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"کوئی بھی"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"صرف رابطے"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"صرف ستارہ کے نشان والے رابطے"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"ایونٹس اور یاد دہانیاں"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"الارمز ہمیشہ ترجیحی مداخلتیں ہیں"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"الارمز"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"یاد دہانیاں"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ایونٹس"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"منتخب کردہ کالرز"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"کالرز دہرائیں"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"اگر ایک ہی شخص <xliff:g id="MINUTES">%d</xliff:g> منٹ کے اندر دوسری بار کال کرتا ہے تو اس کی اجازت دیں"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"خود کار طور پر آن کریں"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"کبھی نہیں"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> اگلے دن"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> یا اس سے پہلے کوئی بھی الارم"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<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_interruptions_voice_title" msgid="855256211259132964">"مداخلتیں"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"جب کالز اور اطلاعات موصول ہوں"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"آپ مداخلت کب پسند کریں گے؟"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"کب تک؟"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"ہمیشہ مداخلت کریں"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"آف، سبھی، سب کچھ"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"صرف ترجیحی مداخلتوں کو اجازت دیں"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"صرف الارمز کی اجازت دیں"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"مداخلت نہ کریں"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"غیر متعینہ"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> منٹ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> منٹ</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"غیر معینہ مدت تک صرف ترجیحی اطلاعات میں تبدیل کریں"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> تک <xliff:g id="DURATION">%1$d</xliff:g> منٹ کیلئے صرف ترجیحی اطلاعات میں تبدیل کریں</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> تک ایک منٹ کیلئے صرف ترجیحی اطلاعات میں تبدیل کریں</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g> تک ایک گھنٹے کیلئے صرف ترجیحی اطلاعات میں تبدیل کریں</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"غیر معینہ مدت تک صرف الارمز میں تبدیل کریں"</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>
+      <item quantity="one"><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"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> تک <xliff:g id="DURATION">%1$d</xliff:g> گھنٹے کیلئے صرف الارمز میں تبدیل کریں</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> تک ایک گھنٹے کیلئے صرف الارمز میں تبدیل کریں</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"غیر معینہ مدت تک مداخلت نہ کریں میں تبدیل کریں"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g> تک ایک منٹ کیلئے مداخلت نہ کریں میں تبدیل کریں</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> تک <xliff:g id="DURATION">%1$d</xliff:g> گھنٹے کیلئے مداخلت نہ کریں میں تبدیل کریں</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> تک ایک گھنٹے کیلئے مداخلت نہ کریں میں تبدیل کریں</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"ہمیشہ مداخلت کریں میں تبدیل کریں"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"ہمیشہ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ایپ کی اطلاعات"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"اطلاع کی ترتیبات"</string>
     <string name="device_feedback" msgid="3238056036766293294">"اس آلہ کے بارے میں تاثرات بھیجیں"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"بطور ڈیفالٹ شروع کریں"</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="app_launch_domain_links_title" msgid="458956710410857777">"ڈومین لنکس"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"‏ڈومین URLs کھولیں"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"‏ایپ کو براہ راست ڈومین URLs کھولنے کی اجازت دیں"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"‏تعاون یافتہ ڈومینز URLs"</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="410824961149037234">"اندرونی میموری"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"بیرونی میموری"</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="notifications_enabled" msgid="6983396130566021385">"آن"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"مسدود"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"حساس"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"ترجیح"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"ترجیح اور حساس"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> اجازتیں دی گئیں</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> اجازت دی گئی</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> از <xliff:g id="COUNT_3">%d</xliff:g> اجازتیں منظور کی گئیں</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> اجازت منظور کی گئی</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"کچھ ڈیفالٹس سیٹ ہیں"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"کوئی ڈیفالٹس سیٹ نہیں ہیں"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"سبھی ایپس"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"فعال"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"ذاتی"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"دفتری"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"مسدود"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ترجیحی"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"حساس"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"‏ڈومین URLs کے ساتھ"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"منتظم نے غیر فعال کر دیا"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"جدید ترین"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"نامعلوم ایپ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"پروفائل منتخب کریں"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"ایپ کی اجازتیں"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> ایپس کو اضافی رسائی کی اجازت دی گئی"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> ایپس کو اجازت دی گئی"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"‏ڈومین URLs"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"‏کوئي بھی ڈومین URL نہ کھولیں"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\'<xliff:g id="DOMAIN">%s</xliff:g>\' کھولیں"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"‏\'<xliff:g id="DOMAIN">%s</xliff:g>\' اور متعلقہ URLs کھولیں"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other">‏<xliff:g id="COUNT">%d</xliff:g> ایپس اپنے ڈومین URLs کھول سکتی ہیں</item>
+      <item quantity="one">‏ایک ایپ اپنے ڈومین URLs کھول سکتی ہے</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"تسلیم شدہ نہیں ہے"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"ڈیفالٹ ایپس"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"براؤزر ایپ"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"کوئی ڈیفالٹ براؤزر نہیں ہے"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ڈیفالٹ)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ایپس اسٹوریج"</string>
 </resources>
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml
index 924dae8..7c2707e 100644
--- a/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz-rUZ/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Bog‘lash tugmasi"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"mikrofonni o‘chirish/yoqish"</item>
     <item msgid="1148142988678569310">"kontentni translatsiya qilish"</item>
     <item msgid="9130014005474445273">"VPN tarmog‘ini faollashtirish"</item>
+    <item msgid="1165192162975045562">"orqa fon rasmiga yozish"</item>
+    <item msgid="7129487923652967258">"yordam tuzilishi"</item>
+    <item msgid="1069023208100114540">"yordam ekran rasmi"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Joylashuv"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Mikrofonni o‘chirish/yoqish"</item>
     <item msgid="5906017727368097853">"Kontentni translatsiya qilish"</item>
     <item msgid="2486614710846178542">"VPN tarmog‘ini faollashtirish"</item>
+    <item msgid="5586547561693629602">"Orqa fon rasmiga yozish"</item>
+    <item msgid="32794179825485062">"Yordam tuzilishi"</item>
+    <item msgid="7872852746938272552">"Yordam ekran rasmi"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Qisqa"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"past"</item>
     <item msgid="4212263919458209842">"jiddiy"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"O‘chirilgan"</item>
-    <item msgid="5656544177755411222">"Cheklangan uzilishlar"</item>
-    <item msgid="8735337502532332056">"Uzilishlarsiz"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"O‘rtacha"</item>
     <item msgid="866544120205026771">"Qoniqarli"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Pushti"</item>
     <item msgid="6131821495505931173">"Qizil"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Media fayllarni o‘tkazish protokoli)"</item>
+    <item msgid="8856820259201251036">"PTP (Rasmlarni o‘tkazish protokoli)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Audio manbasi"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index c5693da..6d20225 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Ruxsat berish"</string>
     <string name="deny" msgid="6947806159746484865">"Rad qilish"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Noma’lum"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Dasturchi bo‘lishingizga bor-yo‘g‘i <xliff:g id="STEP_COUNT">%1$d</xliff:g> qadam qoldi."</item>
-    <item quantity="other" msgid="6722953419953594148">"Dasturchi bo‘lishingizga bor-yo‘g‘i  <xliff:g id="STEP_COUNT">%1$d</xliff:g> qadam qoldi."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Dasturchi sifatida ro‘yxatdan o‘tishni yakunlashga <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> qadam qoldi.</item>
+      <item quantity="one">Dasturchi sifatida ro‘yxatdan o‘tishni yakunlashga <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> qadam qoldi.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Siz endi dasturchisiz!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Bunga ehtiyoj yo‘q. Siz allaqachon dasturchisiz."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Simsiz &amp; tarmoqlar"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"SMS xizmatini IMS ustidan o‘chirib qo‘yish"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMS majburiy ro‘yxatdan o‘tishni yoqib qo‘yish"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS ro‘yxatdan o‘tish talabi o‘chirilsin"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"VoLTE tomonidan ta’minlangan bayroqchani yoqish"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE tomonidan ta’minlangan bayroqchani o‘chirib qo‘yish"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram dump‘ni yoqib qo‘yish"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram dump‘ni o‘chirish"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM karta manzillar kitobini ko‘rish"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Signal uzatish"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil o‘chirib qo‘yilsinmi?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Bu:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>ni&lt;/b&gt;&lt;br&gt;&lt;br&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>dan&lt;br&gt;&lt;b&gt;o‘chiradi&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Ulandi"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ulandi (telefondan tashqari)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ulanildi (mediadan tashqari)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Ulangan (xabarlarga kirib bo‘lmaydi)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ulangan (telefon yoki media qurilma emas)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Uzildi"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Uzilyapti…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Ulanmoqda…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Biriktirilmoqda"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Nomsiz bluetooth qurilma"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Qidirilmoqda"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Yaqin atrofda Bluetooth qurilmalar topilmadi."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Qabul qilingan fayllarni ko‘rsatish"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth qurilmani tanlang"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth ruxsati so‘rovi"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Ilova Bluetooth‘ni yoqmoqchi."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Ilova ushbu qurilmaning Bluetooth modulini yoqmoqchi"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Ilova planshetingizni boshqa Bluetooth qurilmalariga <xliff:g id="TIMEOUT">%1$d</xliff:g> soniya davomida ko‘rinarli qilmoqchi."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Ilova telefoningizni boshqa Bluetooth qurilmalariga <xliff:g id="TIMEOUT">%1$d</xliff:g> soniya davomida ko‘rinarli qilmoqchi."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Ilova planshetingizni boshqa Bluethooth qurilmalarga ko‘rinarli qilmoqchi. Siz buni keyinroq Bluetooth sozlamalarida o‘zgartirishingiz mumkin."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD karta"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proksi sozlamalari"</string>
     <string name="cancel" msgid="6859253417269739139">"Bekor qilish"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"BEKOR QILISH"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"DAVOM ETISH"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"HA"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"YO‘Q"</string>
-    <string name="forget" msgid="7267115980248732932">"UNUTISH"</string>
+    <string name="forget" msgid="1400428660472591263">"Unutish"</string>
+    <string name="save" msgid="879993180139353333">"Saqlash"</string>
+    <string name="done" msgid="6942539184162713160">"Tayyor"</string>
     <string name="settings_label" msgid="1626402585530130914">"Sozlamalar"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Sozlamalar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Sozlamalar yorlig‘i"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Vaqt zonasi bo‘yicha saralash"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Sana"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Vaqt"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Yuzni tanish xususiyatini yaxshilash"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Hayotiylikni tekshirish"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Qulfni ochishda ko‘zni yumib-ochish lozim"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Avtomatik qulflash"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Uyg‘onganiga <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> bo‘ldi"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> tanaffusdan so‘ng (<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> tomonidan qurilma qulfi ochiq qoldiriladigan holatlardan tashqari)"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Joylashuv va xavfsizlik sozlamalari"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Mening joylashuvim, ekran qulfi, hisob ma‘lumotlari omborini qulflash sozlamalari"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parollar"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Barmoq izi"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Barmoq izlari"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Barmoq izi sozlamalari"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Qo‘shish"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ekranni qulflash"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta barmoq izi qayd qilingan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta barmoq izi qayd qilingan</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Barmoq izini sozlash"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Barmoq izi yordamida ekran qulfini yechish yoki xaridlarni tasdiqlash mumkin, buning uchun: \n\n✓ Ekran qulfini sozlang \n\n✓ Barmoq izingizni qo‘shing"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensorni topish"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Telefoningiz orqasidagi barmoq izi sensorini toping."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nomi"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"O‘chirish"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Boshladik!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Barmog‘ingizni barmoq izi sensori ustiga qo‘ying. Tebranishni sezgandan so‘ng barmog‘ingizni oling."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Zo‘r! Endi takrorlang."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"O‘sha barmog‘ingizni barmoq izi sensori ustiga qo‘ying va tebranishni sezgandan so‘ng barmog‘ingizni oling."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Barmoq izi qo‘shildi!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ushbu belgi ko‘rinsa, siz identifikatsiya yoki xaridni ma’qullash uchun barmoq izidan foydalanishingiz mumkin."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Qo‘shish"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Keyingi"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Shifrlash"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Planshetni shifrlash"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefonni shifrlash"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Quvvatlagichni ulab yana urinib ko‘ring."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekran qulfi PIN kodi yoki parol yo‘q"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Shifrlashni boshlashdan oldin, ekran qulfi uchun PIN kod yoki parol o‘rnatish lozim."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Qurilmani shifrlash buyrug‘ini tasdiqlash uchun chizmali kalitingizni kiritishingiz zarur."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Shifrlansinmi?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Boshlangan shifrlash amaliyotini orqaga qaytarib bo‘lmaydi va agar uning jarayoni uzilsa, ma‘lumotlaringiz o‘chirib yuboriladi. Shifrlash jarayoni bir soat yoki ko‘proq vaqtni talab qiladi va uning davomida planshet bir necha marta o‘chib yoqiladi."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Boshlangan shifrlash amaliyotini orqaga qaytarib bo‘lmaydi va agar uning jarayoni uzilsa, ma‘lumotlaringiz o‘chirib yuboriladi. Shifrlash jarayoni bir soat yoki ko‘proq vaqtni talab qiladi va uning davomida telefon bir necha marta o‘chib yoqiladi."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Ekran bo‘ylab surish"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Himoyalanmagan"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Qulfni yuzni tanitib ochish"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Past darajadagi xavfsizlik, sinov jarayonida"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Chizma"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"O‘rtacha darajadagi xavfsizlik"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN kod"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"O‘rtachadan yuqoriga darajasidagi xavfsizlik"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parol"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Yuqori darajadagi xavfsizlik"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Joriy ekran qulfi"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Qurilmani himoyalash funksiyalari ishlamay qoladi."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Administrator, shifrlash siyosati, yoki hisob ma‘lumotlari ombori tomonidan o‘chirib qo‘yilgan"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Bo‘sh"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Ekran bo‘ylab surish"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Qulfni yuzni tanitib ochish"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Qulf ochish chizmasi"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kod"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parol"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Agar ekranni qulflagan bo‘lsangiz, barmoq izlari yordamida ochishni Sozlamalar &gt; Xavfsizlik bandidan o‘rnatishingiz mumkin."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Ekran qulfini o‘chirib qo‘yish"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Chizmali parolni olib tashlash"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Qulfni ochish PIN kodini o‘chirish"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Parolda kamida bitta harf bo‘lishi lozim."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Parolda kamida bitta raqam bo‘lishi lozim."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Parolda kamida bitta belgi bo‘lishi lozim."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Parol kamida 1 harfga ega bo‘lishi kerak."</item>
-    <item quantity="other" msgid="8186027808415585970">"Parol kamida %d harflarga ega bo‘lishi kerak"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Parol kamida 1 kichik harfga ega bo‘lishi kerak."</item>
-    <item quantity="other" msgid="2693910942679679225">"Parol kamida %d kichik harflarga ega bo‘lishi kerak."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Parol kamida 1 katta harfga ega bo‘lishi kerak."</item>
-    <item quantity="other" msgid="3030801209112209245">"Parol kamida %d katta harflarga ega bo‘lishi kerak."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Parol kamida 1 raqamga ega bo‘lishi kerak."</item>
-    <item quantity="other" msgid="4703982391407595924">"Parol kamida %d raqamga ega bo‘lishi kerak."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Parol kamida 1 maxsus belgiga ega bo‘lishi kerak."</item>
-    <item quantity="other" msgid="1221290525051187757">"Parol kamida %d maxsus belgilarga ega bo‘lishi kerak."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Parol kamida 1 belgiga ega bo‘lishi kerak."</item>
-    <item quantity="other" msgid="3952508584649046404">"Parol kamida %d belgilarga ega bo‘lishi kerak."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Parol tarkibida kamida %d ta harf bo‘lishi lozim.</item>
+      <item quantity="one">Parol tarkibida kamida 1 ta harf bo‘lishi lozim.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Parol tarkibida kamida %d ta kichik harf bo‘lishi lozim.</item>
+      <item quantity="one">Parol tarkibida kamida 1 ta kichik harf bo‘lishi lozim.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Parol tarkibida kamida %d ta bosh harf bo‘lishi lozim.</item>
+      <item quantity="one">Parol tarkibida kamida 1 ta bosh harf bo‘lishi lozim.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Parol tarkibida kamida %d ta raqam bo‘lishi lozim.</item>
+      <item quantity="one">Parol tarkibida kamida 1 ta raqam bo‘lishi lozim.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Parol tarkibida kamida %d ta maxsus belgi bo‘lishi lozim.</item>
+      <item quantity="one">Parol tarkibida kamida 1 ta maxsus belgi bo‘lishi lozim.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Parol tarkibida kamida %d ta harf bo‘lmagan belgi bo‘lishi lozim.</item>
+      <item quantity="one">Parol tarkibida kamida 1 ta harf bo‘lmagan belgi bo‘lishi lozim.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Qurilma administratori yaqinda foydalanilgan paroldan yana foydalanishga ruxsat bermaydi."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"O\'sib boruvchi, pasayib boruvchi yoki qaytarilgan ketma-ketlik raqamlari cheklangan"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;br&gt;&lt;b&gt;bilan biriktirish uchun,&lt;/b&gt;&lt;br&gt;&lt;br&gt;unda mana bu kalit so‘z ko‘rsatilayotganligini tekshiring:&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>dan so‘rov&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ushbu qurilma bilan biriktirilsinmi?"</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>bilan biriktirish uchun, uni ekranida:<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> terib, Return yoki Enter tugmalarini bosing."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Biriktirish"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ULANISH"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Bekor qilish"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Agar ulanishga ruxsat bersangiz, u ulangan vaqtda kontaktlaringiz va qo‘ng‘iroqlaringiz tarixiga kirishi mumkin."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bilan biriktirib bo‘lmadi."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bilan PIN kod yoki kalit so‘z noto‘g‘rili tufayli biriktirilmadi."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Quyidagi qurilma javob bermayapti: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> biriktirish so‘rovini rad qildi."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ga o‘zaro bog‘lanmadi."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Qurilmalarni izlash"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Yangilash"</string>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"Joylashuv aniqligini oshirish uchun Bluetooth tarmoqlari o‘chirilgan bo‘lsa-da, ilova va xizmatlar Bluetooth tarmoqlarni tekshirib chiqadi. Siz bu xususiyatni <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tekshirish sozlamalari<xliff:g id="LINK_END_1">LINK_END</xliff:g>dan o‘chirib qo‘yishingiz mumkin."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Ulanish..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media audio"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon audiosi"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Fayl uzatish"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Kiritish qurilmasi"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetga kirish"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktlarni ulashish"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Kontaktlarni ulashish uchun ishlatilsin"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet aloqasi ulashmasi"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Xabarga kirish"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> media audio’dan uziladi."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> garnituradan uziladi."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kiritish qurilmasidan uzib qo‘yiladi"</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Quyidagilar uchun ishlatilsin:"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Nomini o‘zgartirish"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Kiruvchi fayl uzatish so‘roviga ruxsat berish"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Audio qurilmasiga ulangan"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon karnayiga ulanildi"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Fayl almashinish serveriga ulanildi"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Xaritaga ulangan"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Fayl uzatish serveriga ulanmagan"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Kiritish qurilmasiga ulanildi"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Internet manbai qurilmasiga ulanildi"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Qurilmaga mahaliy internet aloqani tarqatish"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Audio qurilma uchun foydalanish"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Dok’dan karnay sifatida foydalanish"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Fayl almashinish uchun foydalanish"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Kiritish qurilmasi sifatida foydalanish"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Internet manbai sifatida foydalanish"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Xaritada foydalanish"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dok sozlamalari"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Dok’dan karnay sifatida foydalanish"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon karnayi sifatida"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiqa va media uchun"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Sozlamalarni eslab qolish"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi yordamchisi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi yordamchisi orqali ulangan"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Aks beruvchi erkan"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Translatsiya"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Simsiz displeyni yoqish"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Atrofda qurilmalar topilmadi."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Ulanmoqda"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Unutish"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Tayyor"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nom"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Planshet boshqa qurilma bilan o‘zaro bog‘langanida ma‘lumot almashishga ruxsat berish"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Telefon boshqa qulilmaga tekkizilganda ma‘lumotlar almashinishiga ruxsat berish"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi o‘chirilmoqda…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Xatolik"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Uchish rejimida"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Tarmoqlarni tekshirib chiqishni iloji bo‘lmadi"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Tarmoq xabarnomasi"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Omma uchun ochiq tarmoqlar mavjud bo‘lganda xabardor qilish"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Sifatsiz ulanishdan chetlashish"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Sifatli Internet ulanishi mavjud bo‘lmaganicha, Wi‑Fi tarmog‘iga ulanmasin."</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Faqat kuchli signalga ega tarmoqlardan foydalanilsin"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanlash har doim yoqilgan"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Har doim izlashga ruxsat berilsin"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-Fi moduli o‘chirilgan bo‘lsa-da, Google joylashuvni aniqlash xizmati va boshqa ilovalarga tarmoqlarni izlashga ruxsat berish"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Ochiq Wi-Fi tarmog‘iga avtomatik ulanish"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fi yordamchisiga ochiq tarmoqlar ichidan eng kuchlisiga avtomatik ulanishi uchun ruxsat bering"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Yordamchini tanlang"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikatlarni o‘rnatish"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Joylashuv aniqligini yana ham yaxshilash va boshqa maqsadlar uchun, Wi-Fi o‘chirilgan bo‘lsada Google va boshqa ilovlar atrofdagi tarmoqlarni skanlashlari mumkin. Buni istamasangiz, Qoshimcha &gt; Har doim mavjud tarmoqlarni skanlash menusiga o‘ting."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi o‘chirilgan bo‘lsada, ilovalar atrofdagi tarmoqlarni skanlashlari mumkin. Buni istamasangiz, Qoshimcha &gt; Har doim mavjud tarmoqlarni skanlash menusiga o‘ting."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Joylashuv aniqligini oshirish uchun Wi-Fi o‘chirilgan bo‘lsa-da, ilova va xizmatlar Wi-Fi tarmoqlarni tekshirib chiqadi. Siz bu xususiyatni <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tekshirish sozlamalari<xliff:g id="LINK_END_1">LINK_END</xliff:g>dan o‘chirib qo‘yishingiz mumkin."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Boshqa ko‘rsatma"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Uyqu holatda ham Wi‑Fi yoqilgan turishi"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Uyqu rejimida Wi-Fi yoniq tursin"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Boshqa tarmoq qo\'shish"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Ko‘proq"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Avtomatik ravishda sozlash (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Sozlashni yakunlash uchun planshetingiz Wi‑Fi tarmog‘iga ulanishi lozim. Shundan so‘ng, mobil tarmoq va Wi-Fi o‘rtasida almashish mumkin."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Kengaytirilgan sozlamalar"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi himoyalangan sozlash"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS‘ni boshlamoqda…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Routeringizda Wi‑Fi himoyalangan sozlash tugmasini bosing. U \"WPS\" deb nomlangan bo‘lishi yoki quyidagi belgiga ega bo‘lishi mumkin:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Routerdagi “Wi‑Fi Xavfsiz sozlash” tugmasini bosing. U “WPS” deb nomlangan bo‘lishi yoki quyidagi belgi bilan ko‘rsatilgan bo‘lishi mumkin:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Wi-Fi routeringizda <xliff:g id="NUMBER">%1$s</xliff:g> pin raqamini kiriting. O‘rnatish ikki daqiqagacha vaqtni oladi."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS muvaffaqiyatli amalga oshdi. Tarmoqqa ulanmoqda…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi tarmog‘iga ulangan"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonim nom"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Parol"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Parolni ko‘rsatish"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Ulanish chastotasini moslash"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz chastota"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz chastota"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP sozlamalari"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(o‘zgartirilmagan)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ko‘rsatilmagan)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Saqlandi"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"O\'chirilgan"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP manzilini sozlab bo‘lmadi"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi ulanishini o‘rnatib bo‘lmadi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tasdiqdan o‘tishda muammo"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Aloqada emas"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Internetga ulanish aniqlanmadi, avtomatik ravishda qayta ulana olmaydi."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS mavjud"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mavjud)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Tarmoqqa ulanish uchun parolni kiriting"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Hech qaysi"</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 skanlash vazifasini yoqmoqchi.\n\nBu ruxsat tarmoqlarni skanlashni 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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Tizimga kirib, ulansinmi?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"Tarmoqqa ulanish u-n “<xliff:g id="APP_NAME">%1$s</xliff:g>” tizimga kirishni talab qiladi"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ULANISH"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Bu tarmoq internetga ulanmagan. Baribir undan foydalanilsinmi?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Bu tarmoq uchun boshqa so‘ralmasin"</string>
     <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">"Unutish"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Ko‘chuvchan “AndroidAP WPA2 PSK” Wi‑Fi ulanish nuqtasi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ixcham Wi‑Fi ulanish nuqtasi"</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_mode_title" msgid="2164073796253284289">"Qo‘ng‘iroqlar sozlamalari"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi qo‘ng‘iroq rejimi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi afzal ko‘rilsin"</item>
+    <item msgid="5267397515594230396">"Mobil tarmoq afzal ko‘rilsin"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Uyga"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Displey"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ovoz"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ekran yorqinligini moslash"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Moslashuvchan yorqinlik"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Yorqinlik darajasini mavjud yorug‘likka qarab optimallashtirish"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Mavzu"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Och rangli"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"To‘q rangli"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Avtomatik"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uxlash"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranning o‘chishi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Faolsiz <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> holatdan keyin"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Ma’qul SIM karta o‘zg-sinmi?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> – qurilmangizdagi yagona SIM karta. Undan qo‘ng‘iroqlar, mobil internet va SMS xabarlar uchun foydalanmoqchimisiz?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM karta noto‘g‘ri PIN kodi. Endi siz qurilmangiz qulfini ochish uchun operatoringizga murojaat qilishingiz lozim."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM kartaning PIN kodi noto‘g‘ri terildi. Qurilmangiz qulflanib uni qulfdan ochish maqsadida operatoringizga qo‘ng‘iroq qilishdan oldin, siz yana <xliff:g id="NUMBER">%d</xliff:g> marta urinib ko‘rishingiz mumkin."</item>
-    <item quantity="other" msgid="77103619544346451">"SIM kartaning PIN kodi noto‘g‘ri terildi. Siz yana <xliff:g id="NUMBER">%d</xliff:g> marta urinib ko‘rishingiz mumkin."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM kartaning PIN kodi noto‘g‘ri. Sizda yana <xliff:g id="NUMBER_1">%d</xliff:g> ta urinish qoldi.</item>
+      <item quantity="one">SIM kartaning PIN kodi noto‘g‘ri. Qurilmani qulfdan chiqarish uchun sizda yana <xliff:g id="NUMBER_0">%d</xliff:g> ta urinish qoldi.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM karta PIN kodining amaliyoti bajarilmadi!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planshet holati"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefon ahvoli"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Mavjud (faqat o‘qish uchun)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Umumiy xotira hajmi"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Hisoblanmoqda…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Ilovalar (ilova ma‘lumoti &amp; multimedia kontenti)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Ilovalar va ilova ma’lumotlari"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Yuklab olinganlar"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Rasmlar, videolar"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musiqa, ringtonlar, podkastlar va boshq.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Boshqa"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Boshqa fayllar"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Keshlangan ma‘lumot"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Bo‘lishilgan xotirani uzish"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartani uzish"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Uzish jarayonida..."</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Xotirada kam joy qoldi"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Tizimning sinxronlash kabi ba‘zi funksiyalari noto‘g‘ri ishlashi mumkin. Ilovalar yoki multimedia kontentlariga o‘xshagan elementlarni o‘chirib yoki olib tashlab, ko‘proq joy bo‘shating."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Qayta nomlash"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Ulash"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Chiqarib olish"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Tozalash va formatlash"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Tozalash va formatlash (IchX)"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB orqali kompyuterga ulanish"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Kompyuter bilan USB ulanish"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Quyidagicha ulanish"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows\'da, yoki Mac\'da Android File Transfer\'dan foydalanib, media fayllar uzatish imkoniyatini beradi (batafsil: www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Sizga kamera dasturiy ta’minotidan foydalanib, rasmlar uzatish imkonini beradi, shuningdek, kompyuterlardagi MTP qo‘llolmaydigan barcha fayllarni uzatish mumkin."</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Fayl uzatish uskunalarini o‘rnatish"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI xususiyatli ilovalarga kompyuteringizdagi MIDI dasturiy ta’minotini USB orqali ishlatish imkonini beradi."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Boshqa foydalanuvchilar"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Xotira qurilmasi"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Tashqi xotira"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"(Umumiy <xliff:g id="TOTAL">%2$s</xliff:g>dan) <xliff:g id="FREE">%1$s</xliff:g> bo‘sh"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ulanildi"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"<xliff:g id="NAME">%1$s</xliff:g> ulanilmadi"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> xavfsiz chiqarib olindi"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"<xliff:g id="NAME">%1$s</xliff:g> xavfsiz chiqarib olinmadi"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> formatlandi"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"<xliff:g id="NAME">%1$s</xliff:g> ni formatlab bo‘lmadi"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Xotira qur-masini qayta nomlash"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Formatlagandan so‘ng, “<xliff:g id="NAME_0">^1</xliff:g>” xotira kartasini boshqa qurilmalarda foydalanishingiz mumkin. \n\n“<xliff:g id="NAME_1">^1</xliff:g>” kartasidagi barcha ma’lumotlar o‘chirib tashlanadi, shuning uchun uning zaxira nusxasini olib qo‘yishni tavsiya etamiz. \n\n"<b>"Rasm va boshqa fayllarning nusxasini saqlab oling."</b>" \nMedia fayllaringizni ushbu qurilmadagi muqobil xotiraga ko‘chiring yoki USB kabeldan foydalanib ularni kompyuterga o‘tkazing. \n\n"<b>"Ilovalarning zaxira nusxasini saqlab oling."</b>" \n“<xliff:g id="NAME_6">^1</xliff:g>” kartasida joylashgan barcha ilovalar va ularning ma’lumotlari o‘chirib tashlanadi. Ularni xotira qurilmasiga ko‘chirib o‘tkazishni tavsiya etamiz."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Agar “<xliff:g id="NAME_0">^1</xliff:g>” xotira kartasini chiqarib olsangiz, unda joylashgan ilovalar ishlashdan to‘xtaydi va undagi media fayllar uni qayta kiritmaguningizcha ishlamaydi."</b>" \n\n “<xliff:g id="NAME_1">^1</xliff:g>” kartasi faqat ushbu qurilmada ishlaydigan qilib formatlanadi. U boshqa hech qanday qurilmada ishlamaydi."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> kartasini sozlang"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Ko‘chma xotira sifatida foydalanish"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Rasm va boshqa fayllarni qurilmalar o‘rtasida ko‘chirib o‘tkazish uchun."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Ichki xotira sifatida foydalanish"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Ma’lumotlarni (rasm, ilova va boshqalar) faqat ushbu qurilmada saqlash uchun. Uni boshqa qurilmalar bilan ishlamaydigan qilish uchun formatlash lozim."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Ichki xotira sifatida formatlash"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Ma’lumotlaringizni himoyalash uchun “<xliff:g id="NAME_0">^1</xliff:g>” xotira kartasini formatlash lozim. \n\nFormatlagandan so‘ng, “<xliff:g id="NAME_1">^1</xliff:g>” kartasi faqat mazkur qurilmada ishlaydi. \n\n"<b>"“<xliff:g id="NAME_2">^1</xliff:g>” kartasidagi barcha ma’lumotlar o‘chirib tashlanadi."</b>" Ma’lumotlar yo‘qolishining oldini olish uchun ularning zaxira nusxasini saqlab oling."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Tozalash va formatlash"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> formatlanmoqda…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"<xliff:g id="NAME">^1</xliff:g> formatlanayotganda, uni chiqara ko‘rmang"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Yangi kartaga ko‘chirib o‘tkazing"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Rasm, fayl va ilovalaringiz ma’lumotlarini ushbu yangi “<xliff:g id="NAME">^1</xliff:g>” kartasiga ko‘chirib o‘tkazishingiz mumkin. \n\nBunga <xliff:g id="TIME">^2</xliff:g> atrofida vaqt ketadi va ichki xotirada <xliff:g id="SIZE">^3</xliff:g> joy bo‘shaydi. Bu jarayon davomida ba’zi ilovalar ishlamaydi."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Ko‘chirib o‘tkazish"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Keyinroq ko‘chirish"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Ma’lumotlarni ko‘chirib o‘tkazish"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Ko‘chirish <xliff:g id="TIME">^1</xliff:g> atrofida vaqt oladi. Buning natijasida ichki xotirada <xliff:g id="SIZE">^2</xliff:g> joy bo‘shaydi."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Ko‘chirib o‘tkazish"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Ma’lumotlar ko‘chirilmoqda…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Ko‘chirish davomida: \n• <xliff:g id="NAME">^1</xliff:g> kartasini chiqara ko‘rmang. \n• Ba’zi ilovalar to‘g‘ri ishlamasligi mumkin. \n• Qurilmangiz quvvati tugab qolmasligi kerak."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> ishlashga tayyor"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Endi “<xliff:g id="NAME">^1</xliff:g>” kartasiga rasm va boshqa fayllarni saqlash mumkin."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Yangi “<xliff:g id="NAME">^1</xliff:g>” kartasi ishlashga tayyor. \n\nUnga rasm, ilova ma’lumotlari va boshqa fayllarni ko‘chirib o‘tkazish uchun Sozlamalar &gt; Xotira bo‘limiga o‘ting."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ilovasini ko‘chirib o‘tkazing"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"<xliff:g id="APP">^1</xliff:g> va uning ma’lumotlarini “<xliff:g id="NAME_0">^2</xliff:g>” kartasiga ko‘chirib o‘tkazish biroz vaqt oladi. Ko‘chirish tugamaguncha ilovadan foydalana olmaysiz. \n\nKo‘chirish davomida “<xliff:g id="NAME_1">^2</xliff:g>” kartasini chiqara ko‘rmang."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ko‘chirib o‘tkazilmoqda…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ko‘chirish davomida “<xliff:g id="NAME">^1</xliff:g>” kartasini chiqara ko‘rmang. \n\n Ushbu qurilmadagi <xliff:g id="APP">^2</xliff:g> ilovasi ko‘chirish tugamaguncha ishlamaydi."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Ko‘chirishni bekor qilish"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batareya ahvoli"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batareya darajasi"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNlar"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"APN standart sozlamalar tiklanmoqda."</string>
     <string name="menu_restore" msgid="8260067415075573273">"standartdan tiklash"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN sozlamalarni andozadan tiklash bajarildi."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Tarmoq sozlamalarini tiklash"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Bu amal barcha tarmoq sozlamalarini qaytadan tiklaydi, jumladan: \n\n"<li>"Wi-Fi"</li>\n<li>"Mobil internet "</li>\n<li>"Bluetooth"</li>" tarmoqlarini"</string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Sozlamalarni tiklash"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Barcha tarmoq sozlamalari qayta tiklansinmi? Bu amalni ortga qaytarib bo‘lmaydi!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Sozlamalarni tiklash"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Tiklansinmi?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Tarmoq sozlamalari qayta tiklandi"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Quril-ni ilk holatga qaytarish"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ishlab chiqarilgan holatiga qaytarish"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Planshetni butunlay tozalash"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Telefonni butunlay tozalash"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Bu planshetning "<b>"ichki xotirasi"</b>"dagi barcha ma\'lumotlarni o\'chirib yuboradi, jumladan:\n\n"<li>"Sizning Google hisobingiz"</li>\n<li>"Tizim va ilovalar ma\'lumotlari va sozlamalari"</li>\n<li>"Ko\'chirib olingan ilovalar"</li>"ni."</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Bu telefoningizdagi "<b>"ichki xotira"</b>"dan,\n\n"<li>" Google hisobingiz"</li>\n<li>"Tizim va ilovalar sozlamalari"</li>\n<li>"Ko‘chirib olingan ilovalar"</li>" kabi barcha ma‘lumotlarni o‘chirib yuboradi."</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD kartadagi musiqa va rasmlar kabi barcha ma’lumotlarni o‘chirish"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Planshetni dastlabki sozlamarga qaytarish"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefonni zavod sozlamalariga tiklash"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Barcha shaxsiy ma\'lumotlaringiz va ko\'chirib olingan ilovalarni o\'chirilishiga rozimisiz? Keyin ortga qaytarishni iloji yo\'q bo\'ladi!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Barcha shaxsiy ma\'lumotlaringiz va ko‘chirib olingan ilovalarni o‘chirilishiga rozimisiz? Bu amalni ortga qaytarib bo‘lmaydi!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Hamma narsani o‘chirish"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Dastlabki sozlamalarga qaytarishni tasdiqlash uchun qulfni ochadigan chizmangizni chizishingiz lozim."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Dastlabki sozlamalarni qaytarib bo\'lmadi, chunki Tizimni tozalash xizmati javob bermayapti."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Tozalanilsinmi?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ushbu foydalanuvchiga sozlamalarni zavod holatiga qaytarishga ruxsat berilmagan"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB xotira ichidagi barcha ma\'lumotlarni o‘chirib, tozalamoqchimisiz? Keyin umuman tiklab bo‘lmaydi!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD karta ichidagi barcha ma\'lumotlarni o‘chirib, tozalamoqchimisiz? Keyin umuman tiklab bo‘lmaydi!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Hamma narsa o\'chirilsin"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB xotirasidagi ma‘lumotlarni o‘chirib tashlashni tasdiqlash uchun qulfni ochadigan chizmangizni chizishingiz lozim."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD xotira kartasidagi ma‘lumotlarni o‘chirib tashlashni tasdiqlash uchun qulfni ochadigan chizmangizni chizishingiz lozim."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Qo‘ng‘iroq sozlamalari"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ovozli pochta, qo‘ng‘iroqni yo‘naltirish, qo‘ng‘roqni kutish va chaqiruvchi IDsi sozlamalari"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB modem"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yordam"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mobil tarmoqlar"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Uyali tarmoq paketlari"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Standart SMS ilovasi"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS ilovasi"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS ilovasi o‘zgartirilsinmi?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMS ilovasi sifatida <xliff:g id="NEW_APP">%1$s</xliff:g>dan <xliff:g id="CURRENT_APP">%2$s</xliff:g> o‘rniga foydalanilsinmi?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g>dan SMS ilovasi sifatida foydalanilsinmi?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Joylashuv rejimi"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Joylashuvni aniqlash uchun GPS, Wi‑Fi va mobil tarmoqlardan foydalanish"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Joylashuvni aniqlash uchun Wi‑Fi va mobil tarmoqlardan foydalanish"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Joylashuvingizni aniqlash uchun GPS‘dan foydalanish"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Joylashuvni GPS yordamida aniqlash"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Tekshirish"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Tekshirilmoqda"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi tarmog‘i tekshirilmoqda"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Joylashuv aniqligini ochirish uchun ilova va xizmatlarga Wi-Fi tarmog‘idagi qurilmalarni Wi-Fi o‘chirilgan bo‘lganda ham tekshirib chiqishga ruxsat berish kerak"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth tarmog‘i tekshirilmoqda"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Joylashuv aniqligini ochirish uchun ilova va xizmatlarga Bluetooth tarmog‘idagi qurilmalarni Bluetooth o‘chirilgan bo‘lganda ham tekshirib chiqishga ruxsat berish kerak"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi va mobil tarmoq"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Joylashuvingizni tezroq aniqlash uchun ilovalarga Google joylashuv xizmatlaridan foydalanishga ruxsat berish. Joylashuv haqida anonim ma‘lumot to‘planib, Google‘ga yuboriladi."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi orqali aniqlangan joylashuv"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parol o‘rnatildi"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN kod o‘rnatildi"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Chizmali parol o‘rnatildi"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Ekran xavfsizligi"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Davom etish uchun chizmali parolingizni kiriting."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Davom etish uchun qurilmangiz PIN kodini kiriting."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Davom etish uchun qurilmangiz parolini kiriting."</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">"Chizmali parol noto‘g‘ri"</string>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Qurilma xavfsizligi"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Qulfni ochish chizmasini o‘zgartirish"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Qulfni ochish PIN kodini o‘zgartirish"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Saqlangan chizmani tasdiqlash"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Qayta urinib ko‘ring:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Qulfdan yechish chizmasini chizing"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Yordam uchun Menyu‘ni bosing."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Chizib bo‘lgandan so‘ng barmog‘ingizni erkandan ajrating"</string>
@@ -1176,8 +1225,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Qulfni ochish chizmasini o‘rnatish"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Qulfni ochish chizmasini o‘zgartirish"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Chizmali parolni ochish uchun chizish"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Juda ko‘p noto‘g‘ri urinishlar!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> soniyadan so‘ng qayta urinib ko‘ring."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Juda ko‘p noto‘g‘ri urinishlar bo‘ldi! <xliff:g id="NUMBER">%d</xliff:g> soniyadan so‘ng qayta urinib ko‘ring."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Ilova telefoningizga o‘rnatilmagan."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Ilovalar boshqaruvi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"O‘rnatilgan ilovlarni boshqarish yoki o‘chirish"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Xajm bo‘yicha saralash"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Ishlayotgan xizmatlarni ko‘rsatish"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Keshlangan jarayonlarni ko‘rsatish"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Favqulodda bildirishnomalar ilovasi"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ilova afzalliklarini dastlabki sozlamalariga qaytarish"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ilova afzalliklari dastlabki sozlamalariga qaytarilsinmi?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Bu quyidagilar uchun barcha afzalliklarni dastlabki sozlamalariga qaytaradi:\n\n "<li>"O‘chirib qo‘yilgan ilovalar"</li>\n" "<li>"O‘chirib qo‘yilgan ilova xabarnomalari "</li>\n" "<li>"Standart ish ilovalari"</li>\n" "<li>"Ilovalar uchun fondagi trafik cheklovlari"</li>\n" "<li>"Har qanday ruxsatlar cheklovlari"</li>\n\n" Ilovalarning hech qanday ma‘lumotlari o‘chirib tashlanmaydi."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Ilova operatsiyalari"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Ishlamoqda"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Foydalanilmagan)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Birlamchi ilovalar mavjud emas"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Xotira sarfi"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ilovalar sarflayotgan xotirani ko‘rish"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Ishlayotgan xizmatlar"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Planshet ma‘lumoti"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefon ma‘lumoti"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Batareya ma‘lumoti"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Tezkor ishga tushirish"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Ilovalarni ishga tushiruvchi klaviatura yoqliqlarini o‘rnatish"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Ilova belgilash"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Yorliqsiz"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Qidiruv + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Tozalash"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) yorlig‘ingiz tozalanadi."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Bekor qilish"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Ilovalar"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Yorliqlar"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Matn kiritish"</string>
     <string name="input_method" msgid="5434026103176856164">"Yozish usuli"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Joriy klaviatura"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Barcha bluetooth HCI paketlarini bitta faylda jamlash"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM qulfini yechish"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Operatsion tizimni yuklovchi dastur qulfini yechish"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN kodni kiriting"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"“OEM qulfini yechish” funksiyasini yoqish uchun qurilmangiz PIN kodini kiriting"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"“OEM qulfini yechish” funksiyasi yoqilsinmi?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"OGOHLANTIRISH: Ushbu funksiya yoqilsa, qurilmani himoyalash funksiyasi ishlamay qoladi."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Jurnal buferi hajmi"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Jurnal buferi hajmini tanlang"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Qo‘lbola joylashuvlarga ruxsat berish"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Joylashuv emulyatsiyasiga ruxsat berish"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Tekshiruv alomatlarini ko‘rish funksiyasini yoqish"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Tarmoqlar"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Displeyning simsiz sertifikatsiyasi"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi jurnalidagi batafsil ma’lumot"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi’dan mob. internetga majburiy o‘tish"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi-Fi rouming tekshiruviga doim ruxsat berilsin"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Amaldagi DHCP mijoz-dasturidan foydalanish"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Displeyning simsiz sertifikatsiyasi uchun tanlamalarni ko‘rsatish"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi-Fi ulanishini tanlashda har bir SSID uchun jurnalda ko‘rsatilsin"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Agar ushbu funksiya yoqilsa, Wi-Fi signali past bo‘lganda internetga ulanish majburiy ravishda mobil internetga o‘tkaziladi."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Ekranda ko‘rsatilgan internet tragigi miqdoriga qarab Wi-Fi rouming tekshiruviga ruxsat berish/taqiqlash"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Jurnal buferi hajmi"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Jurnal buferi hajmini tanlang"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB konfiguratsiyasini tanlang"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB konfiguratsiyasini tanlang"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Qo‘lbola joylashuvlarga ruxsat berish"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Joylashuv emulyatsiyasiga ruxsat berish"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Tekshiruv alomatlarini ko‘rish funksiyasini yoqish"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Yangi Android DHCP mijoz-dasturi o‘rniga Lollipop tizimi DHCP mijoz-dasturidan foydalanilsin."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB nosozliklarni tuzatishga ruxsat berilsinmi?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB nosozliklarni tuzatish faqat dasturlash maqsadlarida yoqiladi. Undan ma‘lumotlarni qurilmangiz va kompyuter o‘rtasida ko‘chirish, ilovalarni xabarnomasiz o‘rnatish va jurnal ma‘lumotlarini o‘qish uchun foydalaniladi."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Oldinroq USB orqali nosozliklarni tuzatishga berilgan ruxsat barcha kompyuterlar uchun bekor qilinsinmi?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Pushtirang"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>dan foydalanilsinmi?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>ga zarur:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Ilova ruxsatnoma so‘roviga xalaqit qilayotgani tufayli, “Sozlamalar” ilovasi javobingizni tekshira olmaydi."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Agar <xliff:g id="SERVICE">%1$s</xliff:g> xizmatini yoqsangiz, qurilmangiz ma’lumotlarni shifrlashni kuchaytirish uchun ekran qulfidan foydalanmaydi."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Maxsus imkoniyatlar xizmati yoqilganligi tufayli qurilmangiz ma’lumotlarni shifrlashni kuchaytirish uchun ekran qulfidan foydalanmaydi."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"“<xliff:g id="SERVICE">%1$s</xliff:g>” xizmatini yoqish ma’lumotlarni shifrlashga ta’sir qilgani bois chizmali parolingizni tasdiqlashingiz lozim."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Jarayon statistikalari"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Ish jarayonlari haqidagi g‘alati statistikalar"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Band xotira"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> ilovalarining tugash vaqti <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="TIMEDURATION">%3$s</xliff:g> davomida <xliff:g id="USEDRAM">%1$s</xliff:g> / <xliff:g id="TOTALRAM">%2$s</xliff:g> ishlatildi"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Fon"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Ahamiyatli"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Keshlangan"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Qurilma xotirasi hozirgi vaqtda <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM‘dan o‘rtacha foydalanish darajasi"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM‘dan maksimal foydalanish darajasi"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Tub"</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">"Kesh"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Foyd. RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Foyd. RAM (orqa fonda)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Ishlash vaqti"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Jarayonlar"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Xizmatlar"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Davomiyligi"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Xotira ma’lumotlari"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 soat"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 kun"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Tizimni ko‘rsatish"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Tizimga oid jarayonlarni berkitish"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss‘dan foydalanish"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistika turi"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Fon"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Quyidagi standart sozlamalar ilova sozlamalarini ustidan yoziladi"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Andoza sozlamalar"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"standart mexanizm"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Nutq sintezi mexanizmini o‘rnatib, og‘zaki matn uchun foydalanadi"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Talaffuz qilinadigan matnda foydalanish uchun nutqni tahlil qilish vositasini ko‘rsating"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Nutq tezligi"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Gapirilgan matn tezligi"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Chimdish"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Apparat bilan qo‘llab-quvvatlangan"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Faqat dasturda"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Ushbu foydalanuvchi uchun hisob ma’lumotlari mavjud emas"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Hisob ma‘lumoti o‘rnatilganini tasdiqlash uchun qulfni ochadigan chizmani ekranda chizish lozim."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Mening ma’lumotlarimni zahiralash"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Ilova ma‘lumoti, Wi-Fi parollari va boshqa sozlamalarning nusxalarini Google serveriga zaxiralash"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Zahiralash hisobi"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Hozir hech qaysi hisobda zahiralangan ma’lumotlar mavjud emas"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Ilova ma’lumotini ham qo‘shish"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Avtomatik qayta tiklash"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ilovani qayta o‘rnatish paytida, zahiralangan sozlamalar va ma’lumotlarni tiklang"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Zaxiralash xizmati faol emas."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Bu qurilma siyosati tomonidan o‘rnatilgan."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Ish stolini zahiralash paroli"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Kompyuterdagi zaxira nusxalar hozirgi vaqtda himoyalanmagan"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Ish stoli to\'liq zaxira nusxalari parolini o‘zgartirish yoki o‘chirish uchun bu yerni bosing."</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Almashinish animatsiyasi o‘lchovi"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animatorning davomiylik o‘lchami"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Ikkinchi ekranga simulyatsiyalash"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Ko‘p oyna rejimi"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Ekranda bir vaqtda bir nechta amalni bajarsh."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Ko‘p oyna rejimi yoqilsinmi?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"DIQQAT: Bu yuqori darajadagi tajribaviy funksiya bo‘lib, u Yaqinda ishlatilgan ilovalar interfeysi orqali bir vaqtning o‘zida ekranda bir nechta amallarni bajarish imkonini beradi. Bu funksiyadan foydalanilganda, ba’zi ilovalar ishlamay qolishi yoki noto‘g‘ri ishlay boshlashi mumkin."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Ilovalar"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Faoliyatlar saqlanilmasin"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Foydalanuvchi qoldirgan faoliyat zudlik bilan tozalanilsin"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Foydalanuvchi"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Cheklangan profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Yangi foyd-chi qo‘shilsinmi?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Siz qo‘shimcha foydalanuvchilarni yaratish orqali ushbu qurilmadan boshqa odamlar bilan o‘rtada foydalanishingiz mumkin. Bunda, har bir foydalanuvchi o‘z hududiga ega bo‘lib, uni o‘z ilovalari, orqa fon rasmi va boshqalar bilan o‘ziga moslashtirib olishi mumkin. Bundan tashqari, foydalanuvchilar Wi-Fi kabi barchaga ta’sir qiluvchi qurilma sozlamalarini ham o‘zgartirishi mumkin.\n\nYangi foydalanuvchi qo‘shilgach, o‘sha shaxs o‘z hududini sozlashi lozim bo‘ladi.\n\nHar qanday foydalanuvchi ilovalarni barcha foydalanuvchilar uchun yangilashi mumkin."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Bu qurilmadan bir necha kishi alohida foydalanuvchilar qo‘shib foydalanishi mumkin. Har bir foydalanuvchiga diskda joy ajratiladi, tayinlangan hajm ilovalar, ekran foni rasmi, va hokazolarga taqsimlanishi mumkin. Foydalanuvchilar Wi-Fi kabi sozlamalarni o‘zgartirsa, qolganlarda ham aks etishi mumkin. \n\nYangi foydalanuvchi qo‘shilganda, unga ajratilgan joy hajmi tayinlanishi kerak.\n\nHar bir foydalanuvchi ilovalarni qolganlarga ham yangilashi mumkin."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Yangi foydalanuvchi qo‘shilgach, o‘sha shaxs o‘z hududini sozlashi lozim bo‘ladi.\n\nHar qanday foydalanuvchi ilovalarni barcha foydalanuvchilar uchun yangilashi mumkin."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Foydalanuvchi hozir yaratilsinmi?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"O‘sha shaxs yoningizda bo‘lib, qurilmani qo‘liga olishi va o‘z hududini sozlashga imkoni bo‘lishi lozim."</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Mehmon hisobi o‘chirib tashlansinmi?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Ushbu seansdagi barcha ilovalar va ma’lumotlar o‘chirib tashlanadi."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"O‘chirish"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Telefon qo‘ng‘iroqlari uchun ruxsat"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Telefon qo‘ng‘iroqlari va SMS uchun ruxsat"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Telefon qo‘ng‘iroqlarini yoqish"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Telefon qo‘ng‘iroqlari va SMSni yoqish"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Foydalanuvchini o‘chirish"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Tel. qo‘ng‘iroqlariga ruxsat berilsinmi?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Telefon qo‘ng‘iroqlari yoqilsinmi?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Qo‘ng‘iroqlar tarixi ushbu foydalanuvchiga ham ko‘rinadi."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Tel. qo‘ng‘. va SMS’ga ruxsat berilsinmi?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Qo‘ng‘iroqlar va SMS xabarlar tarixi ushbu foydalanuvchiga ham ko‘rinadi."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefon qo‘ng‘iroqlari va SMS yoqilsinmi?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Qo‘ng‘iroq va SMS xabarlar tarixi ushbu foydalanuvchiga ham ko‘rinadi."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Ilovalar va kontentga ruxsat berish"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Cheklovlar o‘rnatilgan ilovalar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ilovalar uchun sozlamalarni kengaytirish"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"QAYTA NOMLASH"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Ilova cheklovlarini o‘rnatish"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> bilan boshqariladi"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ushbu ilova checklangan profillarda qo‘llab-quvvatlanmaydi"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Bu ilova hisobinglarizga kira oladi"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Bu ilova hisoblaringizga kirishi mumkin. <xliff:g id="APP">%1$s</xliff:g> tomonidan nazorat qilinadi"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi va uyali tarmoq"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi‑Fi va uyali tarmoq sozlamalarini o‘zgartirishga ruxsat berish"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi tarmoq ulanishi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"matn, xabar, xabarlashuv, xabarlar"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"uyali, uyali aloqa operatori, simsiz internet, 4g, 3g, 2g, lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wi-fi qo‘ng‘iroqlar"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ishga tushirish paneli"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekran tegish ekrani"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"xira, ekran, sensorli ekran, batareya"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"xira, ekran, sensorli ekran, batareya"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"orqa fon, moslashtirish, ekran"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"to‘q rangli mavzu tungi rejim ekranni xiralashtirish yorqinlikni akslantirish"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"orqa fon personallashtirish ekranni moslashtirish"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"matn o\'lchami"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"loyiha"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"loyiha tasvirini uzatish"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"joy, disk, qattiq disk, qurilmadan foydalanish"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"quvvat, foydalanish, quvvatlash"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"imlo lug‘ati, imloni tekshirish, avtomatik tuzatish"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"hisob"</string>
     <string name="keywords_users" msgid="4673901601478559100">"cheklov cheklash cheklangan"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"matnni tuzatish, to‘g‘ri, ovoz, tebranish, avto, til, imo-ishora, taklif qilish, taklif, mavzu, haqoratomuz so‘z, yozish, kulgich, xalqaro"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"tiklash shaxsiy sozlamalar birlamchi dastlabki"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"favqulodda holatlar muz ilova birlamchi"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"ilovalar yuklab olish tizim"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ilovalar ruxsatnomalar xavfsizlik"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ilovalar birlamchi"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"surish, parol, chizmali parol, PIN kod"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi’ni sozlash u-n NFC yorliq"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yozish"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Uyg‘otkich ovozi"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Rington balandligi"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirishnomalar ovozi"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Tanaffuslar"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Qo‘ng‘iroq yoki bildirishnomalar kelganda"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Har doim bezovta qilinsin"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Faqat ustuvor tanaffuslarga ruxsat berilsin"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Bezovta qilinmasin"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Faqat muhimlariga ruxsat ber-n"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Avtomatik qoidalar"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Faqat muhimlari"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Faqat signallar"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Bezovta qilinishlarsiz"</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="ringtone_title" msgid="5379026328015343686">"Telefon ringtoni"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Bild-lar u-n birlamchi rington"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Qo‘ng‘iroq vaqtida tebranish"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Tebranish"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirishnomalarga kirish"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ilovalar xabarnomalarni o‘qiy olmayapti"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d ilovasi xabarnomalarni o‘qishi mumkin"</item>
-    <item quantity="other" msgid="980049191810249052">"%d ilovalari xabarnomalarni o‘qishi mumkin"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d ilova bildirishnomalarni o‘qishi mumkin</item>
+      <item quantity="one">%d ta ilova bildirishnomalarni o‘qishi mumkin</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Hech qanday xabarnoma qabul qiluvchi ilova o‘rnatilmagan."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> yoqilsinmi?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aloqa nomlari va sizga yuborilgan xabarlar matni kabi shaxsiy ma‘lumotlardan iborat bo‘lishi mumkin bo‘lgan tizim yoki o‘rnatilgan ilova tomonidan post sifatida qoldirilgan barcha xabarnomalarni o‘qish imkoniyatiga ega bo‘ladi. Shuningdek, u bu xabarnomalarni e‘tiborsiz qoldirish yoki ulardagi vazifalar tugmalarini bosish imkoniyatiga ham ega bo‘ladi."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Shartlarning manbalari"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Hech qaysi ilova shart qo‘ymaydi"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d ta ilova shart qo‘yadi"</item>
-    <item quantity="other" msgid="358057362115673258">"%d ta ilova shart qo‘yadi"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Shartlar manbasi o‘rnatilmagan."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> yoqilsinmi?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> “Bezovta qilmaslik” rejimidan chiqish shartlarini qo‘shishi mumkin."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilovalar yuklanmoqda…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Bloklash"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Barchasini bloklash"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ushbu ilovadan keladigan bildirishnomalar hech qachon ko‘rsatilmasin"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Muhimlik darajasi"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Bildirishnomalar ro‘yxat boshida ko‘rsatilsin hamda qurilma “Faqat 1-darajali bildirishnomalar” rejimiga o‘tkazilsin"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Maxfiy"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Qurilma ekrani qulflanganda, ushbu ilovadan keladigan bildirishnomalardagi har qanday maxfiy ma’lumotlar ko‘rsatilmasin"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Muhim deb hisoblansin"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"“Bezovta qilinmasin” rejimi “Faqat muhim bildirishnomalar” uchun istisno qilingan holatda ushbu ilova bildirishnomalari ham ko‘rsatilsin."</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Ko‘z yugurtirishga ruxsat berish"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Ushbu ilova muayyan bildirishnomalarni joriy ekranning ko‘rinadigan qismiga biroz surish orqali ajratib ko‘rsatsin."</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Shaxsiy ma’lumotlar yashirilsin"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Qurilma qulflangan holatda, shaxsiy ma’lumotlarni oshkor qilishi mumkin bo‘lgan ilova bildirishnomalari ko‘rsatilmasin."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloklangan"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Muhimlik darajasi"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Maxfiy"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tayyor"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Siz o‘chirguncha"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Ustuvor tanaffuslar"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Nofaol vaqt"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Kunlar soni"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Hech biri"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Bildirishnomalarga ruxsat berilgan"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Faqat birlamchi"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Hech biri"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Avtomatlashtirish"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Avtomatik ravishda yoqish"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Qoida nomi"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Qoida qo‘shish"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Qoidani o‘chirish"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"“<xliff:g id="RULE">%1$s</xliff:g>\" qoidasi o‘chirilsinmi?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"O‘chirish"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Qoida turi"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Noma’lum"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Qoidani moslash"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Qoidalar tartibi"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Qoida topilmadi"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Kunlar"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Hech qaysi"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Har kuni"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Hech qachon"</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">"Qo‘ng‘iroqlar"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Xabarlar"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Qo‘ng‘iroqlar/xabarlar:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Barcha"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Faqat kontaktlar"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Faqat yulduzchali kontaktlar"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Tadbirlar va eslatmalar"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Uyg‘otkich doim birinchi darajali bildirishnomalarga kiradi"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Signallar"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Eslatmalar"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Tadbirlar"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Tanlangan chaqiruvchilar"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Qayta chaqiruvchilar"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Birortasi <xliff:g id="MINUTES">%d</xliff:g> daqiqa ichida qayta qo‘ng‘iroq qilayotgan bo‘lsa, unga ruxsat berishingiz kerak."</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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Ish kunlari kechasi"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Boshlanish vaqti"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Tugash vaqti"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Keyingi kun <xliff:g id="FORMATTED_TIME">%s</xliff:g> da"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> da yoki undan oldingi biror uyg‘otkich vaqtida"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Keyingi kun <xliff:g id="FORMATTED_TIME">%s</xliff:g> da yoki undan oldingi biror uyg‘otkich vaqtida"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Ertasiga <xliff:g id="FORMATTED_TIME">%s</xliff:g> da"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Bezovta qilinishlar"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Qo‘ng‘iroq yoki bildirishnomalar kelganda"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Qachon bezovta qilish mumkin?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Qancha muddatga?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Har doim bezovta qilinsin"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"o‘chirilgan, barchasi, hamma narsa"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Faqat muhim holatlarda bezovta qilinsin"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Faqat signallarga ruxsat berilsin"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Bezovta qilinmasin"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Uzluksiz"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> daqiqa</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> daqiqa</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> soat</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> soat</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Faqat muhim bildirishnomalarni noma’lum muddatga yoqish"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Muhim bildirishnomalar <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha faqat <xliff:g id="DURATION">%1$d</xliff:g> daqiqaga o‘rnatilsin</item>
+      <item quantity="one">Muhim bildirishnomalar <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha faqat bir daqiqaga o‘rnatilsin</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Muhim bildirishnomalar (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha) faqat <xliff:g id="DURATION">%1$d</xliff:g> soatga o‘rnatilsin</item>
+      <item quantity="one">Muhim bildirishnomalar <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha faqat bir soatga o‘rnatilsin</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Faqat signallarni noma’lum muddatga yoqish"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Signallar (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha) faqat <xliff:g id="DURATION">%1$d</xliff:g> daqiqaga o‘rnatilsin</item>
+      <item quantity="one">Signallar <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha faqat bir daqiqaga o‘rnatilsin</item>
+    </plurals>
+    <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="other">Signallar <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha faqat <xliff:g id="DURATION">%1$d</xliff:g> soatga o‘rnatilsin</item>
+      <item quantity="one">Signallar <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha faqat bir soatga o‘rnatilsin</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Noma’lum vaqtda bezovta qilinmasin"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha <xliff:g id="DURATION">%1$d</xliff:g> daqiqa mobaynida bezovta qilinmasin</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha bir daqiqa mobaynida bezovta qilinmasin</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> gacha <xliff:g id="DURATION">%1$d</xliff:g> soat mobaynida bezovta qilinmasin</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> gacha bir soat mobaynida bezovta qilinmasin</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Har doim bezovta qilinaversin"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"har doim"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ilova bildirish-lari"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirishnoma sozlamalari"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Qurilma haqida mulohaza yuborish"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ma’lumotlari"</string>
     <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="2184141780491382435">"Odatiy holat bo‘yicha ishga tushirish"</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="app_launch_domain_links_title" msgid="458956710410857777">"Domen havolalari"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Domen havolalarini ochish"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Ilovaga domen havolalarini to‘g‘ridan-to‘g‘ri ochishga ruxsat berish"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Qo\'llab-quvvatlanadigan domenlar (URL manzillar)"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Boshqa birlamchi sozlamalar"</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="410824961149037234">"ichki xotira"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"tashqi xotira"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Ichki xotira"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Tashqi xotira"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Ilova sarflagan trafik"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="DATE">%2$s</xliff:g> sanasidan beri <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Band xotira"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Yoqilgan"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Bloklash"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Maxfiy"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Muhimlik darajasi"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Muhimlik va maxfiylik darajasi"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta ruxsat berildi</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta ruxsat berildi</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other"> <xliff:g id="COUNT_3">%d</xliff:g>dan <xliff:g id="COUNT_2">%d</xliff:g> ta ruxsat berilgan</item>
+      <item quantity="one"> <xliff:g id="COUNT_1">%d</xliff:g>dan <xliff:g id="COUNT_0">%d</xliff:g> ta ruxsat berilgan</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Ba’zi odatiy sozlamalar o‘rnatilgan"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Odatiy sozlamalar o‘rnatilmagan"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Barcha ilovalar"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Yoqilgan"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Shaxsiy"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Ishga oid"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloklangan"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Muhim"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Maxfiy"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domen havolalari bilan"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Administrator tomonidan o‘chirib qo‘yilgan"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Qo‘shimcha"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Noma’lum ilova"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profil tanlash"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Ilova ruxsatnomalari"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> ta ilovaga qo‘shimcha ruxsat berilgan"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> ta ilovaga ruxsat berilgan"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Domen havolalari"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Hech qaysi domen havolalari ochilmasin"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"\"<xliff:g id="DOMAIN">%s</xliff:g>\" havolasini ochish"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"\"<xliff:g id="DOMAIN">%s</xliff:g>\" va tegishli havolalarni ochish"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"> <xliff:g id="COUNT">%d</xliff:g> tailova o‘z domeni havolalarini (URL manzillar) ochishi mumkin</item>
+      <item quantity="one"> bitta ilova o‘z domeni havolalarini (URL manzillar) ochishi mumkin</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Aniqlanmadi"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Birlamchi ilovalar"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Brauzer ilovasi"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Birlamchi brauzer mavjud emas"</string>
+    <string name="default_app" msgid="6864503001385843060">"(birlamchi)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Ilovalar xotirasi"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 3bbd6c5..a5acdf4 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Nút bấm"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"tắt/bật micrô"</item>
     <item msgid="1148142988678569310">"chiếu phương tiện"</item>
     <item msgid="9130014005474445273">"kích hoạt VPN"</item>
+    <item msgid="1165192162975045562">"hình nền ghi"</item>
+    <item msgid="7129487923652967258">"cấu trúc hỗ trợ"</item>
+    <item msgid="1069023208100114540">"ảnh chụp màn hình hỗ trợ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Vị trí"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Tắt/bật micrô"</item>
     <item msgid="5906017727368097853">"Chiếu phương tiện"</item>
     <item msgid="2486614710846178542">"Kích hoạt VPN"</item>
+    <item msgid="5586547561693629602">"Hình nền ghi"</item>
+    <item msgid="32794179825485062">"Cấu trúc hỗ trợ"</item>
+    <item msgid="7872852746938272552">"Ảnh chụp màn hình hỗ trợ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Ngắn"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"thấp"</item>
     <item msgid="4212263919458209842">"cực thấp"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Tắt"</item>
-    <item msgid="5656544177755411222">"Gián đoạn hạn chế"</item>
-    <item msgid="8735337502532332056">"Gián đoạn bằng 0"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Bình thường"</item>
     <item msgid="866544120205026771">"Trung bình"</item>
@@ -529,10 +533,17 @@
   </string-array>
   <string-array name="color_picker">
     <item msgid="7631642672260600032">"Xanh két"</item>
-    <item msgid="8332294763632946560">"Màu lam"</item>
-    <item msgid="2023216417616991392">"Màu chàm"</item>
+    <item msgid="8332294763632946560">"Lam"</item>
+    <item msgid="2023216417616991392">"Chàm"</item>
     <item msgid="3170497246594232819">"Tía"</item>
     <item msgid="4608643045752965568">"Hồng"</item>
     <item msgid="6131821495505931173">"Đỏ"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (Giao thức chuyển phương tiện)"</item>
+    <item msgid="8856820259201251036">"PTP (Giao thức chuyển hình ảnh)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Nguồn âm thanh"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 35f47a9..d8cd452 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Cho phép"</string>
     <string name="deny" msgid="6947806159746484865">"Từ chối"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Không xác định"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Bây giờ, bạn giờ chỉ cần thực hiện <xliff:g id="STEP_COUNT">%1$d</xliff:g> bước nữa là sẽ trở thành nhà phát triển."</item>
-    <item quantity="other" msgid="6722953419953594148">"Bây giờ, bạn giờ chỉ cần thực hiện <xliff:g id="STEP_COUNT">%1$d</xliff:g> bước nữa là sẽ trở thành nhà phát triển."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">Bây giờ, bạn chỉ cần thực hiện <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> bước nữa là trở thành nhà phát triển.</item>
+      <item quantity="one">Bây giờ, bạn chỉ cần thực hiện <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> bước nữa là trở thành nhà phát triển.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Bạn đã là nhà phát triển!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Không cần, bạn đã là nhà phát triển."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Mạng không dây và mạng"</string>
@@ -40,10 +40,12 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Tắt SMS qua IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Yêu cầu bật đăng ký IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Yêu cầu tắt đăng ký IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Bật cờ cấp phép VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Tắt cờ cấp phép VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Bật lỗi ram lte"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Tắt lỗi ram lte"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Xem sổ địa chỉ trên SIM"</string>
-    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Xem Số Quay định sẵn"</string>
+    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Xem Số quay định sẵn"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Xem Số Quay số Dịch vụ"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Nhận danh sách PDP"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"Đang sử dụng"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Phát sóng"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vô hiệu hồ sơ?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Điều này sẽ vô hiệu:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Khỏi:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Đã kết nối"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Đã kết nối (không có điện thoại)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Đã kết nối (không có phương tiện)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Đã kết nối (không truy cập tin nhắn)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Đã k.nối (kg có ĐT hoặc p.tiện nào)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Đã ngắt kết nối"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Đang ngắt kết nối…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Đang kết nối…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Đang ghép nối…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Thiết bị Bluetooth chưa được đặt tên"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Đang tìm kiếm"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Ko tìm thấy th.bị Bluetooth lân cận nào."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Hiển thị các tệp đã nhận"</string>
     <string name="device_picker" msgid="4978696506172252813">"Chọn thiết bị Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Yêu cầu quyền Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Một ứng dụng muốn bật Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Ứng dụng muốn BẬT Bluetooth cho thiết bị này."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Một ứng dụng muốn đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Một ứng dụng muốn đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Một ứng dụng muốn đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Thẻ SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Cài đặt proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Hủy"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"HỦY"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"TIẾP TỤC"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"CÓ"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"KHÔNG"</string>
-    <string name="forget" msgid="7267115980248732932">"BỎ QUA"</string>
+    <string name="forget" msgid="1400428660472591263">"Bỏ qua"</string>
+    <string name="save" msgid="879993180139353333">"Lưu"</string>
+    <string name="done" msgid="6942539184162713160">"Xong"</string>
     <string name="settings_label" msgid="1626402585530130914">"Cài đặt"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Cài đặt"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Lối tắt cài đặt"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sắp xếp theo múi giờ"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Ngày"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Thời gian"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Cải thiện đối sánh khuôn mặt"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Kiểm tra nhận diện khuôn mặt"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Yêu cầu nháy mắt khi mở khóa"</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_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>
@@ -348,6 +336,30 @@
     <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>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Đặt Vị trí của tôi, mở khóa màn hình, khóa bộ nhớ thông tin xác thực"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mật khẩu"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vân tay"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Quản lý vân tay"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sử dụng vân tay để"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Thêm"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"khóa màn hình"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> vân tay được đăng ký</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> vân tay được đăng ký</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Thiết lập vân tay"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Để sử dụng vân tay của bạn để mở khóa màn hình hoặc xác nhận mua hàng, chúng tôi cần phải: \n\n✓ Thiết lập phương pháp khóa màn hình sao lưu của bạn \n\n✓ Thêm vân tay của bạn"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Tìm cảm biến"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Tìm cảm biến vân tay trên mặt sau điện thoại của bạn."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Tên"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Xóa"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Hãy bắt đầu!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Đặt ngón tay của bạn lên cảm biến vân tay. Nhấc sau khi bạn cảm thấy rung."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Tuyệt! Hãy làm lại."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Đặt cùng một ngón tay lên cảm biến vân tay và nhấc sau khi bạn cảm thấy rung."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Đã thêm vân tay!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bất cứ khi nào nhìn thấy biểu tượng này, bạn có thể sử dụng vân tay của mình để nhận dạng hoặc ủy quyền mua hàng."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Thêm"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Tiếp theo"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Mã hóa"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Mã hóa máy tính bảng"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Mã hóa điện thoại"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Vui lòng cắm bộ sạc của bạn và thử lại."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Không có mật khẩu hoặc PIN khóa màn hình"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Bạn cần đặt mã PIN hoặc mật khẩu khóa màn hình trước khi có thể bắt đầu quá trình mã hóa."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Bạn phải vẽ hình mở khóa của mình để xác nhận mã hóa thiết bị."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Mã hóa?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Tác vụ mã hóa không thể hoàn nguyên được và nếu bạn làm gián đoạn tác vụ này, bạn sẽ mất dữ liệu. Quá trình mã hóa diễn ra ít nhất một tiếng, trong thời gian này máy tính bảng sẽ khởi động lại nhiều lần."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Tác vụ mã hóa không thể hoàn nguyên được và nếu bạn làm gián đoạn tác vụ này, bạn sẽ mất dữ liệu. Quá trình mã hóa diễn ra ít nhất một tiếng, trong thời gian này điện thoại sẽ khởi động lại nhiều lần."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Vuốt"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Không có bảo mật"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Mở khóa bằng khuôn mặt"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Mức độ bảo mật thấp, thử nghiệm"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Hình"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Mức độ bảo mật trung bình"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Mã PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Mức độ bảo mật từ trung bình đến cao"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mật khẩu"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mức độ bảo mật cao"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Khóa màn hình hiện tại"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Tính năng bảo vệ thiết bị sẽ không còn hoạt động."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Bị vô hiệu do quản trị viên, chính sách mã hóa hoặc bộ nhớ thông tin xác thực"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Không"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vuốt"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Mở khóa bằng khuôn mặt"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Hình"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Mã PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Mật khẩu"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Sau khi thiết lập khóa màn hình, bạn cũng có thể thiết lập vân tay của mình trong Cài đặt và bảo mật."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Tắt khóa màn hình"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Xóa hình mở khóa"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Xóa mã PIN mở khóa"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Mật khẩu phải chứa ít nhất một chữ cái."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Mật khẩu phải chứa ít nhất một chữ số."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Mật khẩu phải chứa ít nhất một ký hiệu."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Mật khẩu phải chứa ít nhất 1 chữ cái."</item>
-    <item quantity="other" msgid="8186027808415585970">"Mật khẩu phải chứa ít nhất %d chữ cái."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Mật khẩu phải chứa ít nhất 1 chữ thường."</item>
-    <item quantity="other" msgid="2693910942679679225">"Mật khẩu phải chứa ít nhất %d chữ thường."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Mật khẩu phải chứa ít nhất 1 chữ hoa."</item>
-    <item quantity="other" msgid="3030801209112209245">"Mật khẩu phải chứa ít nhất %d chữ hoa."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Mật khẩu phải chứa ít nhất 1 chữ số."</item>
-    <item quantity="other" msgid="4703982391407595924">"Mật khẩu phải chứa ít nhất %d chữ số."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Mật khẩu phải chứa ít nhất 1 ký tự đặc biệt."</item>
-    <item quantity="other" msgid="1221290525051187757">"Mật khẩu phải chứa ít nhất %d ký tự đặc biệt."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Mật khẩu phải chứa ít nhất 1 ký tự không phải chữ cái."</item>
-    <item quantity="other" msgid="3952508584649046404">"Mật khẩu phải có ít nhất %d ký tự không phải chữ cái"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">Mật khẩu phải chứa ít nhất %d chữ cái.</item>
+      <item quantity="one">Mật khẩu phải chứa ít nhất 1 chữ cái.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">Mật khẩu phải chứa ít nhất %d chữ thường.</item>
+      <item quantity="one">Mật khẩu phải chứa ít nhất 1 chữ thường.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">Mật khẩu phải chứa ít nhất %d chữ hoa.</item>
+      <item quantity="one">Mật khẩu phải chứa ít nhất 1 chữ hoa.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">Mật khẩu phải chứa ít nhất %d chữ số.</item>
+      <item quantity="one">Mật khẩu phải chứa ít nhất 1 chữ số.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">Mật khẩu phải chứa ít nhất %d ký tự đặc biệt.</item>
+      <item quantity="one">Mật khẩu phải chứa ít nhất 1 ký tự đặc biệt.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">Mật khẩu phải chứa ít nhất %d ký tự không phải chữ cái.</item>
+      <item quantity="one">Mật khẩu phải chứa ít nhất 1 ký tự không phải chữ cái.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Quản trị viên thiết bị không cho phép sử dụng mật khẩu gần đây."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Thứ tự chữ số tăng dần, giảm dần hoặc lặp lại bị cấm"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Để ghép nối với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Hãy đảm bảo thiết bị đang hiển thị mã xác nhận này:&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">"Từ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ghép nối với thiết bị này?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Để ghép nối với:<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>Hãy nhập trên thiết bị:<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> rồi nhấn Quay lại hoặc Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Ghép nối"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"GHÉP NỐI"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Hủy"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Ghép nối giúp bạn có thể truy cập danh bạ và nhật ký cuộc gọi của mình khi được kết nối."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Không thể ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Không thể ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g> do mã PIN hoặc mã xác nhận không đúng."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Không thể kết nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Ghép nối bị <xliff:g id="DEVICE_NAME">%1$s</xliff:g> từ chối."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Không thể kết nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Dò tìm thiết bị"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Làm mới"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Nâng cao"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth nâng cao"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Khi Bluetooth bật, thiết bị của bạn có thể kết nối với thiết bị Bluetooth khác ở gần."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Để nâng cao độ chính xác về vị trí, các ứng dụng và dịch vụ sẽ quét tìm thiết bị Bluetooth, ngay cả khi Bluetooth tắt. Bạn có thể thay đổi điều này trong <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>cài đặt quét<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Kết nối với…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Âm thanh của phương tiện"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Âm thanh điện thoại"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Chuyển tệp"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Thiết bị đầu vào"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Truy cập Internet"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Chia sẻ liên hệ"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Sử dụng để chia sẻ liên hệ"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Chia sẻ kết nối internet"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Truy cập tin nhắn"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh phương tiện."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh thiết bị rảnh tay."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi thiết bị nhập."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Sử dụng cho"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Đổi tên"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Cho phép truyền tệp đến"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Đã kết nối với âm thanh phương tiện"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Đã kết nối với âm thanh điện thoại"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Đã kết nối với máy chủ chuyển tệp"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Đã kết nối với bản đồ"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Chưa kết nối với máy chủ chuyển tệp"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Đã kết nối với thiết bị nhập"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Đã kết nối với thiết bị"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Chia sẻ kết nối Internet"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Sử dụng cho âm thanh phương tiện"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Sử dụng cho âm thanh điện thoại"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Sử dụng để chuyển tệp"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Sử dụng để nhập"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Sử dụng để truy cập Internet"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Sử dụng cho bản đồ"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Cài đặt Đế"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Sử dụng đế cho âm thanh"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Làm loa ngoài"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Cho nhạc và phương tiện"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Nhớ cài đặt"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Trình hỗ trợ Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Được kết nối qua trình hỗ trợ Wi‑Fi"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Màn hình truyền"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Truyền"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Bật hiển thị không dây"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Không tìm thấy thiết bị lân cận nào."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Đang kết nối"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Bỏ qua"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Xong"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Tên"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Cho phép trao đổi dữ liệu khi máy tính bảng chạm vào thiết bị khác"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Cho phép trao đổi dữ liệu khi điện thoại chạm vào thiết bị khác"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Đang tắt Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Lỗi"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Ở chế độ trên máy bay"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Không thể dò tìm mạng"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Thông báo mạng"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Thông báo bất cứ khi nào có mạng công cộng"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Tránh kết nối kém"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Không sử dụng mạng Wi‑Fi trừ khi mạng này có kết nối Internet tốt"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Chỉ sử dụng mạng có kết nối Internet tốt"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Luôn quét"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Luôn cho phép quét"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Cho phép dịch vụ định vị và các ứng dụng khác của Google quét tìm mạng, ngay cả khi Wi-Fi bị tắt"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Tự động sử dụng Wi‑Fi mở"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Cho phép Trợ lý Wi‑Fi tự động kết nối với mạng mở được xác định là có chất lượng cao"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Chọn trợ lý"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Cài đặt chứng chỉ"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Để nâng cao độ chính xác và cho các mục đích khác, Google và các ứng dụng khác có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Luôn quét."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Ứng dụng có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Luôn quét."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Để nâng cao độ chính xác về vị trí, các ứng dụng và dịch vụ sẽ quét tìm mạng Wi‑Fi, ngay cả khi Wi‑Fi tắt. Bạn có thể thay đổi điều này trong <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>cài đặt quét<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Không hiển thị nữa"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Bật Wi-Fi khi ở chế độ ngủ"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Bật Wi-Fi khi ở chế độ ngủ"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Thêm mạng khác"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Thêm"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Thiết lập tự động (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Để hoàn tất thiết lập, máy tính bảng của bạn cần truy cập vào Wi-Fi. Sau khi thiết lập, bạn có thể chuyển đổi giữa dữ liệu di động và Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Tùy chọn nâng cao"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Thiết lập Wi‑Fi được bảo vệ"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Đang khởi động WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Nhấn nút Thiết lập Wi‑Fi được bảo vệ trên bộ định tuyến của bạn. Nút này có thể được gọi là \"WPS\" hoặc chứa ký hiệu sau:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Nhấn nút Thiết lập Wi‑Fi được bảo vệ trên bộ định tuyến của bạn. Nút này có thể được viết tắt là \"WPS\" hoặc được đánh dấu bằng biểu tượng sau:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Nhập mã pin <xliff:g id="NUMBER">%1$s</xliff:g> trên bộ định tuyến Wi‑Fi của bạn. Thiết lập có thể mất tối đa hai phút để hoàn tất."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS đã thành công. Đang kết nối với mạng…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Đã kết nối với mạng Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Danh tính ẩn danh"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Mật khẩu"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Hiển thị mật khẩu"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Định cấu hình băng tần AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Băng tần 2,4 GHz"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Băng tần 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Cài đặt IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(không thay đổi)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(không xác định)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Đã lưu"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Đã tắt"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Lỗi cấu hình IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Lỗi kết nối WiFi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Sự cố xác thực"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ngoài vùng phủ sóng"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Không phát hiện thấy truy cập Internet nào, mạng sẽ không được tự động kết nối lại."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Có WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Có WPS)"</string>
     <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_security_none" msgid="7985461072596594400">"Không"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Đăng nhập để kết nối?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> cần bạn đ.nhập trực tuyến trước khi KN với mạng."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KẾT NỐI"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Mạng này không có quyền truy cập Internet. Vẫn sử dụng mạng này?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Không hỏi lại cho mạng này"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Điểm phát sóng Wi‑Fi DĐ AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Điểm phát sóng Wi‑Fi di độ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_mode_title" msgid="2164073796253284289">"Tùy chọn cuộc gọi"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Chế độ gọi qua Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Ưu tiên Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Ưu tiên mạng di động"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Trang chủ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Âm thanh"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Điều chỉnh độ sáng của màn hình"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Độ sáng thích nghi"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Tối ưu hóa độ sáng cho ánh sáng có sẵn"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Chủ đề"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Sáng"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Tối"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Tự động"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Thời gian sáng"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Màn hình tắt"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Cập nhật thẻ SIM ưu tiên?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> là SIM duy nhất trong thiết bị của bạn. Bạn có muốn sử dụng SIM này cho dữ liệu di động, cuộc gọi và tin nhắn SMS không?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Mã PIN của SIM không chính xác, bây giờ bạn phải liên hệ với nhà cung cấp dịch vụ để mở khóa thiết bị của bạn."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Mã PIN của SIM không chính xác, bạn còn <xliff:g id="NUMBER">%d</xliff:g> lần thử trước khi bạn phải liên hệ với nhà cung cấp dịch vụ để mở khóa thiết bị của bạn."</item>
-    <item quantity="other" msgid="77103619544346451">"Mã PIN của SIM không chính xác, bạn còn <xliff:g id="NUMBER">%d</xliff:g> lần thử."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">Mã PIN SIM của bạn không chính xác, bạn còn  <xliff:g id="NUMBER_1">%d</xliff:g> lần thử.</item>
+      <item quantity="one">Mã PIN của SIM không chính xác, bạn còn  <xliff:g id="NUMBER_0">%d</xliff:g> lần thử trước khi bạn phải liên hệ với nhà cung cấp dịch vụ để mở khóa thiết bị của bạn.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Thao tác mã PIN của SIM không thành công!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Trạng thái của máy tính bảng"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Trạng thái điện thoại"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Khả dụng (chỉ đọc)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Tổng dung lượng"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Đang tính toán..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Ứng dụng (dữ liệu ứng dụng và nội dung đa phương tiện)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Ứng dụng và dữ liệu ứng dụng"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Phương tiện"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Nội dung tải xuống"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Ảnh, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Âm thanh (âm nhạc, nhạc chuông, podcast, v.v)."</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Khác"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Tệp khác"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dữ liệu đã lưu trong bộ nhớ cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Ngắt kết nối bộ nhớ được chia sẻ"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Tháo thẻ SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Đang tháo thẻ"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Sắp hết dung lượng lưu trữ"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Một số chức năng hệ thống, chẳng hạn như đồng bộ hóa, có thể không hoạt động đúng. Hãy cố gắng giải phóng dung lượng bằng cách xóa hoặc bỏ ghim các mục, chẳng hạn như các ứng dụng hoặc nội dung đa phương tiện."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Đổi tên"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Gắn"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Đẩy ra"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Xóa và định dạng"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Xóa và định dạng thành bộ nhớ trong"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Kết nối máy tính USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Kết nối máy tính USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Kết nối dưới dạng"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Cho phép bạn truyền tệp phương tiện trên Windows hoặc sử dụng Ứng dụng truyền tệp của Android trên máy Mac (xem www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Máy ảnh (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Cho phép bạn chuyển ảnh bằng cách sử dụng phần mềm máy ảnh và chuyển bất kỳ tệp nào trên máy tính không hỗ trợ MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Cài đặt công cụ truyền tệp"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Cho phép các ứng dụng hỗ trợ MIDI hoạt động qua USB bằng phần mềm MIDI trên máy tính của bạn."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Người dùng khác"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Bộ nhớ của thiết bị"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Bộ nhớ di động"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> miễn phí (tổng cộng <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> đã được gắn"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Không thể gắn <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> đã được đẩy ra an toàn"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Không thể đẩy <xliff:g id="NAME">%1$s</xliff:g> ra an toàn"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> đã được định dạng"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Không thể định dạng <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Đổi tên bộ nhớ"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Sau khi định dạng, bạn có thể sử dụng <xliff:g id="NAME_0">^1</xliff:g> này trong các thiết bị khác. \n\nTất cả dữ liệu trên <xliff:g id="NAME_1">^1</xliff:g> này sẽ bị xóa. Trước tiên, hãy cân nhắc việc sao lưu. \n\n"<b>"Sao lưu ảnh và các phương tiện khác"</b>" \nDi chuyển tệp phương tiện sang bộ nhớ khác trên thiết bị này hoặc chuyển chúng sang máy tính bằng cáp USB. \n\n"<b>"Sao lưu ứng dụng"</b>" \nTất cả ứng dụng được lưu trữ trên <xliff:g id="NAME_6">^1</xliff:g> này sẽ bị gỡ cài đặt và dữ liệu ứng dụng sẽ bị xóa. Để lưu giữ các ứng dụng này, hãy di chuyển chúng sang bộ nhớ khác trên thiết bị này."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Khi bạn tháo <xliff:g id="NAME_0">^1</xliff:g> này, các ứng dụng được lưu trữ trên đó sẽ ngừng hoạt động, đồng thời các tệp phương tiện được lưu trữ trên đó sẽ không khả dụng cho tới khi lắp lại."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> này được định dạng để chỉ hoạt động trên thiết bị này. Nó sẽ không hoạt động trên bất kỳ thiết bị nào khác."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Thiết lập <xliff:g id="NAME">^1</xliff:g> của bạn"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Sử dụng làm bộ nhớ di động"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Để di chuyển ảnh và phương tiện khác giữa các thiết bị."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Sử dụng làm bộ nhớ trong"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Để chỉ lưu trữ nội dung trên thiết bị này, bao gồm cả ứng dụng và ảnh. Yêu cầu định dạng để ngăn bộ nhớ hoạt động với các thiết bị khác."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Định dạng làm bộ nhớ trong"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Việc này yêu cầu phải định dạng <xliff:g id="NAME_0">^1</xliff:g> để đảm bảo an toàn. \n\nSau khi định dạng, <xliff:g id="NAME_1">^1</xliff:g> này sẽ chỉ hoạt động trong thiết bị này. \n\n"<b>"Định dạng sẽ xóa tất cả dữ liệu hiện được lưu trữ trên <xliff:g id="NAME_2">^1</xliff:g>."</b>" Để tránh mất dữ liệu, hãy cân nhắc việc sao lưu."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Xóa và định dạng"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Đang định dạng <xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Không tháo <xliff:g id="NAME">^1</xliff:g> khi đang định dạng."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Chuyển dữ liệu sang bộ nhớ mới"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Bạn có thể di chuyển ảnh, tệp và dữ liệu ứng dụng sang <xliff:g id="NAME">^1</xliff:g> mới này. \n\nQuá trình di chuyển mất khoảng <xliff:g id="TIME">^2</xliff:g> và sẽ giải phóng <xliff:g id="SIZE">^3</xliff:g> trên bộ nhớ trong. Một số ứng dụng sẽ không hoạt động khi đang di chuyển."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Di chuyển ngay bây giờ"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Di chuyển sau"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Di chuyển dữ liệu ngay bây giờ"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Quá trình di chuyển mất khoảng <xliff:g id="TIME">^1</xliff:g>. Di chuyển sẽ giải phóng <xliff:g id="SIZE">^2</xliff:g> bộ nhớ trong."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Di chuyển"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Đang di chuyển dữ liệu..."</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Trong khi di chuyển: \n• Không tháo <xliff:g id="NAME">^1</xliff:g>. \n• Một số ứng dụng sẽ không hoạt động chính xác. \n• Luôn sạc thiết bị."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> đã sẵn sàng"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> của bạn đã sẵn sàng để sử dụng với ảnh và các phương tiện khác."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> mới của bạn đang hoạt động. \n\nĐể di chuyển ảnh, tệp và dữ liệu ứng dụng sang thiết bị này, hãy vào Cài đặt &gt; Bộ nhớ."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Di chuyển <xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Di chuyển <xliff:g id="APP">^1</xliff:g> và dữ liệu ứng dụng sang <xliff:g id="NAME_0">^2</xliff:g> sẽ chỉ mất vài phút. Bạn sẽ không thể sử dụng ứng dụng cho tới khi hoàn tất di chuyển. \n\nKhông tháo <xliff:g id="NAME_1">^2</xliff:g> trong khi di chuyển."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Đang di chuyển <xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Không tháo <xliff:g id="NAME">^1</xliff:g> trong khi di chuyển. \n\nỨng dụng <xliff:g id="APP">^2</xliff:g> trên thiết bị này sẽ không khả dụng cho tới khi hoàn tất di chuyển."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Hủy di chuyển"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Tình trạng pin"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Mức pin"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Đang khôi phục cài đặt APN mặc định."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Đặt lại về mặc định"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Đặt lại cài đặt APN mặc định đã hoàn tất."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Đã đặt lại cài đặt mạng"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Điều 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="4874737348054213767">"Đặ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="reset_network_complete_toast" msgid="787829973559541880">"Cài đặt mạng đã được đặt lại"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Đặt lại thiết bị"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Đặt lại về dữ liệu gốc"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Xóa tất cả dữ liệu trên máy tính bảng"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Xóa tất cả dữ liệu trên điện thoại"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Xóa tất cả dữ liệu trên thẻ SD, chẳng hạn như nhạc hoặc ảnh"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Đặt lại máy tính bảng"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Đặt lại điện thoại"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Xóa tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn? Bạn không thể hoàn nguyên tác vụ này!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Xóa tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn? Bạn không thể hoàn tác thao tác này!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Xóa mọi thứ"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Bạn cần vẽ hình mở khóa để xác nhận thiết lập lại dữ liệu ban đầu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Không có tác vụ đặt lại nào được thực hiện vì dịch vụ Xóa hệ thống không khả dụng."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Đặt lại?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Khôi phục cài đặt gốc không khả dụng cho người dùng này"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Xóa bộ lưu trữ USB, xóa tất cả các tệp được lưu trữ ở đó? Bạn không thể hoàn nguyên tác vụ này!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Xóa thẻ SD, xóa tất cả các tệp được lưu trữ ở đó? Bạn không thể hoàn nguyên tác vụ này!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Xóa mọi thứ"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Bạn cần vẽ hình mở khóa để xác nhận rằng bạn muốn xóa bộ lưu trữ USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Bạn cần vẽ hình mở khóa để xác nhận rằng bạn muốn xóa thẻ SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Cài đặt cuộc gọi"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Thiết lập thư thoại, chuyển tiếp cuộc gọi, chờ cuộc gọi, Số gọi đến"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Dùng làm điểm truy cập Internet qua USB"</string>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Trợ giúp"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Mạng di động"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Gói dịch vụ di động"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Ứng dụng SMS mặc định"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Ứng dụng SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Thay đổi ứng dụng SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Sử dụng <xliff:g id="NEW_APP">%1$s</xliff:g> thay vì <xliff:g id="CURRENT_APP">%2$s</xliff:g> làm ứng dụng SMS của bạn?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Sử dụng <xliff:g id="NEW_APP">%s</xliff:g> làm ứng dụng SMS của bạn?"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Chế độ vị trí"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Sử dụng mạng GPS, Wi-Fi và di động để xác định vị trí"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Sử dụng mạng di động và Wi-Fi để xác định vị trí"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Sử dụng GPS để xác định vị trí của bạn"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Sử dụng GPS để xác định vị trí"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Đang quét"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Đang quét"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Quét Wi‑Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Cải thiện thông tin vị trí bằng cách cho phép các ứng dụng và dịch vụ quét tìm mạng Wi‑Fi ngay cả khi Wi‑Fi tắt"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Quét Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Cải thiện thông tin vị trí bằng cách cho phép các dịch vụ hệ thống quét tìm thiết bị Bluetooth, ngay cả khi Bluetooth tắt"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Vị trí mạng di động và Wi‑Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Cho phép ứng dụng dùng DV vị trí của Google để ước đoán vị trí nhanh hơn. Dữ liệu vị trí ẩn danh sẽ được thu thập và gửi tới Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Vị trí được xác định bằng Wi‑Fi"</string>
@@ -1150,11 +1195,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Mật khẩu đã được đặt"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Mã PIN đã được đặt"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Hình đã được đặt"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Bảo mật màn hình"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Sử dụng hình thiết bị của bạn để tiếp tục."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Nhập mã PIN thiết bị của bạn để tiếp tục."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Nhập mật khẩu thiết bị của bạn để tiếp tục."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Bảo mật thiết bị"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Thay đổi hình mở khóa"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Thay đổi mã PIN mở khóa"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Xác nhận hình đã lưu"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Thử lại:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Vẽ hình mở khóa"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nhấn vào Menu để được trợ giúp."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Thả ngón tay khi xong"</string>
@@ -1176,8 +1225,7 @@
     <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>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Quá nhiều lần không chính xác!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Hãy thử lại sau <xliff:g id="NUMBER">%d</xliff:g> giây."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Quá nhiều lần thử sai. Hãy thử lại sau <xliff:g id="NUMBER">%d</xliff:g> giây."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Ứng dụng chưa được cài đặt trên điện thoại của bạn."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Quản lý ứng dụng"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Quản lý và xóa ứng dụng đã cài đặt"</string>
@@ -1228,6 +1276,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sắp xếp theo kích thước"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Hiển thị dịch vụ đg.chạy"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Hiển thị quá trình đã được lưu trong bộ nhớ cache"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Ứng dụng khẩn cấp"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Đặt lại tùy chọn ứng dụng"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Đặt lại tùy chọn ứng dụng?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Thao tác này sẽ đặt lại tất cả tùy chọn cho:\n\n "<li>"Ứng dụng bị tắt"</li>\n" "<li>"Thông báo ứng dụng bị tắt"</li>\n" "<li>"Ứng dụng mặc định cho các tác vụ"</li>\n" "<li>"Giới hạn dữ liệu nền cho ứng dụng"</li>\n" "<li>"Bất kỳ giới hạn về quyền nào"</li>\n\n" Bạn sẽ không mất bất kỳ dữ liệu ứng dụng nào."</string>
@@ -1299,6 +1348,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Hoạt động của ứng dụng"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Ðang chạy"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Chưa bao giờ được sử dụng)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Không có Ứng dụng mặc định."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Sử dụng bộ nhớ"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Xem dung lượng lưu trữ mà các ứng dụng sử dụng"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Các dịch vụ đang hoạt động"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Thông tin về máy tính bảng"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Thông tin điện thoại"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Thông tin pin"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Chạy nhanh"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Đặt phím tắt để chạy ứng dụng"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Gán ứng dụng"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Không có lối tắt nào"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Tìm kiếm + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Xóa"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Lối tắt của bạn cho <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) sẽ bị xóa."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Hủy"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Ứng dụng"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Lối tắt"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Nhập văn bản"</string>
     <string name="input_method" msgid="5434026103176856164">"Phương thức nhập"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Bàn phím hiện tại"</string>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Giữ tất cả các gói HCI bluetooth trong một tệp"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Mở khóa OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Cho phép mở khóa trình khởi động"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Nhập mã PIN của bạn"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Nhập mã PIN thiết bị của bạn để bật tính năng mở khóa OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Cho phép mở khóa OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"CẢNH BÁO: Tính năng Bảo vệ thiết bị sẽ không hoạt động trên thiết bị này trong khi bạn bật cài đặt này."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Kích cỡ tải trình ghi"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Chọn k.cỡ Trình ghi/lần tải n.ký"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Cho phép vị trí mô phỏng"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Cho phép vị trí mô phỏng"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Cho phép kiểm tra thuộc tính của chế độ xem"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Mạng"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Chứng nhận hiển thị không dây"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Bật ghi nhật ký chi tiết Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Chuyển vùng Wi‑Fi tích cực sang mạng DĐ"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Luôn cho phép quét chuyển vùng Wi‑Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Sử dụng ứng dụng DHCP cũ"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Hiển thị tùy chọn chứng nhận hiển thị không dây"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Tăng mức ghi nhật ký Wi‑Fi, hiển thị mỗi SSID RSSI trong bộ chọn Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Khi được bật, Wi‑Fi sẽ tích cực hơn trong việc chuyển vùng kết nối dữ liệu sang mạng di động khi tín hiệu Wi‑Fi yếu"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Cho phép/Không cho phép quét chuyển vùng Wi‑Fi dựa trên lưu lượng truy cập dữ liệu có tại giao diện"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Kích cỡ tải trình ghi"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Chọn k.cỡ Trình ghi/lần tải n.ký"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Chọn cấu hình USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Chọn cấu hình USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Cho phép vị trí mô phỏng"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Cho phép vị trí mô phỏng"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Cho phép kiểm tra thuộc tính của chế độ xem"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Sử dụng ứng dụng DHCP từ Lollipop thay vì ứng dụng DHCP mới của Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Cho phép gỡ lỗi USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Gỡ lỗi USB chỉ dành cho mục đích phát triển. Hãy sử dụng tính năng này để sao chép dữ liệu giữa máy tính và thiết bị của bạn, cài đặt ứng dụng trên thiết bị của bạn mà không thông báo và đọc dữ liệu nhật ký."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Thu hồi quyền truy cập gỡ lỗi USB từ tất cả máy tính mà bạn đã ủy quyền trước đó?"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Đỏ tươi"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> cần:"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Vì ứng dụng đang che khuất yêu cầu cấp quyền, Cài đặt không thể xác minh câu trả lời của bạn."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Nếu bạn bật <xliff:g id="SERVICE">%1$s</xliff:g>, thiết bị của bạn sẽ không sử dụng khóa màn hình để cải tiến việc mã hóa dữ liệu."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Vì bạn đã bật dịch vụ trợ năng, thiết bị của bạn sẽ không sử dụng khóa màn hình để cải tiến việc mã hóa dữ liệu."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Vì bật <xliff:g id="SERVICE">%1$s</xliff:g> ảnh hưởng đến mã hóa dữ liệu, bạn cần phải xác nhận hình của mình."</string>
@@ -1702,14 +1750,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Số liệu thống kê về quy trình"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Số liệu thống kê chi tiết về các quy trình đang chạy"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Mức sử dụng bộ nhớ"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Ứng dụng <xliff:g id="TYPE">%1$s</xliff:g> qua <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"Đã sử dụng <xliff:g id="USEDRAM">%1$s</xliff:g>/<xliff:g id="TOTALRAM">%2$s</xliff:g> trong hơn <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Nền"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Nền trước"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Đã lưu trong bộ nhớ Cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Bộ nhớ thiết bị hiện tại là <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Sử dụng RAM trung bình"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Sử dụng RAM tối đa"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Hệ điều hành Android"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Gốc"</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">"Bộ nhớ cache"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Sử dụng RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Sử dụng RAM (nền)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Thời gian chạy"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Quá trình"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Dịch vụ"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Thời lượng"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Chi tiết bộ nhớ"</string>
@@ -1726,6 +1780,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 giờ"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 ngày"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Hiển thị hệ thống"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Ẩn hệ thống"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Sử dụng Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Kiểu trạng thái"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Nền"</string>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Cài đặt mặc định dưới đây ghi đè cài đặt ứng dụng"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Cài đặt mặc định"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Công cụ mặc định"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Đặt công cụ tổng hợp tiếng nói đã được sử dụng cho văn bản nói"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Đặt công cụ tổng hợp giọng nói được sử dụng cho văn bản nói"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Tốc độ tiếng nói"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Tốc độ đọc văn bản"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Độ cao"</string>
@@ -1822,7 +1877,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Dựa trên phần cứng"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Chỉ phần mềm"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Không có thông tin đăng nhập cho người dùng này"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Bạn cần vẽ hình mở khóa của mình để xác nhận cài đặt thông tin xác thực."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <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>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Sao lưu dữ liệu của tôi"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sao lưu dữ liệu ứng dụng, mật khẩu Wi-Fi và các cài đặt khác vào máy chủ Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Sao lưu tài khoản"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Hiện không có tài khoản nào lưu trữ dữ liệu được sao lưu"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Bao gồm dữ liệu ứng dụng"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Tự động khôi phục"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Khi cài đặt lại một ứng dụng, khôi phục dữ liệu và cài đặt đã sao lưu"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Dịch vụ sao lưu không hoạt động."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tùy chọn này do chính sách thiết bị của bạn đặt."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"MK sao lưu của m.tính"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Sao lưu toàn bộ tới máy tính hiện không được bảo vệ"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Chạm để thay đổi hoặc xóa mật khẩu dành cho bộ sao lưu toàn bộ tới máy tính"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Tỷ lệ hình động chuyển đổi"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"T.lệ th.lượng tr.tạo h.đ"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Mô phỏng màn hình phụ"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Chế độ nhiều cửa sổ"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Nhiều hoạt động trên màn hình cùng một lúc."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Bật chế độ nhiều cửa sổ?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"CẢNH BÁO: Đây là tính năng mang tính thử nghiệm cao cho phép nhiều hoạt động trên màn hình cùng một lúc thông qua giao diện người dùng ứng dụng Gần đây. Một số ứng dụng có thể bị lỗi hoặc không hoạt động đúng cách khi được sử dụng với tính năng này."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Ứng dụng"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Không tiếp tục các hoạt động"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Hủy mọi hoạt động ngay khi người dùng rời khỏi"</string>
@@ -2195,7 +2251,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Người dùng"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Tiểu sử bị hạn chế"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Thêm người dùng mới?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Bạn có thể chia sẻ thiết bị này với người khác bằng cách tạo thêm người dùng. Mỗi người dùng có không gian riêng của mình. Họ có thể tùy chỉnh không gian đó với ứng dụng, hình nền riêng của mình, v.v.. Người dùng cũng có thể điều chỉnh các cài đặt thiết bị có ảnh hưởng đến tất cả mọi người, chẳng hạn như Wi‑Fi.\n\nKhi bạn thêm người dùng mới, người dùng đó cần thiết lập không gian của mình.\n\nMọi người dùng đều có thể cập nhật ứng dụng cho tất cả người dùng khác."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Bạn có thể chia sẻ thiết bị này với người khác bằng cách tạo thêm người dùng. Mỗi người dùng có không gian riêng của mình. Họ có thể tùy chỉnh không gian đó với ứng dụng, hình nền... riêng của mình. Người dùng cũng có thể điều chỉnh các cài đặt thiết bị có ảnh hưởng đến tất cả mọi người, chẳng hạn như Wi‑Fi.\n\nKhi bạn thêm người dùng mới, người dùng đó cần thiết lập không gian của họ.\n\nMọi người dùng đều có thể cập nhật ứng dụng cho tất cả người dùng khác."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Khi bạn thêm người dùng mới, người dùng đó cần thiết lập không gian của mình.\n\nMọi người dùng đều có thể cập nhật ứng dụng cho tất cả người dùng khác."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Thiết lập người dùng ngay bây giờ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Đảm bảo người đó có mặt để sử dụng thiết bị và thiết lập không gian của mình"</string>
@@ -2226,13 +2282,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Xóa phiên khách?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Tất cả ứng dụng và dữ liệu trong phiên này sẽ bị xóa."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Xóa"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Cho phép gọi điện thoại"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Cho phép gọi điện thoại và nhắn tin SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Bật cuộc gọi điện thoại"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Bật cuộc gọi điện thoại và SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Xóa người dùng"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Cho phép gọi điện thoại?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Bạn muốn bật cuộc gọi điện thoại?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Nhật ký cuộc gọi sẽ được chia sẻ với người dùng này."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Cho phép gọi điện thoại và nhắn tin SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Nhật ký cuộc gọi và tin nhắn SMS sẽ được chia sẻ với người dùng này."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Bạn muốn bật cuộc gọi điện thoại và SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Nhật ký cuộc gọi và tin nhắn SMS sẽ được chia sẻ với người dùng này."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Cho phép ứng dụng và nội dung"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Ứng dụng có hạn chế"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Mở rộng cài đặt cho ứng dụng"</string>
@@ -2283,8 +2339,8 @@
     <string name="user_rename" msgid="8523499513614655279">"ĐỔI TÊN"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Đặt hạn chế ứng dụng"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Do <xliff:g id="APP">%1$s</xliff:g> kiểm soát"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ứng dụng này không được hỗ trợ trong các tiểu sử bị hạn chế"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ứng dụng này có thể truy cập tài khoản của bạn"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Ứng dụng này có thể truy cập tài khoản của bạn. Do <xliff:g id="APP">%1$s</xliff:g> kiểm soát"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi và Di động"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Cho phép sửa đổi cài đặt Di động và Wi‑Fi"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi kết nối mạng"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tin nhắn văn bản nhắn tin tin nhắn nhắn tin"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"di động điện thoại nhà cung cấp không dây dữ liệu 4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"gọi điện qua Wi-Fi"</string>
     <string name="keywords_home" msgid="3626170808219458848">"trình chạy"</string>
     <string name="keywords_display" msgid="6709007669501628320">"màn hình màn hình cảm ứng"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"làm mờ màn hình màn hình cảm ứng pin"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"làm mờ màn hình màn hình cảm ứng pin"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"nền cá nhân hóa tùy chỉnh màn hình"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"chủ đề tối chế độ ban đêm màn hình mờ chuyển đổi độ sáng"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"nền cá nhân hóa tùy chỉnh màn hình"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"kích thước văn bản"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"chiếu"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"truyền dự án"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"dung lượng đĩa ổ đĩa cứng thiết bị sử dụng"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"phí sử dụng năng lượng"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"chính tả từ điển kiểm tra chính tả tự động sửa"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"tài khoản"</string>
     <string name="keywords_users" msgid="4673901601478559100">"hạn chế hạn chế bị hạn chế"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"sửa văn bản sửa âm thanh rung tự động ngôn ngữ cử chỉ đề xuất đề xuất chủ đề từ xúc phạm nhập biểu tượng cảm xúc quốc tế"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"đặt lại tùy chọn về mặc định"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"mặc định ứng dụng trong trường hợp khẩn cấp"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"hệ thống ứng dụng tải xuống ứng dụng"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"bảo mật giấy phép ứng dụng"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"ứng dụng mặc định"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"trượt mật khẩu hình mẫu mã pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Thiết lập thẻ NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Ghi"</string>
@@ -2386,11 +2449,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Âm lượng báo thức"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Âm lượng chuông"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Âm lượng thông báo"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Gián đoạn"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Khi cuộc gọi và thông báo đến"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Luôn cho phép gián đoạn"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Chỉ cho phép các gián đoạn ưu tiên"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Không cho phép gián đoạn"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Chỉ cho phép ưu tiên"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Quy tắc tự động"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Chỉ ưu tiên"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Chỉ báo thức"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Không có gián đoạn nào"</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="ringtone_title" msgid="5379026328015343686">"Nhạc chuông điện thoại"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Nhạc chuông thông báo mặc định"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Đồng thời rung khi có cuộc gọi"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Rung"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Quyền quy cập thông báo"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ứng dụng không thể đọc thông báo"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d ứng dụng có thể đọc thông báo"</item>
-    <item quantity="other" msgid="980049191810249052">"%d ứng dụng có thể đọc thông báo"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d ứng dụng có thể đọc thông báo</item>
+      <item quantity="one">%d ứng dụng có thể đọc thông báo</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Không có trình xử lý thông báo nào được cài đặt."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Bật <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> có thể đọc tất cả thông báo được đăng bởi hệ thống hoặc bất kỳ ứng dụng đã cài đặt nào. Thông báo đó có thể bao gồm thông tin cá nhân như tên liên hệ và văn bản thông báo được gửi tới bạn. Trình xử lý cũng sẽ có thể loại bỏ những thông báo này hoặc chạm vào nút tác vụ trong các thông báo đó."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Trình cung cấp điều kiện"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Không có ứng dụng nào cung cấp điều kiện"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d ứng dụng cung cấp điều kiện"</item>
-    <item quantity="other" msgid="358057362115673258">"%d ứng dụng cung cấp điều kiện"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Không có trình cung cấp điều kiện nào được cài đặt."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Bật <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> có thể thêm điều kiện thoát vào chế độ Không làm phiền."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Chặn"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Chặn tất cả"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Không bao giờ hiển thị thông báo từ ứng dụng này"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Mức độ ưu tiên"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Hiển thị thông báo ở đầu danh sách và tiếp tục hiển thị khi đặt thiết bị thành chỉ các gián đoạn ưu tiên"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Nhạy cảm"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Khi thiết bị bị khóa, hãy ẩn mọi nội dung nhạy cảm khỏi thông báo của ứng dụng này"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Coi là ưu tiên"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Bật âm cho thông báo của ứng dụng này khi Không làm phiền được đặt thành Chỉ ưu tiên"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Cho phép xem nhanh"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Cho phép ứng dụng này nhấn mạnh các thông báo nhất định bằng cách trượt nhanh chúng vào chế độ xem trên màn hình hiện tại"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ẩn nội dung nhạy cảm"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Khi thiết bị bị khóa, hãy ẩn nội dung có thể tiết lộ thông tin cá nhân trong thông báo của ứng dụng này"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bị chặn"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Mức độ ưu tiên"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Nhạy cảm"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Xong"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Cho đến khi bạn tắt tính năng này"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Gián đoạn ưu tiên"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Thời gian ngừng hoạt động"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Ngày"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Không có"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Được phép gián đoạn"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Chỉ ưu tiên"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Không có"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Tự động hóa"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Tự động bật"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Tên quy tắc"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Thêm quy tắc"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Xóa quy tắc"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Xóa quy tắc \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Xóa"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Loại quy tắc"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Không xác định"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Quy tắc định cấu hình"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Quy tắc lên lịch"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Không tìm thấy quy tắc."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Ngày"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Không có"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Hàng ngày"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Không bao giờ"</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> đến <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Cuộc gọi"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Tin nhắn"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Cuộc gọi/tin nhắn từ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Bất kỳ ai"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Chỉ các liên hệ"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Chỉ các liên hệ có gắn dấu sao"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Sự kiện và lời nhắc"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Cảnh báo luôn là gián đoạn ưu tiên"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Báo thức"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Lời nhắc"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Sự kiện"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Người gọi được chọn"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Lặp lại người gọ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 chế độ này"</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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Buổi tối cuối tuần"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Thời gian bắt đầu"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Thời gian kết thúc"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngày tiếp theo"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hoặc mọi báo thức trước đây"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngày tiếp theo hoặc mọi báo thức trước đây"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngày tiếp theo"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Gián đoạn"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Khi cuộc gọi và thông báo đến"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Bạn muốn bị gián đoạn lúc nào?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Trong bao lâu?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Luôn cho phép gián đoạn"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"tắt,tất cả,mọi thứ"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Chỉ cho phép các gián đoạn ưu tiên"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Chỉ cho phép báo thức"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Không cho phép gián đoạn"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Không xác định"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> phút</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> phút</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> giờ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> giờ</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Đổi sang chỉ các thông báo ưu tiên không xác định"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">Đổi sang chỉ các thông báo ưu tiên trong <xliff:g id="DURATION">%1$d</xliff:g> phút cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Đổi sang chỉ các thông báo ưu tiên trong một phút cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">Đổi sang chỉ các thông báo ưu tiên trong <xliff:g id="DURATION">%1$d</xliff:g> giờ (cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Đổi sang chỉ các thông báo ưu tiên trong một giờ cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Đổi sang chỉ báo thức không giới hạn"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="other">Đổi sang chỉ báo thức trong <xliff:g id="DURATION">%1$d</xliff:g> phút (cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Đổi sang chỉ báo thức trong một phút cho đến <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">Đổi sang chỉ báo thức trong <xliff:g id="DURATION">%1$d</xliff:g> giờ cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Đổi sang chỉ báo thức trong một giờ cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Đổi sang không làm gián đoạn không xác định"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">Đổi sang không làm gián đoạn trong <xliff:g id="DURATION">%1$d</xliff:g> phút (cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Đổi sang không làm gián đoạn trong một phút cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">Đổi sang không làm gián đoạn trong <xliff:g id="DURATION">%1$d</xliff:g> giờ cho đến <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Đổi sang không làm gián đoạn trong một giờ cho đến <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Đổi sang luôn làm gián đoạn"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"vĩnh viễn"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Thông báo ứng dụng"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Cài đặt thông báo"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Gửi phản hồi về thiết bị này"</string>
@@ -2512,4 +2629,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Thông tin IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Thông tin liên quan đến IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Khe cắm<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Khởi chạy theo mặc định"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> đã được sử dụng trong <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Liên kết miền"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Mở URL miền"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Cho phép ứng dụng mở trực tiếp URL miền"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"URL miền được hỗ trợ"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Cài đặt mặc định khác"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> đã được sử dụng trong <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"bộ nhớ trong"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"bộ nhớ ngoài"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Bộ nhớ trong"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Bộ nhớ ngoài"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Mức sử dụng dữ liệu ứng dụng"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> được sử dụng từ <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Bộ nhớ đã sử dụng"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Bật"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Chặn"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Nhạy cảm"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Mức độ ưu tiên"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Mức độ ưu tiên và nhạy cảm"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> quyền được cấp</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> quyền được cấp</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">Đã cấp <xliff:g id="COUNT_2">%d</xliff:g> trong <xliff:g id="COUNT_3">%d</xliff:g> quyền</item>
+      <item quantity="one">Đã cấp <xliff:g id="COUNT_0">%d</xliff:g> trong số <xliff:g id="COUNT_1">%d</xliff:g> quyền</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Đã đặt một số mặc định"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Chưa đặt mặc định"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Tất cả ứng dụng"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Đã bật"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Cá nhân"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Cơ quan"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Đã chặn"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Mức độ ưu tiên"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Nhạy cảm"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Có URL miền"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Bị tắt bởi quản trị viên"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Nâng cao"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Ứng dụng không xác định"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Chọn hồ sơ"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Giấy phép ứng dụng"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Đã cấp quyền truy cập bổ sung cho <xliff:g id="COUNT_0">%d</xliff:g> trong số <xliff:g id="COUNT_1">%d</xliff:g> ứng dụng"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Đã cho phép <xliff:g id="COUNT_0">%d</xliff:g> trong số <xliff:g id="COUNT_1">%d</xliff:g> ứng dụng"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"URL miền"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Không mở bất kỳ URL miền nào"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Mở \'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Mở \'<xliff:g id="DOMAIN">%s</xliff:g>\' và các URL có liên quan"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ứng dụng có thể mở URL miền của mình</item>
+      <item quantity="one">Một ứng dụng có thể mở URL miền của mình</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Không nhận dạng được"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Ứng dụng mặc định"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Ứng dụng trình duyệt"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Không có trình duyệt mặc định"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Mặc định)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Bộ nhớ Apps"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index c53a0e9..9d68298 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"按钮"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"将麦克风静音或取消静音"</item>
     <item msgid="1148142988678569310">"投影媒体"</item>
     <item msgid="9130014005474445273">"激活VPN"</item>
+    <item msgid="1165192162975045562">"写入壁纸"</item>
+    <item msgid="7129487923652967258">"辅助结构"</item>
+    <item msgid="1069023208100114540">"辅助屏幕截图"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"将麦克风静音或取消静音"</item>
     <item msgid="5906017727368097853">"投影媒体"</item>
     <item msgid="2486614710846178542">"激活VPN"</item>
+    <item msgid="5586547561693629602">"写入壁纸"</item>
+    <item msgid="32794179825485062">"辅助结构"</item>
+    <item msgid="7872852746938272552">"辅助屏幕截图"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"低"</item>
     <item msgid="4212263919458209842">"严重不足"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"关闭"</item>
-    <item msgid="5656544177755411222">"有限打扰"</item>
-    <item msgid="8735337502532332056">"零打扰"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"正常"</item>
     <item msgid="866544120205026771">"中等"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"粉红色"</item>
     <item msgid="6131821495505931173">"红色"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP（媒体传输协议）"</item>
+    <item msgid="8856820259201251036">"PTP（图片传输协议）"</item>
+    <item msgid="216135047298423770">"RNDIS（USB以太网）"</item>
+    <item msgid="2686051673589572111">"音频来源"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d6b81af..c368ea8 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"允许"</string>
     <string name="deny" msgid="6947806159746484865">"拒绝"</string>
     <string name="device_info_default" msgid="7847265875578739287">"未知"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"只需 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 步操作即可进入开发者模式。"</item>
-    <item quantity="other" msgid="6722953419953594148">"只需 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 步操作即可进入开发者模式。"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">现在只需再执行 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 步操作即可进入开发者模式。</item>
+      <item quantity="one">现在只需再执行 <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 步操作即可进入开发者模式。</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"您现在处于开发者模式！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"您已处于开发者模式，无需进行此操作。"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"无线和网络"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"关闭通过IMS发送短信的功能"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"需要打开 IMS 注册"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"需要关闭IMS注册"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"开启 VoLTE 配置标记"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"关闭 VoLTE 配置标记"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"打开 LTE RAM 转储"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"关闭 LTE RAM 转储"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"查看SIM卡地址簿"</string>
@@ -94,7 +96,7 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"正在充电"</string>
     <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"正在通过交流电源充电"</string>
     <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"正在通过USB充电"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"正在进行无线充电"</string>
+    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"正在无线充电"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"未在充电"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"未在充电"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"电量充足"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"已连接"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已连接（无手机）"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已连接（无媒体）"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"已连接（无消息权限）"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已连接（没有手机或媒体信号）"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"已断开连接"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在断开连接..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"正在连接..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"正在配对..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"未命名的蓝牙设备"</string>
     <string name="progress_scanning" msgid="192587958424295789">"正在搜索"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"未在附近找到蓝牙设备。"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"显示收到的文件"</string>
     <string name="device_picker" msgid="4978696506172252813">"选择蓝牙设备"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"某个应用想要打开蓝牙。"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"某个应用想要开启此设备的蓝牙功能。"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内可检测到您的平板电脑。"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内可检测到您的手机。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"某个应用想让其他蓝牙设备检测到您的平板电脑。之后，您可以在“蓝牙”设置中更改此设置。"</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"取消"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"继续"</string>
     <string name="okay" msgid="1997666393121016642">"确定"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"是"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"否"</string>
-    <string name="forget" msgid="7267115980248732932">"取消保存"</string>
+    <string name="forget" msgid="1400428660472591263">"取消保存"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"改善面部匹配"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"真人判断"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"解锁时需要眨眼"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密码"</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="3453670509485083962">"添加"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"屏幕锁定"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"指纹设置"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"要使用指纹解锁屏幕或确认购买交易，您需要：\n\n✓ 设置您的备用屏幕锁定方式\n\n✓ 添加您的指纹"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"寻找传感器"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"您可以在手机背面找到指纹传感器。"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"我们开始吧！"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"将您的手指放在指纹传感器上，感觉到振动后移开。"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"很好！现在重复此操作。"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"将同一手指放在指纹传感器上，感觉到振动后移开。"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指纹已添加！"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要您看见此图标，就可以使用指纹进行身份验证或对购买交易进行授权。"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"添加"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"请插上充电器，然后重试。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"没有锁屏PIN码或密码"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您需要先设置锁屏PIN码或密码才能开始加密。"</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"您需要绘制解锁图案，以确认对您的设备进行加密。"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"要加密吗？"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"加密操作无法撤消，如果您中断该过程，则会丢失数据。加密过程需要1小时或更长时间，在此期间，平板电脑会重新启动数次。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"加密操作无法撤消，如果您中断该过程，则会丢失数据。加密过程需要1小时或更长时间，在此期间，手机会重新启动数次。"</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"人脸解锁"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"安全性低、实验性"</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_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="current_screen_lock" msgid="4104091715420072219">"当前屏幕锁定设置"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"设备保护功能将无法再发挥作用。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"由于管理员、加密策略或凭据存储的要求，您无法使用此选项"</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_biometric_weak" msgid="3008473624490350142">"人脸解锁"</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_password" msgid="1203938057264146610">"密码"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"设置了屏幕锁定后，您还可以在“设置”&gt;“安全”中设置指纹。"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"关闭屏幕锁定"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"删除解锁图案"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"移除解锁PIN码"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"密码必须包含至少 1 个字母。"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"密码必须包含至少 1 个数字。"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"密码必须包含至少 1 个符号。"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"密码必须包含至少 1 个字母。"</item>
-    <item quantity="other" msgid="8186027808415585970">"密码必须包含至少 %d 个字母。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"密码必须包含至少 1 个小写字母。"</item>
-    <item quantity="other" msgid="2693910942679679225">"密码必须包含至少 %d 个小写字母。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"密码必须包含至少 1 个大写字母。"</item>
-    <item quantity="other" msgid="3030801209112209245">"密码必须包含至少 %d 个大写字母。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"密码必须包含至少 1 个数字。"</item>
-    <item quantity="other" msgid="4703982391407595924">"密码必须包含至少 %d 个数字。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"密码必须包含至少 1 个特殊符号。"</item>
-    <item quantity="other" msgid="1221290525051187757">"密码必须包含至少 %d 个特殊符号。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"密码至少应包含1个非字母字符。"</item>
-    <item quantity="other" msgid="3952508584649046404">"密码至少应包含%d个非字母字符。"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">密码应至少包含 %d 个字母。</item>
+      <item quantity="one">密码应至少包含 1 个字母。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">密码应至少包含 %d 个小写字母。</item>
+      <item quantity="one">密码应至少包含 1 个小写字母。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">密码应至少包含 %d 个大写字母。</item>
+      <item quantity="one">密码应至少包含 1 个大写字母。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">密码应至少包含 %d 个数字。</item>
+      <item quantity="one">密码应至少包含 1 个数字。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">密码应至少包含 %d 个特殊符号。</item>
+      <item quantity="one">密码应至少包含 1 个特殊符号。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">密码应至少包含 %d 个非字母字符。</item>
+      <item quantity="one">密码应至少包含 1 个非字母字符。</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"设备管理器不允许使用最近用过的密码。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"禁止使用以升序、降序或重复序列进行排列的一串数字"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"确定"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"配对"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"配对"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"取消"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"配对之后，所配对的设备将可以在建立连接后访问您的通讯录和通话记录。"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"无法与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”进行配对。"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN码或配对密钥不正确，无法与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对。"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"无法与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”进行通信。"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 已拒绝配对。"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"无法连接到<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"为了提高位置信息的精确度，应用和服务会扫描蓝牙设备（即使蓝牙功能已关闭）。您可以在<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_specific_profiles_title" msgid="6952214406025825164">"连接到..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"媒体音频"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"手机音频"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"文件传输"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"输入设备"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"互联网连接"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"共享联系人"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"用于共享联系人"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"共享互联网连接"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"消息权限"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"已连接到媒体音频"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已连接到手机音频"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已连接到文件传输服务器"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"已连接到地图"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"未连接到文件传输服务器"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"已连接到输入设备"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"用于媒体音频"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"用于手机音频"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用于文件传输"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"用于输入"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"用于连接互联网"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"用于地图"</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_assistant_title" msgid="2553267316621598101">"WLAN助手"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"已连接（通过 WLAN 助手）"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"投射屏幕"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"正在关闭WLAN…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"出错"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"正处于飞行模式下"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"扫描不到网络"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"网络通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"有可用的公共网络时通知我"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"避开状况不佳的网络"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"仅在WLAN互联网连接状况良好时使用WLAN网络"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"仅使用互联网连接情况良好的网络"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"随时都可扫描"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"始终允许扫描网络"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"允许Google的位置信息服务和其他应用扫描网络（即使WLAN已关闭）"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"自动使用开放的 WLAN 网络"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"允许 WLAN 助手自动连接到评定为优质的开放网络上"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"选择助手"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安装证书"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"为了提高位置信息精确度以及其他目的，Google 和其他应用可扫描附近的网络（在关闭了WLAN时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"应用可扫描附近的网络（在关闭了WLAN时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"为了提高位置信息的精确度，应用和服务会扫描 WLAN 网络（即使 WLAN 已关闭）。您可以在<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>扫描设置<xliff:g id="LINK_END_1">LINK_END</xliff:g>中更改此设置。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"不再显示"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"在休眠状态下保持WLAN网络连接"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"在休眠状态下保持WLAN连接"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"添加其他网络"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自动设置 (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"要完成设置，您的平板电脑必须连接到WLAN网络。设置完毕后，您将可以在移动数据网络和WLAN网络之间切换。"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"高级选项"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"WLAN保护设置"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"正在启动 WPS..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"请按下您路由器上的WLAN保护设置按钮，它可能会标为“WPS”或包含此符号："</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"请按下您路由器上的 WLAN 保护设置按钮，它可能会标为“WPS”或标有此符号："</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"请在WLAN路由器上输入PIN码<xliff:g id="NUMBER">%1$s</xliff:g>。设置过程最多可能需要两分钟时间。"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS 已成功启动。正在连接网络..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"已连接到WLAN网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"配置 AP 频段"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"（未更改）"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"（未指定）"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"已保存"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 配置失败"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WLAN 连接失败"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"身份验证出现问题"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"不在范围内"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"未检测到任何互联网连接，因此不会自动重新连接。"</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_security_none" msgid="7985461072596594400">"无"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"使用此网络将无法访问互联网。仍要使用此网络吗？"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"对于此网络不再询问"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"连接"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"无法连接网络"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"取消保存"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK便携式WLAN热点"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>便携式WLAN热点"</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_mode_title" msgid="2164073796253284289">"通话偏好设置"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"WLAN 通话模式"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"首选 WLAN"</item>
+    <item msgid="5267397515594230396">"首选移动网络"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"开启“WLAN 通话”功能后，您的手机可根据您的偏好设置，通过 WLAN 网络或您的运营商网络通话（具体取决于哪个网络信号较强）。开启此功能之前，请先向您的运营商咨询收费情况及其他详情。"</string>
     <string name="home_settings" msgid="212375129455718176">"主屏幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"主题背景"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"浅色"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"深色"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"自动"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"要更新首选 SIM 卡吗？"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g>是此设备上唯一的 SIM 卡。您想将此 SIM 卡用于连接移动数据网络、通话或发送短信吗？"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM卡PIN码不正确，您现在必须联系运营商为您解锁设备。"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM卡PIN码不正确，您还有<xliff:g id="NUMBER">%d</xliff:g>次尝试机会。如果仍然失败，则必须联系运营商帮您解锁设备。"</item>
-    <item quantity="other" msgid="77103619544346451">"SIM卡PIN码不正确，您还有<xliff:g id="NUMBER">%d</xliff:g>次尝试机会。"</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM 卡 PIN 码不正确，您还可尝试 <xliff:g id="NUMBER_1">%d</xliff:g> 次。</item>
+      <item quantity="one">SIM 卡 PIN 码不正确，您还可尝试 <xliff:g id="NUMBER_0">%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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"应用（应用数据和媒体内容）"</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_dcim_usage" msgid="558887013613822577">"图片、视频"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"音频（音乐、铃声、播客等）"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"其他"</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="default" msgid="6915293408836853020">"卸载SD卡"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"装载"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"弹出"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"清空并格式化"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"清空并格式化内部存储设备"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB计算机连接"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB计算机连接"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"连接方式"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"可让您使用相机软件传输照片，并在不支持MTP的计算机上传输任何文件"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"安装文件传输工具"</string>
+    <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_external_title" msgid="2723851748972673696">"移动存储设备"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> 可用空间（共 <xliff:g id="TOTAL">%2$s</xliff:g>）"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g>已装载"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"无法装载<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="4161722509712992231">"无法安全弹出<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="8343688274191391889">"无法格式化<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"重命名存储设备"</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="3677827796634199714"><b>"当您弹出此<xliff:g id="NAME_0">^1</xliff:g>后，存储在其中的应用将会停止运行，而且存储在其中的媒体文件也将无法使用，除非您重新插入。"</b>\n\n"此<xliff:g id="NAME_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_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_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="1259216693690378749">"请勿在格式化过程中移除该<xliff:g id="NAME">^1</xliff:g>。"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"将数据移动到新的存储设备"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"您可以将自己的照片、文件和应用数据移动到这个新<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="5035719146373359329"><b>"该移动操作需要花费大约 <xliff:g id="TIME">^1</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="8641916179067596592">"在移动数据的过程中：\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_move_confirm_title" msgid="292782012677890250">"移动<xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"将<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="4288580957960820740">"请勿在移动过程中移除该<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="battery_status_title" msgid="9159414319574976203">"电池状态"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"电池电量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"重置网络设置"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"此操作会重置所有网络设置，包括：\n\n"<li>"WLAN"</li>\n<li>"移动数据网络"</li>\n<li>"蓝牙"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"重置设置"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"要重置所有网络设置吗？此操作无法撤消！"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"重置设置"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"要重置网络设置吗？"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"网络设置已重置"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"恢复设备出厂设置"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"恢复出厂设置"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板电脑上的所有数据"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手机上的所有数据"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"此操作会清除您平板电脑"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐户"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"此操作会清除您手机"<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除SD卡中的全部数据，例如音乐或照片"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"恢复平板电脑出厂设置"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"恢复手机出厂设置"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"要清除所有个人信息和下载的应用吗？请注意，此操作无法撤消！"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"要清空您的所有个人信息和下载的应用吗？此操作无法撤消！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部内容"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"您需要绘制解锁图案以确认要恢复出厂设置。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"“系统清除”服务不可用，因此未执行恢复出厂设置操作。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"要恢复出厂设置吗？"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"此用户无权恢复出厂设置"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"要清空USB存储设备（此操作会删除其中存储的全部文件）吗？请注意，此操作无法撤消！"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"要清空该SD卡（此操作会删除其中存储的全部文件）吗？请注意，此操作无法撤消！"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"清除全部内容"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"您需要绘制解锁图案以确认要清空USB存储设备。"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"您需要绘制解锁图案以确认要清空SD卡。"</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"帮助"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"移动网络"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"手机套餐"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"默认短信应用"</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_no_previous_dialog_text" msgid="602683880284921998">"要使用“<xliff:g id="NEW_APP">%s</xliff:g>”作为您的短信应用吗？"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置信息模式"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"使用GPS、WLAN和移动网络确定位置"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"使用WLAN和移动网络确定位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"使用GPS确定位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 确定位置"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"扫描"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"扫描"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WLAN 扫描"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"允许应用和服务扫描 WLAN 网络（即使 WLAN 已关闭），以便提高位置信息的精确度"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"蓝牙扫描"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"允许系统服务扫描蓝牙设备（即使蓝牙功能已关闭），以便提高位置信息的精确度"</string>
     <string name="location_network_based" msgid="6010456018401296590">"WLAN和移动网络位置信息"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允许应用使用Google位置信息服务更快地大致了解您所在的位置。系统将收集匿名位置数据并将其发送给Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"通过WLAN确定位置"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"屏幕安全保护"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"请绘制您的设备解锁图案，然后再继续。"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"请输入您的设备 PIN 码，然后再继续。"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"请输入您的设备密码，然后再继续。"</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_need_to_unlock" msgid="757935356911054465">"确认之前所设的图案"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"请重试："</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"绘制解锁图案"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"按 MENU 获得帮助。"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"完成后松开手指"</string>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"错误的尝试次数过多！"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g>秒后重试。"</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="manageapplications_settings_title" msgid="7041951105633616745">"管理应用"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和删除已安装的应用"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"存储空间使用情况"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"查看应用使用的存储空间"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在运行的服务"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板电脑信息"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手机信息"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"电池信息"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"快速启动"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"设置启动应用的键盘快捷键"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"分配给应用"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"无快捷键"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"搜索 + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"清除"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"会清除快捷键 <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>（<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>）。"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"确定"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"取消"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"应用"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"快捷方式"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"捕获单个文件中的所有蓝牙 HCI 包"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM 解锁"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"允许解锁引导加载程序"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"输入您的 PIN 码"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"输入您的设备 PIN 码即可启用 OEM 解锁"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"要允许 OEM 解锁吗？"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告：如果开启此设置，此设备上的设备保护功能将无法使用。"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"日志记录器缓冲区大小"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"选择每个日志缓冲区的日志记录器大小"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"允许模拟位置"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"允许模拟位置"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"启用视图属性检查功能"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"网络"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"无线显示认证"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"启用WLAN详细日志记录功能"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"主动从WLAN网络切换到移动数据网络"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"一律允许WLAN漫游扫描"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"使用旧版 DHCP 客户端"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"显示无线显示认证选项"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"提升WLAN日志记录级别（在WLAN选择器中显示每个SSID的RSSI）"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"开启此设置后，系统会在WLAN信号较弱时，主动将网络模式从WLAN网络切换到移动数据网络"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"根据接口中目前的数据流量允许/禁止WLAN漫游扫描"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"日志记录器缓冲区大小"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"选择每个日志缓冲区的日志记录器大小"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"选择USB配置"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"选择USB配置"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允许模拟位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允许模拟位置"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"启用视图属性检查功能"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"使用 Lollipop 的 DHCP 客户端，而不是新的 Android DHCP 客户端。"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"是否允许USB调试？"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB调试仅适用于开发工作。该功能可用于在您的计算机和设备之间复制数据、在您的设备上安装应用而不发送通知以及读取日志数据。"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"是否针对您之前授权的所有计算机撤消USB调试的访问权限？"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"紫红色"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"要启用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>需要："</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"由于某个应用遮挡了权限请求界面，因此“设置”应用无法验证您的回应。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您开启<xliff:g id="SERVICE">%1$s</xliff:g>，您的设备将无法使用屏幕锁定来增强数据加密。"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"由于您已开启无障碍服务，因此您的设备将无法使用屏幕锁定来增强数据加密。"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的解锁图案。"</string>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g>应用<xliff:g id="TIME">%2$s</xliff:g>内的统计信息"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"过去 <xliff:g id="TIMEDURATION">%3$s</xliff:g>内使用了 <xliff:g id="USEDRAM">%1$s</xliff:g>（共 <xliff:g id="TOTALRAM">%2$s</xliff:g>）"</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_memory_status" msgid="4251599550196193093">"设备内存当前状态：<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"内存平均使用率"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"内存最高使用率"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android 操作系统"</string>
+    <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_ram_use" msgid="976912589127397307">"内存使用量"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"内存使用量（后台）"</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>
     <string name="mem_details_title" msgid="6548392825497290498">"内存详情"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"隐藏系统进程"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"使用以下默认设置代替应用设置"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"默认设置"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"默认引擎"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"设置用于文字语音转换的语音合成引擎"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"设置用于文字转语音功能的语音合成引擎"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"语速"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"文字转换成语音后的播放速度"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音高"</string>
@@ -1822,7 +1877,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"您需要绘制解锁图案，以确认凭据安装操作。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"键入凭据存储的密码。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"当前密码："</string>
@@ -1847,12 +1901,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"备份我的数据"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"将应用数据、WLAN密码和其他设置备份到Google服务器"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"备份帐户"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"目前没有帐户存储备份数据"</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="5355557151569037197">"备份服务未启用。"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"这是由您的设备规范所设定的。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"桌面备份密码"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"桌面完整备份当前未设置密码保护"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"触摸可更改或删除用于桌面完整备份的密码"</string>
@@ -2024,6 +2076,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"过渡动画缩放"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"动画程序时长缩放"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"模拟辅助显示设备"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"多窗口模式"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"在一个屏幕上同时进行多项活动"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"要启用多窗口模式吗？"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"警告：这是一项高度实验性的功能，允许您通过“最近用过的应用”界面在一个屏幕上同时进行多项活动。使用此功能时，某些应用可能会崩溃或无法正常运行。"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"应用"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"不保留活动"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"用户离开后即销毁每个活动"</string>
@@ -2049,7 +2105,7 @@
     <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_sim_cards" msgid="6410498422797244073">"SIM 卡"</string>
     <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"移动网络"</string>
     <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"自动同步数据"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"自动同步个人帐户数据"</string>
@@ -2195,7 +2251,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="718192651887726259">"创建新用户之后，您将可以与其他人共享此设备。每位用户都会有自己的空间，其中可用来存储用户自己的应用、壁纸等内容。每位用户都可以调整WLAN等会影响到其他用户的设备设置。\n\n您添加新用户后，该用户必须设置自己的空间。\n\n任何用户均可为其他所有用户更新应用。"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"创建新用户之后，您将可以与其他人共享此设备。每位用户都会有自己的空间，可用来存储用户自己的应用、壁纸等内容。每位用户都可以调整 WLAN 等会影响到其他用户的设备设置。\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>
@@ -2226,13 +2282,13 @@
     <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="8310589470979488255">"允许接打电话"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"允许接打电话和收发短信"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"开启通话功能"</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="440218975766968124">"要允许接打电话吗？"</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_sms_confirm_title" msgid="188164598768941316">"要允许接打电话和收发短信吗？"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"将与此用户共享通话记录和短信记录。"</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="application_restrictions" msgid="8207332020898004394">"允许应用和内容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限应用"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展开应用设置"</string>
@@ -2283,8 +2339,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"受限个人资料无法使用此应用"</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">"WLAN和移动网络"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"允许修改WLAN和移动网络设置"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"蓝牙"</string>
@@ -2302,8 +2358,8 @@
     <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">"SIM 卡"</string>
+    <string name="sim_settings_title" msgid="6822745211458959756">"SIM 卡"</string>
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"SIM 卡已更改"</string>
     <string name="sim_cards_changed_message_summary" msgid="5452545583546944683">"触摸即可进行设置"</string>
@@ -2313,22 +2369,22 @@
     <string name="select_sim_for_data" msgid="2366081042162853044">"选择用于数据网络的 SIM 卡"</string>
     <string name="data_switch_started" msgid="2040761479817166311">"正在切换用于连接数据网络的 SIM 卡，这最多可能需要 1 分钟的时间…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"选择用于通话的 SIM 卡"</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_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_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_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_card_select_title" msgid="6668492557519243456">"选择 SIM 卡"</string>
     <string name="color_orange" msgid="4417567658855022517">"橙色"</string>
     <string name="color_purple" msgid="3888532466427762504">"紫色"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"尚未插入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_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>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"关闭网络名称广播"</string>
@@ -2349,13 +2405,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"WLAN网络连接"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"短信 信息 发短信 消息 发送消息"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"蜂窝网络 手机运营商 无线 移动网络 数据网络 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"Wi-Fi WLAN 呼叫 通话"</string>
     <string name="keywords_home" msgid="3626170808219458848">"启动器 桌面"</string>
     <string name="keywords_display" msgid="6709007669501628320">"屏幕 触摸屏"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"变暗 调暗 屏幕 触摸屏 电池"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"变暗 调暗 屏幕 触摸屏 电池"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 墙纸 个性化 自定义 显示 显示屏"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"深色主题背景 夜间模式 变暗 调暗 屏幕 反转亮度"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"背景 墙纸 个性化 自定义 显示 显示屏"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"字体大小"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"投影 投射"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"投影 投射"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"空间 磁盘 硬盘 设备 使用量 使用情况"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"耗电量 充电"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"拼写 字典 词典 拼写检查 自动更正"</string>
@@ -2372,6 +2430,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"帐户"</string>
     <string name="keywords_users" msgid="4673901601478559100">"限制 受限"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 文本 更正 声音 提示音 振动 自动 语言 手势 推荐 建议 主题 主题背景 令人反感的字词 输入 表情符号 国际 打字"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"重置 偏好设置 默认"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"紧急 在紧急情况下使用 应用 默认"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"应用 下载 应用程序 系统"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"应用 权限 安全"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"应用 默认"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑动 密码 图案 PIN码"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"设置WLAN NFC标签"</string>
     <string name="write_tag" msgid="8571858602896222537">"写入"</string>
@@ -2386,11 +2449,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"打扰"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"收到来电和通知时"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"一律允许打扰"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"仅允许优先打扰内容"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"禁止打扰"</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_option_important_interruptions" msgid="3903928008177972500">"仅限优先打扰"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"仅限闹钟"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"勿扰"</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="ringtone_title" msgid="5379026328015343686">"手机铃声"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"默认通知铃声"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"有来电时响铃并振动"</string>
@@ -2416,62 +2480,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"振动"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"通知使用权"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"应用无法读取通知"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d个应用可以读取通知"</item>
-    <item quantity="other" msgid="980049191810249052">"%d个应用可以读取通知"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d 个应用可以读取通知</item>
+      <item quantity="one">%d 个应用可以读取通知</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"未安装任何通知侦听器。"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"要向<xliff:g id="SERVICE">%1$s</xliff:g>授予此权限吗？"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"“<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>”将可读取系统或任何已安装的应用发布的任何通知（可能包括联系人姓名和别人发送给您的消息等个人信息），还可关闭这些通知或触摸其中的操作按钮。"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"条件提供程序"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"没有任何应用可提供条件"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d个应用可提供条件"</item>
-    <item quantity="other" msgid="358057362115673258">"%d个应用可提供条件"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"未安装任何条件提供程序。"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"要启用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"“<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>”将可为勿扰模式添加退出条件。"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在加载应用…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"屏蔽"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"全部阻止"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"一律不显示来自此应用的通知"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"优先"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"在列表顶部显示通知，并且在设备设置为“仅限优先打扰内容”时也显示"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"敏感"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"来自此应用的敏感通知内容不会在设备锁定时显示"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"视为优先通知"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"当勿扰模式设为“仅限优先打扰”时，允许此应用的通知发出提示音"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"允许快速查看"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"允许此应用将特定通知暂时滑入当前屏幕，以突出显示这些通知"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"隐藏敏感内容"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"当设备锁定时，隐藏此应用通知中可能会泄露隐私信息的内容"</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="zen_mode_default_option" msgid="6940069025071935243">"直到您将其关闭"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"优先打扰内容"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"休息时间"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"星期几"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"无"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"允许打扰"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"仅限优先打扰"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"无"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"自动"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自动开启"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"规则名称"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"添加规则"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"删除规则"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"要删除“<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="3201273040477861538">"时间安排规则"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"找不到规则。"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">"， "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"一律不"</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_from" msgid="1033337300289871697">"来电者/消息发送者"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"任何人"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"仅限联系人"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"仅限收藏的联系人"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"活动和提醒"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"闹钟始终为优先打扰内容"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"闹钟"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"活动"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"所选的来电者"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重复来电者"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"如果同一个人在 <xliff:g id="MINUTES">%d</xliff:g> 分钟内第二次来电，则允许显示通知"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自动开启"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"永不"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"次日 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> 或早于该时间的闹钟响铃时"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"次日 <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_interruptions_voice_title" msgid="855256211259132964">"打扰"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"收到来电和通知时"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"您允许设备在哪些情况下显示通知？"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"持续多久？"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"一律允许打扰"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"关闭,所有通知,全部通知"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"仅允许优先打扰内容"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"仅允许闹钟"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"禁止打扰"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"无限期"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分钟</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分钟</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"更改为无限期仅限优先通知"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">更改为仅限优先通知，持续 <xliff:g id="DURATION">%1$d</xliff:g> 分钟（到<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">更改为仅限优先通知，持续 1 分钟（到<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>）</item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">更改为仅限优先通知，持续 <xliff:g id="DURATION">%1$d</xliff:g> 小时（到<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">更改为仅限优先通知，持续 1 小时（到<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>）</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"更改为无限期仅限闹钟"</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>
+      <item quantity="one">更改为仅限闹钟，持续 1 分钟（到<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">更改为仅限闹钟，持续 <xliff:g id="DURATION">%1$d</xliff:g> 小时（到<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">更改为仅限闹钟，持续 1 小时（到<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>）</item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"更改为无限期禁止打扰"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">更改为禁止打扰，持续 <xliff:g id="DURATION">%1$d</xliff:g> 分钟（到<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">更改为禁止打扰，持续 1 分钟（到<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>）</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">更改为禁止打扰，持续 <xliff:g id="DURATION">%1$d</xliff:g> 小时（到<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>）</item>
+      <item quantity="one">更改为禁止打扰，持续 1 小时（到<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>）</item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"更改为一律允许打扰"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"不限时间"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"应用通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
     <string name="device_feedback" msgid="3238056036766293294">"发送有关此设备的反馈"</string>
@@ -2512,4 +2629,63 @@
     <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="2184141780491382435">"默认启动"</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="app_launch_domain_links_title" msgid="458956710410857777">"网域链接"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"打开网域网址"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"允许应用直接打开网域网址"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"支持的网域网址"</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="410824961149037234">"内存"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"外部存储"</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="notifications_enabled" msgid="6983396130566021385">"开启"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"屏蔽"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"敏感信息"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"优先级"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"优先级和敏感信息"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other">已授予 <xliff:g id="COUNT_1">%d</xliff:g> 项权限</item>
+      <item quantity="one">已授予 <xliff:g id="COUNT_0">%d</xliff:g> 项权限</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">已授予 <xliff:g id="COUNT_2">%d</xliff:g> 项权限（共 <xliff:g id="COUNT_3">%d</xliff:g> 项）</item>
+      <item quantity="one">已授予 <xliff:g id="COUNT_0">%d</xliff:g> 项权限（共 <xliff:g id="COUNT_1">%d</xliff:g> 项）</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"已设置部分默认选项"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"未设置任何默认选项"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"所有应用"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"已启用"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"个人应用"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"工作应用"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已屏蔽"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"优先"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"含敏感信息"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"包含网域网址"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"已被管理员停用"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"高级"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"未知应用"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"选择个人资料"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"应用权限"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"已授予 <xliff:g id="COUNT_0">%d</xliff:g> 个应用（共 <xliff:g id="COUNT_1">%d</xliff:g> 个）其他权限"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"已授权 <xliff:g id="COUNT_0">%d</xliff:g> 个应用（共 <xliff:g id="COUNT_1">%d</xliff:g> 个）"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"网域网址"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"不打开任何网域网址"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"打开“<xliff:g id="DOMAIN">%s</xliff:g>”"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"打开“<xliff:g id="DOMAIN">%s</xliff:g>”和相关网址"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> 个应用可以打开其网域网址</item>
+      <item quantity="one">1 个应用可以打开其网域网址</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"无法识别"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"默认应用"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"浏览器应用"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"没有默认浏览器"</string>
+    <string name="default_app" msgid="6864503001385843060">"（默认）"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"应用存储空间"</string>
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 64e3bf7..52602b8 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"按鈕"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"關閉/開啟麥克風"</item>
     <item msgid="1148142988678569310">"投影媒體"</item>
     <item msgid="9130014005474445273">"啟用 VPN"</item>
+    <item msgid="1165192162975045562">"撰寫桌布"</item>
+    <item msgid="7129487923652967258">"輔助結構"</item>
+    <item msgid="1069023208100114540">"輔助螢幕擷圖"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"關閉/開啟麥克風"</item>
     <item msgid="5906017727368097853">"投影媒體"</item>
     <item msgid="2486614710846178542">"啟用 VPN"</item>
+    <item msgid="5586547561693629602">"撰寫桌布"</item>
+    <item msgid="32794179825485062">"輔助結構"</item>
+    <item msgid="7872852746938272552">"輔助螢幕擷圖"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"低"</item>
     <item msgid="4212263919458209842">"嚴重不足"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"關閉"</item>
-    <item msgid="5656544177755411222">"有限度干擾"</item>
-    <item msgid="8735337502532332056">"零干擾"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"正常"</item>
     <item msgid="866544120205026771">"中"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"粉紅色"</item>
     <item msgid="6131821495505931173">"紅色"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (媒體傳輸通訊協定)"</item>
+    <item msgid="8856820259201251036">"PTP (圖片傳輸通訊協定)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB 乙太網絡)"</item>
+    <item msgid="2686051673589572111">"音效檔案來源"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index ffaac2c..6be1d78 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"允許"</string>
     <string name="deny" msgid="6947806159746484865">"拒絕"</string>
     <string name="device_info_default" msgid="7847265875578739287">"未知"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"您只需完成剩餘的 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 個步驟，即可成為開發人員。"</item>
-    <item quantity="other" msgid="6722953419953594148">"您只需完成剩餘的 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 個步驟，即可成為開發人員。"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">您只需完成 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
+      <item quantity="one">您只需完成 <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"您現已成為開發人員！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"不需要了，您已經是開發人員。"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"無線與網絡"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"關閉透過 IMS 發送短訊"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"需要開啟 IMS 註冊"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"需要關閉 IMS 註冊"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"開啟 VoLTE 佈建標記"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"關閉 VoLTE 佈建標記"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"開啟 LTE 記憶體傾印"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"關閉 LTE 記憶體傾印"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"查看 SIM 通訊錄"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"已連結"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已連線（無手機）"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已連線 (無媒體)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"已連結 (無訊息存取權)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已連線 (無手機或媒體)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"已中斷連線"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在中斷連線..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"正在連線..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"正在配對..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"未命名的藍牙裝置"</string>
     <string name="progress_scanning" msgid="192587958424295789">"正在搜尋..."</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"附近找不到藍牙裝置。"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"顯示已接收的檔案"</string>
     <string name="device_picker" msgid="4978696506172252813">"選擇藍牙裝置"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"應用程式要求開啟藍牙功能。"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"應用程式要求啟用這個裝置的藍牙功能。"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"應用程式要求將平板電腦設為向其他藍牙裝置顯示，顯示的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"應用程式要求將手機設為向其他藍牙裝置顯示，顯示的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"應用程式要求將平板電腦設為向其他裝置顯示。您稍後可在 [藍牙] 設定中更改這項設定。"</string>
@@ -275,12 +268,10 @@
     <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="cancel_all_caps" msgid="3183966387632229461">"取消"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"繼續"</string>
     <string name="okay" msgid="1997666393121016642">"確定"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"是"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"否"</string>
-    <string name="forget" msgid="7267115980248732932">"刪除"</string>
+    <string name="forget" msgid="1400428660472591263">"刪除"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"提高臉容配對精準度"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"生動檢查"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"解鎖時需眨眼"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、螢幕解鎖及認證儲存空間鎖定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</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="3453670509485083962">"加入"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"螢幕鎖定"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"已設定指紋"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"要使用您的指紋解鎖螢幕或確認購買項目，我們需要：\n\n✓ 設定您的備份螢幕鎖定方式\n\n✓ 加入您的指紋"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"尋找感應器"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"在您的手機背面可以找到指紋感應器。"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"開始登記指紋！"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"將您的手指放在指紋感應器上，並在感到震動後移開手指。"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"做得好！請再做一次。"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"將同一根手指放在指紋感應器上，並在感到震動後移開手指。"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"已加入指紋！"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"如果看到這個圖示，您可以使用您的指紋加以識別或授權購買。"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"加入"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"請插上充電器，然後再試一次。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"沒有鎖定螢幕的 PIN 或密碼"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您必須先設定鎖定螢幕的 PIN 或密碼，才能開始加密。"</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"您必須畫出解鎖圖形，以確認為您的裝置加密。"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"加密？"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"您無法取消加密操作，如果過程中斷，將會失去資料。加密程序需時 1 個小時或以上，您的平板電腦會在過程中重新啟動數次。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"您無法取消加密操作，如果過程中斷，將會失去資料。加密程序需時 1 個小時或以上，您的手機會在過程中重新啟動數次。"</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"臉容解鎖"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"低安全性、實驗性"</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_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="current_screen_lock" msgid="4104091715420072219">"目前的螢幕鎖定"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"裝置保護功能將無法使用。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已由管理員、加密政策或認證儲存空間停用"</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_biometric_weak" msgid="3008473624490350142">"臉容解鎖"</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_password" msgid="1203938057264146610">"密碼"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"設定螢幕鎖定後，您還可以前往 [設定] &gt; [安全性] 設定您的指紋。"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"關閉螢幕鎖定"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"移除解鎖圖形"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"移除解鎖 PIN"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"密碼必須包含至少 1 個字母。"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"密碼必須包含至少 1 個數字。"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"密碼必須包含至少 1 個符號。"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"密碼必須包含至少 1 個字母。"</item>
-    <item quantity="other" msgid="8186027808415585970">"密碼必須包含至少 %d 個字母。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"密碼必須包含至少 1 個小寫字母。"</item>
-    <item quantity="other" msgid="2693910942679679225">"密碼必須包含至少 %d 個小寫字母。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"密碼必須包含至少 1 個大寫字母。"</item>
-    <item quantity="other" msgid="3030801209112209245">"密碼必須包含至少 %d 個大寫字母。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"密碼必須包含至少 1 個數字。"</item>
-    <item quantity="other" msgid="4703982391407595924">"密碼必須包含至少 %d 個數字。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"密碼必須包含至少 1 個特殊符號。"</item>
-    <item quantity="other" msgid="1221290525051187757">"密碼必須包含至少 %d 個特殊符號。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"密碼必須包含至少 1 個非字母字元。"</item>
-    <item quantity="other" msgid="3952508584649046404">"密碼必須包含至少 %d 個非字母字元。"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">密碼必須包含至少 %d 個字母。</item>
+      <item quantity="one">密碼必須包含至少 1 個字母。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">密碼必須包含至少 %d 個小寫字母。</item>
+      <item quantity="one">密碼必須包含至少 1 個小寫字母。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">密碼必須包含至少 %d 個大寫字母。</item>
+      <item quantity="one">密碼必須包含至少 1 個大寫字母。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">密碼必須包含至少 %d 個數字。</item>
+      <item quantity="one">密碼必須包含至少 1 個數字。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">密碼必須包含至少 %d 個特殊符號。</item>
+      <item quantity="one">密碼必須包含至少 1 個特殊符號。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">密碼必須包含至少 %d 個非字母字元。</item>
+      <item quantity="one">密碼必須包含至少 1 個非字母字元。</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"裝置管理員不允許最近用過的密碼。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"不得使用依遞增或遞減順序排列或重複的一串數字"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"確定"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"配對"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"配對"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"取消"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"一旦配對成功，即可存取您的通訊錄和通話記錄。"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 配對。"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 配對，因為 PIN 碼或密鑰不正確。"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 通訊。"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」拒絕配對要求。"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"無法連接「<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"為了提高位置精確度，即使藍牙已關閉，應用程式和服務仍會掃瞄藍牙裝置。您可以前往 <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_specific_profiles_title" msgid="6952214406025825164">"連線至..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"媒體音效"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"手機音效"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"檔案傳輸"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"輸入裝置"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"互聯網連線"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"聯絡人共用"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"用於聯絡人共用"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"互聯網連線分享"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"訊息存取權"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"已連接媒體音頻裝置"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已連接手機耳機"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已連線至檔案傳輸伺服器"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"已連結地圖"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"未連線至檔案傳輸伺服器"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"已連線至輸入裝置"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"用於媒體音效"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"用於手機音效"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用於傳輸檔案"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"用於輸入"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"用於上網"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"用於地圖"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"已透過 Wi-Fi 小幫手連線"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"放送螢幕"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"正在關閉 Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"錯誤"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"處於飛行模式"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"無法掃瞄網絡"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"網絡通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"有可用的公用網絡時通知我"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"已避免欠佳的連線"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"除非互聯網連線穩定，否則不要使用 Wi-Fi 網絡"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"只使用連線品質穩定的網絡"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"永遠可掃瞄"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"永遠執行掃描"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"允許 Google 的位置服務和其他應用程式掃描網絡 (即使 Wi-Fi 已關閉)"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"自動使用開放的 Wi-Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"讓 Wi‑Fi 小幫手自動連線至優質的開放網絡"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"選擇小幫手"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安裝憑證"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"為了提高位置精確度並用作其他用途，即使 Wi-Fi 已關閉，Google 和其他應用程式亦可能會掃瞄附近的網絡。如不想啟用此功能，可前往 [進階] &gt; [永遠可掃瞄] 更改設定。"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"即使 Wi-Fi 已關閉，應用程式亦可能會掃瞄附近的網絡。如不想啟用此功能，可前往 [進階] &gt; [永遠可掃瞄] 更改設定。"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"為了提高位置精確度，即使 Wi-Fi 已關閉，應用程式和服務仍會掃瞄 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="5340097010842405981">"不用再顯示"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"新增其他網絡"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定 (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"您的平板電腦必須連接 Wi-Fi 網絡才能完成設定。完成後，您可以在流動數據網絡與 Wi-Fi 網絡之間切換。"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"進階選項"</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="5940801028985255304">"請按路由器上的 Wi-Fi 保護設定按鈕。該按鈕可能標示為「WPS」或包含這個符號："</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"按路由器上的 Wi-Fi 保護設定按鈕，該按鈕可能標示為「WPS」或顯示這個符號："</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"請在 WiFi 路由器上輸入 PIN 碼 <xliff:g id="NUMBER">%1$s</xliff:g>，設定可能需要長達兩分鐘方能完成。"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS 已成功，正在連接網絡…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"已連接 Wi-Fi 網絡 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"設定 AP 頻段"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(未變更)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(未指定)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"已儲存"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 設定失敗"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi 連線失敗"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"驗證問題"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"超出可用範圍"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"未能偵測到互聯網連線，因此不會自動重新連線。"</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_security_none" msgid="7985461072596594400">"無"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"此網絡並未連接互聯網，您仍要使用嗎？"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"不要再詢問我是否使用此網絡"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"無法連接網絡"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"刪除"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK 可攜式 Wi‑Fi 熱點"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> 可攜式 Wi-Fi 熱點"</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_mode_title" msgid="2164073796253284289">"通話偏好設定"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi 通話模式"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"首選 Wi-Fi"</item>
+    <item msgid="5267397515594230396">"首選流動數據"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"當開啟 Wi-Fi 通話時，您的手機可根據偏好設定及訊號強弱，選擇使用 Wi-Fi 網絡或流動網絡供應商的網絡安排來電轉接。開啟此功能前，請向您的流動網絡供應商查詢收費及其他詳情。"</string>
     <string name="home_settings" msgid="212375129455718176">"主畫面"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"主題背景"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"淺色"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"深色"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"自動"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"要更新首選 SIM 卡嗎？"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> 是您裝置內唯一的 SIM 卡。您要使用這張 SIM 卡用於流動數據、通話和短訊嗎？"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN 碼不正確，您現在必須聯絡流動網絡供應商為您的裝置解鎖。"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM PIN 碼不正確，您剩下 <xliff:g id="NUMBER">%d</xliff:g> 次機會輸入。如果仍然輸入錯誤，您必須聯絡流動網絡供應商為您的裝置解鎖。"</item>
-    <item quantity="other" msgid="77103619544346451">"SIM PIN 碼不正確，您剩下 <xliff:g id="NUMBER">%d</xliff:g> 次機會輸入。"</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM PIN 碼不正確，您還有 <xliff:g id="NUMBER_1">%d</xliff:g> 次機會輸入。</item>
+      <item quantity="one">SIM PIN 碼不正確，您還有 <xliff:g id="NUMBER_0">%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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"應用程式 (應用程式資料和媒體內容)"</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_dcim_usage" msgid="558887013613822577">"圖片、影片"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"音頻 (音樂、鈴聲、Podcast 等)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"其他"</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="default" msgid="6915293408836853020">"卸載 SD 卡"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"安裝"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"移除"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"清除和格式化"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"清除和格式化為內部儲存空間"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB 電腦連接"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB 電腦連接"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"已連結為"</string>
@@ -962,8 +959,49 @@
     <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="7673397474756664929">"讓您使用相機軟件傳送照片，並在不支援 MTP 的電腦上傳送任何檔案"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"安裝檔案傳輸工具"</string>
+    <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_external_title" msgid="2723851748972673696">"可攜式儲存裝置"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"尚餘空間為 <xliff:g id="FREE">%1$s</xliff:g>（可用空間共 <xliff:g id="TOTAL">%2$s</xliff:g>）"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"已連接 <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"無法連接 <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="4161722509712992231">"無法安全移除 <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="8343688274191391889">"無法格式化<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"重新命名儲存裝置"</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="3677827796634199714"><b>"當你移除此<xliff:g id="NAME_0">^1</xliff:g>時，已儲存的應用程式將停止運作，而媒體檔案在再次插入裝置前將不能播放。"</b>" \n\n此<xliff:g id="NAME_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>
+    <!-- syntax error in translation for storage_wizard_format_confirm_body (4401758710076806509) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:86 in     <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509"></b>"<xliff:g id="NAME_0">^1</xliff:g>NAME_0需要格式化，以策安全。\n\n<xliff:g id="NAME_1">^1</xliff:g>經格式化後只能用於這部裝置。\n\n"<b>"格式化將清除目前儲存在<xliff:g id="NAME_2">^1</xliff:g>的所有資料。為免遺失資料，請先備份。"</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="1259216693690378749">"格式化過程中不要移除<xliff:g id="NAME">^1</xliff:g>。"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"將資料移至新的儲存空間"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"您可以將相片、檔案和應用程式資料移至這部全新<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="5035719146373359329"><b>"此操作大約需時<xliff:g id="TIME">^1</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="8641916179067596592">"移動過程中：\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_move_confirm_title" msgid="292782012677890250">"移動<xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"將<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="4288580957960820740">"移動過程中請勿移除<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="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1045,15 @@
     <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_network_title" msgid="4557113742173895074">"重設網絡設定"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"這將重設所有網絡設定，包括：\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="4874737348054213767">"您要重設所有的網絡設定嗎？您無法復原這項操作！"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"重設設定"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"重設？"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"網絡設定已重設"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"重設裝置"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"恢復原廠設定"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板電腦上的所有資料"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手機上的所有資料"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"這會清除您手機"<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>
@@ -1024,9 +1067,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除 SD 記憶卡中的所有資料，例如音樂或相片"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重設平板電腦"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重設手機"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"您要清除所有個人資訊和已下載的應用程式嗎？您無法復原這項操作！"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"您要清除所有個人資訊和已下載的應用程式嗎？您無法復原這項操作！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"全部清除"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"您必須畫出解鎖圖案，確認恢復原廠設定。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"System Clear 服務暫停，因此無法重設。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"重設？"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"這位使用者無法將裝置恢復原廠設定"</string>
@@ -1043,8 +1085,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"清除 USB 儲存裝置時，是否一併刪除所有儲存的檔案？您無法復原這項操作！"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"清除 SD 記憶卡時，是否刪除其中儲存的所有檔案？這項操作無法復原！"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"全部清除"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"您必須畫出解鎖圖案，確認要清除 USB 儲存裝置的資料。"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"您必須畫出解鎖圖案，確認您要清除 SD 記憶卡的資料。"</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>
@@ -1076,7 +1116,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"流動網絡"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"流動數據計劃"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"預設短訊應用程式"</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_no_previous_dialog_text" msgid="602683880284921998">"將 <xliff:g id="NEW_APP">%s</xliff:g> 設為您的短訊應用程式？"</string>
@@ -1104,7 +1144,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"使用 GPS、Wi-Fi 和流動網絡確定位置"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"使用 Wi-Fi 和流動網絡確定位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"使用 GPS 確定您的位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 確定位置"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"正在掃瞄"</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="2070686681074461301">"允許應用程式和服務掃瞄 Wi‑Fi 網絡，以提高位置資訊服務的精確度 (即使 Wi-Fi 已關閉)"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"藍牙掃瞄"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"允許應用程式和服務掃瞄藍牙裝置，以提高位置資訊服務的精確度 (即使藍牙已關閉)"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi 和流動網絡位置資料"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的位置資訊服務，藉此更快確定您的約略位置。系統會收集匿名的位置資料傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"根據 Wi-Fi 確定位置"</string>
@@ -1150,11 +1196,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"螢幕安全"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"畫出您的裝置圖形以繼續操作。"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"輸入您的裝置 PIN 碼以繼續操作。"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"輸入您的裝置密碼以繼續操作。"</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_need_to_unlock" msgid="757935356911054465">"確認已儲存的圖形"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"請再試一次："</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>
@@ -1176,8 +1226,7 @@
     <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_header" msgid="819903817323783498">"失敗次數太多！"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> 秒內再試一次。"</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="manageapplications_settings_title" msgid="7041951105633616745">"管理應用程式"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理及移除已安裝的應用程式"</string>
@@ -1228,6 +1277,7 @@
     <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>
@@ -1299,6 +1349,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"儲存空間使用量"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"查看應用程式所使用的儲存空間"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"執行中的服務"</string>
@@ -1396,17 +1447,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板電腦資訊"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手機資訊"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"電池資訊"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"快速啟動"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"設定啟動應用程式的鍵盤快速鍵"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"指派應用程式"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"沒有快速鍵"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"搜尋 + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"清除"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"系統將清除您的 <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) 捷徑。"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"確定"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"取消"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"應用程式"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"快速鍵"</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>
@@ -1441,23 +1481,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"原始設備製造商 (OEM) 解鎖"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"允許 Bootloader 被解鎖"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"請輸入 PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"請輸入您的裝置 PIN，以啟用原始設備製造商 (OEM) 解鎖"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"允許原始設備製造商 (OEM) 解鎖嗎？"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告：這項設定開啟時，這部裝置上的裝置保護功能將無法運作。"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"記錄器緩衝區空間"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"選取每個記錄緩衝區的記錄器空間"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"啟用檢視屬性檢查"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"網絡"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"啟用 Wi‑Fi 詳細記錄"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"加強 Wi-Fi 至流動數據轉換"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"永遠允許 Wi-Fi 漫遊掃瞄"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"使用舊的 DHCP 用戶端"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"顯示無線螢幕分享認證的選項"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"讓 Wi‑Fi 記錄功能升級，在 Wi‑Fi 選擇器中依每個 SSID RSSI 顯示 Wi‑Fi 詳細紀錄"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"啟用時，Wi-Fi 連線會在訊號不穩的情況下更積極轉換成流動數據連線"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"根據介面中目前的數據流量允許/禁止 WiFi 漫遊掃瞄"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"記錄器緩衝區空間"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"選取每個記錄緩衝區的記錄器空間"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"選取 USB 設定"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"選取 USB 設定"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"啟用檢視屬性檢查"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"使用 Lollipop 的 DHCP 用戶端，而不是新的 Android DHCP 用戶端。"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎？"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB 偵錯是針對應用程式開發而設計的功能，可讓您在電腦與裝置間複製資料、不用通知即可在裝置上安裝應用程式，以及讀取記錄資料。"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"要針對先前授權的所有電腦撤銷 USB 偵錯存取權嗎？"</string>
@@ -1561,6 +1609,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"洋紅色"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要執行下列功能："</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"由於有應用程式阻礙權限請求，「設定」無法驗證您的回覆。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您開啟<xliff:g id="SERVICE">%1$s</xliff:g>，您的裝置將不能透過螢幕鎖定加強資料加密。"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"因為您已開啟無障礙功能，您的裝置將不能透過螢幕鎖定加強資料加密。"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響您的資料加密強度，因此您需要確認解鎖圖案。"</string>
@@ -1702,14 +1751,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"應用程式類型：<xliff:g id="TYPE">%1$s</xliff:g>，統計時間長度：<xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<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_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_memory_status" msgid="4251599550196193093">"裝置記憶體目前的狀態：<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM 平均使用量"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM 最高使用量"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android 作業系統"</string>
+    <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_ram_use" msgid="976912589127397307">"記憶體用量"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"記憶體用量 (背景)"</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>
     <string name="mem_details_title" msgid="6548392825497290498">"記憶體詳情"</string>
@@ -1726,6 +1781,7 @@
     <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_hide_system" msgid="4106826741703745733">"隱藏系統"</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>
@@ -1748,7 +1804,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"下列預設設定會覆寫應用程式設定"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"預設設定"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"預設引擎"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"將語音合成引擎設為處理語音"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"設定朗讀功能用的語音合成引擎"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"語音速率"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"文字轉語音的播放速度"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音調"</string>
@@ -1826,7 +1882,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"您必須畫出解鎖圖案，才能確認安裝憑證。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"輸入憑證儲存空間的密碼。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"目前密碼："</string>
@@ -1851,12 +1906,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"目前沒有任何帳戶儲存備份資料"</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="5355557151569037197">"備份服務目前停用。"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"本服務由您的裝置政策設定。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"桌面電腦備份密碼"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"桌上電腦的完整備份目前未受保護"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"輕觸即可更改或移除桌上電腦完整備份的密碼"</string>
@@ -2028,6 +2081,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"轉場動畫比例"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator 片長比例"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"模擬次要顯示器"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"多重視窗模式"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"螢幕同時顯示多個活動。"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"要啟用多重視窗模式嗎?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"警告：這項功能還在初期實驗階段。這項功能透過最近用過的應用程式用戶介面，允許螢幕同時顯示多個活動。部分應用程式與這項功能同時使用時，可能會出現當機或程式不能正常運作的情況。"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"應用程式"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"不要保留活動"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"使用者離開活動後隨即銷毀活動"</string>
@@ -2199,7 +2256,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="718192651887726259">"您可以建立額外的使用者，與他人分享這部裝置。每位使用者都有各自的個人空間，可使用自己的應用程式和桌布等自訂。此外，他們可以調整影響所有使用者的裝置設定 (例如 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>
@@ -2230,13 +2287,13 @@
     <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="8310589470979488255">"啟用通話功能"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"啟用通話和短訊功能"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"開啟手機通話"</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="440218975766968124">"啟用通話功能？"</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_sms_confirm_title" msgid="188164598768941316">"啟用通話和短訊功能？"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"將與這位使用者共用通話和短訊記錄。"</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="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受到限制的應用程式"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
@@ -2287,8 +2344,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"這個應用程式不支援限制存取的個人檔案"</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>
@@ -2353,13 +2410,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"WiFi Wi-Fi 網絡連線"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"文字訊息 訊息 傳送文字訊息 簡訊 傳送短訊"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"流動網絡 手機網絡 流動網絡供應商 無線 網絡數據 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"WiFi Wi-Fi 通話 撥號中"</string>
     <string name="keywords_home" msgid="3626170808219458848">"應用程式啟動器"</string>
     <string name="keywords_display" msgid="6709007669501628320">"觸控式螢幕"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"變暗 螢幕 觸控螢幕 電池"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"變暗 螢幕 觸控螢幕 電池"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 個人化 自訂 顯示"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"深色主題背景 夜間模式 變暗螢幕 反轉亮度"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"背景 個人化 自訂 顯示"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字大小"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"投影"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"投放"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"空間 磁碟 硬碟 裝置 使用量"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"電源 使用量 充電"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"拼寫 字典 拼字檢查 自動修正"</string>
@@ -2376,6 +2435,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"帳戶"</string>
     <string name="keywords_users" msgid="4673901601478559100">"限制 限制 受限"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 更正 修正 聲音 震動 自動 語言 手勢 建議 字詞建議 主題背景 令人反感的文字 輸入 表情圖案 國際"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"重設偏好設定預設值"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"緊急 應用程式 預設"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"應用程式 下載應用程式 系統"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"應用程式權限安全性"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"應用程式預設"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑動 密碼 圖案 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標籤"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
@@ -2390,11 +2454,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"干擾"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"當收到來電和通知時"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"一律允許干擾"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"只允許重要干擾"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"不允許干擾"</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_option_important_interruptions" msgid="3903928008177972500">"僅限優先"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅限鬧鐘"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"不允許干擾"</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="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"預設通知鈴聲"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"來電時同時震動"</string>
@@ -2420,62 +2485,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"震動"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"應用程式無法讀取通知"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d 個應用程式可讀取通知"</item>
-    <item quantity="other" msgid="980049191810249052">"%d 個應用程式可讀取通知"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d 個應用程式可讀取通知</item>
+      <item quantity="one">%d 個應用程式可讀取通知</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"沒有安裝任何通知接聽器。"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"「<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>」將可讀取系統或任何已安裝的應用程式發佈的所有通知 (可能包括聯絡人姓名和他人傳送給您的訊息文字之類的個人資訊)，並可關閉這些通知或其中的觸控操作按鈕。"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"條件供應商"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"沒有應用程式提供條件"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d 個應用程式提供條件"</item>
-    <item quantity="other" msgid="358057362115673258">"%d 個應用程式提供條件"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"尚未安裝任何條件供應商。"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"是否啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> 可新增結束「請勿騷擾」模式的條件。"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式…"</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"封鎖"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"永不顯示這個應用程式的通知"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"重要"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"裝置設為只限重要干擾時，永遠在最上方顯示通知"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"敏感"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"當裝置鎖定時，隱藏這個應用程式所發通知的任何敏感內容"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"優先處理"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"允許這個應用程式的通知在「請勿騷擾」設定為「僅限優先」時發出"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"允許快速預覽"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"允許這個應用程式將部分通知短暫滑入目前畫面，以示強調"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"隱藏敏感內容"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"當裝置鎖定時，隱藏這個應用程式可能透露個人資訊的通知內容"</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="zen_mode_default_option" msgid="6940069025071935243">"直至您關閉這項設定"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"重要干擾"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"停機時間"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"星期幾"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"無"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"允許干擾"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"僅限優先"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"無"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"自動化"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動開啟"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"規則名稱"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"加入規則"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"刪除規則"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"要刪除規則「<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="3201273040477861538">"計劃規則"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"找不到規則"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> ／ <xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">"、 "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"永不"</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_from" msgid="1033337300289871697">"來電者/訊息傳送者"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"所有人"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"只限聯絡人"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"只限已加星號的聯絡人"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"活動和提醒"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"鬧鐘一律設為重要干擾"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"活動"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"已選取的來電者"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重複來電"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"如果同一人在 <xliff:g id="MINUTES">%d</xliff:g> 分鐘內再次來電，則允許"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自動開啟"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"永不"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"下一天<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>或任何之前的鬧鐘"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"下一天<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_interruptions_voice_title" msgid="855256211259132964">"干擾"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"收到來電和通知時"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"您想何時接受干擾？"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"須運作多久？"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"一律允許干擾"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"關閉所有干擾"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"僅允許優先干擾"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"只允許鬧鐘"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"不允許干擾"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"無限期"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分鐘</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分鐘</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"變更為永遠只允許優先通知"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"變更為永遠只允許鬧鐘"</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>
+      <item quantity="one">變更為一分鐘內只限鬧鐘，直至 <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">變更為 <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"變更為永遠不允許干擾"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <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_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"變更為永遠允許干擾"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"不限時間"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送您對這部裝置的意見"</string>
@@ -2516,4 +2634,63 @@
     <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="2184141780491382435">"按預設啟動"</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="app_launch_domain_links_title" msgid="458956710410857777">"網域連結"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"開啟網域網址"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"允許應用程式直接開啟網域網址"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"支援的網域網址"</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="410824961149037234">"內部記憶體"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"外部記憶體"</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="notifications_enabled" msgid="6983396130566021385">"開啟"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"封鎖"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"敏感"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"重要"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"優先順序和敏感"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other">已授予 <xliff:g id="COUNT_1">%d</xliff:g> 項權限</item>
+      <item quantity="one">已授予 <xliff:g id="COUNT_0">%d</xliff:g> 項權限</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">已授權 <xliff:g id="COUNT_2">%d</xliff:g> 個 (共 <xliff:g id="COUNT_3">%d</xliff:g> 個) 權限</item>
+      <item quantity="one">已授權 <xliff:g id="COUNT_0">%d</xliff:g> 個 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個) 權限</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"已設定部分預設值"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"未設定預設值"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"所有應用程式"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"已啟用"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"工作"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已封鎖"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"重要"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"敏感"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"使用網域網址"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"已由管理員停用"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"不明應用程式"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"應用程式權限"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"已允許 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式額外存取權 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"已允許 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"網域網址"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"不要開啟任何網域網址"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"開啟「<xliff:g id="DOMAIN">%s</xliff:g>」"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"開啟「<xliff:g id="DOMAIN">%s</xliff:g>」和相關網址"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other">有 <xliff:g id="COUNT">%d</xliff:g> 個應用程式可開啟其網域網址</item>
+      <item quantity="one">有 1 個應用程式可開啟其網域網址</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"未能識別"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"預設應用程式"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"瀏覽器應用程式"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"沒有預設瀏覽器"</string>
+    <string name="default_app" msgid="6864503001385843060">"(預設)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"應用程式儲存"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 6677d8c..17cb870 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -125,6 +125,9 @@
     <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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"按鈕"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"關閉/開啟麥克風"</item>
     <item msgid="1148142988678569310">"投影媒體"</item>
     <item msgid="9130014005474445273">"啟用 VPN"</item>
+    <item msgid="1165192162975045562">"寫入桌布"</item>
+    <item msgid="7129487923652967258">"輔助結構"</item>
+    <item msgid="1069023208100114540">"輔助螢幕擷取畫面"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"關閉/開啟麥克風"</item>
     <item msgid="5906017727368097853">"投影媒體"</item>
     <item msgid="2486614710846178542">"啟用 VPN"</item>
+    <item msgid="5586547561693629602">"寫入桌布"</item>
+    <item msgid="32794179825485062">"輔助結構"</item>
+    <item msgid="7872852746938272552">"輔助螢幕擷取畫面"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"低"</item>
     <item msgid="4212263919458209842">"嚴重不足"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"關閉"</item>
-    <item msgid="5656544177755411222">"有限干擾"</item>
-    <item msgid="8735337502532332056">"零干擾"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"正常"</item>
     <item msgid="866544120205026771">"中"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"粉紅色"</item>
     <item msgid="6131821495505931173">"紅色"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"MTP (媒體傳輸通訊協定)"</item>
+    <item msgid="8856820259201251036">"PTP (圖片傳輸通訊協定)"</item>
+    <item msgid="216135047298423770">"RNDIS (USB 乙太網路)"</item>
+    <item msgid="2686051673589572111">"音訊來源"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ad0bbda..dc97328 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"允許"</string>
     <string name="deny" msgid="6947806159746484865">"拒絕"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"您只需完成剩餘的 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 個步驟，即可成為開發人員。"</item>
-    <item quantity="other" msgid="6722953419953594148">"您只需完成剩餘的 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 個步驟，即可成為開發人員。"</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="other">您只需完成剩餘的 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
+      <item quantity="one">您只需完成剩餘的 <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"您現在已成為開發人員！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"不需要了，您已經是開發人員。"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"無線與網路"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"關閉 IMS 簡訊"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"需要開啟 IMS 註冊"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"需要關閉 IMS 註冊"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"開啟 VoLTE 佈建標記"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"關閉 VoLTE 佈建標記"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"開啟 LTE RAM 傾印"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"關閉 LTE RAM 傾印"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"檢視 SIM 地址簿"</string>
@@ -135,16 +137,7 @@
     <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_connected" msgid="6038755206916626419">"已連線"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已連線 (無手機音訊)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已連線 (無媒體音訊)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"已連線 (無訊息存取權)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已連線 (無手機或媒體音訊)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"已中斷連線"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在中斷連線…"</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"連線中…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"配對中…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"未命名的藍牙裝置"</string>
     <string name="progress_scanning" msgid="192587958424295789">"搜尋中"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"找不到附近的藍牙裝置。"</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"顯示已接收的檔案"</string>
     <string name="device_picker" msgid="4978696506172252813">"選擇藍牙裝置"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"應用程式要求開啟藍牙功能。"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"有一個應用程式要求開啟這個裝置的藍牙功能。"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"應用程式要求開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他藍牙裝置能搜尋到您的平板電腦。"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"應用程式要求開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他藍牙裝置能搜尋到您的手機。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"應用程式要求讓其他藍牙裝置能搜尋到您的平版電腦。您日後可在 [藍牙] 設定中變更這項設定。"</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD 卡"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy 設定"</string>
     <string name="cancel" msgid="6859253417269739139">"取消"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"取消"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"繼續"</string>
     <string name="okay" msgid="1997666393121016642">"確定"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"是"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"否"</string>
-    <string name="forget" msgid="7267115980248732932">"清除"</string>
+    <string name="forget" msgid="1400428660472591263">"清除"</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>
@@ -325,9 +316,6 @@
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"加強臉部辨識精準度"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"生動度檢查"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"解鎖時需眨眼"</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_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>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</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="3453670509485083962">"新增"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"螢幕鎖定"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <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_enroll_onboard_title" msgid="4735546436672054254">"指紋設定"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"如要使用您的指紋解鎖螢幕或確認購物交易，必須先完成以下工作：\n\n✓ 設定您的備用螢幕鎖定方法 \n\n✓ 新增指紋"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"找出感應器"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"指紋感應器位於手機背面。"</string>
+    <string name="security_settings_fingerprint_enroll_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="1063375657071124812">"開始註冊！"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"將您的手指放在指紋感應器上，直到感應器震動後再移開手指。"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"很好！現在再重複一次。"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"將同一根手指放在指紋感應器上，直到感應器震動後再移開手指。"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指紋新增成功！"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要看到這個圖示，就表示您可以使用指紋來驗證身分或授權進行購物交易。"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"新增"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</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>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"連接充電器，再試一次。"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"沒有鎖定螢幕的 PIN 或密碼"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您必須先設定鎖定螢幕的 PIN 或密碼，才能開始加密。"</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"畫出解鎖圖形，確認要為您的裝置加密。"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"加密？"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"您無法取消加密操作，如果過程中斷，資料將會遺失。加密過程可能需要 1 個小時以上的時間，您的平板電腦會在過程中重新啟動數次。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"您無法取消加密操作，如果過程中斷，資料將會遺失。加密過程可能需要 1 個小時以上的時間，您的手機會在過程中重新啟動數次。"</string>
@@ -391,22 +402,21 @@
     <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_biometric_weak_title" msgid="2227215291604628670">"人臉解鎖"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"安全性低的實驗性設定"</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_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="current_screen_lock" msgid="4104091715420072219">"目前的螢幕鎖定"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"裝置保護功能將停止運作。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已由管理員、加密政策或認證儲存空間停用"</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_biometric_weak" msgid="3008473624490350142">"人臉解鎖"</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_password" msgid="1203938057264146610">"密碼"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"設定螢幕鎖定之後，您還可以前往 [設定] &gt; [安全性] 設定指紋。"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"關閉螢幕鎖定"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"移除解鎖圖形"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"移除解鎖 PIN"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"密碼至少必須包含 1 個字母。"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"密碼至少必須包含 1 個數字。"</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"密碼至少必須包含 1 個符號。"</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"密碼至少必須包含 1 個字母。"</item>
-    <item quantity="other" msgid="8186027808415585970">"密碼至少必須包含 %d 個字母。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"密碼至少必須包含 1 個小寫字母。"</item>
-    <item quantity="other" msgid="2693910942679679225">"密碼至少必須包含 %d 個小寫字母。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"密碼至少必須包含 1 個大寫字母。"</item>
-    <item quantity="other" msgid="3030801209112209245">"密碼至少必須包含 %d 個大寫字母。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"密碼至少必須包含 1 個數字。"</item>
-    <item quantity="other" msgid="4703982391407595924">"密碼至少必須包含 %d 個數字。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"密碼至少必須包含 1 個特殊符號。"</item>
-    <item quantity="other" msgid="1221290525051187757">"密碼至少必須包含 %d 個特殊符號。"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"密碼至少必須包含 1 個非字母字元。"</item>
-    <item quantity="other" msgid="3952508584649046404">"密碼至少必須包含 %d 個非字母字元。"</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="other">密碼至少必須包含 %d 個字母。</item>
+      <item quantity="one">密碼至少必須包含 1 個字母。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="other">密碼至少必須包含 %d 個小寫字母。</item>
+      <item quantity="one">密碼至少必須包含 1 個小寫字母。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="other">密碼至少必須包含 %d 個大寫字母。</item>
+      <item quantity="one">密碼至少必須包含 1 個大寫字母。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="other">密碼至少必須包含 %d 個數字。</item>
+      <item quantity="one">密碼至少必須包含 1 個數字。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="other">密碼至少必須包含 %d 個特殊符號。</item>
+      <item quantity="one">密碼至少必須包含 1 個特殊符號。</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="other">密碼至少必須包含 %d 個非字母字元。</item>
+      <item quantity="one">密碼至少必須包含 1 個非字母字元。</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"裝置管理員不允許使用最近用過的密碼。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"不得使用依遞增或遞減順序排列、或重複的一串數字"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"確定"</string>
@@ -480,15 +490,8 @@
     <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_accept" msgid="6163520056536604875">"配對"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"配對"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"取消"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"裝置配對完成後，連線時即可存取您的聯絡人和通話紀錄。"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 配對。"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 配對，因為 PIN 或密碼金鑰不正確。"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 通訊。"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」拒絕配對要求。"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"無法連線至「<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>
@@ -515,16 +518,8 @@
     <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="3719383048635344071">"為了提升定位精確度，應用程式和服務會進行掃描，看看附近是否有藍牙裝置 (即使藍牙連線功能處於關閉狀態)。您可以前往<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_specific_profiles_title" msgid="6952214406025825164">"連線到…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"媒體音訊"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"手機音訊"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"檔案傳輸"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"輸入裝置"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"網際網路連線"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"聯絡人共用"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"用於聯絡人共用"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"網際網路連線分享"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"訊息存取權"</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>
@@ -537,28 +532,15 @@
     <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_a2dp_profile_summary_connected" msgid="963376081347721598">"連接至媒體音訊"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"連接至電話音訊"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已連線到檔案傳輸伺服器"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"已連線至地圖"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"不要連線到檔案傳輸伺服器"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"已連線到輸入裝置"</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_a2dp_profile_summary_use_for" msgid="4630849022250168427">"用於媒體音訊"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"用於電話音訊"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用於傳輸檔案"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"用於輸入"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"用於網際網路連線"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"地圖使用偏好"</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_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"已透過 Wi‑Fi 小幫手連線"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"投放螢幕"</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>
@@ -570,6 +552,8 @@
     <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>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <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>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"正在關閉 Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"錯誤"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"處於飛行模式時"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"無法掃描網路"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"網路通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"有可用的公用網路時通知我"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"避開品質不佳的連線"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"除非 Wi-Fi 網路連線狀態良好，否則不使用"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"僅使用網際網路連線品質穩定的網路"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"一律執行掃描"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"一律執行掃描"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"允許 Google 的定位服務和其他應用程式掃描網路 (即使 Wi-Fi 已關閉仍允許掃描)"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"自動使用開放 Wi-Fi"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"允許 Wi‑Fi 小幫手自動連線到系統測定為高品質的開放網路"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"選擇小幫手"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安裝憑證"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"為了提升定位精確度及用於其他用途，Google 和其他應用程式可能會掃描附近的 Wi-Fi 網路 (即使 Wi-Fi 連線功能已關閉)。如果您不想授予這項權限，可隨時前往 [進階] &gt; [掃描] 變更設定。"</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"應用程式可能會掃描附近的網路 (即使 Wi-Fi 連線功能已關閉)。如果您不想授予這項權限，可隨時前往 [進階] &gt; [掃描] 變更設定。"</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"為了提升定位精確度，應用程式和服務會進行掃描，看看附近是否有 Wi-Fi 網路 (即使 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="5340097010842405981">"不要再顯示"</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>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"新增其他網路"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定 (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"您的平板電腦必須連上 Wi-Fi 網路才能完成設定。設定完畢後，您可以切換選擇行動數據網路或 Wi-Fi 網路。"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"進階選項"</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="5940801028985255304">"請按路由器上的 Wi-Fi 保護設定按鈕，該按鈕可能標示為「WPS」或含有這個符號："</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"按下路由器上的 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_complete" msgid="2388138550456729134">"WPS 成功，正在連線至網路…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"已連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <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="219415018348922629">"設定存取點頻帶"</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>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(未變更)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(未指定)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"已儲存"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 設定失敗"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi 連線失敗"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"驗證問題"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"不在有效範圍內"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"未偵測到可用的網際網路連線，系統無法為您自動重新連線。"</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_security_none" msgid="7985461072596594400">"無"</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>
@@ -686,6 +659,8 @@
     <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="1509171132175355674">"這個網路沒有網際網路連線。您仍要使用這個網路嗎？"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"不要再詢問我是否使用這個網路"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"無法連線至網路"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"清除"</string>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK 可攜式 Wi‑Fi 無線基地台"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> 可攜式 Wi-Fi 無線基地台"</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_mode_title" msgid="2164073796253284289">"撥號偏好"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi 通話模式"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Wi-Fi 優先"</item>
+    <item msgid="5267397515594230396">"行動通訊優先"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"開啟 Wi-Fi 通話功能之後，您的手機可依據您的偏好設定，透過 Wi-Fi 網路或您的行動通訊網路通話 (選擇訊號較強者)。開啟這項功能前，請先與您的行動通訊業者詢問費用與其他細節。"</string>
     <string name="home_settings" msgid="212375129455718176">"主螢幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
@@ -814,6 +801,11 @@
     <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="night_mode_title" msgid="6928425617491943384">"主題"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"淺色"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"深色"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"自動"</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>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"更新慣用的 SIM 卡？"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"「<xliff:g id="NEW_SIM">%1$s</xliff:g>」是裝置中唯一的 SIM 卡。您要使用這張 SIM 卡連線到行動網路、通話及傳送簡訊嗎？"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM 卡的 PIN 碼輸入錯誤，您現在必須請行動通訊業者為裝置解鎖。"</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM 卡的 PIN 碼輸入錯誤，您還可以再試 <xliff:g id="NUMBER">%d</xliff:g> 次。如果仍然失敗，就必須請行動通訊業者為裝置解鎖。"</item>
-    <item quantity="other" msgid="77103619544346451">"SIM 卡的 PIN 碼輸入錯誤，您還可以再試 <xliff:g id="NUMBER">%d</xliff:g> 次。"</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="other">SIM 卡的 PIN 碼輸入錯誤，您還可以再試 <xliff:g id="NUMBER_1">%d</xliff:g> 次。</item>
+      <item quantity="one">SIM 卡的 PIN 碼輸入錯誤，您還可以再試 <xliff:g id="NUMBER_0">%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>
@@ -917,12 +909,12 @@
     <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="2348501997988663688">"應用程式 (相關資料和媒體內容)"</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_dcim_usage" msgid="558887013613822577">"圖片、影片"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"音訊 (音樂、鈴聲、Podcast 等)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"其他"</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="default" msgid="6915293408836853020">"卸載 SD 卡"</string>
@@ -955,6 +947,11 @@
     <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_mount" msgid="1014683672493425425">"掛載"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"退出"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"清除並格式化"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"清除並格式化為內部儲存空間"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB 電腦連線"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB 電腦連線"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"連線方式"</string>
@@ -962,8 +959,48 @@
     <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="7673397474756664929">"讓您使用相機軟體傳輸相片，並在任何不支援 MTP 的電腦上傳輸檔案"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"安裝檔案傳輸工具"</string>
+    <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_external_title" msgid="2723851748972673696">"外接儲存裝置"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> 可用空間 (共 <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"已掛載「<xliff:g id="NAME">%1$s</xliff:g>」"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"無法掛載「<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="4161722509712992231">"無法安全退出「<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="8343688274191391889">"無法將「<xliff:g id="NAME">%1$s</xliff:g>」格式化"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"重新命名儲存空間"</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="3677827796634199714"><b>"當您退出此「<xliff:g id="NAME_0">^1</xliff:g>」時，儲存在其中的應用程式將停止運作，而儲存在其中的媒體檔案也無法供您使用，直到重新插上裝置為止。"</b>" \n\n此「<xliff:g id="NAME_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_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_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="1259216693690378749">"請勿在進行格式化程序時移除「<xliff:g id="NAME">^1</xliff:g>」。"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"將資料移動到新的儲存空間"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"您可以將相片、檔案和應用程式資料移動到新的「<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="5035719146373359329"><b>"移動作業大約需要 <xliff:g id="TIME">^1</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="8641916179067596592">"執行移動作業時：\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_move_confirm_title" msgid="292782012677890250">"移動「<xliff:g id="APP">^1</xliff:g>」"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"將「<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="4288580957960820740">"請勿在執行移動作業時移除「<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="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電池存量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1007,10 +1044,15 @@
     <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_network_title" msgid="4557113742173895074">"重設網路設定"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"這個動作會重設所有網路設定，包括：\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="4874737348054213767">"您要重設所有網路設定嗎？這個動作無法復原！"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"重設設定"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"您要重設嗎？"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"已重設網路設定"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"重設裝置"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"恢復原廠設定"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板電腦上的所有資料"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手機上所有資料"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"這會清除您手機"<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>
@@ -1024,9 +1066,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除 SD 卡中的所有資料，例如音樂或相片。"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重設平板電腦"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重設手機"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"您要清除所有個人資訊和已下載的應用程式嗎？您無法復原這個動作！"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"您要清除所有個人資訊和已下載的應用程式嗎？這個動作無法復原！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"全部清除"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"請畫出解鎖圖形，確認您要恢復原廠設定。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"無法使用 System Clear 服務，因此未執行任何重設。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"您要重設嗎？"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"這位使用者無法將裝置恢復原廠設定"</string>
@@ -1043,8 +1084,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"清除 USB 儲存裝置時，是否一併刪除所有儲存的檔案？您無法復原這個動作！"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"清除 SD 卡時，是否刪除其中儲存的所有檔案？這項動作無法復原！"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"全部清除"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"您必須畫出解鎖圖形以確認要清除 USB 儲存裝置的資料。"</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"請畫出解鎖圖形，確認您要清除 SD 卡中的資料。"</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>
@@ -1076,7 +1115,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"行動網路"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"行動數據傳輸資費方案"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"預設簡訊應用程式"</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_no_previous_dialog_text" msgid="602683880284921998">"使用 <xliff:g id="NEW_APP">%s</xliff:g> 做為簡訊應用程式嗎？"</string>
@@ -1104,7 +1143,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"使用 GPS、Wi-Fi 和行動網路判斷位置"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"使用 Wi-Fi 和行動網路判斷位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"使用 GPS 判斷您的位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 判斷您的所在位置"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"掃描"</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="2070686681074461301">"允許應用程式和服務執行 Wi‑Fi 網路掃描作業 (即使 Wi-Fi 連線功能處於關閉狀態)，以提升定位精確度"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"藍牙掃描"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"允許系統服務執行藍牙裝置掃描作業 (即使藍牙連線功能處於關閉狀態)，以提升定位精確度"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi 和行動網路位置資訊"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的定位服務加速判斷您的約略位置。系統會收集匿名的位置資料並傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"根據 Wi-Fi 判定位置"</string>
@@ -1150,11 +1195,15 @@
     <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="lock_settings_title" msgid="335025124489630932">"螢幕安全性"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"請畫出您的裝置解鎖圖形以繼續作業。"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"請輸入您的裝置 PIN 以繼續作業。"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"請輸入您的裝置密碼以繼續作業。"</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_need_to_unlock" msgid="757935356911054465">"確認儲存的圖形"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"請再試一次："</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"畫出解鎖圖形"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"請按 [Menu] 以取得說明。"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"完成時請移開手指"</string>
@@ -1176,8 +1225,7 @@
     <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_header" msgid="819903817323783498">"錯誤嘗試太多！"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> 秒後再試一次。"</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="manageapplications_settings_title" msgid="7041951105633616745">"管理應用程式"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和移除已安裝的應用程式"</string>
@@ -1228,6 +1276,7 @@
     <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>
@@ -1299,6 +1348,7 @@
     <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>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"儲存空間使用量"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"查看應用程式的儲存空間使用量"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在運作的服務"</string>
@@ -1396,17 +1446,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板電腦資訊"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手機資訊"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"電池資訊"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"快速啟動"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"設定啟動應用程式的鍵盤快速鍵"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"指派應用程式"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"沒有快速建"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"搜尋 + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"清除"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) 的捷徑會被清除。"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"確定"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"取消"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"應用程式"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"快速鍵"</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>
@@ -1441,23 +1480,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM 解鎖"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"允許解除鎖定開機載入器"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"輸入您的 PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"如要啟用 OEM 解鎖設定，請輸入您的裝置 PIN"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"要允許 OEM 解鎖嗎？"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告：開啟這項設定時，您將無法使用這個裝置的防盜功能。"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"紀錄器緩衝區空間"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"選取每個紀錄緩衝區的紀錄器空間"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"啟用檢視屬性檢查"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"網路連線"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"啟用 Wi‑Fi 詳細紀錄設定"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi 至行動數據轉換強化"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"一律允許 Wi-Fi 漫遊掃描"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"使用舊版 DHCP 用戶端"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"顯示無線螢幕分享認證的選項"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"讓 Wi‑Fi 記錄功能升級，在 Wi‑Fi 選擇器中依每個 SSID RSSI 顯示 Wi‑Fi 詳細紀錄"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"啟用時，Wi-Fi 連線在訊號不穩的情況下會更積極轉換成行動數據連線"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"根據介面中目前的數據流量允許/禁止 Wi-Fi 漫遊掃描"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"紀錄器緩衝區空間"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"選取每個紀錄緩衝區的紀錄器空間"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"選取 USB 設定"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"選取 USB 設定"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"啟用檢視屬性檢查"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"使用 Lollipop 的 DHCP 用戶端，不使用新型 Android DHCP 用戶端。"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎？"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB 偵錯是針對應用程式開發而設計的功能，可讓您複製電腦和裝置中的資料、不需經由通知即可在裝置上安裝應用程式，以及讀取記錄資料。"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"要針對先前授權的所有電腦撤銷 USB 偵錯權限嗎？"</string>
@@ -1561,6 +1608,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"洋紅色"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要執行下列動作："</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"權限要求遭到其他應用程式畫面遮掩，因此「設定」無法驗證您的回應。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您開啟 <xliff:g id="SERVICE">%1$s</xliff:g>，您的裝置將無法使用螢幕鎖定加強資料加密。"</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"您已開啟協助工具服務，因此您的裝置無法使用螢幕鎖定加強資料加密。"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密，因此您必須畫出解鎖圖形。"</string>
@@ -1646,7 +1694,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前景使用時間"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"停用休眠"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi 執行中"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"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>
@@ -1702,14 +1750,20 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"類型：<xliff:g id="TYPE">%1$s</xliff:g>，時間：<xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"過去 <xliff:g id="TIMEDURATION">%3$s</xliff:g> 使用了 <xliff:g id="USEDRAM">%1$s</xliff:g>  (共 <xliff:g id="TOTALRAM">%2$s</xliff:g> )"</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_memory_status" msgid="4251599550196193093">"裝置記憶體目前狀態：<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM 平均使用量"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM 最高使用量"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"Android 作業系統"</string>
+    <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_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="processes_subtitle" msgid="6827502409379462438">"處理程序"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"服務"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"時間長度"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"記憶體詳細資料"</string>
@@ -1726,6 +1780,7 @@
     <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_hide_system" msgid="4106826741703745733">"隱藏系統"</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>
@@ -1748,7 +1803,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"下列預設設定會覆寫應用程式設定"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"預設設定"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"預設引擎"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"將語音合成引擎設為處理語音"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"設定執行文字轉語音作業專用的語音合成引擎"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"語音速率"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"文字轉語音的播放速度"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音調"</string>
@@ -1826,7 +1881,6 @@
     <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_install_gesture_explanation" msgid="7408921172253634829">"您必須畫出解鎖圖形，才能確認安裝憑證。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"輸入認證儲存空間的密碼。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"目前的密碼："</string>
@@ -1851,12 +1905,10 @@
     <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_configure_account_default_summary" msgid="2436933224764745553">"目前沒有帳戶正在儲存備份資料"</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="5355557151569037197">"目前無法使用備份服務。"</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"這是由您的裝置政策所設定。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"電腦備份密碼"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"電腦完整備份目前未受保護"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"輕觸即可變更或移除電腦完整備份的密碼"</string>
@@ -2028,6 +2080,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"轉場動畫比例"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"動畫影片長度比例"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"模擬次要顯示器"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"多視窗模式"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"同時在螢幕上顯示多個活動。"</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"啟用多視窗模式？"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"警告：這項極具實驗性的功能可讓您透過 [最近使用的應用程式] 使用者介面，將多個活動同時顯示在螢幕上。提醒您，搭配這項功能使用時，部分應用程式可能會當機或無法正常運作。"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"應用程式"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"不要保留活動"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"使用者離開活動後立刻刪除所有活動內容"</string>
@@ -2199,7 +2255,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="718192651887726259">"您可以建立其他使用者，藉此與他人共用這個裝置。每位使用者都有自己的專屬空間，並可使用應用程式、桌布等項目自訂這個個人空間。此外，使用者也可以調整會影響所有人的裝置設定，例如 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>
@@ -2230,13 +2286,13 @@
     <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="8310589470979488255">"啟用通話功能"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"啟用通話和簡訊功能"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"開啟通話功能"</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="440218975766968124">"啟用通話功能？"</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_sms_confirm_title" msgid="188164598768941316">"啟用通話和簡訊功能？"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"將與這位使用者共用通話和簡訊紀錄。"</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="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限的應用程式"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
@@ -2287,8 +2343,8 @@
     <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_not_supported_in_limited" msgid="913035259626149121">"系統不支援設有限制的個人資料使用這個應用程式"</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>
@@ -2353,13 +2409,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi 網路連線"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"文字訊息 訊息 傳送文字訊息 簡訊 傳送簡訊"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"行動通訊 行動網路 行動通訊業者 無線 數據 4G 3G 2G LTE"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi 通話 撥號"</string>
     <string name="keywords_home" msgid="3626170808219458848">"啟動器"</string>
     <string name="keywords_display" msgid="6709007669501628320">"螢幕 觸控式螢幕"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"變暗 螢幕 觸控螢幕 電池"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"變暗 螢幕 觸控螢幕 電池"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 個人化 自訂 顯示"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"深色主題 夜間模式 調暗螢幕 反轉亮度"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"背景 個人化 自訂 顯示"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字大小"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"投影"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"投影 投放"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"空間 磁碟 硬碟 裝置 使用量"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"電源 使用量 充電"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"拼寫 字典 拼字檢查 自動更正"</string>
@@ -2376,6 +2434,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"帳戶"</string>
     <string name="keywords_users" msgid="4673901601478559100">"限制 限制 受限"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 更正 修正 音效 震動 自動 語言 手勢 建議 字詞建議 主題 令人反感 字詞 輸入 表情符號 國際"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"重設 偏好設定 預設值"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"預設緊急狀況應用程式"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"app 下載 應用程式 系統"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"應用程式權限安全性"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"應用程式 預設"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑動 密碼 圖形 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標記"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
@@ -2390,11 +2453,12 @@
     <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="zen_mode_settings_title" msgid="7014915558669122902">"干擾"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"收到來電和通知時"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"一律允許干擾"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"僅允許優先干擾"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"不允許干擾"</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_option_important_interruptions" msgid="3903928008177972500">"僅顯示優先通知"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅允許鬧鐘"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"無干擾"</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="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"預設通知鈴聲"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"來電時同時震動"</string>
@@ -2420,62 +2484,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"震動"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"應用程式無法讀取通知"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d 個應用程式可以讀取通知"</item>
-    <item quantity="other" msgid="980049191810249052">"%d 個應用程式可以讀取通知"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="other">%d 個應用程式可以讀取通知</item>
+      <item quantity="one">%d 個應用程式可以讀取通知</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"沒有安裝任何通知接聽器。"</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"「<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>」將可讀取系統或任何已安裝的應用程式發佈的所有通知 (可能包括聯絡人姓名和他人傳送給您的訊息文字等個人資訊)，並可關閉這些通知或其中的觸控操作按鈕。"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"條件提供者"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"沒有任何應用程式提供條件"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d 個應用程式提供了條件"</item>
-    <item quantity="other" msgid="358057362115673258">"%d 個應用程式提供了條件"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"尚未安裝任何條件提供者。"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> 將可新增結束「請勿打擾」模式的條件。"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"封鎖"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"永不顯示這個應用程式的通知"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"優先"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"在清單頂端顯示通知，並在裝置設為僅限優先干擾時，持續顯示通知"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"機密"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"當裝置鎖定時，隱藏這個應用程式所通知的任何機密內容"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"視為優先通知"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"當「零打擾」設定為 [僅顯示優先通知] 時，讓這個應用程式的通知發出聲響"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"允許迅速瀏覽"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"讓這個應用程式將通知短暫滑入目前的畫面，藉此突顯特定通知"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"隱藏機密內容"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"當裝置鎖定時，隱藏這個應用程式通知中可能涉及私人資訊的內容"</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="zen_mode_default_option" msgid="6940069025071935243">"手動關閉這項設定前一律啟用"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"優先干擾"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"停機"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"星期幾"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"無"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"允許干擾"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"僅限優先干擾"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"無"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"自動化"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動開啟"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"規則名稱"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"新增規則"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"刪除規則"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"要刪除「<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="3201273040477861538">"時間表規則"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"找不到規則。"</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>/<xliff:g id="MODE">%2$s</xliff:g>"</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="summary_divider_text" msgid="7228986578690919294">"、 "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"永遠不要"</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_from" msgid="1033337300289871697">"來電者/訊息傳送者"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"所有人"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"僅限聯絡人"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"僅限已加星號的聯絡人"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"活動和提醒"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"鬧鐘一律可優先干擾"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"活動"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"所選來電者"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重複來電者"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"如果同一個人在 <xliff:g id="MINUTES">%d</xliff:g> 分鐘的時間內第二次來電，即顯示通知"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自動開啟"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"永遠不要"</string>
     <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_priority_next_day_summary_format" msgid="2910982148167785730">"隔天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> 或任何早於該時間的鬧鐘鈴響時"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"隔天 <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_interruptions_voice_title" msgid="855256211259132964">"干擾"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"有人來電和收到通知時"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"您想接收哪些干擾通知？"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"要持續多久？"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"一律允許干擾"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"關閉,所有,全部"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"僅允許優先干擾"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"僅允許鬧鐘"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"無干擾"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"無限期"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分鐘</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分鐘</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <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="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"無限期變更為僅顯示優先通知模式"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="other">變更為僅顯示優先通知模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 分鐘，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為僅顯示優先通知模式：持續 1 分鐘，結束時間為<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="other">變更為僅顯示優先通知模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 小時，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為僅顯示優先通知模式：持續 1 小時，結束時間為<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"無限期變更為僅允許鬧鐘模式"</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>
+      <item quantity="one">變更為僅允許鬧鐘模式：持續 1 分鐘，結束時間為<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">變更為僅允許鬧鐘模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 小時，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為僅允許鬧鐘模式：持續 1 小時，結束時間為<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"無限期變更為無干擾模式"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="other">變更為無干擾模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 分鐘，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為無干擾模式：持續 1 分鐘，結束時間為<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="other">變更為無干擾模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 小時，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">變更為無干擾模式：持續 1 小時，結束時間為<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"變更為一律允許干擾模式"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"不限時間"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送您對這個裝置的意見回饋"</string>
@@ -2516,4 +2633,63 @@
     <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="2184141780491382435">"預設為啟動"</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="app_launch_domain_links_title" msgid="458956710410857777">"網域連結"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"開啟網域網址"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"允許應用程式直接開啟網域網址"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"支援的網域網址"</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="410824961149037234">"內部記憶體"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"外部記憶體"</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="notifications_enabled" msgid="6983396130566021385">"開啟"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"封鎖"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"機密"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"優先"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"優先與敏感"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="other">已取得 <xliff:g id="COUNT_1">%d</xliff:g> 項權限</item>
+      <item quantity="one">已取得 <xliff:g id="COUNT_0">%d</xliff:g> 項權限</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="other">已授予 <xliff:g id="COUNT_2">%d</xliff:g> 項權限 (共 <xliff:g id="COUNT_3">%d</xliff:g> 項)</item>
+      <item quantity="one">已授予 <xliff:g id="COUNT_0">%d</xliff:g> 項權限 (共 <xliff:g id="COUNT_1">%d</xliff:g> 項)</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"已設定部分預設值"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"未設定預設值"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"所有應用程式"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"已啟用"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"公司"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已封鎖"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"優先"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"敏感"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"包含網域網址"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"已由管理員停用"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"不明的應用程式"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"應用程式權限"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"已將額外存取權授予 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"已授權 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"網域網址"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"不開啟任何網域網址"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"開啟「<xliff:g id="DOMAIN">%s</xliff:g>」"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"開啟「<xliff:g id="DOMAIN">%s</xliff:g>」和相關網址"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> 個應用程式可以開啟自身的網域網址</item>
+      <item quantity="one">1 個應用程式可以開啟自身的網域網址</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"無法識別"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"預設應用程式"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"瀏覽器應用程式"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"沒有預設瀏覽器"</string>
+    <string name="default_app" msgid="6864503001385843060">"(預設)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"應用程式儲存空間"</string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index f3a81bf..219a3c1 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -125,6 +125,9 @@
     <item msgid="7981731051382306293">"i-TLS"</item>
     <item msgid="2892994535305020162">"i-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="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Cindezela inkinobho"</item>
@@ -283,6 +286,9 @@
     <item msgid="3073734345226842233">"thulisa/yekisa ukuthulisa imakrofoni"</item>
     <item msgid="1148142988678569310">"imidiya yephrojekthi"</item>
     <item msgid="9130014005474445273">"sebenzisa i-VPN"</item>
+    <item msgid="1165192162975045562">"bhala isithombe-skrini"</item>
+    <item msgid="7129487923652967258">"ukulekelela ukwakheka"</item>
+    <item msgid="1069023208100114540">"ukulekelela isithombe-skrini"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Indawo"</item>
@@ -332,6 +338,9 @@
     <item msgid="1312534577834048535">"Thulisa/yekisa ukuthulisa imakrofoni"</item>
     <item msgid="5906017727368097853">"Imidiya yephrojekthi"</item>
     <item msgid="2486614710846178542">"Sebenzisa i-VPN"</item>
+    <item msgid="5586547561693629602">"Bhala isithombe sangemuva"</item>
+    <item msgid="32794179825485062">"Ukulekelela ukwakheka"</item>
+    <item msgid="7872852746938272552">"Ukulekelela isithombe-skrini"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kufushane"</item>
@@ -500,11 +509,6 @@
     <item msgid="406385694840950802">"phansi"</item>
     <item msgid="4212263919458209842">"bucayi"</item>
   </string-array>
-  <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"Valiwe"</item>
-    <item msgid="5656544177755411222">"Iziphazamiso ezinomkhawulo"</item>
-    <item msgid="8735337502532332056">"Iziphazamiso ezingekho"</item>
-  </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Okujwayelekile"</item>
     <item msgid="866544120205026771">"Maphakathi"</item>
@@ -535,4 +539,11 @@
     <item msgid="4608643045752965568">"Ophinki"</item>
     <item msgid="6131821495505931173">"Okubomvu"</item>
   </string-array>
+  <string-array name="usb_configuration_titles">
+    <item msgid="5350926807680564950">"I-MTP (Iphrothokholi Yokudlulisa Imidiya)"</item>
+    <item msgid="8856820259201251036">"I-PTP (Iphrothokholi Yokudlulisa Izithombe)"</item>
+    <item msgid="216135047298423770">"I-RNDIS (USB Ethernet)"</item>
+    <item msgid="2686051673589572111">"Umthombo Womsindo"</item>
+    <item msgid="7014054229609338176">"MIDI"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index a17569f..010e516 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -22,10 +22,10 @@
     <string name="allow" msgid="3349662621170855910">"Vumela"</string>
     <string name="deny" msgid="6947806159746484865">"Nqaba"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Akwaziwa"</string>
-  <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Manje usalelwe yizinyathelo ezingu-<xliff:g id="STEP_COUNT">%1$d</xliff:g> ukuthi ube ngunjiniyela."</item>
-    <item quantity="other" msgid="6722953419953594148">"Manje usalelwe yizinyathelo ezingu-<xliff:g id="STEP_COUNT">%1$d</xliff:g> ukuthi ube ngunjiniyela."</item>
-  </plurals>
+    <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">Manje ususele ngamagxathu angu-<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ukuthi ube ngunjiniyela.</item>
+      <item quantity="other">Manje ususele ngamagxathu angu-<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ukuthi ube ngunjiniyela.</item>
+    </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Manje ungunjiniyela!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Asikho isidingo, usuvele ungunjiniyela."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Okugenantambo namanethiwekhi"</string>
@@ -40,6 +40,8 @@
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Cisha i-SMS phezulu kwe-IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Kudingeka ukuthi kuvulwe ukubhaliswa kwe-IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Kudingeka ukuthi kucinywe ukubhaliswa kwe-IMS"</string>
+    <string name="volte_provisioned_flag_on" msgid="6023503159480902956">"Vula ifulegi elimiselwe le-VoLTE"</string>
+    <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"Vala ifulegi elimiselwe le-VoLTE"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Vula i-lte ram dump"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Cima i-lte ram dump"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Buka incwadi yekheli le-SIM"</string>
@@ -135,16 +137,7 @@
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Ukusakaza"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vimbela iphrofayli?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Lokhu kuzovimbela:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kusukalt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_connected" msgid="6038755206916626419">"Ixhunyiwe"</string>
-    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ixhunyiwe (ayikho ifoni)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ixhunyiwe (ayikho imidiya)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Kuxhunyiwe (akukho ukufinyelela umlayezo)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ixhunyiwe (ayikho ifoni noma imidiya)"</string>
-    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ayixhunyiwe"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Inqamula uxhumano kwi-inthanethi..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Iyaxhuma..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Iyabhangqa..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Idivayisi ye-Bluetooth engaqanjwanga igama"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Iyasesha..."</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Awekho amadivayisi e-Bluetooth atholakele."</string>
@@ -154,7 +147,7 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Bonisa amafayili atholiwe"</string>
     <string name="device_picker" msgid="4978696506172252813">"Khetha idivayisi ye-Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Isicelo semvume ye-Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="1712443355224737143">"Uhlelo lokusebenza lifuna UKUVULA i-Bluetooth kule divayisi."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Uhlelo lokusebenza oluthile lufuna ukwenza ithebulethi yakho ibonakale kwamanye amadivayisi we-Bluetooth kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Uhlelo lokusebenza oluthile lufuna ukwenza ifoni yakho ibonakale kwamanye amadivayisi we-Bluetooth kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ithebulethi yakho ibonakale kwamanye amadivayisi we-Bluetooth. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
@@ -275,12 +268,10 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Ikhadi le-SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Izilungiselelo zommeleli"</string>
     <string name="cancel" msgid="6859253417269739139">"Khansela"</string>
-    <string name="cancel_all_caps" msgid="3183966387632229461">"KHANSELA"</string>
-    <string name="continue_all_caps" msgid="5152713914673789893">"QHUBEKA"</string>
     <string name="okay" msgid="1997666393121016642">"KULUNGILE"</string>
-    <string name="yes_all_caps" msgid="5454685069075197457">"YEBO"</string>
-    <string name="no_all_caps" msgid="3242375449351298529">"CHA"</string>
-    <string name="forget" msgid="7267115980248732932">"KHOHLWA"</string>
+    <string name="forget" msgid="1400428660472591263">"Khohlwa"</string>
+    <string name="save" msgid="879993180139353333">"Londoloza"</string>
+    <string name="done" msgid="6942539184162713160">"Kwenziwe"</string>
     <string name="settings_label" msgid="1626402585530130914">"Izilungiselelo"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Izilungiselelo"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Isinqamuleli sezilungiselelo"</string>
@@ -325,9 +316,6 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Hlunga ngesikhathi somkhawulo"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Idethi"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Isikhathi"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Enza kangcono ukufana kobuso"</string>
-    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Ukuhlola ukuphila"</string>
-    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Idinga ukucwabiza kweso ngenkathi ivula"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Ivalwe ngokuzenzakalelayo"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> ngemuva kokulala"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> ngemva kokulala, ngaphandle kokugcina ivuliwe yi-<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -348,6 +336,30 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setha Indawo Yami, ukuvula isikrini, ukuvala isitoreji seziqinisekiso"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Amaphasiwedi"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Izigxivizo zeminwe"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Phatha izigxivizo zeminwe"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sebenzisa izigxivizo zeminwe ukuthi"</string>
+    <string name="fingerprint_add_title" msgid="3453670509485083962">"Engeza"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ukukhiya isikrini"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> izigxivizo zeminwe zibhalisiwe</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> izigxivizo zeminwe zibhalisiwe</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Ukusetha kwezigxivizo zeminwe"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Ukuze usebenzise izigxivizo zakho zeminwe ukuvula isikrini sakho noma ukuqinisekisa ukuthenga kwakho, uzodinga: \n\n✓ Ukusetha indlela yakho yokukhiya isikrini sokwenza isipele \n\n✓ Ukungeza izigxivizo zakho zeminwe"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Thola inzwa"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Beka inzwa yezigxivizo zeminwe emuva kwefoni yakho."</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Igama"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"KULUNGILE"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Susa"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Asiqalise!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Faka umunwe wakho kunzwa yezigxivizo zeminwe. Phakamisa ngemuva kokuzwa ukudlidlizela."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Kuhle! Manje phinda."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Faka umunwe ofanayo kunzwa yezigxivizo zeminwe uphinde uphakamise ukuze uzozwa ukudlidlizela."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Izigxivizo zeminwe zingeziwe!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Noma kunini lapho ubona khona lesi sithonjana, ungasebenzisa izigxivizo zakho zeminwe noma ugunyaze ukuthenga."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Engeza"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Okulandelayo"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Ukubethelwa"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Bethela ithebhulethi"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Bethela ifoni"</string>
@@ -360,7 +372,6 @@
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sicela uxhume ishaja yakho bese uzama futhi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ayikho i-PIN yokuvala isikrini noma iphasiwedi"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Udinga ukusetha i-PIN yokukhiya isikrini noma iphasiwedi ngaphambi kokuqala ukubhala ngakhodi."</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukubethelwa idivayisi yakho."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Bhala ngekhodi?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Umsebenzi wokubhala ngekhodi awubuyiseleki emuva futhi uma uwuphazamisa, uzolahlekelwa idatha. Ukubhala ngekhodi kuthatha ihora noma ngaphezulu, phakathi kwesikhathi lapho ikhomyutha izoqala kabusha kambalwa."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Umsebenzi wokubhala ngekhodi awubuyiseleki emuva futhi uma uwuphazamisa, uzolahlekelwa idatha. Ukubhala ngekhodi kuthatha ihora noma ngaphezulu, phakathi kwesikhathi lapho ucingo lizoqala kabusha kambalwa."</string>
@@ -391,22 +402,21 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Swayipha"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Akukho ukuphepha"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"I-Face Unlock"</string>
-    <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Ukuphepha okuphansi, ukulinga"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Iphathini"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Ukuphepha Okuphakathi nendawo"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"i-PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Ukuphepha okuphakathi nendawo kuya kokuphezulu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Iphasiwedi"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Ukuphepha okuphezulu"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Ukukhiya isikrini kwamanje"</string>
     <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Izici zokuvikela idivayisi ngeke zisasebenza."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Khubaza umqondisi, ukubethela inqubomgomo, noma isitoreji sobuqinisekisa"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Lutho"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Swayipha"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"I-Face Unlock"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Iphathini"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Iphasiwedi"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7579210814842056547">"Uma ususethe ukukhiya isikrini, ungaphinda usethe izigxivizo zeminwe zakho ku-Izilungiselelo &gt; Ukuvikela."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Cima ukuvala isikrini"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Khipha iphathini yokuvula"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Khipha ukuvala i-PIN"</string>
@@ -427,30 +437,30 @@
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Iphasiwedi kumele okungenani ibe nohlamvu olulodwa"</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Iphasiwedi kumele okungenani ibe nenombolo eyodwa."</string>
     <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Iphasiwedi kumele okungenani ibe nesimbuli eyodwa."</string>
-  <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="3063853802158131458">"Iphasiwedi okungenani kumele ibe negama elingu-1"</item>
-    <item quantity="other" msgid="8186027808415585970">"Iphasiwedi kumele okungenani ibe namagama angu-%d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="5583986519662091001">"Iphasiwedi kumele okungenani ibe negama lombhalo elingafelebisiwe elingu-1"</item>
-    <item quantity="other" msgid="2693910942679679225">"Iphasiwedi kumele ibe okungenani namagama ezinhlamvu ezingafelebisiwe ze-%d"</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="2611909966725502768">"Iphasiwedi kumele ibe okungenani negama lofeleba olungu-1"</item>
-    <item quantity="other" msgid="3030801209112209245">"Iphasiwedi kumele okungenani namagama ofeleba e-%d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="3820355568839621231">"Iphasiwedi kumele okungenani ibe nedijithi yenombolo engu-1"</item>
-    <item quantity="other" msgid="4703982391407595924">"Iphasiwedi kumele ibe okungenani amadijithi ezinombolo angu-%d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="8456579939292408631">"Iphasiwedi kumele okungenani ibe nohlamvu olukhethekile olungu-1."</item>
-    <item quantity="other" msgid="1221290525051187757">"Iphasiwedi kumele ibe nezinhlamvu ezikhethekile ezingu-%d."</item>
-  </plurals>
-  <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="4594051152085925921">"Iphasiwedi kumele okungenani ibe nohlamvu olungelona igama olungu-1"</item>
-    <item quantity="other" msgid="3952508584649046404">"Iphasiwedi kumele okungenani ibe nezinhlamvu ezingewona amagama ezingu-%d."</item>
-  </plurals>
+    <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
+      <item quantity="one">Iphasiwedi okungenani kufanele ibenezinhlamvu ezingu-%d.</item>
+      <item quantity="other">Iphasiwedi okungenani kufanele ibenezinhlamvu ezingu-%d.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="5396846200894553640">
+      <item quantity="one">Iphasiwedi kufanele okungenani ibe nezinhhlamvu ezincane ezingu-%d.</item>
+      <item quantity="other">Iphasiwedi kufanele okungenani ibe nezinhhlamvu ezincane ezingu-%d.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="2483949715040341677">
+      <item quantity="one">Iphasiwedi kufanele okungenani ibe namafama angofeleba angu-%d.</item>
+      <item quantity="other">Iphasiwedi kufanele okungenani ibe namafama angofeleba angu-%d.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="9156410893744210033">
+      <item quantity="one">Iphasiwedi kufanele okungenani ibe namadijithi wenombolo angu-%d.</item>
+      <item quantity="other">Iphasiwedi kufanele okungenani ibe namadijithi wenombolo angu-%d.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="5384442837439742233">
+      <item quantity="one">Iphasiwedi kufanele okungenani ibe nezimpawu ezikhethekile ezingu-%d.</item>
+      <item quantity="other">Iphasiwedi kufanele okungenani ibe nezimpawu ezikhethekile ezingu-%d.</item>
+    </plurals>
+    <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4175064976268466293">
+      <item quantity="one">Iphasiwedi kufanele okungenani ibe nezinhlambu ezingezona amagama olungu-%d.</item>
+      <item quantity="other">Iphasiwedi kufanele okungenani ibe nezinhlambu ezingezona amagama olungu-%d.</item>
+    </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Umqondisi wedivayisi akavumeli ukusebenzisa iphasiwedi yakamuva."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Ukunyuka, ukwehla noma ukulandelana kwamadijithi okuphindiwe kuvinjelwe"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"KULUNGILE"</string>
@@ -480,15 +490,8 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Ukuhambisa ngokubili:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Qinisekisa ukuthi ibonisa ukhiye wokungena:&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">"Kusuka ku:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Beka eceleni namanye amadivayisi?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Ukubhangqa ne:<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>Thayipha kuyona:<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>, bese ucindezela inkinobho uBuyisela noma uNgena."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Bhangqa"</string>
-    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"BHANQA"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Khansela"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Ukubhanqa kunika ukufinyelela koxhumana nabo nomlando wekholi uma uxhumekile."</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Ayikwazanga ukuhlangana ne <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Ayikwazanga ukumataniswa ne <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngenxa ye-PIN noma isihluthulelo sokungena okungafanele."</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Ayaikwazi ukuxhumana ne- <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Ukubhangqa kunqatshelwe i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Ayikwazanga ukuxhuma ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Skena amadivaysi"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Vuselela"</string>
@@ -515,16 +518,8 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Okuthuthukisiwe"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"i-Bluetooth ephambili"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Uma i-Bluetooth ivuliwe, idivayisi yakho ingakwazi ukuxhumana namanye amadivayisi aseduze we-Bluetooth."</string>
+    <string name="ble_scan_notify_text" msgid="3719383048635344071">"Ukuze uthuthukise ukunemba kwendawo, izinhlelo zokusebenza namasevisi azoskenela amadivayisi we-Bluetooth, noma ngabe i-Bluetooth ivaliwe. Ungaguqula lokhu <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>kuzilungiselelo zokuskena<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Xhuma kwi..."</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Umsindo wemidiya"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Umsindo wefoni"</string>
-    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Dlulisa ifayela"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Idivaysi yokufakwayo"</string>
-    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ukufinyelela i-Inthanethi"</string>
-    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Ukwabelana kokuxhumana"</string>
-    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Sebenzisela ukwabelana kokuxhumana"</string>
-    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ukwabelana ngoxhumano lwe-Inthanethi"</string>
-    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Ukufinyelela umlayezo"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingeke ixhumeke kumsindo wemidiya."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke ixhumeke kumsindo wehendsfri."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke ixhumeke kwidivaysi yokufakwayo."</string>
@@ -537,28 +532,15 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Sebenzisela i-"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Qamba kabusha"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Vumela ukudlulisa amafayela angenayo"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ixhume emsindweni wemidiya"</string>
-    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ixhunywe kumsindo wefoni"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ixhunywe kwiseva yokudlulisa ifayela"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Ixhumeke kumephu"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ayixhunyiwe kwiseva sokudlulisa ifayela"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ixhunywe kwidivaysi yokufakwayo"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ixhunyiwe kwidivaysi yokufinyelela kwi-Inthanethi"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Yabelana noxhumano lwe-Inthanethi kanye nedivaysi"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Sebenzisela umsindo wemidiya"</string>
-    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Sebenziselwa umsindo wefoni"</string>
-    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Sebenziselwa ukudlulisa ifayela"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Isetshenziselwa okufakwayo"</string>
-    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Sebenzisa ukufinyelela i-Inthanethi"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Sebenzisela imephu"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Izilungiselelo zokudokha"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Sebenzisa ukubeka ingxenye komsindo"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Njenge sipikhafoni"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Komculo nemidiya"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Khumbula izilungiselelo"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Umsizi we-Google Wi‑Fi"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Ixhunywe ngomsizi we-Wi-FI"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Isikrini sabalingisi"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Abalingisi"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Nika amandla ukubukeka okungenantambo "</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Awekho amadivayisi aseduze atholakele."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Iyaxhuma"</string>
@@ -570,6 +552,8 @@
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Khohlwa"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Kwenziwe"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Igama"</string>
+    <!-- no translation found for wifi_alert_lockdown_by_device_owner (5063705929160653088) -->
+    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"i-NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Vumela ukushintshanisa kwedatha uma ithebhulethi ithinta enye idivayisi"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Vumela ukushintshanisa kwedatha uma ifoni ithinta enye idivayisi"</string>
@@ -593,21 +577,16 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Ivala i-Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Iphutha"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Kwimodi yendiza"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ayikwazi ukuhlola amanethiwekhi"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Isaziso senethiwekhi"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Ngazise uma inethwekhi esesidlangalaleni itholakala"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Gwema uxhumo olubi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Ungasebenzisi inethiwekhi ye-Wi-Fi ngaphandle kokuthi inoxhumano lwe-intanethi olukahle."</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Sebenzisa kuphela amanethwekhi anoxhumo oluhle lwe-inthanethi"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Ukuskena kuhlala njalo kutholakala"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Njalo vumela ukuskena"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Vumela isevisi yendawo ye-Google nezinye izinhlelo zokusebenza ukuthi ziskene amanethiwekhi, noma ngabe i-Wi-Fi ivaliwe"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Sebenzisa ukuvula i-Wi-Fi ngokuzenzakalela"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Vumela umsizi we-Wi-Fi axhumeke ngokuzenzakalela kumanethiwekhi avulekile anqunywa ngokuthi ayikhwalithi ephezulu."</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Khetha umsizi"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Faka izitifiketi"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Ukuthuthukisa ukulunga kwendawo nezinye izinjongo, i-Google nezinye izinhlelo zokusebenza zingaskenela amanethiwekhi aseduze, noma ngabe i-Wi-Fi ivaliwe. Uma ungafuni ukuthi lokhu kwenzeke, hamba ekuskeneni okuthuthukisiwe &gt; okuhlala kutholakala."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Izinhlelo zokusebenza zingaskenela amanethiwekhi aseduze, noma ngabe i-Wi-Fi ivaliwe. Uma ungafuni ukuthi lokhu kwenzeke, hamba ekuskeneni okuthuthukisiwe &gt; okuhlala kutholakala."</string>
+    <string name="wifi_scan_notify_text" msgid="3135282824516650989">"Ukuze uthuthukise ukunemba kwendawo, izinhlelo zokusebenza namasevisi azoskenela amanethiwekhi wendawo, noma ngabe i-Wi-Fi ivaliwe. Ungaguqula lokhu ku-<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>izilungiselelo zokuskena<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ungabonisi futhi"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Gcina i-Wi-Fi isebenza ngesikhathi sokulala"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"I-Wi‑Fi ivulekile phakathi kokulala"</string>
@@ -635,11 +614,10 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"Engeza enye inethiwekhi"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Okunye"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Ukusetha okuzenzakalelayo (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"Ukuze uqedele ukusetha, ithebhulethi yakho idinga ukufinyelela i-Wi-Fi. Ngemva kokusetha, ungashintsha phakathi kwedatha yeselula ne-Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Izinketho ezithuthukile"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Ukusethwa okuvikelwe kwe-Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iqala i-WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Cindezela inkinobho yokusetha kokuvikela i-Wi-Fi kumzila wakho. Ingahle ibizwe nge-\"WPS\" noma iqukathe lolu phawu:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Cindezela inkinobho yokusetha evikelwe yi-Wi-Fi kurutha yakho. Ingabizwa nge-\"WPS\" noma imakwe ngale simbuli:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Faka iphinikhodi <xliff:g id="NUMBER">%1$s</xliff:g> kumzila wakho we-Wi-Fi. Ukusetha kungathatha kufika emaminithini amabili ukuqedela."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"I-WPS iphumelele. Ixhuma kunethiwekhi…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Ixhunywe kwinethiwekhi ye-Wi-Fi i-<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -665,20 +643,15 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Ukuhlonza okungaziwe"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Iphasiwedi"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Bonisa iphasiwedi"</string>
+    <string name="wifi_ap_band_config" msgid="219415018348922629">"Lungiselela ibhendi ye-AP"</string>
+    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz Ibhendi"</string>
+    <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz Ibhendi"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Izilungiselelo ze-IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(akushintshiwe)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(okungacacisiwe)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Kulondoloziwe"</string>
-    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Akusebenzi"</string>
-    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Ukwehluleka kokulungiswa kwe-IP"</string>
-    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Ukwehlulekla koxhumo le-WiFi"</string>
-    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Inkinga yokufakazela ubuqiniso"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ayikho ebubanzini"</string>
-    <string name="wifi_no_internet" msgid="9151470775868728896">"Ukufinyeela okungekhona kwe-inthanethi kutholakele, ngeke kuxhumeke ngokuzenzakalelayo."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"i-WPS iyatholakala"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (i-WPS iyatholakala)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Faka iphasiwedi yakho yenethiwekhi"</string>
-    <string name="wifi_security_none" msgid="7985461072596594400">"Lutho"</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>
@@ -686,6 +659,8 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Ngena ngemvume ukuze uxhume?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> idinga ukuthi ungene ngemvume ngaphambi kokuxhuma kunethiwekhi."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"XHUMA"</string>
+    <string name="no_internet_access_text" msgid="1509171132175355674">"Le nethiwekhi ayinakho ukufinyelela kwe-inthanethi. Sebenzisa le nethiwekhi noma kunjalo?"</string>
+    <string name="no_internet_access_remember" msgid="5963015664551707981">"Ungaphindi ubuze ngale nethiwekhi"</string>
     <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>
@@ -751,6 +726,18 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"I-AndroidAP WPA2 PSK portable Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> Wi-Fi hotspot ephathekayo"</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_mode_title" msgid="2164073796253284289">"Okuncanyelwayo kokushaya"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Imodi yokushaya ye-Wi-Fi"</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item msgid="2124257075906188844">"Kuncanyelwa i-Wi-Fi"</item>
+    <item msgid="5267397515594230396">"Kuncanyelwa iselula"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+  </string-array>
+    <string name="wifi_calling_off_explanation" msgid="4124926334215228094">"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="home_settings" msgid="212375129455718176">"Ikhaya"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
@@ -814,6 +801,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Lungisa ukukhanya kwesikrini"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Ukukhanya okuguqukayo"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Lungiselela izinga lokukhanya ekukhanyeni okutholakalayo"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Itimu"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Ukukhanya"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Kumnyama"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Okuzenzakalelayo"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Lala"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Isikrini siyavaleka"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
@@ -865,10 +857,10 @@
     <string name="sim_preferred_title" msgid="5567909634636045268">"Buyekeza ikhadi le-SIM olincamelayo?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"I-<xliff:g id="NEW_SIM">%1$s</xliff:g> yiyo kuphela i-SIM ekudivayisi yakho. Ingabe ufuna ukusebenzisa le-SIM kudatha yeselula, amakholi, nemilayezo ye-SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Ikhodi yephinikhodi ye-SIM engalungile manje kumele uxhumane nenkampini yenethiwekhi yakho ukuvula idivayisi yakho."</string>
-  <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"Ikhodi yephinikhodi ye-SIM engalungile, unemizamo engu-<xliff:g id="NUMBER">%d</xliff:g> esele ngaphambi kokuba uxhumane nenkampini yenethiwekhi."</item>
-    <item quantity="other" msgid="77103619544346451">"Ikhodi yephinikhodi ye-SIM engalungile, unemizamo esele engu-<xliff:g id="NUMBER">%d</xliff:g>."</item>
-  </plurals>
+    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Ikhodi engalungile yephinikhodi ye-SIM, unemizamo engu-<xliff:g id="NUMBER_1">%d</xliff:g> esele.</item>
+      <item quantity="other">Ikhodi engalungile yephinikhodi ye-SIM, unemizamo engu-<xliff:g id="NUMBER_1">%d</xliff:g> esele.</item>
+    </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Umsebenzi wephinikhodi ye-SIM wehlulekile!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Isimo sethebhulethi"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Umumo wefoni"</string>
@@ -917,12 +909,12 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Kuyatholakala (ukufunda-kuphela)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Inani lesikhala"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Iyabala..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Izinhlelo zokusebenza (idatha yohlelo lokusebenza &amp; okuqukethwe kwabezindaba)"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"Izinhlelo zokusebenza nedatha yohlelo lokusebenza"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Imidiya"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Okulandiwe"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Izithombe, Amavidiyo"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Umsindo (umculo, ithoni yokukhala, ama-podcasts nokunye)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Okungaziwa"</string>
+    <string name="memory_media_misc_usage" msgid="6094866738586451683">"Amanye amafayela"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Idatha yenqolobane"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Yehlisa isitoreji sokwabelene"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Khipha ikhadi le-SD"</string>
@@ -955,6 +947,11 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Ukwehlisa kuyaqhubeka"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Isikhala sokulondoloza siyaphela"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Eminye imisebenzi yohlelo, njengokuvumelanisa, kungahle kungasebenzi kahle. Zama ukukhulula isikhala ngokususa noma ukususa ukuphina izinto, njengezinhlelo zokusebenza noma okuqukethwe kwabezindaba."</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"Qamba kabusha"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"Khweza"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Khipha"</string>
+    <string name="storage_menu_format" msgid="8334422679047059459">"Sula futhi ufomethe"</string>
+    <string name="storage_menu_format_internal" msgid="6553368530402755543">"Sula futhi ufomethe njengesitoreji sangaphakathi"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"Uxhumano lwekhompyutha ye-USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Uxhumano lwekhompyutha ye-USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Xhuma njenge"</string>
@@ -962,8 +959,48 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Ikuvumela ukuba udlulise amafayela emidiya e-Windows, noma usebenzisa Ukudlulisa Ifayela ye-Android e-Mac (bheka www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Ikhamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Ikuvumela ukuba udlulise izithombe usebenzisa isofthiwe yekhamera, futhi udlulise nanoma yimaphi amafayela kumakhompyutha angasekeli i-MTP"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Faka amathuluzi okudlulisa ifayela"</string>
+    <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Ivumela izinhlelo zokusebenza ezinike amandla i-MIDI ngesofthiwe le-MIDI kukhompyutha yakho."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Abanye abasebenzisi"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Isitoreji sedivayisi"</string>
+    <string name="storage_external_title" msgid="2723851748972673696">"Isitoreji esikhiphekayo"</string>
+    <string name="storage_volume_summary" msgid="476551204412943800">"<xliff:g id="FREE">%1$s</xliff:g> ikhululekile (Inani <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"I-<xliff:g id="NAME">%1$s</xliff:g> ikhweziwe"</string>
+    <string name="storage_mount_failure" msgid="8928389741212129060">"Ayikwazanga ukukhweza i-<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"I-<xliff:g id="NAME">%1$s</xliff:g> ikhishwe ngokuphephile"</string>
+    <string name="storage_unmount_failure" msgid="4161722509712992231">"Ayikwazanga ukukhipha ngokuphephile i-<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_success" msgid="3023144070597190555">"I-<xliff:g id="NAME">%1$s</xliff:g> ifomethiwe"</string>
+    <string name="storage_format_failure" msgid="8343688274191391889">"Ayikwazanga ukufometha i-<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"Qamba kabusha isitoreji"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Ngemuva kokufometha, ungasebenzisa le-<xliff:g id="NAME_0">^1</xliff:g> kwamanye amadivayisi. \n\nYonke idatha kule-<xliff:g id="NAME_1">^1</xliff:g> izosuswa. Cabanga ukwenza isipele kuqala. \n\n"<b>"Yenza isipele izithombe nenye imidiya"</b>" \nHambisa amafayela wakho wemidiya kwesinye isitoreji kule divayisi, noma uwadlulisele kukhompuyutha usebenzisa intambo ye-USB. \n\n"<b>"Yenza isipele izinhlelo zokusebenza"</b>" \nZonke izinhlelo zokusebenza ezigcinwe kule-<xliff:g id="NAME_6">^1</xliff:g> zizokhishwa futhi idatha yazo izosulwa. Ukuze ugcine lezi zinhlelo zokusebenza, zihambise kwesinye isitoreji kule divayisi."</string>
+    <string name="storage_internal_unmount_details" msgid="3677827796634199714"><b>"Uma ukhipha le-<xliff:g id="NAME_0">^1</xliff:g>, izinhlelo zokusebenza ezigcinwe kuyo zizoma ukusebenza, futhi amafayela wemidiya agcine kuyo ngeke aze atholakale ize iphinde ifakwe."</b>" \n\nLe-<xliff:g id="NAME_1">^1</xliff:g> ifomethwe ukuze isebenze kule divayisi kuphela. Angeke ize isebenze kwamanye."</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"Setha i-<xliff:g id="NAME">^1</xliff:g> yakho"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Sebenzisa njengesitoreji esiphathekayo"</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Ngokuhambisa izithombe nenye imidiya ngaphakathi kwamadivayisi."</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"Sebenzisa njengesitoreji sangaphakathi"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"Ukuze ugcine noma yini kule divayisi kuphela, okufaka izinhlelo zokusebenza nezithombe. Idinga ukufometha okuyivimbela kusukela ekusebenzeni namanye amadivayisi."</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"Fometha njengesitoreji sangaphakathi"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"Lokhu kudinga i-<xliff:g id="NAME_0">^1</xliff:g> ukuthi ifomethwe ukuze yenziwe ivikeleke. \n\nNgemuva kokufometha, le-<xliff:g id="NAME_1">^1</xliff:g> izosebenza kuphela kule divayisi. \n\n"<b>"Ukufometha kususa yonke idatha manje egcinwe ku-<xliff:g id="NAME_2">^1</xliff:g>."</b>" Ukuze ugweme ukulahlekelwa yidatha, cabanga ukuyenza isipele."</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Sula uphinde ufomethe"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Ifometha i-<xliff:g id="NAME">^1</xliff:g>…"</string>
+    <string name="storage_wizard_format_progress_body" msgid="1259216693690378749">"Ungasusi i-<xliff:g id="NAME">^1</xliff:g> ngenkathi ifometha."</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Hambisa idatha kusitoreji esisha"</string>
+    <string name="storage_wizard_migrate_body" msgid="606648689408670617">"Ungahambisa izithombe zakho, amafayela, nedatha yohlelo lokusebenza kule-<xliff:g id="NAME">^1</xliff:g> entsha. \n\nUkuhanjiswa kuthatha cishe okungu-<xliff:g id="TIME">^2</xliff:g> futhi kuzokhulula okungu-<xliff:g id="SIZE">^3</xliff:g> kusitoreji sangaphakathi. Ezinye izinhlelo zokusebenza ngeke zize zisebenze ngenkathi kusasebenza."</string>
+    <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Hambisa manje"</string>
+    <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Hambisa ngemuva kwesikhathi"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Hambisa idatha manje"</string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="5035719146373359329"><b>"Ukuhanjiswa kuthatha okungenani okungu-<xliff:g id="TIME">^1</xliff:g>. Kuzokhulula okungu-<xliff:g id="SIZE">^2</xliff:g> kwesitoreji sangaphakathi."</b></string>
+    <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Hambisa"</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Ihambisa idatha…"</string>
+    <string name="storage_wizard_migrate_details" msgid="8641916179067596592">"Ngesikhathi sokuhambisa: \n• Ungasusi i-<xliff:g id="NAME">^1</xliff:g>. \n• Ezinye izinhlelo zokusebenza ngeke zisebenze kahle. \n• Gcina idivayisi ishajiwe."</string>
+    <string name="storage_wizard_ready_title" msgid="5381632402953258267">"I-<xliff:g id="NAME">^1</xliff:g> ilungile"</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"I-<xliff:g id="NAME">^1</xliff:g> yakho isilungele ukusetshenziswa ngezithombe nenye imidiya."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"I-<xliff:g id="NAME">^1</xliff:g> yakho entsha iyasebenza. \n\nUkuze uhambise izithombe, amafayela, nedatha yohlelo lokusebenza kule divayisi, hamba ku-Izilungiselelo &gt; Isitoreji."</string>
+    <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Hambisa i-<xliff:g id="APP">^1</xliff:g>"</string>
+    <string name="storage_wizard_move_confirm_body" msgid="236043946721254139">"Ukuhambisa i-<xliff:g id="APP">^1</xliff:g> kanye nedatha yayo ku-<xliff:g id="NAME_0">^2</xliff:g> kuzothatha izikhathi ezimbalwa kuphela. Ngeke uze ukwazi ukusebenzisa uhlelo lokusebenza kuze kube ukuhanjiswa kuqedile. \n\nUngasusi i-<xliff:g id="NAME_1">^2</xliff:g> ngesikhathi sokuhambisa."</string>
+    <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Ihambisa i-<xliff:g id="APP">^1</xliff:g>…"</string>
+    <string name="storage_wizard_move_progress_body" msgid="4288580957960820740">"Ungasusi i-<xliff:g id="NAME">^1</xliff:g> ngesikhathi sokuhambisa. \n\nUhlelo lokusebenza lwe-<xliff:g id="APP">^2</xliff:g> kule divayisi ngeke luze lutholakale kuze kuqedwe ukuhambisa."</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Khansela ukuhambisa"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Umumo webhetri"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Izinga lebhetri"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -1008,10 +1045,15 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Ibuyisela izilungiselelo ezizenzakalelayo ku-APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Setha kabusha kube okumisiwe"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ukuhlela okumisiwe izilungiselelo ze-APN kuqedile."</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Ukusetha kabusha kwezilungiselelo zenethiwekhi"</string>
+    <string name="reset_network_desc" msgid="581668983587311282">"Lokhu kuzosetha kabusha zonke izilungiselelo zenethiwekhi ezifaka:\n\n"<li>"i-Wi‑Fi"</li>\n<li>"idatha yeselula"</li>\n<li>"i-Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Setha kabusha izilungiselelo"</string>
+    <string name="reset_network_final_desc" msgid="4874737348054213767">"Setha kabusha zonke izilungiselelo zenethiwekhi? Awukwazi ukuhlehlisa lesi senzo!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Setha kabusha izilungiselelo"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Setha kabusha?"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Izilungiselelo zenethiwekhi zisethwe kabusha"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Setha kabusha idivayisi"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ukuhlela kabusha idatha yasembonini"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Isula yonke idatha kwithebhulethi"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Isula yonke idatha kwifoni"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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="9165016501623540228">"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>
@@ -1025,9 +1067,8 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Sula yonke idatha ekhadini le-SD, njengomculo noma izithombe"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Setha kabusha ithebhulethi"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Setha kabusha ifoni"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Susa lonke ulwazi lomuntu kanye nezinhlelo zokusebenza ezilayishiwe? Ngeke ukwazi ukuguqula lokhu!"</string>
+    <string name="master_clear_final_desc" msgid="1062841478823409667">"Sula lonke ulwazi lakho lomuntu siqu kanye nezinhlelo zokusebenza ezilandiwe? Awukwazi ukuhlehlisa lesi senzo!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Sula yonke into"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Udinga ukudweba iphethini yakho yokuvula ukuqinisekisa ukwenza kabusha idatha yonkampani."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Akukho ukusetha kabusha okwenziwe ngoba isevisi Yokwesula Isistimu ayitholakali."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Setha kabusha"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ukusetha kabusha kwasekuqaleni akutholakaleli lo msebenzisi"</string>
@@ -1044,8 +1085,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Sula isitoreji se-USB, isula wonke amafayela agcinwe lapho? Isinyathelo asikwazi ukuguqulwa!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Sula ikhadi le-SD, isula wonke amafayela agcinwe lapho? Isinyathelo asikwazi ukuguqulwa!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Sula yonke into"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuthi ufuna ukusula isitoreji se-USB."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuba ufuna ukusula ikhadi le-SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Izilungiselelo zekholi"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Hlela ivoyisimeyili, ukudlulisa ikholi, ikholi elindile, i-ID yomshayeli"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Imodemu nge-USB"</string>
@@ -1077,7 +1116,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usizo"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"Amanethiwekhi weselula"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Uhlelo lweselula"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"Uhlelo lokusebenza oluzenzakalelayo le-SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Uhlelo lokusebenza lwe-SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Shintsha uhlelo lokusebenza le-SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Sebenzisa i-<xliff:g id="NEW_APP">%1$s</xliff:g> kunokusebenzisa i-<xliff:g id="CURRENT_APP">%2$s</xliff:g> njengohlelo lwakho lokusebenza le-SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Sebenzisa i-<xliff:g id="NEW_APP">%s</xliff:g> njengohlelo lwakho lokusebenza le-SMS?"</string>
@@ -1105,7 +1144,13 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Imodi yendawo"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Sebenzisa i-GPS, Wi‑Fi namanethiwekhi weselula ukucacisa indawo"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Sebenzisa i-Wi‑Fi namanethiwekhi weselula ukucacisa indawo"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Sebenzisa i-GPS ukuze uthole indawo yakho"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Sebenzisa i-GPS ukuze unqume indawo"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Iyaskena"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Iyaskena"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Ukuskena kwe-Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="2070686681074461301">"Thuthukisa indawo ngokuvumela izinhlelo zokusebenza namasevisi ukuthi askenele amanethiwekhi we-Wi-Fi noma ngabe i-Wi-Fi ivaliwe"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Ukuskena kwe-Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="7308864666710919365">"Thuthukisa indawo ngokuvumela amasevisi wesistimu ukuthi askenele amadivayisi we-Bluetooth, noma ngabe i-Bluetooth ivaliwe"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Indawo ye-Wi‑Fi nenethiwekhi yeselula"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Vumela izinhlelo zokusebenza zisebenzise isevisi yendawo yakwa-Google ukucabangela indawo yakho ngokushesha. Idatha yendawo engaziwa izoqoqwa futhi ithunyelwe kwa-Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Indawo etholwe i-Wi-Fi"</string>
@@ -1151,11 +1196,15 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Iphasiwedi imisiwe"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"i-PIN imisiwe"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Iphathini imisiwe"</string>
-    <string name="lock_settings_title" msgid="335025124489630932">"Ukuvikeleka kwesikrini"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Sebenzisa iphethini yedivayisi yakho ukuze uqhubeke."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Faka iphinikhodi yedivayisi yakho ukuze uqhubeke."</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Faka iphasiwedi yedivayisi yakho ukuze uqhubeke."</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>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Ukuphepha kwedivaysi"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Shintsha iphathini yokuvula"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Shintsha ukuvula i-PIN"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Qinisekisa iphathini egciniwe"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Zama futhi:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dweba iphathini yokuvula"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Chofoza Imenyu ukuthola usizo."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Dedela umunwe uma usuqedile"</string>
@@ -1177,8 +1226,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Setha iphathini yokuvula"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Shintsha iphathini yokuvula"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Udweba kanjani phathini yokuvula"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Kunemizamo engalungile eminingi kakhulu!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Zama futhi emasekhondini angu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Imizamo eminingi engalungile. Zama futhi kumasekhondi angu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Uhlelo lokusebenza alufakiwe efonini yakho."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Phatha izinhlelo zokusebenza"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Phatha futhi ukhiphe izinhlelo zokusebenza ezifakiwe"</string>
@@ -1229,6 +1277,7 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Hlunga ngosayizi"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Bonisa amasevisi asebenzayo"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Bonisa izinqubo zokulondoloza kwesikhashana"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Uhlelo lokusebenza lwesimo esiphuthumayo"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Setha kabusha izintandokazi zezinhlelo zokusebenza"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setha kabusha izintandokazi zohlelo lokusebenza?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Lokhu kuzosetha kabusha konke okuncamelayo kwe-:\n\n "<li>"Izinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izaziso zezinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izinhlelo zokusebenza ezizenzakalelayo zezenzo"</li>\n" "<li>"Imikhawulo yedatha yangemuva yezinhlelo zokusebenza"</li>\n" "<li>"Noma yimiphi imikhawulo yemvume"</li>\n\n" Ngeke uze ulahlekelwe noma iyiphi idatha yohlelo lokusebenza."</string>
@@ -1306,6 +1355,7 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"Imisebenzi yohlelo lokusebenza"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Sebenzayo"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Ayikaze yasetshenziswa)"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Azikho izinhlelo zokusebenza ezizenzakalelayo"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Ukusetshensiswa kwesitoreji"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Buka isitoreji esisetshenziswa izinhlelo zokusebenza"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Amasevisi asebenzayo"</string>
@@ -1403,17 +1453,6 @@
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Ulwazi lethebhulethi"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Ulwazi lwefoni"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Ulwazi lebhetri"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"Ukuqalisa okusheshayo"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Setha izinqamuleli zekhibhodi ukuqalisa izinhlelo zokusebenza"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Beka uhlelo lokusebenza"</string>
-    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Asikho isinqamuleli"</string>
-    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Sesha + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Sula"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Isinqamuleli sakho se <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) sizosulwa."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"KULUNGILE"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Khansela"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Izinhlelo zokusebenza"</string>
-    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Izinqamuleli"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Okufakwayo kombhalo"</string>
     <string name="input_method" msgid="5434026103176856164">"Indlela yokufaka"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Ikhibhodi yamanje"</string>
@@ -1448,23 +1487,31 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Shutha wonke amaphakethe we-bluetooth HCI kufayela"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Ukuvula i-OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Vumela ukuthi i-bootloader ivulwe"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Faka i-PIN yakho"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Faka i-PIN yedivayisi yakho ukuze unike amandla ukuvula kwe-OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vumela ukuvula i-OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ISEXWAYISO: Izici zokuvikela idivayisi ngeke zisebenze kule divayisi ngenkathi le sethingi ivuliwe."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Amasayizi weloga ngebhafa"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Khetha amasayizi weloga ngebhafa ngayinye yelogu"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Vumela izindawo mbumbulu"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Vumela izindawo mbumbulu"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Nika amandla ukubuka"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Ukunethiwekha"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Ukunikezwa isitifiketi sokubukeka okungenantambo"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Nika amandlaukungena kwe-Wi-Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Ukunikezela kwe-Wi-Fi kuya kuselula okunamandla"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Vumela njalo ukuskena kokuzula kwe-Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Sebenzisa iklayenti le-legacy le-DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Bonisa izinketho zokunikeza isitifiketi ukubukeka okungenantambo"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"khuphula izinga lokungena le-Wi-Fi, bonisa nge-SSID RSSI engayodwana kusikhethi se-Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Uma inikwe amandla, i-Wi-Fi izoba namandla kakhulu ekunikezeleni ukuxhumeka kwedatha kuselula, uma isiginali ye-Wi-Fi iphansi"</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Vumela/Ungavumeli ukuskena kokuzula kwe-Wi-Fi okususelwa kunani ledatha yethrafikhi ekhona ekusebenzisaneni"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Amasayizi weloga ngebhafa"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Khetha amasayizi weloga ngebhafa ngayinye yelogu"</string>
+    <string name="select_usb_configuration_title" msgid="2649938511506971843">"Khetha ukulungiselelwa kwe-USB"</string>
+    <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Khetha ukulungiselelwa kwe-USB"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Vumela izindawo mbumbulu"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Vumela izindawo mbumbulu"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Nika amandla ukubuka"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Sebenzisa iklayenti le-DHCP kusukela ku-Lollipop esikhundleni seklayenti elisha le-Android DHCP."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vumela ukulungisa iphutha le-USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ukulungisa iphutha le-USB kuhloselwe izinjongo zokuthuthukisa kuphela. Ingasebenziselwa ukukopisha idatha phakathi kwekhompyutha yakho nedivaysi yakho, faka izinhlelo zokusebenza kwidivaysi yakho ngaphandle kwesaziso, bese ufunda idatha yefayela lokungena."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Buyisa ukufinyelela ekususeni iphutha le-USB kusuka kuwo wonke amakhompyutha owagunyaze ngaphambilini?"</string>
@@ -1568,6 +1615,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"I-Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Sebenzisa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> idinga :"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Ngoba uhlelo lokusebenza lusitha isicelo semvume, Izilungiselelo azikwazi ukuqinisekisa impendulo yakho."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Uma uvula i-<xliff:g id="SERVICE">%1$s</xliff:g>, idivayisi yakho ngeke isebenzise ukukhiya kwakho kwesikrini sakho ukuthuthukisa ukubethelwa kwedatha."</string>
     <string name="secure_lock_encryption_warning" msgid="464101518421886337">"Ngoba uvule isevisi yokufinyelela, idivayisi yakho ngeke isebenzise ukukhiya kwakho kwesikrini ukuthuthukisa ukubethelwa kwedatha."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Ngoba ukuvula i-<xliff:g id="SERVICE">%1$s</xliff:g> kuthinta ukubethelwa kwedatha, udinga ukuqinisekisa iphethini yakho."</string>
@@ -1709,14 +1757,20 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Izibalo zenqubo"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Izibalo ze-Geeky mayelana nezinqubo zokuqalisa"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Ukusetshenziswa kwememori"</string>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> izinhlelo zokusebenza ezingaphezulu kuka-<xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_total_duration" msgid="2243876627952936205">"<xliff:g id="USEDRAM">%1$s</xliff:g> kokungu-<xliff:g id="TOTALRAM">%2$s</xliff:g> kusetshenziswe ngaphezu kwe-<xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"Ingemuva"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"Ingaphambili"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Kufakwe kunqolobane"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Imemori yedivayisi okwamanje yi-<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Ukusetshenziswa kwe-RAM okumaphakathi nendawo"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Ukusetshenziswa kwe-RAM okukhulu"</string>
+    <string name="process_stats_os_label" msgid="4813434110442733392">"I-Android OS"</string>
+    <string name="process_stats_os_native" msgid="5322428494231768472">"Okwemvelo"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"I-Kernel"</string>
+    <string name="process_stats_os_zram" msgid="677138324651671575">"I-Z-Ram"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"Izinqolobane"</string>
+    <string name="process_stats_ram_use" msgid="976912589127397307">"Ukusetshenziswa kwe-RAM"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Ukusetshenziswa kwe-RAM (okungemuva)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Isikhathi sokuqalisa"</string>
+    <string name="processes_subtitle" msgid="6827502409379462438">"Izinqubo"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Amasevisi"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Ubude besikhathi"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Imininingwane yememori"</string>
@@ -1733,6 +1787,7 @@
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 amahora"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 usuku"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Bonisa isistimu"</string>
+    <string name="menu_hide_system" msgid="4106826741703745733">"Fihla isistimu"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Sebenzisa i-Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Uhlobo lwezibalo"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Ingemuva"</string>
@@ -1755,7 +1810,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Izilungiselelo ezizenzakalelayo ngenzansi kwezilungiselelo zohlelo lokusebenza"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Izilungiselelo ezizenzakalalelayo"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Okuzenzekelayo kwenjini"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Ihlela injini yokuthola izinhlelo zamagama ukusebenziselwa umbhalo okhulunyiwe"</string>
+    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Setha ukuhlelwa kwemiqondo kwenjini yengxoxo okumele isetshenziselwe umbhalo okhulunyiwe"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Ukukala izwi"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Isivinini leso umbhalo okhulunywe ngaso"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ukuphakama"</string>
@@ -1829,7 +1884,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Izingxenyekazi zekhompyutha zisekelwe ngokulondoloza"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Isofthiwe kuphela"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Izifakazo azitholakaleli lo msebenzisi"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukufakwa kwezincwadi ezichaza ngomuntu."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Thayipha iphasiwedi yokulondoloza ukufakazela ubuqiniso"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Iphasiwedi yamanje:"</string>
@@ -1854,12 +1908,10 @@
     <string name="backup_data_title" msgid="1239105919852668016">"Sekela ngokulondoloza idatha yami"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sekela ngokulondoloza idatha yohlelo lokusebenza, amaphasiwedi e-Wi-Fi, nezinye izilungiselelo kwumaseva we-Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Sekela ngokulondoloza i-akhawunti"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ayikho i-akhawunti okwamanje egcina ukusekela ngokulondoloza idatha"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Bandakanya idatha yohlelo lokusebenza"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ukubuyisela esimweni okuzenzakalelayo"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Uma ufaka futhi uhlelo lokusebenza, buyisela okuhlelwe ukusebenza kwezipele kanye nemininingo"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Isevisi yesipele ayisebenzi."</string>
-    <string name="backup_inactive_summary" msgid="7630412094703573180">"Lokhu kusethwa yinqubomgomo yedivayisi yakho."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Iphasiwedi yokusekela ngokulondoloza ye-Desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Ukusekela ngokulondoloza okugcwele kwe-Desktop akuvikelekile okwamanje."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Khetha ukushintsha noma ukususa iphasiwedi yokwenziwa kwezipele ngokugcwele kwideskithophu"</string>
@@ -2031,6 +2083,10 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Isilinganiso sesithombe soku"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Isilinganiso sobude besikhathi somenzi womfanekiso onyakazayo"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Hlalisa kahle ukubukwa kwesibili"</string>
+    <string name="enable_multi_window" msgid="1091779249819137016">"Imodi yamawindi amaningi"</string>
+    <string name="enable_multi_window_summary" msgid="5837641304114783514">"Imisebenzi eminingi kusikrini ngesikhathi esifanayo."</string>
+    <string name="confirm_enable_multi_window_title" msgid="950964546995895971">"Nika amandla imodi yamawindi amaningi?"</string>
+    <string name="confirm_enable_multi_window_text" msgid="565834092374755117">"ISEXWAYISO: Lesi isici sokuhlola okuphezulu kakhulu esivumela imisebenzi eminingi ekuskrini ngesikhathi esifanayo nge-UI yezinhlelo zokusebenza zakamuva. Ezinye izinhlelo zokusebenza zingakhubazeka noma zingasebenzi ngokufanelekile uma zisetshenziswa nalesi sici."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Izinhlelo zokusebenza"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ungagcini imisibenzi"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Phihliza zonke izenzo ngokushesha ngemva kokuna umsebenzisi awuyeka"</string>
@@ -2202,7 +2258,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Umsebenzisi"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Iphrofayela evinjelwe"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Engeza umsebenzisi omusha?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Ungabelana ngale divayisi nabanye abantu ngokudala abasebenzisi abangeziwe. Umsebenzisi ngamunye unesikhala sakhe, angasenza ngezifiso ngezinhlelo zakhe zokusebenza, uphephadonga, najalo njalo. Abasebenzisi futhi bangashintsha izilungiselelo zedivayisi njenge-Wi‑Fi ethinta wonke umuntu.\n\nUma ungeza umsebenzisi omusha, loyo muntu udinga ukusetha isikhala sakhe.\n\nNoma yimuphi umsebenzisi angabuyekeza izinhlelo zokusebenza zabo bonke abasebenzisi."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Ungabelana ngale divayisi nabanye abantu ngokudala abasebenzisi abangeziwe. Umsebenzisi ngamunye unesikhala sakhe, angasenza ngokwezifiso ngezinhlelo zokusebenza, isithombe esingemuva, njalo njalo. Abasebenzisi bangaphinda balungise izilungiselelo zedivayisi ezifana ne-Wi-Fi ezithinta wonke umuntu.\n\nUma ungeza umsebenzisi omusha, loyo muntu udinga ukusetha isikhala sakhe.\n\nNoma yimuphi umsebenzisi angabuyekeza izinhlelo zokusebenza kubo bonke abanye abasebenzisi."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Uma ungeza umsebenzisi omusha, loyo muntu udinga ukusetha isikhala sakhe.\n\nNoma yimuphi umsebenzisi angabuyekeza izinhlelo zokusebenza kubo bonke abasebenzisi."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Setha umsebenzisi manje?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Qinisekisa ukuthi umuntu uyatholakala ukuze athathe idivayisi futhi asethe isikhala sakhe"</string>
@@ -2233,13 +2289,13 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Susa isivakashi?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Zonke izinhlelo zokusebenza nedatha kulesi sikhathi zizosuswa."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Susa"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"Vumela amakholi wefoni"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"Vumela amakholi wefoni ne-SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Vula amakholi wamafoni"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Vula amakholi wefoni ne-SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Susa umsebenzisi"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Vumela amakholi wefoni?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Vula amakholi wamafoni?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"umlando wekholi uzokwabiwa nalo msebenzisi."</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Vumela amakholi wefoni ne-SMS?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"Umlando wekholi ne-SMS uzokwabiwa nalo msebenzisi."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vula amakholi wefoni ne-SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Umlando wekholi ne-SMS uzokwabiwa nalo msebenzisi."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Vumela izinhlelo zokusebenza nokuqukethwe"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Izinhlelo zokusebenza ezinomkhawulo"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Nweba izilungiselelo zohlelo lokusebenza"</string>
@@ -2290,8 +2346,8 @@
     <string name="user_rename" msgid="8523499513614655279">"QAMBA KABUSHA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Misa imikhawulo yohlelo"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Ilawulwa yi-<xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Lolu hlelo lokusebenza alusekelwe kumaphrofayela akhawulelwe"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Lolu hlelo lokusebenza lingafinyelela kuma-akhawunti wakho"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Lolu hlelo lokusebenza lungafinyelela kuma-akhawunti wakho. Kulawulwa yi-<xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"I-Wi‑Fi neselula"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Vumela ukushintsha kwezilungiselelo ze-Wi-Fi nezeselula"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2356,13 +2412,15 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"ukuxhumeka kwenethiwekhi ye-wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"umlayezo wombhalo ukubhala imilayezo umlayezo"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"iselula iseli inkampathi yenethiwekhi idatha engenantambo  4g 3g 2g lte"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"I-wifi wi-fi ikholi ukushaya"</string>
     <string name="keywords_home" msgid="3626170808219458848">"isiqalisi"</string>
     <string name="keywords_display" msgid="6709007669501628320">"isikrini sesikrini sokuthinta"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ibhethri lesikrini esithintwayo lokucisha isikrini"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ibhethri lesikrini esithintwayo lokucisha isikrini"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"isibonisi sokwenza ngezifiso okwsemuva"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"itimu emnyama imodi yasebusuku fiphalisa isikrini guqula ukukhanya"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"ingemuva yenza kube ngokwakho yenza ngokwezifiso isibonisi"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"usayizi wombhalo"</string>
-    <string name="keywords_display_cast_screen" msgid="8887412173792143329">"iphrojekthi"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"ukusakaza iphrojekthi"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"isikhala idiski eliqinile ukusetshenziswa kwedivayisi"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"ukushaja kokusebenzisa kwamandla"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"isipelingi isichazamazwi isihloli sokupela ukulungisa ngokuzenzakalela"</string>
@@ -2379,6 +2437,11 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"i-akhawunti"</string>
     <string name="keywords_users" msgid="4673901601478559100">"umkhawulo wokukhawulela ukhawulelwe"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ukulungiswa kombhalo ukulungisa imsindo ukudlidliza ulimi lokuzenzakalelayo ukuthinta ukuphakamisa isiphakamiso itimu igama elingalungile uhlobo i-emoji okwamazwe"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"setha kabusha izintandokazi"</string>
+    <string name="keywords_emergency_app" msgid="6542122071127391103">"okuzenzakalelayo kohlelo lokusebenza lwe-ice lesimo esiphuthumayo"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"izinhlelo zokusebenza zilanda isistimu yezinhleloz kusebenza"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ukuvikeleka kwezimvume zezinhlelo zokusebenza"</string>
+    <string name="keywords_default_apps" msgid="3581727483175522599">"okuzenzakalelayo kwezinhlelo zokusebenza"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slayida iphini yephethini yephasiwedi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setha umaka we-Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Bhala"</string>
@@ -2393,11 +2456,12 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ivolumu ye-alamu"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Ivolumu yokukhala"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ivolumu yesaziso"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Iziphazamiso"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Uma kufika amakholi nezaziso"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Phazamisa njalo"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Vumela iziphazamiso ezibalulekile kuphela"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ungaphazamisi"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Okubalulekile kuvumela kuphela"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Izimiso ezizenzakalelayo"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Okubalulekile kuphela"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ama-alamu kuphela"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="1168212070233080706">"Azikho iziphazamiso"</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="ringtone_title" msgid="5379026328015343686">"Iringithoni yefoni"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ithoni yokukhala yezaziso ezenzakalelayo"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Iyadlidliza uma kungena amakholi"</string>
@@ -2423,62 +2487,115 @@
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dlidliza"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Ukufinyelela isaziso"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Izinhlelo zokusebenza azikwazi ukufunda izaziso"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d uhlelo lokusebenza lungakwazi ukufunda izaziso"</item>
-    <item quantity="other" msgid="980049191810249052">"%d izinhlelo zokusebenza zingakwazi ukufunda izaziso"</item>
-  </plurals>
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d izinhlelo zokusebenza zingakwazi ukufunda izaziso</item>
+      <item quantity="other">%d izinhlelo zokusebenza zingakwazi ukufunda izaziso</item>
+    </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Abekho abalaleli besaziso abafakiwe."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Nika amandla i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"I-<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> izokwazi ukufunda zonke izaziso eziposwe isistimu noma yinoma yiluphi uhlelo lokusebenza olufakiwe, olungase lufake ulwazi lomuntu siqu njengamagama oxhumana nabo nemilayezo yombhalo ethunyelwe kuwe. Izokwazi futhi ukucashisa lezi zaziso noma ukuthinta amabhathini esenzo aphakathi kwawo."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Izihlinzeki zesimo"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Azikho izinhlelo zokusebenza ezinikeza ngezimo"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"I-%d yohlelo lokusebenza inikeza ngezimo"</item>
-    <item quantity="other" msgid="358057362115673258">"I-%d yezinhlelo zokusebenza inikeza ngezimo"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Azikho izihlinzeki zesimo ezifakiwe."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Nika amandla i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"I-<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> izokwazi ukungeza izimo zokuphuma kumodi yokungaphazamisi."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
-    <string name="app_notification_block_title" msgid="172237877395761371">"Vimba"</string>
+    <string name="app_notification_block_title" msgid="4069351066849087649">"Vimbela konke"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ungalokothi ubonise izaziso kusuka kulolu hlelo lokusebenza"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Okubalulekile"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Bonisa izaziso ngaphezulu kohlu uphinde uzigcine ziza uma idivayisi isethelwe kuziphazamiso zokubalulekile kuphela"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Ukuzwela"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Uma idivayisi ikhiyiwe, fihla noma yikuphi okuqukethwe okuzwelayo kusuka kulezi zaziso zohlelo lokusebenza"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Phatha njengokubalulekile"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Vumela izaziso zalolu hlelo lokusebenza ukuthi zizwiwe uma  ukungaphazamisi kusethelwe kokubalulekile kuphela"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Vumela ukukoba"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Vumela lolu hlelo lokusebenza lugcizelele izaziso ezithile ngokuzislayida kafushane ekubukweni kwesikrini samanje"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Fihla okuqukethwe okubucayi"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Uma idivayisi ikhiyiwe, fihla okuqukethwe kuzaziso zalolu hlelo lokusebenza okungaveza ulwazi oluyimfihlo"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Ivinjelwe"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Okubalulekile"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Ukuzwela"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Kwenziwe"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"Uze uvale lokhu"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Iziphazamiso ezibalulekile"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Isikhathi sokuphumula"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Izinsuku"</string>
-    <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Lutho"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Ukuphazamisa kuvunyelwe"</string>
-    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Okubalulekile kuphela"</string>
-    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Lutho"</string>
-    <string name="zen_mode_automation_category" msgid="4653551005950835761">"Okokuzenzakalela"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Vula ngokuzenzakalela"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Igama lesimiso"</string>
+    <string name="zen_mode_time_add_rule" msgid="8651108307310558795">"Engeza isimiso"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Susa isimiso"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="5338206274433295824">"Susa isimiso se-\"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Susa"</string>
+    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Uhlobo lomyalo"</string>
+    <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Akwaziwa"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Lungiselela isimiso"</string>
+    <string name="zen_schedule_rule_type_name" msgid="3201273040477861538">"Shejula umyalo"</string>
+    <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Isimiso asitholiwe."</string>
+    <string name="zen_mode_rule_summary_combination" msgid="2526506268333198254">"<xliff:g id="DESCRIPTION">%1$s</xliff:g> / <xliff:g id="MODE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Izinsuku"</string>
+    <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Lutho"</string>
+    <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Nsuku zonke"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Akusoze"</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> ukuya ku-<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Amakholi"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Imilayezo"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Amakholi/imilayezo evela ku-"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Noma ubani"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Oxhumana nabo kuphela"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Oxhumana nabo abafakwe izinkanyezi kuphela"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"Imicimbi nezikhumbuzi"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Ama-alamu ahlala ayiziphazamiso eziphambili"</string>
+    <string name="zen_mode_alarms" msgid="2165302777886552926">"Ama-alamu"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"Izikhumbuzi"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Imicimbi"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Khetha abafonayo"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Phinda abafonayo"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Uma umuntu ofanayo ashaya ngesikhathi sesibili ngaphakathi kwesikhathi samaminithi angu-<xliff:g id="MINUTES">%d</xliff:g>, kuvumele"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Vula ngokuzenzakalela"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Akusoze"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Njalo ngobusuku"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Ubusuku baphakathi neviki"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Isikhathi sokuqala"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Isikhathi sokugcina"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngosuku olulandelayo"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> noma iyiphi i-alamu yangaphambilini"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngosuku olulandelayo noma iyiphi i-alamu yangaphambilini"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> usuku olulandelayo"</string>
+    <string name="zen_mode_interruptions_voice_title" msgid="855256211259132964">"Iziphazamiso"</string>
+    <string name="zen_mode_interruptions_voice_header" msgid="2888750427673157270">"Uma kufika amakholi nezaziso"</string>
+    <string name="zen_mode_interruptions_voice_prompt" msgid="3041817362475695079">"Ungathanda ukuphazanyiswa nini?"</string>
+    <string name="zen_mode_duration_voice_prompt" msgid="7381920739389625133">"Isikhathi esingakanani?"</string>
+    <string name="zen_mode_option_voice_all_interruptions" msgid="9222054216334506341">"Phazamisa njalo"</string>
+    <string name="zen_mode_option_voice_all_interruptions_synonyms" msgid="475880955609403705">"valiwe,konke,yonke into"</string>
+    <string name="zen_mode_option_voice_important_interruptions" msgid="3695277268139705627">"Vumela iziphazamiso ezibalulekile kuphela"</string>
+    <!-- no translation found for zen_mode_option_voice_important_synonyms (2727831854148694795) -->
+    <skip />
+    <string name="zen_mode_option_voice_alarms" msgid="5961982397880688359">"Vumela ama-alamu kuphela"</string>
+    <!-- no translation found for zen_mode_option_voice_alarms_synonyms (4049356986371569950) -->
+    <skip />
+    <string name="zen_mode_option_voice_no_interruptions" msgid="351955012579170932">"Ungaphazamisi"</string>
+    <!-- no translation found for zen_mode_option_voice_no_interruptions_synonyms (8368549512275129844) -->
+    <skip />
+    <string name="zen_mode_duration_indefinte_voice_label" msgid="9026001994945950539">"Unaphakade"</string>
+    <plurals name="zen_mode_duration_minutes_voice_label" formatted="false" msgid="4750982084453980">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> amaminithi</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> amaminithi</item>
+    </plurals>
+    <plurals name="zen_mode_duration_hours_voice_label" formatted="false" msgid="175180249071227957">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> amahora</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> amahora</item>
+    </plurals>
+    <string name="zen_mode_summary_priority_indefinitely" msgid="5417246022606171241">"Guqulela kuzaziso ezibalulekile kuphela unaphakade"</string>
+    <plurals name="zen_mode_summary_priority_by_minute" formatted="false" msgid="1938955186728929112">
+      <item quantity="one">Guqulela kuzaziso ezibalulekile kuphela ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Guqulela kuzaziso ezibalulekile kuphela ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <plurals name="zen_mode_summary_priority_by_hour" formatted="false" msgid="6664710096150897823">
+      <item quantity="one">Guqulela kuzaziso ezibalulekile kuphela ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Guqulela kuzaziso ezibalulekile kuphela ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <string name="zen_mode_summary_alarams_only_indefinite" msgid="7941708969866496605">"Guqulela kuma-alamu kuphela unaphakade"</string>
+    <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Guqulela kuma-alamu ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Guqulela kuma-alamu ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<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">Guqulela kuma-alamu kuphela ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Guqulela kuma-alamu kuphela ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_no_interruptions_indefinite" msgid="5705225870569410806">"Guqulela kukungaphazamisi ngunaphakade"</string>
+    <plurals name="zen_mode_summary_no_interruptions_by_minute" formatted="false" msgid="4719882120685708458">
+      <item quantity="one">Guqulela kukungaphazamisi ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Guqulela kukungaphazamisi ngamaminithi angu-<xliff:g id="DURATION">%1$d</xliff:g> (kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+    </plurals>
+    <plurals name="zen_mode_summary_no_interruptions_by_hour" formatted="false" msgid="1508397683895056389">
+      <item quantity="one">Guqulela kukungaphazamisi ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Guqulela kukungaphazamisi ngamahora angu-<xliff:g id="DURATION">%1$d</xliff:g> kuze kube ngu-<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+    </plurals>
+    <string name="zen_mode_summary_always" msgid="6172985102689237703">"Guqulela kuhlala uphazamisa"</string>
+    <string name="zen_mode_duration_indefinite_voice_synonyms" msgid="4213829562303429456">"phakade"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Izaziso zohlelo lokusebenza"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Izilungiselelo zesaziso"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Thumela impendulo mayelana nale divayisi"</string>
@@ -2519,4 +2636,63 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Ulwazi le-IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Ulwazi oluhlobene lwe-IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Isilothi<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
+    <string name="launch_by_default" msgid="2184141780491382435">"Qalisa ngokuzenzakalelayo"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> isetshenziwe ku-<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="app_launch_domain_links_title" msgid="458956710410857777">"Izixhumanisi zesizinda"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="5821849783765291139">"Vula ama-URL wesizinda"</string>
+    <string name="app_launch_open_domain_urls_summary" msgid="7305739311608755281">"Vumela uhlelo lokusebenza ukuthi livule ngokuqondile ama-URL wesizinda"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8148494155921307572">"Ama-URL asekelwe wesizinda"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Okunye okuzenzakalelayo"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> isetshenziwe ku-<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_type_internal" msgid="410824961149037234">"imemori yangaphakathi"</string>
+    <string name="storage_type_external" msgid="8928374515368986503">"imemori yangaphandle"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"Isitoreji sangaphakathi"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"Isitoreji sangaphandle"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Ukusetshenziswa kwedatha yohlelo lokusebenza"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> esetshenzisiwe kusukela ngomhla ka-<xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Isitoreji esisetshenzisiwe"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Vuliwe"</string>
+    <string name="notifications_disabled" msgid="4326096527874762629">"Vimba"</string>
+    <string name="notifications_sensitive" msgid="3139432048186620878">"Ukuzwela"</string>
+    <string name="notifications_priority" msgid="1812498477331421719">"Okubalulekile"</string>
+    <string name="notifications_priority_sensitive" msgid="9011871917486793616">"Okubalulekile nokuzwela"</string>
+    <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> izimvume zinikeziwe</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izimvume zinikeziwe</item>
+    </plurals>
+    <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> yezimvume ezingu-<xliff:g id="COUNT_3">%d</xliff:g> zinikeziwe</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> yezimvume ezingu-<xliff:g id="COUNT_3">%d</xliff:g> zinikeziwe</item>
+    </plurals>
+    <string name="launch_defaults_some" msgid="313159469856372621">"Okunye okuzenzakalelayo okusethiwe"</string>
+    <string name="launch_defaults_none" msgid="4241129108140034876">"Akukho okuzenzakalelayo okusethiwe"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Zonke izinhlelo zokusebenza"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Kunikwe amandla"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Okomuntu siqu"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Umsebenzi"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Uvinjelwe"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Okubalulekile"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Ukuzwela"</string>
+    <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Nama-URL wesizinda"</string>
+    <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Ikhutshazwe ngumlawuli"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Okuthuthukisiwe"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Uhlelo lokusebenza olungaziwa"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Khetha iphrofayela"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Izimvume zohlelo lokusebenza"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> kuzinhlelo zokusebenza ezingu-<xliff:g id="COUNT_1">%d</xliff:g> ezivunyelwe ekufinyeleleni okungeziwe"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> kuzinhlelo zokusebenza ezingu-<xliff:g id="COUNT_1">%d</xliff:g> ezivunyelwe"</string>
+    <string name="domain_urls_title" msgid="8735310976048599572">"Ama-URL wesizinda"</string>
+    <string name="domain_urls_summary_none" msgid="3517494281628717719">"Ungavuli noma iyiphi i-URL yesizinda"</string>
+    <string name="domain_urls_summary_one" msgid="3804994599497120956">"Vula i-\'<xliff:g id="DOMAIN">%s</xliff:g>\'"</string>
+    <string name="domain_urls_summary_some" msgid="4859484048050301933">"Vula i-\'<xliff:g id="DOMAIN">%s</xliff:g>\' nama-URL ahlobene"</string>
+    <plurals name="domain_urls_apps_summary" formatted="false" msgid="6604886186235343653">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> izinhlelo zokusebenza zingavula ama-URL wesizinda sawo</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> izinhlelo zokusebenza zingavula ama-URL wesizinda sawo</item>
+    </plurals>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Akubonwa"</string>
+    <string name="default_apps_title" msgid="1854974637597514435">"Izinhlelo zokusebenza ezizenzakalelayo"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Uhlelo lokusebenza lwesiphequluli"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Asikho isiphequluli esizenzakalelayo"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Okuzenzakalelayo)"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Isitoreji sezinhlelo zokusebenza"</string>
 </resources>
diff --git a/res/values/aliases.xml b/res/values/aliases.xml
index 97a50c5..248ac71 100644
--- a/res/values/aliases.xml
+++ b/res/values/aliases.xml
@@ -15,7 +15,8 @@
 -->
 
 <resources>
-    <item name="notification_app_section" type="layout">@*android:layout/preference_category_material
-    </item>
+     <item name="notification_app_section" type="layout">@*android:layout/preference_category_material</item>
+     <item name="confirm_lock_pattern" type="layout">@layout/confirm_lock_pattern_base</item>
+     <item name="confirm_lock_password" type="layout">@layout/confirm_lock_password_base</item>
 </resources>
 
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 49a0037..032382e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -635,6 +635,9 @@
         <item>mute/unmute microphone</item>
         <item>project media</item>
         <item>activate VPN</item>
+        <item>write wallpaper</item>
+        <item>assist structure</item>
+        <item>assist screenshot</item>
     </string-array>
 
     <!-- User display names for app ops codes -->
@@ -686,6 +689,9 @@
         <item>Mute/unmute microphone</item>
         <item>Project media</item>
         <item>Activate VPN</item>
+        <item>Write wallpaper</item>
+        <item>Assist structure</item>
+        <item>Assist screenshot</item>
     </string-array>
 
     <!-- Titles for the list of long press timeout options. -->
@@ -1221,20 +1227,6 @@
         <item>3</item>
     </string-array>
 
-    <!-- Setting display values for zen mode -->
-    <string-array name="entries_zen_mode">
-        <item>Off</item>
-        <item>Limited interruptions</item>
-        <item>Zero interruptions</item>
-    </string-array>
-
-    <!-- Setting values for zen mode, must match the Settings.Global.ZEN_MODE_ constants -->
-    <string-array name="entryvalues_zen_mode" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-
     <!-- Battery saver mode: allowable trigger threshold levels. -->
     <integer-array name="battery_saver_trigger_values" translatable="false" >
         <item>0</item>
@@ -1277,4 +1269,54 @@
         <item>Pink</item>
         <item>Red</item>
     </string-array>
+
+    <!-- USB configuration names for Developer Settings.
+         This can be overridden by devices with additional USB configurations. -->
+    <string-array name="usb_configuration_titles">
+        <item>MTP (Media Transfer Protocol)</item>
+        <item>PTP (Picture Transfer Protocol)</item>
+        <item>RNDIS (USB Ethernet)</item>
+        <item>Audio Source</item>
+        <item>MIDI</item>
+    </string-array>
+
+    <!-- USB configuration values for Developer Settings.
+         These are lists of USB functions passed to the USB Manager to change USB configuraton.
+         This can be overridden by devices with additional USB configurations.
+         Do not translate. -->
+    <string-array name="usb_configuration_values" translatable="false">
+        <!-- Do not translate. -->
+        <item>mtp</item>
+        <!-- Do not translate. -->
+        <item>ptp</item>
+        <!-- Do not translate. -->
+        <item>rndis</item>
+        <!-- Do not translate. -->
+        <item>audio_source</item>
+        <!-- Do not translate. -->
+        <item>midi</item>
+    </string-array>
+
+    <!-- Possible values for user theme in Display Settings.
+         Do not translate. -->
+    <string-array name="night_mode_entries" translatable="false">
+        <!-- Do not translate. -->
+        <item>@string/night_mode_no</item>
+        <!-- Do not translate. -->
+        <item>@string/night_mode_yes</item>
+        <!-- Do not translate. -->
+        <item>@string/night_mode_auto</item>
+    </string-array>
+
+    <!-- These values should match up with the MODE_NIGHT constants in UiModeManager.
+         Do not translate. -->
+    <string-array name="night_mode_values" translatable="false">
+        <!-- Do not translate. -->
+        <item>1</item>
+        <!-- Do not translate. -->
+        <item>2</item>
+        <!-- Do not translate. -->
+        <item>0</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 1fe36d6..248cf92 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -109,4 +109,8 @@
     <attr name="switchBarMarginEnd" format="dimension" />
 
     <attr name="preferenceBackgroundColor" format="color" />
+
+    <!-- Confirm device credentials screen -->
+    <attr name="confirmDeviceCredentialsSideMargin" format="dimension" />
+    <attr name="confirmDeviceCredentialsTopMargin" format="dimension" />
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 70fc4a0..3115da3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,6 +17,7 @@
 <resources>
     <color name="black">#000</color>
     <color name="red">#F00</color>
+    <color name="blue">#00F</color>
 
     <color name="material_empty_color_light">#FFCED7DB</color>
 
@@ -43,41 +44,43 @@
     <color name="setup_lock_pattern_view_regular_color_dark">#ffbdbdbd</color>
     <color name="setup_lock_pattern_view_regular_color_light">@color/lock_pattern_view_regular_color</color>
     <color name="setup_lock_pattern_view_success_color_dark">#ff84ffff</color>
-    <color name="setup_lock_pattern_view_success_color_light">@color/setup_wizard_color_accent_light</color>
+    <color name="setup_lock_pattern_view_success_color_light">@color/suw_color_accent_light</color>
     <color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>
     <color name="setup_lock_pattern_view_error_color_light">@color/lock_pattern_view_error_color</color>
-    <color name="setup_wizard_color_accent_dark">#ff00e4ff</color>
-    <color name="setup_wizard_color_accent_light">#ff00828e</color>
-    <color name="setup_wizard_wifi_color_dark">#ff00e4ff</color>
-    <color name="setup_wizard_wifi_color_light">#ff0096a6</color>
-
-    <color name="circle_avatar_frame_color">#ffffffff</color>
-    <color name="circle_avatar_frame_shadow_color">#80000000</color>
-    <color name="circle_avatar_frame_pressed_color">#ffffffff</color>
+    <color name="setup_wizard_wifi_color_dark">#89ffffff</color>
+    <color name="setup_wizard_wifi_color_light">#89000000</color>
 
     <color name="lock_pattern_background">#00000000</color>
     <color name="lock_pattern_view_regular_color">#ff37474f</color>
-    <color name="lock_pattern_view_success_color">@color/theme_accent</color>
-    <color name="lock_pattern_view_error_color">#fff4511e</color>
+    <color name="lock_pattern_view_error_color">@color/warning</color>
+
+    <color name="lock_pattern_view_regular_color_dark">#ffffff</color>
 
     <color name="unlock_pattern_view_regular_color">@android:color/white</color>
-    <color name="unlock_pattern_view_success_color">@color/theme_accent</color>
     <color name="unlock_pattern_view_error_color">#fff4511e</color>
 
+    <color name="fingerprint_title_area_bg">#ff009688</color>
+    <color name="fingerprint_title_color">#ffffffff</color>
+    <color name="fingerprint_message_color">#de000000</color>
+    <color name="fingerprint_progress_ring">#ff009688</color>
+    <color name="fingerprint_progress_ring_bg">#20000000</color>
+
     <color name="running_processes_system_ram">#ff384248</color>
     <color name="running_processes_apps_ram">#ff009587</color>
     <color name="running_processes_free_ram">#ffced7db</color>
 
-    <!-- Palette colors referenced by top-level themes. -->
-    <color name="theme_primary">#ff263238</color>
-    <color name="theme_primary_dark">#ff21272b</color>
-    <color name="theme_accent">#ff009688</color>
+    <color name="card_background">#ffffffff</color>
 
-    <color name="dashboard_background_color">#ffe1e1e0</color>
     <color name="switchbar_background_color">#ff37474f</color>
     <color name="switch_accent_color">#ff7fcac3</color>
 
     <color name="wifi_divider">#ffe0e0e0</color>
+    <color name="wifi_signal_icon_color">#ff009688</color>
     <color name="sim_noitification">@*android:color/material_deep_teal_500</color>
 
+    <color name="warning">#ff5621</color>
+    <color name="confirm_device_credential_dark_background">#263238</color>
+    <color name="fab_ripple">#1fffffff</color><!-- 12% white -->
+    <color name="fab_shape">#ff009688</color><!-- Teal 500 -->
+    <color name="voice_interaction_highlight">#33b5e5</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 339a2e4..cd11c2c 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -38,27 +38,10 @@
 
     <dimen name="crypt_clock_size">100sp</dimen>
 
-    <dimen name="setup_margin_bottom">0dip</dimen>
-    <dimen name="setup_title_size">24sp</dimen>
-    <dimen name="setup_title_margin_bottom">16dp</dimen>
-    <!-- This is the extra spacing required to make the leading exactly 32sp -->
-    <dimen name="setup_title_line_spacing_extra">3.67sp</dimen>
-    <dimen name="setup_title_padding_bottom">2dp</dimen>
-    <dimen name="setup_title_padding_top">16dp</dimen>
     <!-- Size of padding to give in the wifi list when there is no icon -->
     <dimen name="setup_list_no_icon_padding">56dp</dimen>
     <dimen name="setup_add_network_item_height">56dp</dimen>
-    <dimen name="setup_wizard_card_corner_radius">2dp</dimen>
-    <dimen name="setup_wizard_card_elevation">5dp</dimen>
-    <dimen name="setup_wizard_tablet_illustration_height">256dp</dimen>
-    <dimen name="setup_wizard_card_title_padding_end">0dp</dimen>
-    <dimen name="setup_wizard_card_title_padding_start">0dp</dimen>
-    <dimen name="setup_wizard_card_title_padding_top">16dp</dimen>
-    <dimen name="setup_wizard_card_title_padding_bottom">28dp</dimen>
-    <dimen name="setup_wizard_card_port_margin_sides">56dp</dimen>
-    <dimen name="setup_wizard_card_land_margin_top">128dp</dimen>
-    <dimen name="setup_wizard_margin_sides">40dp</dimen>
-    <dimen name="setup_wizard_title_area_elevation">3dp</dimen>
+    <dimen name="setup_wizard_margin_top">24dp</dimen>
 
     <dimen name="divider_height">3dip</dimen>
     <dimen name="divider_margin_top">6dip</dimen>
@@ -72,9 +55,7 @@
 
     <dimen name="pager_tabs_padding">0dp</dimen>
 
-    <dimen name="circle_avatar_size">48dp</dimen>
-    <dimen name="circle_avatar_frame_stroke_width">1dp</dimen>
-    <dimen name="circle_avatar_frame_shadow_radius">3dp</dimen>
+    <dimen name="circle_avatar_size">40dp</dimen>
 
     <!-- Minimum width for the popup for updating a user's photo. -->
     <dimen name="update_user_photo_popup_min_width">300dip</dimen>
@@ -91,8 +72,8 @@
     <dimen name="notification_app_icon_size">64dp</dimen>
     <dimen name="notification_app_icon_badge_size">20dp</dimen>
     <dimen name="notification_app_icon_badge_margin">4dp</dimen>
-    <dimen name="zen_downtime_checkbox_padding">7dp</dimen>
-    <dimen name="zen_downtime_margin">17dp</dimen>
+    <dimen name="zen_schedule_rule_checkbox_padding">7dp</dimen>
+    <dimen name="zen_schedule_day_margin">17dp</dimen>
 
     <!-- Default text size for caption preview samples. Uses dp rather than sp because captions are not scaled. -->
     <dimen name="caption_preview_text_size">48dp</dimen>
@@ -213,7 +194,8 @@
     <dimen name="user_icon_view_height">56dp</dimen>
     <!-- User spinner -->
     <dimen name="user_spinner_height">72dp</dimen>
-    <dimen name="user_spinner_padding">8dp</dimen>
+    <dimen name="user_spinner_padding">4dp</dimen>
+    <dimen name="user_spinner_padding_sides">20dp</dimen>
     <dimen name="user_spinner_item_height">56dp</dimen>
 
     <!-- CheckBoxPreference -->
@@ -231,4 +213,16 @@
     <dimen name="color_swatch_size">16dp</dimen>
     <dimen name="color_swatch_stroke_width">4dp</dimen>
 
+    <!-- RedactionInterstitial -->
+    <dimen name="redaction_vertical_margins">8dp</dimen>
+
+    <!-- Fingerprint -->
+    <dimen name="fingerprint_ring_radius">96dip</dimen>
+    <dimen name="fingerprint_ring_thickness">4dip</dimen>
+
+    <dimen name="confirm_credentials_security_method_margin">48dp</dimen>
+    <dimen name="fab_size">56dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="fab_elevation">12dp</dimen>
+    <dimen name="fab_press_translation_z">9dp</dimen>
 </resources>
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
index e6bd9a6..611e2b4 100644
--- a/res/values/donottranslate.xml
+++ b/res/values/donottranslate.xml
@@ -33,4 +33,8 @@
         <item>@string/input_method_selector_always_show_value</item>
         <item>@string/input_method_selector_always_hide_value</item>
     </string-array>
+    <string name="category_key_wireless">com.android.settings.category.wireless</string>
+    <string name="category_key_device">com.android.settings.category.device</string>
+    <string name="category_key_personal">com.android.settings.category.personal</string>
+    <string name="category_key_system">com.android.settings.category.system</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 989219d..f2732fa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -16,16 +16,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Strings for Dialog yes button -->
     <string name="yes">"Yes"</string>
-
     <!-- Strings for Dialog no button -->
     <string name="no">"No"</string>
-
     <!-- Strings for Dialog create button -->
     <string name="create">Create</string>
-
     <!-- Strings for Dialog allow button -->
     <string name="allow">Allow</string>
-
     <!-- Strings for Dialog deny button -->
     <string name="deny">Deny</string>
 
@@ -285,26 +281,8 @@
     <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
     <string name="bluetooth_disable_profile_message">This will disable:&lt;br>&lt;b><xliff:g id="profile_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>From:&lt;br>&lt;b><xliff:g id="device_name">%2$s</xliff:g>&lt;/b></string>
 
-    <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
-    <string name="bluetooth_connected">Connected</string>
-    <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
-    <string name="bluetooth_connected_no_headset">Connected (no phone)</string>
-    <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
-    <string name="bluetooth_connected_no_a2dp">Connected (no media)</string>
-    <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
-    <string name="bluetooth_connected_no_map">Connected (no message access)</string>
-    <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
-    <string name="bluetooth_connected_no_headset_no_a2dp">Connected (no phone or media)</string>
-    <!-- Bluetooth settings.  Message when a device is disconnected -->
-    <string name="bluetooth_disconnected">Disconnected</string>
-    <!-- Bluetooth settings.  Message when disconnecting from a device -->
-    <string name="bluetooth_disconnecting">Disconnecting\u2026</string>
-    <!-- Bluetooth settings.  Message when connecting to a device -->
-    <string name="bluetooth_connecting">Connecting\u2026</string>
     <!-- Bluetooth settings.  Message when the device state is unknown -->
     <string name="bluetooth_unknown" />
-    <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
-    <string name="bluetooth_pairing">Pairing\u2026</string>
     <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
     <string name="bluetooth_device">Unnamed Bluetooth device</string>
     <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -326,8 +304,8 @@
     <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
     <string name="bluetooth_permission_request">"Bluetooth permission request"</string>
 
-    <!-- Strings for asking to the user whether to allow an app to enable bluetooth -->
-    <string name="bluetooth_ask_enablement">An app wants to turn on Bluetooth.</string>
+    <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+    <string name="bluetooth_ask_enablement">An app wants to turn Bluetooth ON for this device.</string>
 
     <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
     <string name="bluetooth_ask_discovery" product="tablet">An app wants to make your tablet visible to other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds.</string>
@@ -389,11 +367,6 @@
     <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
     <string name="bluetooth_map_acceptance_dialog_text">%1$s wants to access your messages. Give access to %2$s?</string>
 
-    <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
-    <string name="bluetooth_sap_request">"SIM Access request"</string>
-
-    <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
-    <string name="bluetooth_sap_acceptance_dialog_text">%1$s wants to access your SIM card. Give access to %2$s?</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. -->
@@ -609,24 +582,14 @@
 
     <!-- Button label for generic cancel action [CHAR LIMIT=20] -->
     <string name="cancel">Cancel</string>
-
-    <!-- Button label for generic cancel action in all caps [CHAR LIMIT=20] -->
-    <string name="cancel_all_caps">CANCEL</string>
-
-    <!-- Button label for generic continue action in all caps [CHAR LIMIT=20] -->
-    <string name="continue_all_caps">CONTINUE</string>
-
     <!-- Button label for generic OK action [CHAR LIMIT=20] -->
     <string name="okay">OK</string>
-
-    <!-- Button label for generic YES action [CHAR LIMIT=20] -->
-    <string name="yes_all_caps">YES</string>
-
-    <!-- Button label for generic NO action [CHAR LIMIT=20] -->
-    <string name="no_all_caps">NO</string>
-
-    <!-- Button label for generic FORGET action [CHAR LIMIT=20] -->
-    <string name="forget">FORGET</string>
+    <!-- Button label for generic forget action [CHAR LIMIT=20] -->
+    <string name="forget">Forget</string>
+    <!-- Button label for generic save action [CHAR LIMIT=20] -->
+    <string name="save">Save</string>
+    <!-- Button label for generic done action [CHAR LIMIT=20] -->
+    <string name="done">Done</string>
 
     <!-- Title of the Settings activity shown within the application itself. -->
     <string name="settings_label">Settings</string>
@@ -683,7 +646,7 @@
     <string name="date_and_time_settings_title_setup_wizard">Set date and time</string>
     <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
     <string name="date_and_time_settings_summary">Set date, time, time zone, &amp; formats</string>
-    <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=25] -->
+    <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] -->
     <string name="date_time_auto">Automatic date &amp; time</string>
     <!-- Date & time setting screen setting option summary text when Automatic check box is selected
         (that is, when date and time should be determined automatically) [CHAR LIMIT=100] -->
@@ -691,7 +654,7 @@
     <!-- Date & time setting screen setting option summary text when Automatic check box is clear
         [CHAR LIMIT=100] -->
     <string name="date_time_auto_summaryOff">Use network-provided time</string>
-    <!-- Date & time setting screen setting check box title if the time zone should be determined automatically [CHAR LIMIT=25] -->
+    <!-- Date & time setting screen setting check box title if the time zone should be determined automatically [CHAR LIMIT=30] -->
     <string name="zone_auto">Automatic time zone</string>
     <!-- Date & time setting screen setting option summary text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
         [CHAR LIMIT=100]  -->
@@ -728,13 +691,6 @@
 
     <!-- Security Settings --><skip />
 
-    <!-- Security settings screen when using face unlock, setting option name to start an activity that allows the user to improve accuracy by adding additional enrollment faces -->
-    <string name="biometric_weak_improve_matching_title">Improve face matching</string>
-<!-- On the security settings screen when using face unlock.  This checkbox is used to toggle whether liveliness detection is required.  If it is checked the user must blink during unlock to prove it's not a photo  -->
-    <string name="biometric_weak_liveliness_title">Liveness check</string>
-    <!-- On the security settings screen when using face unlock.  The summary of the liveliness checkbox -->
-    <string name="biometric_weak_liveliness_summary" msgid="7980026533493781616">Require eye blink while unlocking</string>
-
     <!-- Security settings screen, setting option name to change screen timeout -->
     <string name="lock_after_timeout">Automatically lock</string>
     <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -744,17 +700,17 @@
     <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
     <string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>
     <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
-    <string name="owner_info_settings_title">Owner info</string>
+    <string name="owner_info_settings_title">Lock screen message</string>
     <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
     <string name="security_enable_widgets_title">Enable widgets</string>
     <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
     <string name="security_enable_widgets_disabled_summary">Disabled by administrator</string>
-    <!-- Text shown for summary of owner info setting [CHAR LIMIT=40]-->
-    <string name="owner_info_settings_summary"></string>
+    <!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
+    <string name="owner_info_settings_summary">None</string>
+    <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
+    <string name="owner_info_settings_status"><xliff:g id="count" example="90">%1$d</xliff:g> / <xliff:g id="count" example="100">%2$d</xliff:g></string>
     <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
-    <string name="owner_info_settings_edit_text_hint">Type text to display on the lock screen</string>
-    <!-- Text shown next to checkbox for showing user info on LockScreen [CHAR LIMIT=50]-->
-    <string name="show_user_info_on_lockscreen_label">Show user info on lock screen</string>
+    <string name="owner_info_settings_edit_text_hint">E.g., Joe\'s Android.</string>
     <!-- Text shown for title of user info setting [CHAR LIMIT=20]-->
     <string name="user_info_settings_title">User info</string>
     <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
@@ -776,6 +732,58 @@
     <!-- In the security screen, the header title for settings related to  Passwords-->
     <string name="security_passwords_title">Passwords</string>
 
+    <!-- Fingerprint enrollment and settings --><skip />
+    <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_preference_title">Fingerprint</string>
+    <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
+    <string name="fingerprint_manage_category_title">Manage fingerprints</string>
+    <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
+	<string name="fingerprint_usage_category_title">Use fingerprint for</string>
+	<!-- Preference to add another fingerprint -->
+	<string name="fingerprint_add_title">Add</string>
+	<!-- switch for allowing fingerprint to be used for keyguard -->
+	<string name="fingerprint_enable_keyguard_toggle_title">screen lock</string>
+    <!-- message shown for menu item that launches fingerprint settings or enrollment -->
+    <plurals name="security_settings_fingerprint_preference_summary">
+        <item quantity="one"><xliff:g id="count">%1$d</xliff:g> fingerprint enrolled</item>
+        <item quantity="other"><xliff:g id="count">%1$d</xliff:g> fingerprints enrolled</item>
+    </plurals>
+    <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_onboard_title">Fingerprint setup</string>
+    <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
+         alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
+    <string name="security_settings_fingerprint_enroll_onboard_message">
+        To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to:
+        \n\n\u2713 Set up your backup screen lock method
+        \n\n\u2713 Add your fingerprint</string>
+    <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_find_sensor_title">Find the sensor</string>
+    <!-- Introduction detail message shown in fingerprint enrollment dialog -->
+    <string name="security_settings_fingerprint_enroll_find_sensor_message">
+        Locate the fingerprint sensor on the back of your phone.</string>
+    <!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_dialog_name_label">Name</string>
+    <!-- Button text shown in fingerprint dialog that allows the user to rename a fingerprint template [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_dialog_ok">OK</string>
+    <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_dialog_delete">Delete</string>
+    <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=22]-->
+    <string name="security_settings_fingerprint_enroll_start_title">Let\'s start!</string>
+    <!-- Message shown in fingerprint enrollment dialog to begin enrollment -->
+    <string name="security_settings_fingerprint_enroll_start_message">Put your finger on the fingerprint sensor. Lift after you feel a vibration.</string>
+    <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_repeat_title">Great! Now repeat.</string>
+    <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor -->
+    <string name="security_settings_fingerprint_enroll_repeat_message">Put the same finger on the fingerprint sensor and lift after you feel a vibration.</string>
+    <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added!</string>
+    <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
+    <string name="security_settings_fingerprint_enroll_finish_message">Whenever you see this icon, you can use your fingerprint for identification or to authorize a purchase.</string>
+    <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
+    <string name="fingerprint_enroll_button_add">Add</string>
+    <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
+    <string name="fingerprint_enroll_button_next">Next</string>
+
     <!-- Title of the preferences category for preference items to control encryption -->
     <string name="crypt_keeper_settings_title">Encryption</string>
 
@@ -822,12 +830,6 @@
     <string name="crypt_keeper_dialog_need_password_message">You need to set a lock screen PIN or
     password before you can start encryption.</string>
 
-    <!-- String at bottom of screen when prompting for pattern.
-         Note: This is only for the pattern case. -->
-    <string name="crypt_keeper_confirm_encrypt">
-    You need to draw your unlock pattern to confirm encrypting your device.
-    </string>
-
     <!-- Title of the final confirmation screen before starting device encryption -->
     <string name="crypt_keeper_confirm_title">Encrypt?</string>
     <!-- Warning text in the final confirmation screen before starting device encryption -->
@@ -948,11 +950,6 @@
     <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
     <string name="unlock_set_unlock_none_summary">No security</string>
 
-    <!-- Title for preference that guides the user through a weak biometric lock [CHAR LIMIT=22] -->
-    <string name="unlock_set_unlock_biometric_weak_title">Face Unlock</string>
-    <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
-    <string name="unlock_set_unlock_biometric_weak_summary">Low security, experimental</string>
-
     <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
     <string name="unlock_set_unlock_pattern_title">Pattern</string>
     <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
@@ -968,6 +965,9 @@
     <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_password_summary">High security</string>
 
+    <!-- Summary specifying that this is the current screen lock setting [CHAR LIMIT=45] -->
+    <string name="current_screen_lock">Current screen lock</string>
+
     <!--  Content of warning dialog about disabling device protection features when user is switching from a secure unlock method to an insecure one. [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_content">Device protection features will no longer work.</string>
 
@@ -978,8 +978,6 @@
     <string name="unlock_set_unlock_mode_off">None</string>
     <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_none">Swipe</string>
-    <!-- Summary for "Configure lockscreen" when security biometric weak is enabled [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_mode_biometric_weak">Face Unlock</string>
     <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_pattern">Pattern</string>
     <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
@@ -987,6 +985,11 @@
     <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_password">Password</string>
 
+    <!-- Footer text in when choosing screen lock type during setup wizard, telling the user that
+         they can add fingerprint after they complete setup wizard. The text "Settings > Security"
+         should match settings_label and security_settings_title [CHAR LIMIT=NONE] -->
+    <string name="unlock_setup_wizard_fingerprint_details">Once you\'ve set up a screen lock, you can also set up your fingerprint in Settings &gt; Security.</string>
+
     <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
     <string name="unlock_disable_lock_title">Turn off screen lock</string>
 
@@ -1164,27 +1167,11 @@
     <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
     <string name="bluetooth_display_passkey_pin_msg">To pair with:<xliff:g id="bold1">&lt;br>&lt;b></xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1">&lt;/b>&lt;br>&lt;br></xliff:g>Type on it:<xliff:g id="bold2">&lt;br>&lt;b></xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2">&lt;/b></xliff:g>, then press Return or Enter.</string>
 
-    <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
-    <string name="bluetooth_pairing_accept">Pair</string>
-    <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
-    <string name="bluetooth_pairing_accept_all_caps">PAIR</string>
-    <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
-    <string name="bluetooth_pairing_decline">Cancel</string>
-
     <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
     <string name="bluetooth_pairing_will_share_phonebook">Pairing grants access to your contacts and call history when connected.</string>
 
     <!-- Title for BT error dialogs. -->
     <string name="bluetooth_error_title"></string>
-    <!-- Message for the error dialog when BT pairing fails generically. -->
-    <string name="bluetooth_pairing_error_message">Couldn\'t pair with <xliff:g id="device_name">%1$s</xliff:g>.</string>
-    <!-- Message for the error dialog when BT pairing fails because the PIN /
-    Passkey entered is incorrect. -->
-    <string name="bluetooth_pairing_pin_error_message">Couldn\'t pair with <xliff:g id="device_name">%1$s</xliff:g> because of an incorrect PIN or passkey.</string>
-    <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
-    <string name="bluetooth_pairing_device_down_error_message">Can\'t communicate with <xliff:g id="device_name">%1$s</xliff:g>.</string>
-    <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
-    <string name="bluetooth_pairing_rejected_error_message">Pairing rejected by <xliff:g id="device_name">%1$s</xliff:g>.</string>
 
     <!-- Message for the error dialog when BT connecting operation fails generically. -->
     <string name="bluetooth_connecting_error_message">Couldn\'t connect to <xliff:g id="device_name">%1$s</xliff:g>.</string>
@@ -1239,32 +1226,19 @@
     <string name="bluetooth_advanced_titlebar">Advanced Bluetooth</string>
     <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->
     <string name="bluetooth_empty_list_bluetooth_off">When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices.</string>
+    <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+    <string name="ble_scan_notify_text">To improve location accuracy, apps and
+        services will scan for Bluetooth devices, even when Bluetooth is off.
+        You can change this in
+        <xliff:g id="link_begin">LINK_BEGIN</xliff:g>scanning
+        settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>
 
 
     <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
     <string name="bluetooth_connect_specific_profiles_title">Connect to\u2026</string>
 
-    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
-    <string name="bluetooth_profile_a2dp">Media audio</string>
-    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
-    <string name="bluetooth_profile_headset">Phone audio</string>
-    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
-    <string name="bluetooth_profile_opp">File transfer</string>
-    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
-    <string name="bluetooth_profile_hid">Input device</string>
-    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
-    <string name="bluetooth_profile_pan">Internet access</string>
-    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
-    <string name="bluetooth_profile_pbap">Contact sharing</string>
-    <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
-    <string name="bluetooth_profile_pbap_summary">Use for contact sharing</string>
-    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
-    <string name="bluetooth_profile_pan_nap">Internet connection sharing</string>
-    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the map profile. -->
-    <string name="bluetooth_profile_map">Message Access</string>
-    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the sap profile (sharing SIM card). -->
-    <string name="bluetooth_profile_sap">SIM Access</string>
-
     <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
     <string name="bluetooth_disconnect_a2dp_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from media audio.</string>
     <!-- Bluetooth settings.  Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
@@ -1291,44 +1265,11 @@
     <string name="bluetooth_device_advanced_rename_device">Rename</string>
     <!-- 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 A2DP checkbox preference when A2DP is connected. -->
-    <string name="bluetooth_a2dp_profile_summary_connected">Connected to media audio</string>
-    <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
-    <string name="bluetooth_headset_profile_summary_connected">Connected to phone audio</string>
-    <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
-    <string name="bluetooth_opp_profile_summary_connected">Connected to file transfer server</string>
-    <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
-    <string name="bluetooth_map_profile_summary_connected">Connected to map</string>
-    <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when sap is connected. -->
-    <string name="bluetooth_sap_profile_summary_connected">Connected to sap</string>
-    <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
-    <string name="bluetooth_opp_profile_summary_not_connected">Not connected to file transfer server</string>
-    <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
-    <string name="bluetooth_hid_profile_summary_connected">Connected to input device</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>
     <!-- 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>
 
-    <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
-    <string name="bluetooth_a2dp_profile_summary_use_for">Use for media audio</string>
-    <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
-    <string name="bluetooth_headset_profile_summary_use_for">Use for phone audio</string>
-    <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
-    <string name="bluetooth_opp_profile_summary_use_for">Use for file transfer</string>
-    <!-- Bluetooth settings. Connection options screen. The summary
-         for the HID checkbox preference that describes how checking it
-         will set the HID profile as preferred. -->
-    <string name="bluetooth_hid_profile_summary_use_for">Use for input</string>
-    <!-- Bluetooth settings. Connection options screen. The summary
-         for the PAN checkbox preference that describes how checking it
-         will set the PAN profile as preferred. -->
-    <string name="bluetooth_pan_profile_summary_use_for">Use for Internet access</string>
-    <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
-    <string name="bluetooth_map_profile_summary_use_for">Use for map</string>
-    <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
-    <string name="bluetooth_sap_profile_summary_use_for">Use for sap</string>
-
     <!-- Bluetooth settings.  Dock Setting Title -->
     <string name="bluetooth_dock_settings">Dock Settings</string>
     <!-- Bluetooth settings.  Dock Setting Dialog Title -->
@@ -1342,15 +1283,9 @@
 
     <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
     <string name="wifi_assistant_title">Wi\u2011Fi Assistant</string>
-    <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
-    <string name="connected_via_wfa">Connected via Wi\u2011Fi assistant</string>
-    <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
-    <string name="connected_via_passpoint">Connected via %1$s</string>
-    <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
-    <string name="available_via_passpoint">Available via %1$s</string>
 
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
-    <string name="wifi_display_settings_title">Cast screen</string>
+    <string name="wifi_display_settings_title">Cast</string>
     <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
     <string name="wifi_display_enable_menu_item">Enable wireless display</string>
     <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
@@ -1398,6 +1333,8 @@
     <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
     <string name="wifi_band_5ghz" translatable="false">5GHz</string>
 
+    <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
+    <string name="wifi_alert_lockdown_by_device_owner"><xliff:g id="app_name">%1$s</xliff:g> manages your device and has disabled modifying and deleting this Wi-Fi network. For more information, contact your administrator.</string>
 
     <!-- NFC settings -->
     <!-- Used in the 1st-level settings screen to turn on NFC -->
@@ -1451,8 +1388,6 @@
     <string name="wifi_error">Error</string>
     <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
     <string name="wifi_in_airplane_mode">In Airplane mode</string>
-    <!-- Toast message when Wi-Fi cannot scan for networks -->
-    <string name="wifi_fail_to_scan">Can\'t scan for networks</string>
     <!-- Checkbox title for option to notify user when open networks are nearby -->
     <string name="wifi_notify_open_networks">Network notification</string>
     <!-- Checkbox summary for option to notify user when open networks are nearby [CHAR LIMIT=60]-->
@@ -1463,12 +1398,6 @@
     <string name="wifi_poor_network_detection_summary">Don\'t 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>
-    <!-- Checkbox title for option to scan always available setting -->
-    <string name="wifi_scan_always_available">Scanning always available</string>
-    <!-- Checkbox title for option to scan always available setting [CHAR LIMIT=60] -->
-    <string name="wifi_scan_always_available_title">Always allow scanning</string>
-    <!-- Checkbox summary for option to toggle scan always available setting -->
-    <string name="wifi_scan_always_available_summary">Let Google\'s location service and other apps scan for networks, even when Wi\u2011Fi is off</string>
     <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
     <string name="wifi_automatically_connect_title">Use open Wi\u2011Fi automatically</string>
     <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
@@ -1477,8 +1406,14 @@
     <string name="wifi_select_assistant_dialog_title">Choose assistant</string>
     <!-- Preference title for option to install certificates -->
     <string name="wifi_install_credentials">Install certificates</string>
-    <string name="wifi_scan_notify_text_location_on">To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available.</string>
-    <string name="wifi_scan_notify_text_location_off">Apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available.</string>
+    <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+    <string name="wifi_scan_notify_text">To improve location accuracy, apps and
+        services will scan for Wi\u2011Fi networks, even when Wi\u2011Fi is off.
+        You can change this in
+        <xliff:g id="link_begin">LINK_BEGIN</xliff:g>scanning
+        settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>
     <!-- Wifi scan always mode checkbox text -->
     <string name="wifi_scan_notify_remember_choice">Don\'t show again</string>
     <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
@@ -1533,8 +1468,6 @@
     <string name="wifi_more">More</string>
     <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
     <string name="wifi_setup_wps">Automatic setup (WPS)</string>
-    <!-- Message informing that wifi is required during setup [CHAR LIMIT=NONE] -->
-    <string name="wifi_required_info_text">To complete setup, your tablet needs access to Wi\u2011Fi. After setup, you can switch between cellular data and Wi\u2011Fi.</string>
 
     <!-- Dialog for Access Points --> <skip />
     <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
@@ -1544,7 +1477,7 @@
     <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
     <string name="wifi_wps_setup_msg">Starting WPS\u2026</string>
     <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
-    <string name="wifi_wps_onstart_pbc">Press the Wi\u2011Fi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol:</string>
+    <string name="wifi_wps_onstart_pbc">Press the Wi\u2011Fi Protected Setup button on your router. It may be called \"WPS\" or marked with this symbol:</string>
     <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
     <string name="wifi_wps_onstart_pin">Enter pin <xliff:g id="number">%1$s</xliff:g> on your Wi\u2011Fi router. The setup can take up to two minutes to complete.</string>
     <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
@@ -1609,21 +1542,6 @@
     <string name="wifi_unchanged">(unchanged)</string>
     <!-- Hint for unspecified fields -->
     <string name="wifi_unspecified">(unspecified)</string>
-    <!-- Summary for the remembered network. -->
-    <string name="wifi_remembered">Saved</string>
-    <!-- Status for networks disabled for unknown reason -->
-    <string name="wifi_disabled_generic">Disabled</string>
-    <!-- Status for networked disabled from a DNS or DHCP failure -->
-    <string name="wifi_disabled_network_failure">IP Configuration Failure</string>
-    <!-- Status for networked disabled from a wifi association failure -->
-    <string name="wifi_disabled_wifi_failure">WiFi Connection Failure</string>
-    <!-- Status for networks disabled from authentication failure (wrong password
-         or certificate). -->
-    <string name="wifi_disabled_password_failure">Authentication problem</string>
-    <!-- Summary for the remembered network but currently not in range. -->
-    <string name="wifi_not_in_range">Not in range</string>
-    <!-- Summary for the remembered network but no internet connection was detected. -->
-    <string name="wifi_no_internet">No Internet Access Detected, won\'t automatically reconnect.</string>
     <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
          string is listed first [CHAR LIMIT=20]-->
     <string name="wifi_wps_available_first_item">WPS available</string>
@@ -1633,35 +1551,6 @@
     <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
     <string name="wifi_wps_nfc_enter_password">Enter your network password</string>
 
-    <!-- Do not translate.  Concise terminology for wifi with WEP security -->
-    <string name="wifi_security_short_wep">WEP</string>
-    <!-- Do not translate.  Concise terminology for wifi with WPA security -->
-    <string name="wifi_security_short_wpa">WPA</string>
-    <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
-    <string name="wifi_security_short_wpa2">WPA2</string>
-    <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
-    <string name="wifi_security_short_wpa_wpa2">WPA/WPA2</string>
-    <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
-    <string name="wifi_security_short_psk_generic">@string/wifi_security_short_wpa_wpa2</string>
-    <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
-    <string name="wifi_security_short_eap">802.1x</string>
-
-    <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
-    <string name="wifi_security_none">None</string>
-
-    <!-- Do not translate.  Terminology for wifi with WEP security -->
-    <string name="wifi_security_wep">WEP</string>
-    <!-- Do not translate.  Terminology for wifi with WPA security -->
-    <string name="wifi_security_wpa">WPA PSK</string>
-    <!-- Do not translate.  Terminology for wifi with WPA2 security -->
-    <string name="wifi_security_wpa2">WPA2 PSK</string>
-    <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
-    <string name="wifi_security_wpa_wpa2">WPA/WPA2 PSK</string>
-    <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
-    <string name="wifi_security_psk_generic">@string/wifi_security_wpa_wpa2</string>
-    <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
-    <string name="wifi_security_eap">802.1x EAP</string>
-
     <string name="wifi_scan_always_turnon_message">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>
     <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->
     <string name="wifi_scan_always_turnoff_message">To turn this off, go to Advanced in the overflow menu.</string>
@@ -1675,6 +1564,10 @@
     <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
     <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. Use this network anyway?</string>
+    <string name="no_internet_access_remember">Don\'t ask again for this network</string>
+
     <!-- Button label to connect to a Wi-Fi network -->
     <string name="wifi_connect">Connect</string>
     <!-- Failured notification for connect -->
@@ -2057,6 +1950,16 @@
     <string name="auto_brightness_title">Adaptive brightness</string>
     <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
     <string name="auto_brightness_summary">Optimize brightness level for available light</string>
+    <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
+    <string name="night_mode_title">Theme</string>
+    <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
+    <string name="night_mode_summary">%s</string>
+    <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
+    <string name="night_mode_no">Light</string>
+    <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
+    <string name="night_mode_yes">Dark</string>
+    <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
+    <string name="night_mode_auto">Automatic</string>
     <!-- Sound & display settings screen, setting option name to change screen timeout -->
     <string name="screen_timeout">Sleep</string>
     <!-- Sound & display settings screen, setting option name to change screen timeout [CHAR LIMIT=30] -->
@@ -2274,7 +2177,7 @@
     <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
     <string name="memory_calculating_size">Calculating\u2026</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
-    <string name="memory_apps_usage">Apps (app data &amp; media content)</string>
+    <string name="memory_apps_usage">Apps &amp; app data</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
     <string name="memory_media_usage">Media</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
@@ -2284,7 +2187,7 @@
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
     <string name="memory_music_usage">Audio (music, ringtones, podcasts, etc.)</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
-    <string name="memory_media_misc_usage">Misc.</string>
+    <string name="memory_media_misc_usage">Other files</string>
     <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
     <string name="memory_media_cache_usage">Cached data</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
@@ -2359,6 +2262,16 @@
     <!-- Settings item summary when storage is running low [CHAR LIMIT=NONE] -->
     <string name="storage_low_summary">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>
 
+    <!-- Storage setting.  Menu option for renaming a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_rename">Rename</string>
+    <!-- Storage setting.  Menu option for mounting a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_mount">Mount</string>
+    <!-- Storage setting.  Menu option for unmounting a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_unmount">Eject</string>
+    <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_format">Erase &amp; format</string>
+    <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+    <string name="storage_menu_format_internal">Erase &amp; format as internal storage</string>
     <!-- Storage setting.  Menu option for USB transfer settings [CHAR LIMIT=30]-->
     <string name="storage_menu_usb">USB computer connection</string>
 
@@ -2372,14 +2285,135 @@
     <string name="usb_mtp_summary">Lets you transfer media files on Windows, or using Android File Transfer on Mac (see www.android.com/filetransfer)</string>
     <!-- Storage setting.  Title for PTP checkbox [CHAR LIMIT=30]-->
     <string name="usb_ptp_title">Camera (PTP)</string>
-    <!-- Storage setting.  Label for installer CD [CHAR LIMIT=30]-->
-    <string name="usb_ptp_summary">Lets you transfer photos using camera software, and transfer any files on computers that don\'t support MTP</string>
     <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
-    <string name="usb_label_installer_cd">"Install file-transfer tools"</string>
+    <string name="usb_ptp_summary">Lets you transfer photos using camera software, and transfer any files on computers that don\'t support MTP</string>
+    <!-- Storage setting.  Title for MIDI checkbox [CHAR LIMIT=30]-->
+    <string name="usb_midi_title">MIDI</string>
+    <!-- Storage setting.  Summary for MIDI checkbox [CHAR LIMIT=NONE]-->
+    <string name="usb_midi_summary">Lets MIDI enabled applications work over USB with MIDI software on your computer.</string>
 
     <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
     <string name="storage_other_users">Other users</string>
 
+    <!-- Section header above list of internal storage devices [CHAR LIMIT=30]-->
+    <string name="storage_internal_title">Device storage</string>
+    <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
+    <string name="storage_external_title">Removable storage</string>
+
+    <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
+    <string name="storage_volume_summary"><xliff:g id="free" example="1.2GB">%1$s</xliff:g> free (Total <xliff:g id="total" example="32GB">%2$s</xliff:g>)</string>
+
+    <!-- Toast informing that storage mount operation was successful. [CHAR LIMIT=64]-->
+    <string name="storage_mount_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> is mounted</string>
+    <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+    <string name="storage_mount_failure">Couldn\'t mount <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
+
+    <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
+    <string name="storage_unmount_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> is safely ejected</string>
+    <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+    <string name="storage_unmount_failure">Couldn\'t safely eject <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
+
+    <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
+    <string name="storage_format_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> is formatted</string>
+    <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
+    <string name="storage_format_failure">Couldn\'t format <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
+
+    <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]-->
+    <string name="storage_rename_title">Rename storage</string>
+
+    <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]-->
+    <string name="storage_internal_format_details">After formatting, you can use this <xliff:g id="name" example="SD card">^1</xliff:g> in other devices.
+\n\nAll data on this <xliff:g id="name" example="SD card">^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" example="SD card">^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>
+
+    <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]-->
+    <string name="storage_internal_unmount_details"><b>When you eject this <xliff:g id="name" example="SD card">^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" example="SD card">^1</xliff:g> is formatted to work on this device only.  It won\'t work on any others.</string>
+
+    <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] -->
+    <string name="storage_wizard_init_title">Set up your <xliff:g id="name" example="SD card">^1</xliff:g></string>
+    <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] -->
+    <string name="storage_wizard_init_external_title">Use as portable storage</string>
+    <!-- Summary of wizard choice to use storage device as external storage [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_init_external_summary">For moving photos and other media between devices.</string>
+    <!-- Title of wizard choice to use storage device as internal storage [CHAR LIMIT=64] -->
+    <string name="storage_wizard_init_internal_title">Use as internal storage</string>
+    <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_init_internal_summary">For storing anything on this device only, including apps and photos. Requires formatting that prevents it from working with other devices.</string>
+
+    <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+    <string name="storage_wizard_format_confirm_title">Format as internal storage</string>
+    <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_format_confirm_body">This requires the <xliff:g id="name" example="SD card">^1</xliff:g> to be formatted to make it secure.
+\n\nAfter formatting, this <xliff:g id="name" example="SD card">^1</xliff:g> will only work in this device.
+\n\n<b>Formatting erases all data currently stored on the <xliff:g id="name" example="SD card">^1</xliff:g>.</b> To avoid losing the data, consider backing it up.
+    </string>
+    <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+    <string name="storage_wizard_format_confirm_next">Erase &amp; format</string>
+
+    <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] -->
+    <string name="storage_wizard_format_progress_title">Formatting <xliff:g id="name" example="SD card">^1</xliff:g>\u2026</string>
+    <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_format_progress_body">Don\'t remove the <xliff:g id="name" example="SD card">^1</xliff:g> while it\'s formatting.</string>
+
+    <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_title">Move data to new storage</string>
+    <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_migrate_body">You can move your photos, files, and app data to this new <xliff:g id="name" example="SD card">^1</xliff:g>.
+\n\nThe move takes about <xliff:g id="time" example="1 hour">^2</xliff:g> and will free <xliff:g id="size" example="1.2 GB">^3</xliff:g> on internal storage. Some apps won\'t work while it\'s underway.
+    </string>
+    <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
+    <string name="storage_wizard_migrate_now">Move now</string>
+    <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_migrate_later">Move later</string>
+
+    <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_confirm_title">Move data now</string>
+    <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_migrate_confirm_body"><b>The move takes about <xliff:g id="time" example="1 hour">^1</xliff:g>. It will free <xliff:g id="size" example="1.2 GB">^2</xliff:g> of internal storage.</b></string>
+    <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_confirm_next">Move</string>
+
+    <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
+    <string name="storage_wizard_migrate_progress_title">Moving data\u2026</string>
+
+    <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_migrate_details">During the move:
+\n\u2022 Don\'t remove the <xliff:g id="name" example="SD card">^1</xliff:g>.
+\n\u2022 Some apps won\'t work correctly.
+\n\u2022 Keep the device charged.
+    </string>
+
+    <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
+    <string name="storage_wizard_ready_title"><xliff:g id="name" example="SD card">^1</xliff:g> is ready</string>
+    <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_ready_external_body">
+        Your <xliff:g id="name" example="SD card">^1</xliff:g> is all set to use with photos and other media.
+    </string>
+    <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_ready_internal_body">Your new <xliff:g id="name" example="SD card">^1</xliff:g> is working.
+\n\nTo move photos, files, and app data to this device, go to Settings > Storage.
+    </string>
+
+    <!-- Title of wizard step prompting user to move an app [CHAR LIMIT=32] -->
+    <string name="storage_wizard_move_confirm_title">Move <xliff:g id="app" example="Calculator">^1</xliff:g></string>
+    <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_move_confirm_body">Moving <xliff:g id="app" example="Calculator">^1</xliff:g> and its data to <xliff:g id="name" example="SD card">^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" example="SD card">^2</xliff:g> during the move.
+    </string>
+
+    <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] -->
+    <string name="storage_wizard_move_progress_title">Moving <xliff:g id="app" example="Calculator">^1</xliff:g>\u2026</string>
+    <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
+    <string name="storage_wizard_move_progress_body">Don\'t remove the <xliff:g id="name" example="SD card">^1</xliff:g> during the move.
+\n\nThe <xliff:g id="app" example="Calculator">^2</xliff:g> app on this device won\'t be available until the move is complete.
+    </string>
+    <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] -->
+    <string name="storage_wizard_move_progress_cancel">Cancel move</string>
+
     <!-- Phone info screen, section titles: -->
     <string name="battery_status_title">Battery status</string>
     <!-- Phone info screen, section titles: -->
@@ -2467,15 +2501,27 @@
     <!-- APNs screen toast message to inform reset default APN settings is completed -->
     <string name="restore_default_apn_completed">Reset default APN settings completed.</string>
 
+    <!-- Reset Network -->
+    <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->
+    <string name="reset_network_title">Network settings reset</string>
+    <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
+    <string name="reset_network_desc">This will reset all network settings, including:\n\n<li>Wi\u2011Fi</li>\n<li>Cellular data</li>\n<li>Bluetooth</li>"</string>
+    <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
+    <string name="reset_network_button_text">Reset settings</string>
+    <!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
+    <string name="reset_network_final_desc">Reset all network settings? You can\'t undo this action!</string>
+    <!-- SD card & phone storage settings screen, button on screen after user selects Reset settings button -->
+    <string name="reset_network_final_button_text">Reset settings</string>
+    <!-- Reset settings confirmation screen title [CHAR LIMIT=30] -->
+    <string name="reset_network_confirm_title">Reset?</string>
+    <!-- Reset settings complete toast text [CHAR LIMIT=75] -->
+    <string name="reset_network_complete_toast">Network settings have been reset</string>
+
     <!-- Master Clear -->
     <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=30] -->
     <string name="device_reset_title">Reset device</string>
     <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
     <string name="master_clear_title">Factory data reset</string>
-    <!-- SD card & phone storage settings screen, setting option summary text under Internal phone storage heading -->
-    <string name="master_clear_summary" product="tablet">Erases all data on tablet</string>
-    <!-- SD card & phone storage settings screen, setting option summary text under Internal phone storage heading -->
-    <string name="master_clear_summary" product="default">Erases all data on phone</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
     <string name="master_clear_desc" product="tablet">"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>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -2503,11 +2549,9 @@
     <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
     <string name="master_clear_button_text" product="default">Reset phone</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
-    <string name="master_clear_final_desc">Erase all your personal information and downloaded apps? You can\'t reverse this action!</string>
+    <string name="master_clear_final_desc">Erase all your personal information and downloaded apps? You can\'t undo this action!</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
     <string name="master_clear_final_button_text">Erase everything</string>
-    <!-- Explanation of drawing unlock pattern to reset phone -->
-    <string name="master_clear_gesture_explanation">You need to draw your unlock pattern to confirm a factory data reset.</string>
     <!-- Master clear failed message -->
     <string name="master_clear_failed">No reset was performed because the System Clear service isn\'t available.</string>
     <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
@@ -2542,10 +2586,6 @@
     <string name="media_format_final_desc" product="default">Erase the SD card, deleting all files stored there? You can\'t reverse this action!</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Format media button -->
     <string name="media_format_final_button_text">Erase everything</string>
-    <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
-    <string name="media_format_gesture_explanation" product="nosdcard">You need to draw your unlock pattern to confirm that you want to erase the USB storage.</string>
-    <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
-    <string name="media_format_gesture_explanation" product="default">You need to draw your unlock pattern to confirm that you want to erase the SD card.</string>
 
     <!-- Main settings screen, Call settings title for item to go into the call settings -->
     <string name="call_settings_title">Call settings</string>
@@ -2618,7 +2658,7 @@
     <string name="manage_mobile_plan_title" translatable="true">Mobile plan</string>
 
     <!-- SMS Application [CHAR LIMIT=35]-->
-    <string name="sms_application_title" translatable="true">Default SMS app</string>
+    <string name="sms_application_title" translatable="true">SMS app</string>
     <string name="sms_change_default_dialog_title" translatable="true">Change SMS app?</string>
     <string name="sms_change_default_dialog_text" translatable="true">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" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> as your SMS app?</string>
@@ -2678,6 +2718,23 @@
     <string name="location_mode_battery_saving_description">Use Wi\u2011Fi and cellular networks to determine location</string>
     <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
     <string name="location_mode_sensors_only_description">Use GPS to determine location</string>
+    <!-- Help menu label [CHAR LIMIT=20] Location settings screen, overflow menu that takes the user
+      to scanning settings activity -->
+    <string name="location_menu_scanning">Scanning</string>
+    <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
+    <string name="location_scanning_screen_title">Scanning</string>
+    <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+    <string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning</string>
+    <!-- Preference description text for Wi-Fi always scanning -->
+    <string name="location_scanning_wifi_always_scanning_description">Improve
+        location by allowing apps and services to scan for Wi\u2011Fi networks
+        even when Wi\u2011Fi is off</string>
+    <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+    <string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning</string>
+    <!-- Description text for Bluetooth always scanning -->
+    <string name="location_scanning_bluetooth_always_scanning_description">
+        Improve location by allowing system services to scan for Bluetooth
+        devices, even when Bluetooth is off</string>
 
     <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
     <string name="location_network_based">Wi\u2011Fi &amp; cellular network location</string>
@@ -2781,21 +2838,33 @@
     <!-- Toast shown if setting pattern was successful -->
     <string name="lockpassword_pattern_set_toast">Pattern has been set</string>
 
+    <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
+         particular operation. [CHAR LIMIT=70]-->
+    <string name="lockpassword_confirm_your_pattern_generic">Use your device pattern to continue.</string>
+    <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
+         particular operation. [CHAR LIMIT=70]-->
+    <string name="lockpassword_confirm_your_pin_generic">Enter your device PIN to continue.</string>
+    <!-- Message to be used to explain the user that he needs to enter his password to continue a
+         particular operation. [CHAR LIMIT=70]-->
+    <string name="lockpassword_confirm_your_password_generic">Enter your device password to continue.</string>
+
+    <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect PIN [CHAR LIMIT=30] -->
+    <string name="lockpassword_invalid_pin">Wrong PIN</string>
+    <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect password [CHAR LIMIT=30] -->
+    <string name="lockpassword_invalid_password">Wrong password</string>
+    <!-- Security & location settings screen, change unlock pattern screen instruction if user
+         draws incorrect pattern [CHAR LIMIT=30] -->
+    <string name="lockpattern_need_to_unlock_wrong">Wrong pattern</string>
+
     <!-- Lock Pattern settings -->
     <!-- Security & location settings screen, header -->
-    <string name="lock_settings_title">Screen security</string>
+    <string name="lock_settings_title">Device security</string>
     <!-- Security & location settings screen, setting option name -->
     <string name="lockpattern_change_lock_pattern_label">Change unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
     <string name="lockpattern_change_lock_pin_label">Change unlock PIN</string>
-    <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
-    <string name="lockpattern_need_to_unlock">Confirm saved pattern</string>
-    <!-- Do not translate. -->
-    <string name="lockpattern_need_to_unlock_footer" />
-    <!-- Security & location settings screen, change unlock pattern screen instruction if user draws incorrect pattern -->
-    <string name="lockpattern_need_to_unlock_wrong">Try again:</string>
-    <!-- Do not translate. -->
-    <string name="lockpattern_need_to_unlock_wrong_footer" />
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
     <string name="lockpattern_recording_intro_header">Draw an unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
@@ -2837,10 +2906,9 @@
     <string name="lockpattern_settings_change_lock_pattern">Change unlock pattern</string>
     <!-- Security & location settings screen, the help instructions (an animation) caption -->
     <string name="lockpattern_settings_help_how_to_record">How to draw an unlock pattern</string>
-    <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen after too many incorrect attempts -->
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header">Too many incorrect attempts!</string>
-    <!-- Security & location settings screen, change unlock pattern screen countdown hint on bottom of screen after too many incorrect attempts -->
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">Try again in <xliff:g id="number">%d</xliff:g> seconds.</string>
+    <!-- Security & location settings screen, confirm unlock pattern screen hint at the bottom after
+         too many incorrect attempts [CHAR LIMIT=120]-->
+    <string name="lockpattern_too_many_failed_confirmation_attempts">Too many incorrect attempts. Try again in <xliff:g id="number">%d</xliff:g> seconds.</string>
     <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
     <string name="activity_not_found">Application is not installed on your phone.</string>
 
@@ -2950,6 +3018,8 @@
     <string name="show_running_services">Show running services</string>
     <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
     <string name="show_background_processes">Show cached processes</string>
+    <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
+    <string name="default_emergency_app">Emergency app</string>
     <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
     <string name="reset_app_preferences">Reset app preferences</string>
     <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
@@ -2989,7 +3059,7 @@
     <string name="filter_apps_onsdcard" product="default">On SD card</string>
     <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
     <string name="disabled">Disabled</string>
-    <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. -->
+    <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
     <string name="not_installed">Not installed for this user</string>
     <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
     <string name="no_applications">No apps.</string>
@@ -3116,6 +3186,9 @@
     <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
     <string name="app_ops_never_used">(Never used)</string>
 
+    <!-- [CHAR LIMIT=25] Text shown when there are no default Apps -->
+    <string name="no_default_apps">No default Apps.</string>
+
     <!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
     <string name="storageuse_settings_title">Storage use</string>
     <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->
@@ -3353,29 +3426,6 @@
     <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations.  -->
     <string name="testing_sim_toolkit">SIM toolkit</string>
 
-    <!-- The title of the item to go into the Quick launch settings. -->
-    <string name="quick_launch_title">Quick launch</string>
-    <!-- The summary of the item to go into the Quick launch settings. This is a description of what Quick launch offers. -->
-    <string name="quick_launch_summary">Set keyboard shortcuts to launch apps</string>
-    <!-- On the Quick launch settings screen, title of the item for shortcut letters that are not assigned to an application yet. Quick launch is assigning a global shortcut to launch a specific app. -->
-    <string name="quick_launch_assign_application">Assign app</string>
-    <!-- On the Quick launch settings screen, summary text for the item of letters that are not assigned. See the quick launch "Assign application" for a description of quick launch -->
-    <string name="quick_launch_no_shortcut">No shortcut</string>
-    <!-- On the Quick launch settings screen, summary text under the item for each assigned letter.  -->
-    <string name="quick_launch_shortcut">Search + <xliff:g id="shortcut_letter">%1$s</xliff:g></string>
-    <!-- On the Quick launch settings screen, title of "Clear shortcut" confirmation dialog. This is reached by longpressing an item for a shortcut letter.  This allows the user to clear the assigned application for that shortcut letter. -->
-    <string name="quick_launch_clear_dialog_title">Clear</string>
-    <!-- On the Quick launch settings screen, message in the "Clear shortcut" confirmation dialog.  See the title for this dialog for more info. -->
-    <string name="quick_launch_clear_dialog_message">Your shortcut for <xliff:g id="shortcut_letter">%1$s</xliff:g> (<xliff:g id="application_name">%2$s</xliff:g>) will be cleared.</string>
-    <!-- Clear dialog for quick launch setting box button labels: -->
-    <string name="quick_launch_clear_ok_button">OK</string>
-    <!-- Clear dialog for quick launch setting box button labels: -->
-    <string name="quick_launch_clear_cancel_button">Cancel</string>
-    <!-- Quick launch screen, when assigning an app to a shortcut, this menu item to show a list of all applications.  -->
-    <string name="quick_launch_display_mode_applications">Apps</string>
-    <!-- Quick launch screen, when assigning an app to a shortcut, this menu item to show a list of all shortcutable applications -->
-    <string name="quick_launch_display_mode_shortcuts">Shortcuts</string>
-
     <!-- Input methods Settings -->
     <string name="input_methods_settings_title">Text input</string>
     <!-- Setting name for Input Method chooser -->
@@ -3445,10 +3495,6 @@
     <string name="oem_unlock_enable">OEM unlocking</string>
     <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
     <string name="oem_unlock_enable_summary">Allow the bootloader to be unlocked</string>
-    <!-- Message to enter device PIN to enable OEM unlock -->
-    <string name="oem_unlock_enable_pin_prompt">Enter your PIN</string>
-    <!-- Explanation to enter device pin to enable OEM unlock -->
-    <string name="oem_unlock_enable_pin_description">Enter your device PIN to enable OEM unlock</string>
     <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
     <string name="confirm_enable_oem_unlock_title">Allow OEM unlocking?</string>
     <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
@@ -3489,9 +3535,23 @@
     <string name="wifi_aggressive_handover_summary">When enabled, Wi\u2011Fi will be more aggressive in handing over the data connection to Cellular, when Wi\u2011Fi signal is low</string>
     <!-- Setting Checkbox summary whether to always allow WiFi Roam Scans [CHAR LIMIT=130] -->
     <string name="wifi_allow_scan_with_traffic_summary">Allow/Disallow Wi\u2011Fi Roam Scans based on the amount of data traffic present at the interface</string>
+    <!-- UI debug setting: limit size of Android logger buffers -->
+    <string name="select_logd_size_title">Logger buffer sizes</string>
+    <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+    <string name="select_logd_size_dialog_title">Select Logger sizes per log buffer</string>
+    <!-- UI debug setting: select USB configuration -->
+    <string name="select_usb_configuration_title">Select USB Configuration</string>
+    <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+    <string name="select_usb_configuration_dialog_title">Select USB Configuration</string>
+    <!-- Setting Checkbox title whether to allow mock locations -->
+    <string name="allow_mock_location">Allow mock locations</string>
+    <!-- setting Checkbox summary whether to allow mock locations  -->
+    <string name="allow_mock_location_summary">Allow mock locations</string>
+    <!-- Setting Checkbox title whether to enable view attribute inspection -->
+    <string name="debug_view_attributes">Enable view attribute inspection</string>
+    <!-- Title of warning dialog about the implications of enabling USB debugging -->
     <!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
     <string name="legacy_dhcp_client_summary">Use the DHCP client from Lollipop instead of the new Android DHCP client.</string>
-
     <string name="adb_warning_title">Allow USB debugging?</string>
     <!-- Warning text to user about the implications of enabling USB debugging -->
     <string name="adb_warning_message">USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification, and read log data.</string>
@@ -3737,6 +3797,11 @@
     <!-- Title for the list of capabilities of an accessibility service. -->
     <string name="capabilities_list_title"><xliff:g id="service" example="TalkBack">%1$s</xliff:g>
         needs to:</string>
+    <!-- Warning shown when user input has been blocked due to another app overlaying screen
+         content. Since we don't know what the app is showing on top of the input target, we
+         can't verify user consent. [CHAR LIMIT=NONE] -->
+    <string name="touch_filtered_warning">Because an app is obscuring a permission request, Settings
+        can’t verify your response.</string>
     <!-- Warning that the device data will not be encrypted with password or PIN if
         enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
     <string name="enable_service_encryption_warning">If you turn on <xliff:g id="service"
@@ -4107,9 +4172,11 @@
     <string name="process_stats_summary">Geeky stats about running processes</string>
     <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
     <string name="app_memory_use">Memory use</string>
-    <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over -->
-    <string name="process_stats_total_duration"><xliff:g id="type">%1$s</xliff:g> apps over
-        <xliff:g id="time">%2$s</xliff:g></string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+    <string name="process_stats_total_duration"><xliff:g id="usedRam">%1$s</xliff:g>
+        of <xliff:g id="totalRam">%2$s</xliff:g> used over
+        <xliff:g id="timeDuration">%3$s</xliff:g></string>
     <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
     <string name="process_stats_type_background">Background</string>
     <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
@@ -4119,12 +4186,24 @@
     <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over -->
     <string name="process_stats_memory_status">Device memory is currently
         <xliff:g id="memstate">%1$s</xliff:g></string>
+    <!-- [CHAR LIMIT=NONE] Label OS "process" app -->
+    <string name="process_stats_os_label">Android OS</string>
+    <!-- [CHAR LIMIT=NONE] Name of OS "process" for all native processes -->
+    <string name="process_stats_os_native">Native</string>
+    <!-- [CHAR LIMIT=NONE] Name of OS "process" for all kernel memory -->
+    <string name="process_stats_os_kernel">Kernel</string>
+    <!-- [CHAR LIMIT=NONE] Name of OS "process" for all zram memory -->
+    <string name="process_stats_os_zram">Z-Ram</string>
+    <!-- [CHAR LIMIT=NONE] Name of OS "process" for base memory needed for caches -->
+    <string name="process_stats_os_cache">Caches</string>
     <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
-    <string name="process_stats_avg_ram_use">Average RAM use</string>
-    <!-- [CHAR LIMIT=NONE] Label for item showing details of maximum RAM use -->
-    <string name="process_stats_max_ram_use">Maximum RAM use</string>
+    <string name="process_stats_ram_use">RAM use</string>
+    <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+    <string name="process_stats_bg_ram_use">RAM use (background)</string>
     <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
     <string name="process_stats_run_time">Run time</string>
+    <!-- [CHAR LIMIT=NONE] Subtitle for process stats processes list -->
+    <string name="processes_subtitle">Processes</string>
     <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
     <string name="services_subtitle">Services</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
@@ -4155,8 +4234,10 @@
     <string name="menu_duration_12h">12 hours</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
     <string name="menu_duration_1d">1 day</string>
-    <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether system processes are shown -->
+    <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are shown -->
     <string name="menu_show_system">Show system</string>
+    <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are hidden -->
+    <string name="menu_hide_system">Hide system</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
         on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
     <string name="menu_use_uss">Use Uss</string>
@@ -4221,7 +4302,7 @@
     <!-- On main TTS Settings screen, in default settings section, setting default synthesis engine for synthesized voice -->
     <string name="tts_default_synth_title">Default engine</string>
     <!-- On main TTS Settings screen, summary for default synthesis engine for synthesized voice -->
-    <string name="tts_default_synth_summary">Sets the speech synthesis engine to be used for spoken text</string>
+    <string name="tts_default_synth_summary">Set the speech synthesis engine to be used for spoken text</string>
     <!-- On main TTS Settings screen, in default settings section, setting default speech rate for synthesized voice -->
     <string name="tts_default_rate_title">Speech rate</string>
     <!-- On main TTS Settings screen, summary for default speech rate for synthesized voice -->
@@ -4390,9 +4471,6 @@
     <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
     <string name="credentials_settings_not_available">Credentials are not available for this user</string>
 
-    <!-- Explanation of drawing unlock pattern to install credentials -->
-    <string name="credentials_install_gesture_explanation">You need to draw your unlock pattern to confirm credential installation.</string>
-
     <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
     <string name="credentials_unlock"></string>
     <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
@@ -4419,10 +4497,6 @@
 
     <!-- Title of Usage Access preference item [CHAR LIMIT=30] -->
     <string name="usage_access_title">Apps with usage access</string>
-    <!-- AlertDialog title for warning user when enabling usage access [CHAR LIMIT=30] -->
-    <string name="allow_usage_access_title">Allow access?</string>
-    <!-- AlertDialog message for warning user when enabling usage access [CHAR LIMIT=NONE] -->
-    <string name="allow_usage_access_message">If you allow access, this app can view general information about the apps on your device, such as how often you use them.</string>
 
     <!-- Sound settings screen, setting check box label -->
     <string name="emergency_tone_title">Emergency tone</string>
@@ -4444,8 +4518,6 @@
     <string name="backup_data_summary">Back up app data, Wi\u2011Fi passwords, and other settings to Google servers</string>
     <!-- Configure backup account options menu title [CHAR LIMIT=25]-->
     <string name="backup_configure_account_title">Backup account</string>
-    <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
-    <string name="backup_configure_account_default_summary">No account is currently storing backed up data</string>
     <!-- Auto-restore menu title [CHAR LIMIT=30] -->
     <string name="include_app_data_title">Include app data</string>
     <!-- Auto-restore menu title -->
@@ -4454,8 +4526,6 @@
     <string name="auto_restore_summary">When reinstalling an app, restore backed up settings and data</string>
     <!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
     <string name="backup_inactive_title">Backup service is inactive.</string>
-    <!-- Summary text of the preference informing the user about the backup service being inactive, explaining that this is likely set by device policy [CHAR LIMIT=150]-->
-    <string name="backup_inactive_summary">This is set by your device policy.</string>
 
     <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
     <string name="local_backup_password_title">Desktop backup password</string>
@@ -4905,6 +4975,14 @@
     <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
     <string name="overlay_display_devices_title">Simulate secondary displays</string>
 
+    <!-- UI debug setting: enable/disable debug multi-window ui [CHAR LIMIT=25] -->
+    <string name="enable_multi_window">Multi-window mode</string>
+    <!-- setting Checkbox summary whether to enable debug multi-window ui [CHAR_LIMIT=50] -->
+    <string name="enable_multi_window_summary">Multiple activities on screen at the same time.</string>
+    <string name="confirm_enable_multi_window_title">Enable multi-window mode?</string>
+    <!-- Warning dialog message to confirm user wishes to enable experimental multi-window mode feature -->
+    <string name="confirm_enable_multi_window_text">WARNING: This is a highly experimental feature that allows multiple activities on-screen at the same time through the Recent apps UI. Some apps may crash or not function correctly when used with this feature.</string>
+
     <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
     <string name="debug_applications_category">Apps</string>
 
@@ -5159,14 +5237,24 @@
 
     <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_cancel">Cancel</string>
+    <!-- Button label to finish editing a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_done">Dismiss</string>
     <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_save">Save</string>
     <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_connect">Connect</string>
     <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_edit">Edit VPN profile</string>
+    <!-- Button label to forget a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_forget">Forget</string>
     <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_connect_to">Connect to <xliff:g id="profile" example="School">%s</xliff:g></string>
+    <!-- Dialog message body to disconnect from a VPN profile. -->
+    <string name="vpn_disconnect_confirm">Disconnect this VPN.</string>
+    <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_disconnect">Disconnect</string>
+    <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
+    <string name="vpn_version">Version <xliff:g id="version" example="3.3.0">%s</xliff:g></string>
 
     <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
     <string name="vpn_title">VPN</string>
@@ -5291,7 +5379,7 @@
     <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
     <string name="user_add_user_title">Add new user?</string>
     <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
-    <string name="user_add_user_message_long">You can share this device with other people by creating additional users. Each user has their own space, which they can customize with their own apps, wallpaper, and so on. Users can also adjust device settings like Wi\u2011Fi 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_long">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\u2011Fi 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>
     <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
     <string name="user_add_user_message_short">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>
     <!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
@@ -5355,19 +5443,19 @@
     <string name="user_exit_guest_dialog_remove">Remove</string>
 
     <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
-    <string name="user_enable_calling">Allow phone calls</string>
+    <string name="user_enable_calling">Turn on phone calls</string>
     <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
-    <string name="user_enable_calling_sms">Allow phone calls and SMS</string>
+    <string name="user_enable_calling_sms">Turn on phone calls &amp; SMS</string>
     <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
     <string name="user_remove_user">Remove user</string>
     <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
-    <string name="user_enable_calling_confirm_title">Allow phone calls?</string>
+    <string name="user_enable_calling_confirm_title">Turn on phone calls?</string>
     <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
     <string name="user_enable_calling_confirm_message">Call history will be shared with this user.</string>
     <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
-    <string name="user_enable_calling_sms_confirm_title">Allow phone calls and SMS?</string>
+    <string name="user_enable_calling_and_sms_confirm_title">Turn on phone calls &amp; SMS?</string>
     <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->
-    <string name="user_enable_calling_sms_confirm_message">Call and SMS history will be shared with this user.</string>
+    <string name="user_enable_calling_and_sms_confirm_message">Call and SMS history will be shared with this user.</string>
 
     <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
     <string name="application_restrictions">Allow apps and content</string>
@@ -5425,6 +5513,34 @@
     <!--  Help URLs for some screens. Not specified here. Specified in product overlays --><skip/>
     <!-- Help menu label [CHAR LIMIT=20] -->
     <string name="help_label">Help &amp; feedback</string>
+
+    <!-- Help URI, Default [DO NOT TRANSLATE] -->
+    <string name="help_uri_default" translatable="false"></string>
+    <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
+    <string name="help_uri_dashboard" translatable="false"></string>
+    <!-- Help URI, Android beam [DO NOT TRANSLATE] -->
+    <string name="help_uri_beam" translatable="false"></string>
+    <!-- Help URI, Display [DO NOT TRANSLATE] -->
+    <string name="help_uri_display" translatable="false"></string>
+    <!-- Help URI, Wallpaper [DO NOT TRANSLATE] -->
+    <string name="help_uri_wallpaper" translatable="false"></string>
+    <!-- Help URI, Interruptions [DO NOT TRANSLATE] -->
+    <string name="help_uri_interruptions" translatable="false"></string>
+    <!-- Help URI, Other sounds [DO NOT TRANSLATE] -->
+    <string name="help_uri_other_sounds" translatable="false"></string>
+    <!-- Help URI, Notifications [DO NOT TRANSLATE] -->
+    <string name="help_uri_notifications" translatable="false"></string>
+    <!-- Help URI, Apps [DO NOT TRANSLATE] -->
+    <string name="help_uri_apps" translatable="false"></string>
+    <!-- Help URI, Storage [DO NOT TRANSLATE] -->
+    <string name="help_uri_storage" translatable="false"></string>
+    <!-- Help URI, Accessibility [DO NOT TRANSLATE] -->
+    <string name="help_uri_accessibility" translatable="false"></string>
+    <!-- Help URI, Printing [DO NOT TRANSLATE] -->
+    <string name="help_uri_printing" translatable="false"></string>
+    <!-- Help URI, About phone [DO NOT TRANSLATE] -->
+    <string name="help_uri_about" translatable="false"></string>
+
     <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
     <string name="help_url_wifi" translatable="false"></string>
     <!-- Help URL, Bluetooth [DO NOT TRANSLATE] -->
@@ -5514,10 +5630,10 @@
     <string name="app_restrictions_custom_label">Set app restrictions</string>
     <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
     <string name="user_restrictions_controlled_by">Controlled by <xliff:g id="app">%1$s</xliff:g></string>
-    <!-- Summary for apps that aren't supported in limited users [CHAR LIMIT=none] -->
-    <string name="app_not_supported_in_limited">This app is not supported in restricted profiles</string>
     <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
     <string name="app_sees_restricted_accounts">This app can access your accounts</string>
+    <!-- Summary for a case when app entries that are controlled by another entry and app can access user accounts [CHAR LIMIT=none] -->
+    <string name="app_sees_restricted_accounts_and_controlled_by">This app can access your accounts. Controlled by <xliff:g id="app">%1$s</xliff:g></string>
 
     <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
     <string name="restriction_wifi_config_title">Wi\u2011Fi and Mobile</string>
@@ -5661,9 +5777,11 @@
     <string name="keywords_display">screen touchscreen</string>
     <string name="keywords_display_brightness_level">dim screen touchscreen battery</string>
     <string name="keywords_display_auto_brightness">dim screen touchscreen battery</string>
-    <string name="keywords_display_wallpaper">background personalize customize diplay</string>
+    <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->
+    <string name="keywords_display_night_mode">dark theme night mode dim screen invert brightness</string>
+    <string name="keywords_display_wallpaper">background personalize customize display</string>
     <string name="keywords_display_font_size">text size</string>
-    <string name="keywords_display_cast_screen">project</string>
+    <string name="keywords_display_cast_screen">project cast</string>
     <string name="keywords_storage">space disk hard drive device usage</string>
     <string name="keywords_battery">power usage charge</string>
     <string name="keywords_spell_checker">spelling dictionary spellcheck auto-correct</string>
@@ -5680,6 +5798,12 @@
     <string name="keywords_accounts">account</string>
     <string name="keywords_users">restriction restrict restricted</string>
     <string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international</string>
+    <string name="keywords_reset_apps">reset preferences default</string>
+    <string name="keywords_emergency_app">emergency ice app default</string>
+    <string name="keywords_default_dialer_app">dialer default</string>
+    <string name="keywords_all_apps">apps download applications system</string>
+    <string name="keywords_app_permissions">apps permissions security</string>
+    <string name="keywords_default_apps">apps default</string>
     <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
     <string name="keywords_lockscreen">slide password pattern pin</string>
 
@@ -5722,19 +5846,25 @@
     <string name="notification_volume_option_title">Notification volume</string>
 
     <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
-    <string name="zen_mode_settings_title">Interruptions</string>
+    <string name="zen_mode_settings_title" translatable="false">@*android:string/zen_mode_feature_name</string>
 
-    <!-- Sound & notification > Sound section: Title for the zen mode option. [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_title">When calls and notifications arrive</string>
+    <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
+    <string name="zen_mode_priority_settings_title">Priority only allows</string>
 
-    <!-- Sound & notification > Sound section: Zen mode option: Off [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_off">Always interrupt</string>
+    <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
+    <string name="zen_mode_automation_settings_title">Automatic rules</string>
 
     <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_important_interruptions">Allow only priority interruptions</string>
+    <string name="zen_mode_option_important_interruptions">Priority only</string>
+
+    <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+    <string name="zen_mode_option_alarms">Alarms only</string>
 
     <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_no_interruptions">Don\'t interrupt</string>
+    <string name="zen_mode_option_no_interruptions">No interruptions</string>
+
+    <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
+    <string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>
 
     <!-- Sound & notification > Sound section: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
     <string name="ringtone_title">Phone ringtone</string>
@@ -5839,52 +5969,32 @@
         to dismiss these notifications or touch action buttons within them.
     </string>
 
-    <!-- Title of preference to manage condition providers -->
-    <string name="manage_condition_providers">Condition providers</string>
-
-    <!-- Summary of preference to manage condition providers, when none are enabled -->
-    <string name="manage_condition_providers_summary_zero">No apps provide conditions</string>
-
-    <!-- Summary of preference to manage condition providers, when one or more are enabled -->
-    <plurals name="manage_condition_providers_summary_nonzero">
-        <item quantity="one">%d app provides conditions</item>
-        <item quantity="other">%d apps provide conditions</item>
-    </plurals>
-
-    <!-- String to show in the list of condition providers, when none is installed -->
-    <string name="no_condition_providers">No condition providers are installed.</string>
-
-    <!-- Title for a warning message about security implications of enabling a condition
-          provider, displayed as a dialog message. [CHAR LIMIT=NONE] -->
-    <string name="condition_provider_security_warning_title">Enable
-         <xliff:g id="service" example="ConditionProvider">%1$s</xliff:g>?</string>
-    <!-- Summary for a warning message about security implications of enabling a condition
-          provider, displayed as a dialog message. [CHAR LIMIT=NONE] -->
-    <string name="condition_provider_security_warning_summary">
-        <xliff:g id="condition_provider_name">%1$s</xliff:g> will be able to
-        add exit conditions to Do not disturb mode.
-    </string>
-
     <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
     <string name="loading_notification_apps">Loading apps...</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: Block option title -->
-    <string name="app_notification_block_title">Block</string>
+    <string name="app_notification_block_title">Block all</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: Block option description-->
     <string name="app_notification_block_summary">Never show notifications from this app</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: Priority option title -->
-    <string name="app_notification_priority_title">Priority</string>
+    <string name="app_notification_priority_title">Treat as priority</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: Priority option description-->
-    <string name="app_notification_priority_summary">Show notifications at the top of the list and keep them coming when the device is set to priority interruptions only</string>
+    <string name="app_notification_priority_summary">Let this app\'s notifications be heard when Do not disturb is set to Priority only</string>
+
+    <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option title -->
+    <string name="app_notification_peekable_title">Allow peeking</string>
+
+    <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option description-->
+    <string name="app_notification_peekable_summary">Let this app emphasize certain notifications by sliding them briefly into view on the current screen</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option title -->
-    <string name="app_notification_sensitive_title">Sensitive</string>
+    <string name="app_notification_sensitive_title">Hide sensitive content</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option description-->
-    <string name="app_notification_sensitive_summary">When the device is locked, hide any sensitive content from this app\'s notifications</string>
+    <string name="app_notification_sensitive_summary">When the device is locked, hide content in this app\'s notifications that might reveal private information</string>
 
     <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when banned -->
     <string name="app_notification_row_banned">Blocked</string>
@@ -5898,41 +6008,56 @@
     <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
     <string name="app_notifications_dialog_done">Done</string>
 
-    <!-- [CHAR LIMIT=30] Zen mode settings: Exit condition selection dialog, default option -->
-    <string name="zen_mode_default_option">Until you turn this off</string>
+    <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
+    <string name="zen_mode_rule_name">Rule name</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: Important category text -->
-    <string name="zen_mode_important_category">Priority interruptions</string>
+    <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
+    <string name="zen_mode_time_add_rule">Add rule</string>
 
-    <!-- [CHAR LIMIT=60] Zen mode settings: Downtime category text -->
-    <string name="zen_mode_downtime_category">Downtime</string>
+    <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
+    <string name="zen_mode_delete_rule">Delete rule</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option title -->
-    <string name="zen_mode_downtime_days">Days</string>
+    <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog confirmation message -->
+    <string name="zen_mode_delete_rule_confirmation">Delete \"<xliff:g id="rule" example="Weekends">%1$s</xliff:g>\" rule?</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
+    <string name="zen_mode_delete_rule_button">Delete</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
+    <string name="zen_mode_rule_type">Rule type</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
+    <string name="zen_mode_rule_type_unknown">Unknown</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
+    <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">Schedule rule</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found  -->
+    <string name="zen_mode_rule_not_found_text">Rule not found.</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Rule summary template (when enabled)  -->
+    <string name="zen_mode_rule_summary_combination"><xliff:g id="description" example="Sun - Thu">%1$s</xliff:g> / <xliff:g id="mode" example="Alarms only">%2$s</xliff:g></string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Timebased rule days option title -->
+    <string name="zen_mode_schedule_rule_days">Days</string>
 
     <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
-    <string name="zen_mode_downtime_days_none">None</string>
+    <string name="zen_mode_schedule_rule_days_none">None</string>
 
-    <!-- [CHAR LIMIT=60] Zen mode settings: Downtime mode option title -->
-    <string name="zen_mode_downtime_mode_title">Interruptions allowed</string>
-
-    <!-- [CHAR LIMIT=40] Zen mode settings: Downtime mode option value, priority only -->
-    <string name="zen_mode_downtime_mode_priority">Priority only</string>
-
-    <!-- [CHAR LIMIT=40] Zen mode settings: Downtime mode option value, none -->
-    <string name="zen_mode_downtime_mode_none">None</string>
-
-    <!-- [CHAR LIMIT=40] Zen mode settings: Automation category text -->
-    <string name="zen_mode_automation_category">Automation</string>
-
-    <!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: title -->
-    <string name="zen_mode_entry_conditions_title">Automatically turn on</string>
+    <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
+    <string name="zen_mode_schedule_rule_days_all">Every day</string>
 
     <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
     <string name="summary_divider_text">,\u0020</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: value when blank -->
-    <string name="zen_mode_entry_conditions_summary_none">Never</string>
+    <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
+    <string name="summary_range_symbol_combination"><xliff:g id="start" example="Sun">%1$s</xliff:g> - <xliff:g id="end" example="Thu">%2$s</xliff:g></string>
+
+    <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
+    <string name="summary_range_verbal_combination"><xliff:g id="start" example="Sun">%1$s</xliff:g> to <xliff:g id="end" example="Thu">%2$s</xliff:g></string>
 
     <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
     <string name="zen_mode_calls">Calls</string>
@@ -5952,11 +6077,23 @@
     <!-- [CHAR LIMIT=30] Zen mode settings: From option value: Starred contacts -->
     <string name="zen_mode_from_starred">Starred contacts only</string>
 
-    <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
-    <string name="zen_mode_events">Events and reminders</string>
+    <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
+    <string name="zen_mode_alarms">Alarms</string>
 
-    <!-- [CHAR LIMIT=80] Zen mode settings: Reminder text about alarms -->
-    <string name="zen_mode_alarm_info">Alarms are always priority interruptions</string>
+    <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
+    <string name="zen_mode_reminders">Reminders</string>
+
+    <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
+    <string name="zen_mode_events">Events</string>
+
+    <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
+    <string name="zen_mode_selected_callers">Selected callers</string>
+
+    <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
+    <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>
 
     <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
     <string name="zen_mode_when">Automatically turn on</string>
@@ -5976,14 +6113,110 @@
     <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
     <string name="zen_mode_end_time">End time</string>
 
-    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = priority and end time = next day -->
-    <string name="zen_mode_end_time_priority_next_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day</string>
+    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when end time = next day -->
+    <string name="zen_mode_end_time_next_day_summary_format"><xliff:g id="formatted_time" example="7:00 AM">%s</xliff:g> next day</string>
 
-    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = none and end time = same day -->
-    <string name="zen_mode_end_time_none_same_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> or any alarm before</string>
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Activity title for interruption level  -->
+    <string name="zen_mode_interruptions_voice_title">Interruptions</string>
 
-    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = none and end time = next day -->
-    <string name="zen_mode_end_time_none_next_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day or any alarm before</string>
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Header for interruption level  -->
+    <string name="zen_mode_interruptions_voice_header">When calls and notifications arrive</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Prompt read for interruption type -->
+    <string name="zen_mode_interruptions_voice_prompt">When would you like to be interrupted?</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Prompt read for zen mode duration -->
+    <string name="zen_mode_duration_voice_prompt">For how long?</string>
+
+    <!-- [CHAR LIMIT=80] Zen mode voice: All interruptions -->
+    <string name="zen_mode_option_voice_all_interruptions">Always interrupt</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for all interriuptions -->
+    <string name="zen_mode_option_voice_all_interruptions_synonyms">off,all,everything</string>
+
+    <!-- [CHAR LIMIT=80] Zen mode voice: Important interruptions -->
+    <string name="zen_mode_option_voice_important_interruptions">Allow only priority interruptions</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for important interriuptions -->
+    <string name="zen_mode_option_voice_important_synonyms">important,priority,priority only,only priority,priority notifications</string>
+
+    <!-- [CHAR LIMIT=80] Zen mode voice option: Alarms only -->
+    <string name="zen_mode_option_voice_alarms">Allow only alarms</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for alarm interriuptions -->
+    <string name="zen_mode_option_voice_alarms_synonyms">alarms,alarms only,only alarms</string>
+
+    <!-- [CHAR LIMIT=80] Zen mode voice: No interruptions -->
+    <string name="zen_mode_option_voice_no_interruptions">Don\'t interrupt</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for no interriuptions -->
+    <string name="zen_mode_option_voice_no_interruptions_synonyms">none,never,nothing,no interruptions</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode voice: Label for indefinite mode duration -->
+    <string name="zen_mode_duration_indefinte_voice_label">Indefinitely</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode voice: Label for duration in minutes -->
+    <plurals name="zen_mode_duration_minutes_voice_label">
+       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> minute</item>
+       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> minutes</item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=40] Zen mode voice: Label for duration in hours -->
+    <plurals name="zen_mode_duration_hours_voice_label">
+       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> hour</item>
+       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> hours</item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: important only duration indefinite. -->
+    <string name="zen_mode_summary_priority_indefinitely">Change to priority notifications only indefinitely</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: important only duration minutes. -->
+    <plurals name="zen_mode_summary_priority_by_minute">
+        <item quantity="one">Change to priority notifications only for one minute until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to priority notifications only for <xliff:g id="duration" example="2">%1$d</xliff:g> minutes until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: important only duration hours. -->
+    <plurals name="zen_mode_summary_priority_by_hour">
+        <item quantity="one">Change to priority notifications only for one hour until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to priority notifications only for <xliff:g id="duration" example="2">%1$d</xliff:g> hours (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: alarms only duration indefinite. -->
+    <string name="zen_mode_summary_alarams_only_indefinite">Change to alarms only indefinitely</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: alarms only duration minutes. -->
+    <plurals name="zen_mode_summary_alarms_only_by_minute">
+        <item quantity="one">Change to alarms only for one minute until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to alarms only for <xliff:g id="duration" example="2">%1$d</xliff:g> minutes (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: alarms only duration hours. -->
+    <plurals name="zen_mode_summary_alarms_only_by_hour">
+        <item quantity="one">Change to alarms only for one hour until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to alarms only for <xliff:g id="duration" example="2">%1$d</xliff:g> hours until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: no interruptions duration indefinite. -->
+    <string name="zen_mode_summary_no_interruptions_indefinite">Change to don\'t interrupt indefinitely</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: alarms only duration minutes. -->
+    <plurals name="zen_mode_summary_no_interruptions_by_minute">
+        <item quantity="one">Change to don\'t interrupt for one minute until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to don\'t interrupt for <xliff:g id="duration" example="2">%1$d</xliff:g> minutes (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: alarms only duration hours. -->
+    <plurals name="zen_mode_summary_no_interruptions_by_hour">
+        <item quantity="one">Change to don\'t interrupt for one hour until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+        <item quantity="other">Change to don\'t interrupt for <xliff:g id="duration" example="2">%1$d</xliff:g> hours until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
+    </plurals>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: off. -->
+    <string name="zen_mode_summary_always">Change to always interrupt</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for indefinte duration -->
+    <string name="zen_mode_duration_indefinite_voice_synonyms">forever</string>
 
     <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
     <string name="notification_settings_apps_title">App notifications</string>
@@ -6099,4 +6332,157 @@
    <string name="imei_information_summary">IMEI relative information</string>
    <string name="slot_number">(Slot<xliff:g id="slot_num">%1$d</xliff:g>)</string>
 
+   <!-- New strings needed for App Info 2 -->
+   <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
+   <string name="launch_by_default">Launch by default</string>
+
+   <!-- Summary for app storage preference [CHAR LIMIT=15] -->
+   <string name="storage_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used in <xliff:g id="storage_type" example="internal storage">%2$s</xliff:g></string>
+
+   <!-- Category name for App Launch -->
+   <string name="app_launch_domain_links_title">Domain links</string>
+   <string name="app_launch_open_domain_urls_title">Open Domain URLs</string>
+   <string name="app_launch_open_domain_urls_summary">Allow app to directly open Domain URLs</string>
+   <string name="app_launch_supported_domain_urls_title">Supported domains URLs</string>
+   <string name="app_launch_other_defaults_title">Other defaults</string>
+
+   <!-- Summary for app storage preference -->
+   <string name="storage_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used in <xliff:g id="storage_type" example="internal memory">%2$s</xliff:g></string>
+   <!-- Internal storage label -->
+   <string name="storage_type_internal">internal memory</string>
+   <!-- External storage label -->
+   <string name="storage_type_external">external memory</string>
+
+   <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
+   <string name="storage_type_internal">Internal storage</string>
+   <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+   <string name="storage_type_external">External storage</string>
+
+   <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
+   <string name="app_data_usage">App data usage</string>
+   <!-- Summary for data usage preference [CHAR LIMIT=15] -->
+   <string name="data_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used since <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>
+
+   <!-- Title of storage preference to control where app is stored -->
+   <string name="storage_used">Storage used</string>
+
+   <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
+   <string name="notifications_label">Notifications</string>
+   <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
+   <string name="notifications_enabled">Normal</string>
+   <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
+   <string name="notifications_disabled">Block</string>
+   <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
+   <string name="notifications_sensitive">Sensitive</string>
+   <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->
+   <string name="notifications_priority">Priority</string>
+   <!-- App notification summary with notifications priority and sensitive [CHAR LIMIT=40] -->
+   <string name="notifications_priority_sensitive">Priority &amp; Sensitive</string>
+
+   <!-- Permissions preference summary [CHAR LIMIT=40] -->
+   <plurals name="permissions_summary">
+       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> permission granted</item>
+       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> permissions granted</item>
+   </plurals>
+
+   <!-- Runtime permissions preference summary [CHAR LIMIT=40] -->
+   <plurals name="runtime_permissions_summary">
+       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> of <xliff:g id="count" example="1">%d</xliff:g> permission granted</item>
+       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> of <xliff:g id="count" example="10">%d</xliff:g> permissions granted</item>
+   </plurals>
+
+    <!-- Launch defaults preference summary with some set [CHAR LIMIT=40] -->
+    <string name="launch_defaults_some">Some defaults set</string>
+    <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->
+    <string name="launch_defaults_none">No defaults set</string>
+
+    <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
+    <string name="filter_all_apps">All apps</string>
+    <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
+    <string name="filter_enabled_apps">Enabled</string>
+    <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
+    <string name="filter_personal_apps">Personal</string>
+    <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
+    <string name="filter_work_apps">Work</string>
+    <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
+    <string name="filter_notif_blocked_apps">Blocked</string>
+    <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->
+    <string name="filter_notif_priority_apps">Priority</string>
+    <!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->
+    <string name="filter_notif_sensitive_apps">Sensitive</string>
+    <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
+    <string name="filter_with_domain_urls_apps">With domain URLs</string>
+
+    <!-- Summary for a trust agent that was disabled by the device policy [LIMIT=NONE] -->
+    <string name="trust_agent_disabled_device_admin">Disabled by administrator</string>
+
+    <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
+    <string name="advanced_apps">Advanced</string>
+
+   <!-- Warning toast shown when data usage screen can't find specified app -->
+   <string name="unknown_app">Unknown app</string>
+
+   <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
+   <string name="choose_profile">Choose Profile</string>
+
+   <!-- Label for list that shows all permissions -->
+   <string name="app_permissions">App permissions</string>
+   <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] -->
+   <string name="app_permissions_summary"><xliff:g id="count" example="10">%d</xliff:g> of <xliff:g id="count" example="10">%d</xliff:g> apps allowed additional access</string>
+   <!-- Summary of number of apps currently granted a single permission [CHAR
+        LIMIT=45] -->
+   <string name="app_permissions_group_summary"><xliff:g id="count" example="10">%d</xliff:g> of <xliff:g id="count" example="10">%d</xliff:g> apps allowed</string>
+
+    <!-- Label for the Domain URLs list that shows domain urls per App [CHAR LIMIT=30] -->
+    <string name="domain_urls_title">Domain URLs</string>
+
+    <!-- Summary for an App that dont open any domain URLs [CHAR LIMIT=45] -->
+    <string name="domain_urls_summary_none">Don\'t open any domain URL</string>
+
+    <!-- Summary of number of App that can open one and only one domain URLs [CHAR LIMIT=45] -->
+    <string name="domain_urls_summary_one">Open \'<xliff:g id="domain" example="mail.google.com">%s</xliff:g>\'</string>
+
+    <!-- Summary of number of App that can open several domain URLs [CHAR LIMIT=45] -->
+    <string name="domain_urls_summary_some">Open \'<xliff:g id="domain" example="mail.google.com">%s</xliff:g>\' and related URLs</string>
+
+    <!-- Description of settings item that leads to list of all apps with Domain URLs [CHAR LIMIT=NONE] -->
+    <plurals name="domain_urls_apps_summary">
+        <item quantity="zero">No app can open any domain URL</item>
+        <item quantity="one">One app can open its domain URLs</item>
+        <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> apps can open their domain URLs</item>
+    </plurals>
+
+    <!-- Fingerprint hint message when finger was not recognized.-->
+    <string name="fingerprint_not_recognized">Not recognized</string>
+
+    <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
+    <string name="default_apps_title">Default Apps</string>
+
+    <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
+    <string name="default_browser_title">Browser app</string>
+
+    <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
+    <string name="default_browser_title_none">No default Browser</string>
+
+    <!--  Title for Default Dialer settings [CHAR LIMIT=30] -->
+    <string name="default_dialer_title">Dialer app</string>
+
+    <!-- Label of default app for current setting [CHAR LIMIT=40] -->
+    <string name="default_app">(Default)</string>
+
+    <!-- Title of app storage screen [CHAR LIMIT=30] -->
+    <string name="apps_storage">Apps storage</string>
+
+    <!-- Title of usage access screen [CHAR LIMIT=30] -->
+    <string name="usage_access">Usage access</string>
+
+    <!-- Label for setting which controls whether app has usage access [CHAR LIMIT=45] -->
+    <string name="permit_usage_access">Permit usage access</string>
+
+    <!-- Link to the apps page for app usage settings [CHAR LIMIT=45] -->
+    <string name="app_usage_preference">App usage preferences</string>
+
+    <!-- Description of the usage access setting [CHAR LIMIT=NONE] -->
+    <string name="usage_access_description">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>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 626fc27..f9f4561 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -78,12 +78,10 @@
     <style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.Material">
         <item name="android:gravity">center</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textStyle">bold</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.Material">
-        <item name="android:textSize">36sp</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:background">@null</item>
         <item name="android:textCursorDrawable">@null</item>
@@ -148,43 +146,7 @@
         <item name="android:clickable">false</item>
     </style>
 
-    <!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
-         be consistent with ProgressBar -->
-    <style name="TopDivider">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/divider_height</item>
-        <item name="android:background">?attr/setup_divider_color</item>
-        <item name="android:focusable">false</item>
-        <item name="android:clickable">false</item>
-        <item name="android:layout_marginTop">@dimen/divider_margin_top</item>
-        <item name="android:layout_marginBottom">@dimen/divider_margin_bottom</item>
-    </style>
-
-    <style name="SetupTitle">
-        <item name="android:layout_marginBottom">@dimen/setup_title_margin_bottom</item>
-        <item name="android:layout_marginEnd">@dimen/setup_wizard_margin_sides</item>
-        <item name="android:layout_marginStart">@dimen/setup_wizard_margin_sides</item>
-        <item name="android:clickable">false</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:lineSpacingExtra">@dimen/setup_title_line_spacing_extra</item>
-        <item name="android:longClickable">false</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:textSize">@dimen/setup_title_size</item>
-        <item name="android:paddingBottom">@dimen/setup_title_padding_bottom</item>
-        <item name="android:paddingTop">@dimen/setup_title_padding_top</item>
-    </style>
-
-    <!-- Alternate title style used for some tablet layouts -->
-    <style name="SetupCardTitle">
-        <item name="android:paddingBottom">@dimen/setup_wizard_card_title_padding_bottom</item>
-        <item name="android:paddingEnd">@dimen/setup_wizard_card_title_padding_end</item>
-        <item name="android:paddingStart">@dimen/setup_wizard_card_title_padding_start</item>
-        <item name="android:paddingTop">@dimen/setup_wizard_card_title_padding_top</item>
-        <item name="android:textAppearance">@style/TextAppearance.SetupWizardCardTitle</item>
-    </style>
-
-    <style name="TextAppearance.SetupWizardCardTitle" parent="@android:style/TextAppearance.Material.Display1">
-        <item name="android:textColor">@android:color/white</item>
+    <style name="TextAppearance.SetupWizardDescription" parent="@android:style/TextAppearance.Material.Subhead">
     </style>
 
     <style name="SetupAddWifiNetwork">
@@ -243,6 +205,14 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
+    <style name="wifi_advanced_toggle" parent="wifi_item_content">
+        <item name="android:background">@null</item>
+        <item name="android:button">@null</item>
+        <item name="android:drawableEnd">@drawable/ic_expand</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
     <style name="wifi_item_edit_content">
         <item name="android:paddingStart">4dip</item>
         <item name="android:layout_marginStart">4dip</item>
@@ -296,10 +266,7 @@
         <item name="android:singleLine">true</item>
     </style>
 
-    <style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Material.Small">
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textStyle">bold</item>
-    </style>
+    <style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Material.Widget.TabWidget" />
 
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">18sp</item>
@@ -316,33 +283,40 @@
         <item name="android:widgetLayout">@*android:layout/preference_widget_switch</item>
     </style>
 
-    <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium">
+    <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium" />
+    <style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small" />
+    <style name="TextAppearance.Switch" parent="@android:style/TextAppearance.Material.Title" />
+
+    <style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Material.Body2">
+        <item name="android:textColor">?android:attr/colorAccent</item>
     </style>
 
-    <style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small">
-    </style>
+    <style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Subhead" />
+    <style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Material.Body1" />
+    <style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle" />
+    <style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle" />
 
-    <style name="TextAppearance.Switch" parent="TextAppearance.Medium">
-    </style>
-
-    <style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Material.Small">
-        <item name="android:textColor">@color/theme_accent</item>
+    <style name="TextAppearance.FingerprintTitle"
+        parent="android:TextAppearance.Material.Large.Inverse">
         <item name="android:textStyle">bold</item>
+        <item name="android:textSize">24sp</item>
+        <item name="android:textColor">@color/fingerprint_title_color</item>
     </style>
 
-    <style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Medium">
+    <style name="TextAppearance.FingerprintMessage"
+        parent="android:TextAppearance.Material.Medium.Inverse">
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/fingerprint_message_color</item>
     </style>
 
-    <style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Material.Small">
+    <style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
+        parent="android:TextAppearance.Material.Caption">
+        <item name="android:textColor">@color/warning</item>
     </style>
 
-    <style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle">
-    </style>
-
-    <style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle">
-    </style>
-
-    <style name="Widget.TimePicker" parent="@*android:style/Widget.Material.Light.TimePicker">
-        <item name="@android:numbersBackgroundColor">@android:color/white</item>
+    <style name="TextAppearance.Small.SwitchBar">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textStyle">normal</item>
     </style>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 18cc40e..f3d5e40 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -29,14 +29,11 @@
         <item name="android:windowBackground">@null</item>
     </style>
 
-    <style name="SetupWizardTheme" parent="android:Theme.Material.NoActionBar">
+    <style name="SetupWizardTheme" parent="SuwThemeMaterial">
         <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
-        <item name="android:colorAccent">@color/setup_wizard_color_accent_dark</item>
-        <item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
-        <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
-        <item name="android:windowAnimationStyle">@style/Animation.SetupWizard</item>
+        <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
+        <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
         <item name="android:windowBackground">?android:attr/colorBackground</item>
-        <item name="android:windowSoftInputMode">adjustPan</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
@@ -44,7 +41,7 @@
         <item name="setup_divider_color">@color/setup_divider_color_dark</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
-        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+        <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
 
         <!-- LockPatternView colors -->
@@ -53,14 +50,11 @@
         <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_dark</item>
     </style>
 
-    <style name="SetupWizardTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
+    <style name="SetupWizardTheme.Light" parent="SuwThemeMaterial.Light">
         <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
-        <item name="android:colorAccent">@color/setup_wizard_color_accent_light</item>
-        <item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
-        <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
-        <item name="android:windowAnimationStyle">@style/Animation.SetupWizard</item>
+        <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
+        <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
         <item name="android:windowBackground">?android:attr/colorBackground</item>
-        <item name="android:windowSoftInputMode">adjustPan</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="ic_menu_add">@drawable/ic_menu_add_light</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
@@ -68,7 +62,7 @@
         <item name="setup_divider_color">@color/setup_divider_color_light</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
-        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+        <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
 
         <!-- LockPatternView colors -->
@@ -77,13 +71,6 @@
         <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>
     </style>
 
-    <style name="Animation.SetupWizard" parent="@android:style/Animation.Activity">
-        <item name="android:activityOpenEnterAnimation">@anim/slide_next_in</item>
-        <item name="android:activityOpenExitAnimation">@anim/slide_next_out</item>
-        <item name="android:activityCloseEnterAnimation">@anim/slide_back_in</item>
-        <item name="android:activityCloseExitAnimation">@anim/slide_back_out</item>
-    </style>
-
     <style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
         <item name="android:windowSoftInputMode">adjustResize</item>
         <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
@@ -119,14 +106,15 @@
         <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
         <item name="ic_wps">@drawable/ic_wps_light</item>
-        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+        <item name="wifi_signal">@drawable/wifi_signal</item>
+        <item name="wifi_signal_color">@color/wifi_signal_icon_color</item>
         <item name="side_margin">@dimen/settings_side_margin</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
         <item name="@*android:actionBarSize">@dimen/actionbar_size</item>
 
-        <item name="switchBarTheme">@style/Theme.SwitchBar.Settings</item>
+        <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
 
         <item name="preferenceBackgroundColor">@drawable/preference_background</item>
 
@@ -137,19 +125,16 @@
         <item name="@*android:regularColor">@color/lock_pattern_view_regular_color</item>
         <item name="@*android:successColor">@color/lock_pattern_view_success_color</item>
         <item name="@*android:errorColor">@color/lock_pattern_view_error_color</item>
-
-        <!-- For the TimePicker -->
-        <item name="@android:timePickerStyle">@style/Widget.TimePicker</item>
     </style>
 
     <style name="Theme.SubSettings" parent="Theme.Settings">
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
 
-        <item name="switchBarTheme">@style/Theme.SwitchBar.SubSettings</item>
+        <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.SubSettings</item>
     </style>
 
-    <style name="Theme.ActionBar" parent="@android:style/Widget.Material.Light.ActionBar.Solid">
+    <style name="Theme.ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid">
         <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
     </style>
 
@@ -157,27 +142,17 @@
         <item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>
     </style>
 
-    <style name="Theme.SwitchBar.Settings" parent="@android:style/Theme.Material">
+    <style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
         <item name="switchBarMarginStart">@dimen/switchbar_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_margin_end</item>
     </style>
 
-    <style name="Theme.SwitchBar.SubSettings" parent="@android:style/Theme.Material">
+    <style name="ThemeOverlay.SwitchBar.SubSettings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
     </style>
 
-    <style name="Theme.DialogWhenLarge" parent="@android:style/Theme.Material.Light.DialogWhenLarge">
-        <!-- Explicitly override the background color. -->
-        <item name="android:colorBackground">@android:color/white</item>
-
-        <!-- Used by the ActionBar -->
-        <item name="android:colorPrimary">@color/theme_primary</item>
-        <!-- Used by the StatusBar -->
-        <item name="android:colorPrimaryDark">@color/theme_primary_dark</item>
-        <!-- Used by controls, e.g. CheckBox, ProgressBar, etc. -->
-        <item name="android:colorAccent">@color/theme_accent</item>
-
+    <style name="Theme.DialogWhenLarge" parent="@android:style/Theme.Material.DayNight.DialogWhenLarge">
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
 
@@ -188,6 +163,7 @@
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:background">@android:color/black</item>
 
         <!-- LockPatternView colors -->
         <item name="@*android:regularColor">@color/unlock_pattern_view_regular_color</item>
@@ -202,19 +178,9 @@
         <item name="preferenceBackgroundColor">@drawable/preference_background</item>
     </style>
 
-    <style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
+    <style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.DayNight.Dialog.Alert">
         <item name="android:windowSoftInputMode">adjustResize</item>
 
-        <!-- Explicitly override the background color. -->
-        <item name="android:colorBackground">@android:color/white</item>
-
-        <!-- Used by the ActionBar -->
-        <item name="android:colorPrimary">@color/theme_primary</item>
-        <!-- Used by the StatusBar -->
-        <item name="android:colorPrimaryDark">@color/theme_primary_dark</item>
-        <!-- Used by controls, e.g. CheckBox, ProgressBar, etc. -->
-        <item name="android:colorAccent">@color/theme_accent</item>
-
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
     </style>
@@ -233,4 +199,24 @@
         <item name="android:colorAccent">@color/switch_accent_color</item>
     </style>
 
+    <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
+        <item name="confirmDeviceCredentialsSideMargin">16dp</item>
+        <item name="confirmDeviceCredentialsTopMargin">16dp</item>
+    </style>
+
+    <style name="Theme.ConfirmDeviceCredentialsDark" parent="@android:style/Theme.Material">
+        <item name="android:colorPrimary">@*android:color/material_blue_grey_900</item>
+        <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_950</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="preferenceBackgroundColor">@color/confirm_device_credential_dark_background</item>
+
+        <item name="confirmDeviceCredentialsSideMargin">32dp</item>
+        <item name="confirmDeviceCredentialsTopMargin">32dp</item>
+
+        <!-- LockPatternView colors -->
+        <item name="@*android:regularColor">@color/lock_pattern_view_regular_color_dark</item>
+        <item name="@*android:successColor">@color/lock_pattern_view_regular_color_dark</item>
+        <item name="@*android:errorColor">@color/lock_pattern_view_error_color</item>
+    </style>
 </resources>
diff --git a/res/xml/advanced_apps.xml b/res/xml/advanced_apps.xml
new file mode 100644
index 0000000..e808210
--- /dev/null
+++ b/res/xml/advanced_apps.xml
@@ -0,0 +1,43 @@
+<?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:key="applications_settings">
+
+    <PreferenceScreen
+        android:key="default_apps"
+        android:fragment="com.android.settings.applications.ManageDefaultApps"
+        android:title="@string/default_apps_title"
+        settings:keywords="@string/keywords_default_apps" />
+
+    <PreferenceScreen
+        android:key="manage_perms"
+        android:fragment="com.android.settings.applications.ManagePermissions"
+        android:title="@string/app_permissions"
+        settings:keywords="@string/keywords_app_permissions" />
+
+    <PreferenceScreen
+            android:key="domain_urls"
+            android:title="@string/domain_urls_title"
+            android:fragment="com.android.settings.applications.ManageApplications">
+        <extra
+                android:name="classname"
+                android:value="com.android.settings.Settings$DomainsURLsAppListActivity" />
+    </PreferenceScreen>
+
+</PreferenceScreen>
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index a65b98d..9aebb39 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -23,7 +23,7 @@
             android:key="block"
             android:title="@string/app_notification_block_title"
             android:summary="@string/app_notification_block_summary"
-            android:disableDependentsState="true"
+            android:order="1"
             android:persistent="false" />
 
     <!-- Priority -->
@@ -31,7 +31,15 @@
             android:key="priority"
             android:title="@string/app_notification_priority_title"
             android:summary="@string/app_notification_priority_summary"
-            android:dependency="block"
+            android:order="2"
+            android:persistent="false" />
+
+    <!-- Peekable -->
+    <SwitchPreference
+            android:key="peekable"
+            android:title="@string/app_notification_peekable_title"
+            android:summary="@string/app_notification_peekable_summary"
+            android:order="3"
             android:persistent="false" />
 
     <!-- Sensitive -->
@@ -39,6 +47,7 @@
             android:key="sensitive"
             android:title="@string/app_notification_sensitive_title"
             android:summary="@string/app_notification_sensitive_summary"
+            android:order="4"
             android:persistent="false" />
 
 </PreferenceScreen>
diff --git a/res/xml/app_storage_settings.xml b/res/xml/app_storage_settings.xml
new file mode 100644
index 0000000..6baaae1
--- /dev/null
+++ b/res/xml/app_storage_settings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:title="@string/application_info_label">
+
+    <com.android.settings.DropDownPreference
+        android:key="app_location_setting"
+        android:title="@string/storage_used"
+        android:summary="@string/storage_type_internal"
+        android:selectable="true" />
+
+    <com.android.settings.applications.LayoutPreference
+        android:key="storage_settings"
+        android:layout="@layout/app_storage_settings" />
+
+    <com.android.settings.applications.LayoutPreference
+        android:key="cache_settings"
+        android:layout="@layout/app_cache_settings" />
+
+</PreferenceScreen>
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index b49896c..1dfdce8 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -62,16 +62,5 @@
         android:entries="@array/app_install_location_entries"
         android:entryValues="@array/app_install_location_values"/>
 
-    <!-- Disabled quick launch settings pending UI redesign.
-    <PreferenceScreen
-            android:key="quick_launch"
-            android:title="@string/quick_launch_title"
-            android:summary="@string/quick_launch_summary">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.quicklaunch.QuickLaunchSettings" />
-    </PreferenceScreen>
-    -->
-
 </PreferenceScreen>
 
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index cb923c8..0134c6f 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -19,7 +19,7 @@
         android:key="battery_saver">
 
     <!-- Turn on automatically -->
-    <com.android.settings.notification.DropDownPreference
+    <com.android.settings.DropDownPreference
             android:key="turn_on_automatically"
             android:title="@string/battery_saver_turn_on_automatically_title"
             android:persistent="false" />
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index 01a4f83..78fe0e7 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -20,6 +20,7 @@
     <!-- WIRELESS and NETWORKS -->
     <dashboard-category
             android:id="@+id/wireless_section"
+            android:key="@string/category_key_wireless"
             android:title="@string/header_category_wireless_networks" >
 
         <!-- Wifi -->
@@ -74,6 +75,7 @@
     <!-- DEVICE -->
     <dashboard-category
             android:id="@+id/device_section"
+            android:key="@string/category_key_device"
             android:title="@string/header_category_device" >
 
         <!-- Home -->
@@ -104,7 +106,7 @@
         <dashboard-tile
                 android:id="@+id/storage_settings"
                 android:title="@string/storage_settings"
-                android:fragment="com.android.settings.deviceinfo.Memory"
+                android:fragment="com.android.settings.deviceinfo.StorageSettings"
                 android:icon="@drawable/ic_settings_storage"
                 />
 
@@ -152,6 +154,7 @@
     <!-- PERSONAL -->
     <dashboard-category
             android:id="@+id/personal_section"
+            android:key="@string/category_key_personal"
             android:title="@string/header_category_personal" >
 
         <!-- Location -->
@@ -178,6 +181,9 @@
                 android:icon="@drawable/ic_settings_accounts"
                 />
 
+        <!-- Marker for where to place external tiles in this category -->
+        <external-tiles />
+
         <!-- Language -->
         <dashboard-tile
                 android:id="@+id/language_settings"
@@ -199,6 +205,7 @@
     <!-- SYSTEM -->
     <dashboard-category
         android:id="@+id/system_section"
+        android:key="@string/category_key_system"
         android:title="@string/header_category_system" >
 
         <!-- Date & Time -->
diff --git a/res/xml/default_apps.xml b/res/xml/default_apps.xml
new file mode 100644
index 0000000..301c248
--- /dev/null
+++ b/res/xml/default_apps.xml
@@ -0,0 +1,46 @@
+<?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:key="default_apps">
+
+    <com.android.settings.applications.DefaultBrowserPreference
+            android:key="default_browser"
+            android:title="@string/default_browser_title"
+            android:summary="@string/default_browser_title_none"
+            />
+
+    <com.android.settings.applications.DefaultDialerPreference
+            android:key="default_dialer"
+            android:title="@string/default_dialer_title"
+            settings:keywords="@string/keywords_default_dialer_app"
+            />
+
+    <com.android.settings.applications.DefaultEmergencyPreference
+            android:key="default_emergency_app"
+            android:title="@string/default_emergency_app"
+            settings:keywords="@string/keywords_emergency_app"
+            />
+
+    <com.android.settings.applications.DefaultSmsPreference
+            android:key="default_sms_app"
+            android:title="@string/sms_application_title"
+            settings:keywords="@string/keywords_more_default_sms_app"
+            />
+
+</PreferenceScreen>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 1a03c2c..4e8ca0e 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -60,6 +60,12 @@
             android:fragment="com.android.settings.applications.ProcessStatsUi">
     </PreferenceScreen>
 
+    <PreferenceScreen
+        android:key="running_apps"
+        android:title="@string/runningservices_settings_title"
+        android:summary="@string/runningservices_settings_summary"
+        android:fragment="com.android.settings.applications.RunningServices" />
+
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">
 
@@ -140,6 +146,13 @@
             android:title="@string/legacy_dhcp_client" />
             android:summary="@string/legacy_dhcp_client_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" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_input_category"
@@ -203,6 +216,11 @@
             android:entries="@array/overlay_display_devices_entries"
             android:entryValues="@array/overlay_display_devices_values" />
 
+        <SwitchPreference
+            android:key="enable_multi_window"
+            android:title="@string/enable_multi_window"
+            android:summary="@string/enable_multi_window_summary"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_hw_drawing_category"
diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml
deleted file mode 100644
index 38cc94a..0000000
--- a/res/xml/device_info_memory.xml
+++ /dev/null
@@ -1,24 +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:title="@string/storage_settings"
-        settings:keywords="@string/keywords_storage">
-
-<!-- Preference categories are dynamically created based on the list of available storage volumes -->
-
-</PreferenceScreen>
diff --git a/res/xml/device_info_storage.xml b/res/xml/device_info_storage.xml
new file mode 100644
index 0000000..19c5982
--- /dev/null
+++ b/res/xml/device_info_storage.xml
@@ -0,0 +1,31 @@
+<?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:title="@string/storage_settings"
+    settings:keywords="@string/keywords_storage">
+
+    <PreferenceCategory
+        android:key="storage_internal"
+        android:title="@string/storage_internal_title" />
+
+    <PreferenceCategory
+        android:key="storage_external"
+        android:title="@string/storage_external_title" />
+
+</PreferenceScreen>
diff --git a/res/xml/quick_launch_settings.xml b/res/xml/device_info_storage_volume.xml
similarity index 70%
copy from res/xml/quick_launch_settings.xml
copy to res/xml/device_info_storage_volume.xml
index eb5585c..35435d7 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/xml/device_info_storage_volume.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:key="shortcut_category"
-        android:title="@string/quick_launch_title">
-            
-    <!-- Preferences will be filled here. -->
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/storage_settings"
+    settings:keywords="@string/keywords_storage">
 
-</PreferenceScreen>   
+</PreferenceScreen>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 6cfad2d..70dcb9a 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -33,6 +33,15 @@
                 android:summary="@string/auto_brightness_summary"
                 android:persistent="false" />
 
+        <ListPreference
+            android:key="night_mode"
+            android:title="@string/night_mode_title"
+            settings:keywords="@string/keywords_display_night_mode"
+            android:summary="@string/night_mode_summary"
+            android:persistent="false"
+            android:entries="@array/night_mode_entries"
+            android:entryValues="@array/night_mode_values" />
+
         <PreferenceScreen
                 android:key="wallpaper"
                 android:title="@string/wallpaper_settings_title"
@@ -72,7 +81,7 @@
                 android:entryValues="@array/entryvalues_font_size"
                 android:dialogTitle="@string/dialog_title_font_size" />
 
-        <com.android.settings.notification.DropDownPreference
+        <com.android.settings.DropDownPreference
                 android:key="auto_rotate"
                 android:title="@string/display_auto_rotate_title" />
 
diff --git a/res/xml/installed_app_details.xml b/res/xml/installed_app_details.xml
new file mode 100644
index 0000000..233331d
--- /dev/null
+++ b/res/xml/installed_app_details.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:title="@string/application_info_label">
+    <com.android.settings.applications.LayoutPreference
+        android:key="header_view"
+        android:layout="@layout/installed_app_details" />
+
+    <Preference
+        android:key="storage_settings"
+        android:title="@string/storage_settings"
+        android:selectable="true" />
+
+    <Preference
+        android:key="data_settings"
+        android:title="@string/data_size_label"
+        android:selectable="true" />
+
+    <Preference
+        android:key="permission_settings"
+        android:title="@string/permissions_label"
+        android:selectable="true" />
+
+    <Preference
+        android:key="notification_settings"
+        android:title="@string/notifications_label"
+        android:selectable="true" />
+
+    <Preference
+        android:key="preferred_settings"
+        android:title="@string/launch_by_default"
+        android:selectable="true" />
+</PreferenceScreen>
diff --git a/res/xml/installed_app_launch_settings.xml b/res/xml/installed_app_launch_settings.xml
new file mode 100644
index 0000000..7d6642c
--- /dev/null
+++ b/res/xml/installed_app_launch_settings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:title="@string/application_info_label">
+
+    <PreferenceCategory android:key="app_launch_domain_links"
+                        android:title="@string/app_launch_domain_links_title">
+
+        <SwitchPreference
+                android:key="app_launch_open_domain_urls"
+                android:title="@string/app_launch_open_domain_urls_title"
+                android:summary="@string/app_launch_open_domain_urls_summary"
+                />
+
+
+        <com.android.settings.applications.AppDomainsPreference
+                android:key="app_launch_supported_domain_urls"
+                android:title="@string/app_launch_supported_domain_urls_title"
+                android:persistent="false"
+                android:dependency="app_launch_open_domain_urls"
+                />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="app_launch_other_defaults"
+                        android:title="@string/app_launch_other_defaults_title">
+
+        <com.android.settings.applications.ClearDefaultsPreference
+                android:key="app_launch_clear_defaults"
+                android:persistent="false"
+                />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/location_scanning.xml b/res/xml/location_scanning.xml
new file mode 100644
index 0000000..74e6d3b
--- /dev/null
+++ b/res/xml/location_scanning.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/location_scanning_screen_title">
+
+        <SwitchPreference
+            android:title="@string/location_scanning_wifi_always_scanning_title"
+            android:summary="@string/location_scanning_wifi_always_scanning_description"
+            android:defaultValue="true"
+            android:key="wifi_always_scanning"
+            android:persistent="false" />
+
+        <SwitchPreference
+            android:title="@string/location_scanning_bluetooth_always_scanning_title"
+            android:summary="@string/location_scanning_bluetooth_always_scanning_description"
+            android:defaultValue="true"
+            android:key="bluetooth_always_scanning"
+            android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml
index e5dda19..7956a6d 100644
--- a/res/xml/notification_settings.xml
+++ b/res/xml/notification_settings.xml
@@ -27,7 +27,7 @@
         <!-- Media volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="media_volume"
-                android:icon="@*android:drawable/ic_audio_vol"
+                android:icon="@*android:drawable/ic_audio_media"
                 android:title="@string/media_volume_option_title" />
 
         <!-- Alarm volume -->
@@ -84,6 +84,12 @@
                 android:persistent="false"
                 android:fragment="com.android.settings.notification.OtherSoundSettings" />
 
+        <!-- Cast -->
+        <PreferenceScreen
+                android:key="wifi_display"
+                android:title="@string/wifi_display_settings_title"
+                android:fragment="com.android.settings.wfd.WifiDisplaySettings" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -99,7 +105,7 @@
                 android:persistent="false" />
 
          <!-- When device is locked -->
-        <com.android.settings.notification.DropDownPreference
+        <com.android.settings.DropDownPreference
                 android:key="lock_screen_notifications"
                 android:title="@string/lock_screen_notifications_title"
                 android:persistent="false" />
@@ -108,7 +114,11 @@
         <PreferenceScreen
                 android:key="app_notifications"
                 android:title="@string/app_notifications_title"
-                android:fragment="com.android.settings.notification.NotificationAppList" />
+                android:fragment="com.android.settings.applications.ManageApplications">
+                <extra
+                    android:name="classname"
+                    android:value="com.android.settings.Settings$NotificationAppListActivity" />
+        </PreferenceScreen>
 
         <!-- Notification access -->
         <Preference
diff --git a/res/xml/other_sound_settings.xml b/res/xml/other_sound_settings.xml
index 08679db..88c4130 100644
--- a/res/xml/other_sound_settings.xml
+++ b/res/xml/other_sound_settings.xml
@@ -60,13 +60,13 @@
             android:persistent="false" />
 
     <!-- Dock speaker plays -->
-    <com.android.settings.notification.DropDownPreference
+    <com.android.settings.DropDownPreference
             android:key="dock_audio_media"
             android:title="@string/dock_audio_media_title"
             android:persistent="false" />
 
     <!-- Emergency tone -->
-    <com.android.settings.notification.DropDownPreference
+    <com.android.settings.DropDownPreference
             android:key="emergency_tone"
             android:title="@string/emergency_tone_title"
             android:persistent="false" />
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 4760300..4607254 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -15,54 +15,47 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/privacy_settings_title">
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/privacy_settings_title">
 
-    <PreferenceCategory android:key="backup_category"
-            android:title="@string/backup_section_title">
+    <!-- Backup settings -->
+    <SwitchPreference
+        android:key="backup_data"
+        android:title="@string/backup_data_title"
+        android:summary="@string/backup_data_summary"
+        android:persistent="false" />
 
-        <!-- Backup settings -->
-        <SwitchPreference
-                android:key="backup_data"
-                android:title="@string/backup_data_title"
-                android:summary="@string/backup_data_summary"
-                android:persistent="false" />
+    <PreferenceScreen
+        android:key="configure_account"
+        android:title="@string/backup_configure_account_title"
+        android:persistent="false">
+        <!-- the Intent declared here is always overwritten by a real one -->
+        <intent android:action="dummy" />
+    </PreferenceScreen>
 
-        <PreferenceScreen
-                android:key="configure_account"
-                android:title="@string/backup_configure_account_title"
-                android:summary="@string/backup_configure_account_default_summary"
-                android:persistent="false">
-            <!-- the Intent declared here is always overwritten by a real one -->
-            <intent android:action="dummy" />
-        </PreferenceScreen>
+    <SwitchPreference
+        android:key="auto_restore"
+        android:title="@string/auto_restore_title"
+        android:summary="@string/auto_restore_summary"
+        android:persistent="false" />
 
-        <SwitchPreference
-                android:key="auto_restore"
-                android:title="@string/auto_restore_title"
-                android:summary="@string/auto_restore_summary"
-                android:persistent="false" />
+    <Preference
+        android:key="backup_inactive"
+        android:title="@string/backup_inactive_title"
+        android:persistent="false"
+        android:enabled="false"
+        android:selectable="false" />
 
-        <Preference
-                android:key="backup_inactive"
-                android:title="@string/backup_inactive_title"
-                android:summary="@string/backup_inactive_summary"
-                android:persistent="false"
-                android:enabled="false"
-                android:selectable="false" />
+    <!-- Network reset -->
+    <PreferenceScreen
+        android:title="@string/reset_network_title"
+        android:fragment="com.android.settings.ResetNetwork" />
 
-    </PreferenceCategory>
-
-    <PreferenceCategory android:key="personal_data_category"
-            android:title="@string/personal_data_section_title">
-
-        <!-- Factory reset -->
-        <PreferenceScreen
-            android:title="@string/master_clear_title"
-            android:summary="@string/master_clear_summary"
-            settings:keywords="@string/keywords_factory_data_reset"
-            android:fragment="com.android.settings.MasterClear" />
-
-    </PreferenceCategory>
+    <!-- Factory reset -->
+    <PreferenceScreen
+        android:key="factory_reset"
+        android:title="@string/master_clear_title"
+        settings:keywords="@string/keywords_factory_data_reset"
+        android:fragment="com.android.settings.MasterClear" />
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
deleted file mode 100644
index 4879fe6..0000000
--- a/res/xml/security_settings_biometric_weak.xml
+++ /dev/null
@@ -1,63 +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/security_settings_title">
-
-    <PreferenceCategory
-        android:key="security_category"
-        android:title="@string/lock_settings_title">
-
-        <PreferenceScreen
-            android:key="unlock_set_or_change"
-            android:title="@string/unlock_set_unlock_launch_picker_title"
-            android:summary="@string/unlock_set_unlock_mode_biometric_weak"
-            android:persistent="false"/>
-
-        <PreferenceScreen
-            android:key="biometric_weak_improve_matching"
-            android:title="@string/biometric_weak_improve_matching_title"/>
-
-        <SwitchPreference
-           android:key="biometric_weak_liveliness"
-           android:title="@string/biometric_weak_liveliness_title"
-           android:summary="@string/biometric_weak_liveliness_summary"/>
-
-        <SwitchPreference
-            android:key="visiblepattern"
-            android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
-
-        <ListPreference
-            android:key="lock_after_timeout"
-            android:title="@string/lock_after_timeout"
-            android:summary="@string/lock_after_timeout_summary"
-            android:entries="@array/lock_after_timeout_entries"
-            android:entryValues="@array/lock_after_timeout_values"
-            android:persistent="false"/>
-
-        <SwitchPreference
-            android:key="power_button_instantly_locks"
-            android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
-
-        <PreferenceScreen
-            android:key="owner_info_settings"
-            android:fragment="com.android.settings.OwnerInfoSettings"
-            android:title="@string/owner_info_settings_title"
-            android:summary="@string/owner_info_settings_summary"/>
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index 4c1d809..af7bfeb 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -27,9 +27,8 @@
             android:summary="@string/unlock_set_unlock_mode_none"
             android:persistent="false"/>
 
-        <PreferenceScreen
+        <com.android.settings.SingleLineSummaryPreference
             android:key="owner_info_settings"
-            android:fragment="com.android.settings.OwnerInfoSettings"
             android:title="@string/owner_info_settings_title"
             android:summary="@string/owner_info_settings_summary"/>
 
diff --git a/res/xml/security_settings_fingerprint.xml b/res/xml/security_settings_fingerprint.xml
new file mode 100644
index 0000000..7cc3a56
--- /dev/null
+++ b/res/xml/security_settings_fingerprint.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  android:title="@string/security_settings_fingerprint_preference_title">
+
+    <PreferenceCategory
+        android:key="fingerprint_manage_category"
+        android:title="@string/fingerprint_manage_category_title">
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="fingerprint_usage_category"
+        android:title="@string/fingerprint_usage_category_title">
+
+        <SwitchPreference
+            android:key="fingerprint_enable_keyguard_toggle"
+            android:title="@string/fingerprint_enable_keyguard_toggle_title"
+            android:persistent="false" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
+
diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml
index 88df74b..480d6ee 100644
--- a/res/xml/security_settings_lockscreen.xml
+++ b/res/xml/security_settings_lockscreen.xml
@@ -29,9 +29,8 @@
             settings:keywords="@string/keywords_lockscreen"
             android:persistent="false"/>
 
-        <PreferenceScreen
+        <com.android.settings.SingleLineSummaryPreference
             android:key="owner_info_settings"
-            android:fragment="com.android.settings.OwnerInfoSettings"
             android:title="@string/owner_info_settings_title"
             android:summary="@string/owner_info_settings_summary"/>
 
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 71f9ffa..b67e1b7 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -117,7 +117,11 @@
 
         <Preference android:key="usage_access"
                     android:title="@string/usage_access_title"
-                    android:fragment="com.android.settings.UsageAccessSettings"/>
+                    android:fragment="com.android.settings.applications.ManageApplications">
+            <extra
+                android:name="classname"
+                android:value="com.android.settings.Settings$UsageAccessSettingsActivity" />
+        </Preference>
 
     </PreferenceCategory>
 
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index 9f1092a..b610562 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -41,9 +41,8 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
-        <PreferenceScreen
+        <com.android.settings.SingleLineSummaryPreference
             android:key="owner_info_settings"
-            android:fragment="com.android.settings.OwnerInfoSettings"
             android:title="@string/owner_info_settings_title"
             android:summary="@string/owner_info_settings_summary"/>
 
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index ceb749c..867bed4 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -45,8 +45,7 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
-        <PreferenceScreen
-            android:fragment="com.android.settings.OwnerInfoSettings"
+        <com.android.settings.SingleLineSummaryPreference
             android:key="owner_info_settings"
             android:title="@string/owner_info_settings_title"
             android:summary="@string/owner_info_settings_summary"/>
diff --git a/res/xml/security_settings_picker.xml b/res/xml/security_settings_picker.xml
index fda44e1..e0c5185 100644
--- a/res/xml/security_settings_picker.xml
+++ b/res/xml/security_settings_picker.xml
@@ -29,11 +29,6 @@
             android:persistent="false"/>
 
     <PreferenceScreen
-            android:key="unlock_set_biometric_weak"
-            android:title="@string/unlock_set_unlock_biometric_weak_title"
-            android:persistent="false"/>
-
-    <PreferenceScreen
             android:key="unlock_set_pattern"
             android:title="@string/unlock_set_unlock_pattern_title"
             android:persistent="false"/>
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 4470b1d..ac09a2c 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -41,9 +41,8 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
-        <PreferenceScreen
+        <com.android.settings.SingleLineSummaryPreference
             android:key="owner_info_settings"
-            android:fragment="com.android.settings.OwnerInfoSettings"
             android:title="@string/owner_info_settings_title"
             android:summary="@string/owner_info_settings_summary"/>
 
diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index 7c30de8..b6f1f1d 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -20,6 +20,7 @@
     <timezone id="America/Manaus"></timezone>
     <timezone id="America/Santiago"></timezone>
     <timezone id="America/St_Johns"></timezone>
+    <timezone id="America/Recife"></timezone>
     <timezone id="America/Sao_Paulo"></timezone>
     <timezone id="America/Buenos_Aires"></timezone>
     <timezone id="America/Godthab"></timezone>
@@ -32,11 +33,13 @@
     <timezone id="Europe/Amsterdam"></timezone>
     <timezone id="Europe/Belgrade"></timezone>
     <timezone id="Europe/Brussels"></timezone>
+    <timezone id="Europe/Madrid"></timezone>
     <timezone id="Europe/Sarajevo"></timezone>
     <timezone id="Africa/Windhoek"></timezone>
     <timezone id="Africa/Brazzaville"></timezone>
     <timezone id="Asia/Amman"></timezone>
     <timezone id="Europe/Athens"></timezone>
+    <timezone id="Europe/Istanbul"></timezone>
     <timezone id="Asia/Beirut"></timezone>
     <timezone id="Africa/Cairo"></timezone>
     <timezone id="Europe/Helsinki"></timezone>
diff --git a/res/xml/usage_access_details.xml b/res/xml/usage_access_details.xml
new file mode 100644
index 0000000..d8b3bb1
--- /dev/null
+++ b/res/xml/usage_access_details.xml
@@ -0,0 +1,33 @@
+<?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/usage_access">
+
+    <SwitchPreference
+        android:key="usage_switch"
+        android:title="@string/permit_usage_access" />
+
+    <Preference
+        android:key="app_usage_preference"
+        android:title="@string/app_usage_preference" />
+
+    <Preference
+        android:summary="@string/usage_access_description"
+        android:selectable="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/usb_settings.xml b/res/xml/usb_settings.xml
index 4b0268b..611a1b4 100644
--- a/res/xml/usb_settings.xml
+++ b/res/xml/usb_settings.xml
@@ -32,4 +32,10 @@
         android:summary="@string/usb_ptp_summary"
         />
 
+    <CheckBoxPreference
+        android:key="usb_midi"
+        android:title="@string/usb_midi_title"
+        android:summary="@string/usb_midi_summary"
+        />
+
 </PreferenceScreen>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index a7f47b1..ed6cfbd 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -24,12 +24,6 @@
             android:summary="@string/wifi_notify_open_networks_summary"
             android:persistent="false" />
 
-    <SwitchPreference
-            android:key="wifi_scan_always_available"
-            android:title="@string/wifi_scan_always_available"
-            android:summary="@string/wifi_scan_always_available_summary"
-            android:persistent="false" />
-
     <ListPreference
             android:key="sleep_policy"
             android:title="@string/wifi_setting_sleep_policy_title"
@@ -75,7 +69,7 @@
     <Preference
             android:key="mac_address"
             android:title="@string/wifi_advanced_mac_address_title"
-            android:layout="@layout/mac_preference" />
+            android:layout="@layout/wifi_advance_layout" />
 
     <Preference
             android:key="current_ip_address"
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index b615c9e..f08de5e 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -24,13 +24,6 @@
         android:persistent="false"
         android:disableDependentsState="true" />
 
-    <com.android.settings.AppListPreference
-        android:key="sms_application"
-        android:title="@string/sms_application_title"
-        settings:keywords="@string/keywords_more_default_sms_app"
-        android:summary="%s"
-        android:persistent="false" />
-
     <SwitchPreference
         android:key="toggle_nfc"
         android:title="@string/nfc_quick_toggle_title"
diff --git a/res/xml/quick_launch_settings.xml b/res/xml/zen_mode_automation_settings.xml
similarity index 75%
rename from res/xml/quick_launch_settings.xml
rename to res/xml/zen_mode_automation_settings.xml
index eb5585c..7cfffd4 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/xml/zen_mode_automation_settings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!--
+     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.
@@ -15,9 +16,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:key="shortcut_category"
-        android:title="@string/quick_launch_title">
-            
-    <!-- Preferences will be filled here. -->
+    android:key="zen_mode_settings"
+    android:title="@string/zen_mode_automation_settings_title" >
 
-</PreferenceScreen>   
+    <!-- Rules added at runtime -->
+</PreferenceScreen>
diff --git a/res/xml/zen_mode_external_rule_settings.xml b/res/xml/zen_mode_external_rule_settings.xml
new file mode 100644
index 0000000..e244dc8
--- /dev/null
+++ b/res/xml/zen_mode_external_rule_settings.xml
@@ -0,0 +1,45 @@
+<?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_external_rule_settings" >
+
+    <!-- Rule name -->
+    <Preference
+        android:key="rule_name"
+        android:title="@string/zen_mode_rule_name"
+        android:persistent="false" />
+
+    <!-- Rule type -->
+    <Preference
+        android:key="type"
+        android:title="@string/zen_mode_rule_type"
+        android:persistent="false" />
+
+    <!-- Configure -->
+    <Preference
+        android:key="configure"
+        android:title="@string/zen_mode_configure_rule"
+        android:persistent="false" />
+
+    <!-- Zen mode -->
+    <com.android.settings.DropDownPreference
+        android:key="zen_mode"
+        android:title="@string/zen_mode_settings_title"
+        android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/zen_mode_priority_settings.xml b/res/xml/zen_mode_priority_settings.xml
new file mode 100644
index 0000000..5b1dbf8
--- /dev/null
+++ b/res/xml/zen_mode_priority_settings.xml
@@ -0,0 +1,78 @@
+<?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" >
+
+    <!-- Alarms -->
+    <SwitchPreference
+        android:key="alarms"
+        android:title="@string/zen_mode_alarms"
+        android:enabled="false"
+        android:defaultValue="true"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
+    <!-- Reminders -->
+    <SwitchPreference
+        android:key="reminders"
+        android:title="@string/zen_mode_reminders"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
+    <!-- Events -->
+    <SwitchPreference
+        android:key="events"
+        android:title="@string/zen_mode_events"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
+    <!-- Messages -->
+    <SwitchPreference
+        android:key="messages"
+        android:title="@string/zen_mode_messages"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
+    <!-- Calls -->
+    <SwitchPreference
+        android:key="calls"
+        android:title="@string/zen_mode_calls"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
+    <!-- Messages/calls from -->
+    <com.android.settings.DropDownPreference
+            android:key="starred"
+            android:title="@string/zen_mode_from"
+            android:persistent="false" />
+
+    <!-- Repeat callers -->
+    <SwitchPreference
+        android:key="repeat_callers"
+        android:title="@string/zen_mode_repeat_callers"
+        android:persistent="false"
+        android:switchTextOff=""
+        android:switchTextOn="" />
+
+</PreferenceScreen>
diff --git a/res/xml/zen_mode_schedule_rule_settings.xml b/res/xml/zen_mode_schedule_rule_settings.xml
new file mode 100644
index 0000000..d808b10
--- /dev/null
+++ b/res/xml/zen_mode_schedule_rule_settings.xml
@@ -0,0 +1,42 @@
+<?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_schedule_rule_settings" >
+
+    <!-- Rule name -->
+    <Preference
+        android:key="rule_name"
+        android:title="@string/zen_mode_rule_name"
+        android:persistent="false" />
+
+    <!-- Days -->
+    <Preference
+        android:key="days"
+        android:title="@string/zen_mode_schedule_rule_days"
+        android:persistent="false" />
+
+    <!-- Start time/End time added and removed here! :-) -->
+
+    <!-- Zen mode -->
+    <com.android.settings.DropDownPreference
+            android:key="zen_mode"
+            android:title="@string/zen_mode_settings_title"
+            android:order="100"
+            android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 7514565..267727f 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -19,88 +19,15 @@
     android:key="zen_mode_settings"
     android:title="@string/zen_mode_settings_title" >
 
-    <!-- When calls and notifications arrive -->
-    <com.android.settings.notification.DropDownPreference
-            android:key="zen_mode"
-            android:title="@string/zen_mode_option_title"
-            android:persistent="false" />
-
-    <PreferenceCategory
-        android:key="important"
-        android:title="@string/zen_mode_important_category" >
-
-        <SwitchPreference
-            android:key="events"
-            android:title="@string/zen_mode_events"
-            android:persistent="false"
-            android:switchTextOff=""
-            android:switchTextOn="" />
-
-        <SwitchPreference
-            android:key="calls"
-            android:title="@string/zen_mode_calls"
-            android:persistent="false"
-            android:switchTextOff=""
-            android:switchTextOn="" />
-
-        <SwitchPreference
-            android:key="messages"
-            android:title="@string/zen_mode_messages"
-            android:persistent="false"
-            android:switchTextOff=""
-            android:switchTextOn="" />
-
-        <com.android.settings.notification.DropDownPreference
-                android:key="starred"
-                android:title="@string/zen_mode_from"
-                android:persistent="false" />
-
-        <Preference
-            android:key="alarm_info"
-            android:title=""
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/colorForegroundInverse"
-            android:selectable="false"
-            android:summary="@string/zen_mode_alarm_info" />
-
-    </PreferenceCategory>
+    <!-- Priority only allows -->
+    <PreferenceScreen
+            android:key="priority_settings"
+            android:title="@string/zen_mode_priority_settings_title"
+            android:fragment="com.android.settings.notification.ZenModePrioritySettings" />
 
     <!-- Downtime -->
-    <PreferenceCategory
-        android:key="downtime"
-        android:title="@string/zen_mode_downtime_category" >
-
-        <!-- Days -->
-        <Preference
-            android:key="days"
-            android:title="@string/zen_mode_downtime_days"
-            android:persistent="false" />
-
-        <!-- Start time/End time added and removed here! :-) -->
-
-        <!-- Interruptions allowed -->
-        <com.android.settings.notification.DropDownPreference
-                android:key="downtime_mode"
-                android:title="@string/zen_mode_downtime_mode_title"
-                android:order="100"
-                android:persistent="false" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="automation"
-        android:title="@string/zen_mode_automation_category" >
-
-        <Preference
-            android:key="entry"
-            android:title="@string/zen_mode_entry_conditions_title"
-            android:persistent="false" />
-
-        <Preference
-                android:key="manage_condition_providers"
-                android:title="@string/manage_condition_providers"
-                android:persistent="false"
-                android:fragment="com.android.settings.notification.ConditionProviderSettings" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
\ No newline at end of file
+    <PreferenceScreen
+            android:key="automation_settings"
+            android:title="@string/zen_mode_automation_settings_title"
+            android:fragment="com.android.settings.notification.ZenModeAutomationSettings" />
+</PreferenceScreen>
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index 5b8ad0d..06648db 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -29,6 +29,7 @@
 
 import com.android.internal.telephony.PhoneStateIntentReceiver;
 import com.android.internal.telephony.TelephonyProperties;
+import com.android.settingslib.WirelessUtils;
 
 public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListener {
 
@@ -71,7 +72,7 @@
 
     public void resume() {
         
-        mSwitchPref.setChecked(isAirplaneModeOn(mContext));
+        mSwitchPref.setChecked(WirelessUtils.isAirplaneModeOn(mContext));
 
         mPhoneStateReceiver.registerIntent();
         mSwitchPref.setOnPreferenceChangeListener(this);
@@ -86,11 +87,6 @@
         mContext.getContentResolver().unregisterContentObserver(mAirplaneModeObserver);
     }
 
-    public static boolean isAirplaneModeOn(Context context) {
-        return Settings.Global.getInt(context.getContentResolver(),
-                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
-    }
-
     private void setAirplaneModeOn(boolean enabling) {
         // Change the system setting
         Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 
@@ -113,7 +109,7 @@
      * - mobile does not send failure notification, fail on timeout.
      */
     private void onAirplaneModeChanged() {
-        mSwitchPref.setChecked(isAirplaneModeOn(mContext));
+        mSwitchPref.setChecked(WirelessUtils.isAirplaneModeOn(mContext));
     }
     
     /**
diff --git a/src/com/android/settings/AirplaneModeVoiceActivity.java b/src/com/android/settings/AirplaneModeVoiceActivity.java
index 3ab0c37..e0649e4 100644
--- a/src/com/android/settings/AirplaneModeVoiceActivity.java
+++ b/src/com/android/settings/AirplaneModeVoiceActivity.java
@@ -20,6 +20,8 @@
 import android.provider.Settings;
 import android.util.Log;
 
+import com.android.settings.utils.VoiceSettingsActivity;
+
 /**
  * Activity for modifying the {@link Settings.Global#AIRPLANE_MODE_ON AIRPLANE_MODE_ON}
  * setting using the Voice Interaction API.
@@ -27,14 +29,14 @@
 public class AirplaneModeVoiceActivity extends VoiceSettingsActivity {
     private static final String TAG = "AirplaneModeVoiceActivity";
 
-    protected void onVoiceSettingInteraction(Intent intent) {
+    protected boolean onVoiceSettingInteraction(Intent intent) {
         if (intent.hasExtra(Settings.EXTRA_AIRPLANE_MODE_ENABLED)) {
-            boolean enabled =
-                    intent.getBooleanExtra(Settings.EXTRA_AIRPLANE_MODE_ENABLED, false);
             Settings.Global.putInt(getContentResolver(),
-                    Settings.Global.AIRPLANE_MODE_ON, enabled ? 1 : 0);
+                    Settings.Global.AIRPLANE_MODE_ON,
+                    intent.getBooleanExtra(Settings.EXTRA_AIRPLANE_MODE_ENABLED, false) ? 1 : 0);
         } else {
             Log.v(TAG, "Missing airplane mode extra");
         }
+        return true;
     }
 }
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 4e14c60..f8db3d8 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -26,10 +26,8 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.SwitchPreference;
@@ -40,14 +38,10 @@
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
-
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.RILConstants;
-import com.android.internal.telephony.TelephonyProperties;
+import com.android.internal.logging.MetricsLogger;
 
 
-public class ApnEditor extends PreferenceActivity
+public class ApnEditor extends InstrumentedPreferenceActivity
         implements SharedPreferences.OnSharedPreferenceChangeListener,
                     Preference.OnPreferenceChangeListener {
 
@@ -235,6 +229,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APN_EDITOR;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         getPreferenceScreen().getSharedPreferences()
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 670924c..1b32b86 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -35,25 +35,21 @@
 import android.os.Message;
 import android.os.UserManager;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Telephony;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 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.widget.TextView;
 import android.widget.Toast;
 
-import com.android.internal.telephony.Phone;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.TelephonyIntents;
-import com.android.internal.telephony.TelephonyProperties;
 import android.telephony.TelephonyManager;
 
 import java.util.ArrayList;
@@ -130,6 +126,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APN;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         final Activity activity = getActivity();
@@ -145,7 +146,7 @@
             setHasOptionsMenu(true);
         }
 
-        mSubscriptionInfo = Utils.findRecordBySubId(activity, subId);
+        mSubscriptionInfo = SubscriptionManager.from(activity).getActiveSubscriptionInfo(subId);
     }
 
     @Override
diff --git a/src/com/android/settings/AppHeader.java b/src/com/android/settings/AppHeader.java
new file mode 100644
index 0000000..cd76e80
--- /dev/null
+++ b/src/com/android/settings/AppHeader.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+public class AppHeader {
+
+    public static void createAppHeader(final Activity activity, Drawable icon, CharSequence label,
+            final Intent settingsIntent) {
+        final View content = activity.findViewById(R.id.main_content);
+        final ViewGroup contentParent = (ViewGroup) content.getParent();
+        final View bar = activity.getLayoutInflater().inflate(R.layout.app_header,
+                contentParent, false);
+
+        final ImageView appIcon = (ImageView) bar.findViewById(R.id.app_icon);
+        appIcon.setImageDrawable(icon);
+
+        final TextView appName = (TextView) bar.findViewById(R.id.app_name);
+        appName.setText(label);
+
+        final View appSettings = bar.findViewById(R.id.app_settings);
+        if (settingsIntent == null) {
+            appSettings.setVisibility(View.GONE);
+        } else {
+            appSettings.setClickable(true);
+            appSettings.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    activity.startActivity(settingsIntent);
+                }
+            });
+        }
+        contentParent.addView(bar, 0);
+    }
+
+}
diff --git a/src/com/android/settings/AppListPreference.java b/src/com/android/settings/AppListPreference.java
index 96897ae..3cc91cd 100644
--- a/src/com/android/settings/AppListPreference.java
+++ b/src/com/android/settings/AppListPreference.java
@@ -23,15 +23,17 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.drawable.Drawable;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.CheckedTextView;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
+import android.widget.TextView;
 
 /**
  * Extends ListPreference to allow us to show the icons for a given list of applications. We do this
@@ -56,10 +58,10 @@
         public View getView(int position, View convertView, ViewGroup parent) {
             LayoutInflater inflater = ((Activity)getContext()).getLayoutInflater();
             View view = inflater.inflate(R.layout.app_preference_item, parent, false);
-            CheckedTextView checkedTextView = (CheckedTextView)view.findViewById(R.id.app_label);
-            checkedTextView.setText(getItem(position));
+            TextView textView = (TextView) view.findViewById(R.id.app_label);
+            textView.setText(getItem(position));
             if (position == mSelectedIndex) {
-                checkedTextView.setChecked(true);
+                view.findViewById(R.id.default_label).setVisibility(View.VISIBLE);
             }
             ImageView imageView = (ImageView)view.findViewById(R.id.app_image);
             imageView.setImageDrawable(mImageDrawables[position]);
@@ -76,14 +78,14 @@
         super(context, attrs);
     }
 
-    public void setPackageNames(String[] packageNames, String defaultPackageName) {
+    public void setPackageNames(CharSequence[] packageNames, CharSequence defaultPackageName) {
         // Look up all package names in PackageManager. Skip ones we can't find.
         int foundPackages = 0;
         PackageManager pm = getContext().getPackageManager();
         ApplicationInfo[] appInfos = new ApplicationInfo[packageNames.length];
         for (int i = 0; i < packageNames.length; i++) {
             try {
-                appInfos[i] = pm.getApplicationInfo(packageNames[i], 0);
+                appInfos[i] = pm.getApplicationInfo(packageNames[i].toString(), 0);
                 foundPackages++;
             } catch (NameNotFoundException e) {
                 // Leave appInfos[i] uninitialized; it will be skipped in the list.
@@ -123,4 +125,61 @@
         builder.setAdapter(adapter, this);
         super.onPrepareDialogBuilder(builder);
     }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        return new SavedState(getEntryValues(), getValue(), superState);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state instanceof SavedState) {
+            SavedState savedState = (SavedState) state;
+            setPackageNames(savedState.entryValues, savedState.value);
+            super.onRestoreInstanceState(savedState.superState);
+        } else {
+            super.onRestoreInstanceState(state);
+        }
+    }
+
+    private static class SavedState implements Parcelable {
+
+        public final CharSequence[] entryValues;
+        public final CharSequence value;
+        public final Parcelable superState;
+
+        public SavedState(CharSequence[] entryValues, CharSequence value, Parcelable superState) {
+            this.entryValues = entryValues;
+            this.value = value;
+            this.superState = superState;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeCharSequenceArray(entryValues);
+            dest.writeCharSequence(value);
+            dest.writeParcelable(superState, flags);
+        }
+
+        public static Creator<SavedState> CREATOR = new Creator<SavedState>() {
+            @Override
+            public SavedState createFromParcel(Parcel source) {
+                CharSequence[] entryValues = source.readCharSequenceArray();
+                CharSequence value = source.readCharSequence();
+                Parcelable superState = source.readParcelable(getClass().getClassLoader());
+                return new SavedState(entryValues, value, superState);
+            }
+
+            @Override
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
 }
diff --git a/src/com/android/settings/AppPicker.java b/src/com/android/settings/AppPicker.java
index e58b835..d525427 100644
--- a/src/com/android/settings/AppPicker.java
+++ b/src/com/android/settings/AppPicker.java
@@ -24,7 +24,6 @@
 
 import com.android.settings.applications.AppViewHolder;
 
-import android.app.ActivityManagerNative;
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
@@ -32,8 +31,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Process;
-import android.os.RemoteException;
-import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -121,10 +118,10 @@
             holder.appName.setText(info.label);
             if (info.info != null) {
                 holder.appIcon.setImageDrawable(info.info.loadIcon(getPackageManager()));
-                holder.appSize.setText(info.info.packageName);
+                holder.summary.setText(info.info.packageName);
             } else {
                 holder.appIcon.setImageDrawable(null);
-                holder.appSize.setText("");
+                holder.summary.setText("");
             }
             holder.disabled.setVisibility(View.GONE);
             holder.checkBox.setVisibility(View.GONE);
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java
index 6a17049..9e010b6 100644
--- a/src/com/android/settings/ApplicationSettings.java
+++ b/src/com/android/settings/ApplicationSettings.java
@@ -24,6 +24,7 @@
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
+import com.android.internal.logging.MetricsLogger;
 
 public class ApplicationSettings extends SettingsPreferenceFragment {
     
@@ -43,6 +44,11 @@
     private ListPreference mInstallLocation;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATION;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index b289e7a..a3bd5a1 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -23,31 +23,26 @@
 import android.app.DialogFragment;
 import android.app.Fragment;
 import android.app.FragmentManager;
-import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.UserInfo;
 import android.os.Bundle;
 import android.os.Process;
-import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.security.KeyStore;
+import android.hardware.fingerprint.Fingerprint;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
 import android.util.EventLog;
 import android.util.Log;
-import android.util.MutableBoolean;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityManager;
-import android.widget.ListView;
+import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 
-import java.util.List;
-
 public class ChooseLockGeneric extends SettingsActivity {
     public static final String CONFIRM_CREDENTIALS = "confirm_credentials";
 
@@ -72,44 +67,62 @@
     }
 
     public static class ChooseLockGenericFragment extends SettingsPreferenceFragment {
+        private static final String TAG = "ChooseLockGenericFragment";
         private static final int MIN_PASSWORD_LENGTH = 4;
-        private static final String KEY_UNLOCK_BACKUP_INFO = "unlock_backup_info";
         private static final String KEY_UNLOCK_SET_OFF = "unlock_set_off";
         private static final String KEY_UNLOCK_SET_NONE = "unlock_set_none";
-        private static final String KEY_UNLOCK_SET_BIOMETRIC_WEAK = "unlock_set_biometric_weak";
         private static final String KEY_UNLOCK_SET_PIN = "unlock_set_pin";
         private static final String KEY_UNLOCK_SET_PASSWORD = "unlock_set_password";
         private static final String KEY_UNLOCK_SET_PATTERN = "unlock_set_pattern";
-        private static final int CONFIRM_EXISTING_REQUEST = 100;
-        private static final int FALLBACK_REQUEST = 101;
-        private static final int ENABLE_ENCRYPTION_REQUEST = 102;
         private static final String PASSWORD_CONFIRMED = "password_confirmed";
-
         private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";
-        private static final String FINISH_PENDING = "finish_pending";
-        private static final String TAG = "ChooseLockGenericFragment";
         public static final String MINIMUM_QUALITY_KEY = "minimum_quality";
+        public static final String HIDE_DISABLED_PREFS = "hide_disabled_prefs";
         public static final String ENCRYPT_REQUESTED_QUALITY = "encrypt_requested_quality";
         public static final String ENCRYPT_REQUESTED_DISABLED = "encrypt_requested_disabled";
         public static final String TAG_FRP_WARNING_DIALOG = "frp_warning_dialog";
 
-        private static final boolean ALWAY_SHOW_TUTORIAL = true;
+        private static final int CONFIRM_EXISTING_REQUEST = 100;
+        private static final int ENABLE_ENCRYPTION_REQUEST = 101;
+        private static final int CHOOSE_LOCK_REQUEST = 102;
 
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
         private DevicePolicyManager mDPM;
         private KeyStore mKeyStore;
+        private boolean mHasChallenge = false;
+        private long mChallenge;
         private boolean mPasswordConfirmed = false;
         private boolean mWaitingForConfirmation = false;
-        private boolean mFinishPending = false;
         private int mEncryptionRequestQuality;
         private boolean mEncryptionRequestDisabled;
         private boolean mRequirePassword;
+        private String mUserPassword;
         private LockPatternUtils mLockPatternUtils;
+        private FingerprintManager mFingerprintManager;
+        private RemovalCallback mRemovalCallback = new RemovalCallback() {
+
+            @Override
+            public void onRemovalSucceeded(Fingerprint fingerprint) {
+                Log.v(TAG, "Fingerprint removed: " + fingerprint.getFingerId());
+            }
+
+            @Override
+            public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
+                Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
+            }
+        };
+
+        @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CHOOSE_LOCK_GENERIC;
+        }
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
 
+            mFingerprintManager =
+                (FingerprintManager) getActivity().getSystemService(Context.FINGERPRINT_SERVICE);
             mDPM = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
             mKeyStore = KeyStore.getInstance();
             mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this.getActivity());
@@ -122,10 +135,14 @@
                 mPasswordConfirmed = !confirmCredentials;
             }
 
+            mHasChallenge = getActivity().getIntent().getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+            mChallenge = getActivity().getIntent().getLongExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+
             if (savedInstanceState != null) {
                 mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
                 mWaitingForConfirmation = savedInstanceState.getBoolean(WAITING_FOR_CONFIRMATION);
-                mFinishPending = savedInstanceState.getBoolean(FINISH_PENDING);
                 mEncryptionRequestQuality = savedInstanceState.getInt(ENCRYPT_REQUESTED_QUALITY);
                 mEncryptionRequestDisabled = savedInstanceState.getBoolean(
                         ENCRYPT_REQUESTED_DISABLED);
@@ -136,7 +153,8 @@
             } else if (!mWaitingForConfirmation) {
                 ChooseLockSettingsHelper helper =
                         new ChooseLockSettingsHelper(this.getActivity(), this);
-                if (!helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST, null, null)) {
+                if (!helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
+                        getString(R.string.unlock_set_unlock_launch_picker_title), true)) {
                     mPasswordConfirmed = true; // no password set, so no need to confirm
                     updatePreferencesOrFinish();
                 } else {
@@ -146,15 +164,6 @@
         }
 
         @Override
-        public void onResume() {
-            super.onResume();
-            if (mFinishPending) {
-                mFinishPending = false;
-                finish();
-            }
-        }
-
-        @Override
         public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
                 Preference preference) {
             final String key = preference.getKey();
@@ -176,6 +185,8 @@
          * @param quality
          * @param disabled
          */
+        // TODO: why does this take disabled, its always called with a quality higher than
+        // what makes sense with disabled == true
         private void maybeEnableEncryption(int quality, boolean disabled) {
             if (Process.myUserHandle().isOwner() && LockPatternUtils.isDeviceEncryptionEnabled()) {
                 mEncryptionRequestQuality = quality;
@@ -195,36 +206,21 @@
         }
 
         @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View v = super.onCreateView(inflater, container, savedInstanceState);
-            final boolean onlyShowFallback = getActivity().getIntent()
-                    .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
-            if (onlyShowFallback) {
-                View header = v.inflate(getActivity(),
-                        R.layout.weak_biometric_fallback_header, null);
-                ((ListView) v.findViewById(android.R.id.list)).addHeaderView(header, null, false);
-            }
-
-            return v;
-        }
-
-        @Override
         public void onActivityResult(int requestCode, int resultCode, Intent data) {
             super.onActivityResult(requestCode, resultCode, data);
             mWaitingForConfirmation = false;
             if (requestCode == CONFIRM_EXISTING_REQUEST && resultCode == Activity.RESULT_OK) {
                 mPasswordConfirmed = true;
+                mUserPassword = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
                 updatePreferencesOrFinish();
-            } else if (requestCode == FALLBACK_REQUEST) {
-                mChooseLockSettingsHelper.utils().deleteTempGallery();
-                getActivity().setResult(resultCode);
-                finish();
             } else if (requestCode == ENABLE_ENCRYPTION_REQUEST
                     && resultCode == Activity.RESULT_OK) {
                 mRequirePassword = data.getBooleanExtra(
                         EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
                 updateUnlockMethodAndFinish(mEncryptionRequestQuality, mEncryptionRequestDisabled);
+            } else if (requestCode == CHOOSE_LOCK_REQUEST) {
+                getActivity().setResult(resultCode, data);
+                finish();
             } else {
                 getActivity().setResult(Activity.RESULT_CANCELED);
                 finish();
@@ -237,7 +233,6 @@
             // Saved so we don't force user to re-enter their password if configuration changes
             outState.putBoolean(PASSWORD_CONFIRMED, mPasswordConfirmed);
             outState.putBoolean(WAITING_FOR_CONFIRMATION, mWaitingForConfirmation);
-            outState.putBoolean(FINISH_PENDING, mFinishPending);
             outState.putInt(ENCRYPT_REQUESTED_QUALITY, mEncryptionRequestQuality);
             outState.putBoolean(ENCRYPT_REQUESTED_DISABLED, mEncryptionRequestDisabled);
         }
@@ -248,22 +243,51 @@
             if (quality == -1) {
                 // If caller didn't specify password quality, show UI and allow the user to choose.
                 quality = intent.getIntExtra(MINIMUM_QUALITY_KEY, -1);
-                MutableBoolean allowBiometric = new MutableBoolean(false);
-                quality = upgradeQuality(quality, allowBiometric);
+                quality = upgradeQuality(quality);
+                final boolean hideDisabledPrefs = intent.getBooleanExtra(
+                        HIDE_DISABLED_PREFS, false);
                 final PreferenceScreen prefScreen = getPreferenceScreen();
                 if (prefScreen != null) {
                     prefScreen.removeAll();
                 }
                 addPreferencesFromResource(R.xml.security_settings_picker);
-                disableUnusablePreferences(quality, allowBiometric);
+                disableUnusablePreferences(quality, hideDisabledPrefs);
+                updateCurrentPreference();
                 updatePreferenceSummaryIfNeeded();
             } else {
                 updateUnlockMethodAndFinish(quality, false);
             }
         }
 
-        /** increases the quality if necessary, and returns whether biometric is allowed */
-        private int upgradeQuality(int quality, MutableBoolean allowBiometric) {
+        private void updateCurrentPreference() {
+            String currentKey = getKeyForCurrent();
+            Preference preference = findPreference(currentKey);
+            if (preference != null) {
+                preference.setSummary(R.string.current_screen_lock);
+            }
+        }
+
+        private String getKeyForCurrent() {
+            if (mLockPatternUtils.isLockScreenDisabled()) {
+                return KEY_UNLOCK_SET_OFF;
+            }
+            switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) {
+                case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                    return KEY_UNLOCK_SET_PATTERN;
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                    return KEY_UNLOCK_SET_PIN;
+                case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+                    return KEY_UNLOCK_SET_PASSWORD;
+                case DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED:
+                    return KEY_UNLOCK_SET_NONE;
+            }
+            return null;
+        }
+
+        /** increases the quality if necessary */
+        private int upgradeQuality(int quality) {
             quality = upgradeQualityForDPM(quality);
             quality = upgradeQualityForKeyStore(quality);
             return quality;
@@ -292,49 +316,33 @@
          * implementation is in disableUnusablePreferenceImpl.
          *
          * @param quality the requested quality.
-         * @param allowBiometric whether to allow biometic screen lock.
+         * @param hideDisabledPrefs if false preferences show why they were disabled; otherwise
+         * they're not shown at all.
          */
-        protected void disableUnusablePreferences(final int quality,
-                MutableBoolean allowBiometric) {
-            disableUnusablePreferencesImpl(quality, allowBiometric, false /* hideDisabled */);
+        protected void disableUnusablePreferences(final int quality, boolean hideDisabledPrefs) {
+            disableUnusablePreferencesImpl(quality, hideDisabledPrefs);
         }
 
         /***
          * Disables preferences that are less secure than required quality.
          *
          * @param quality the requested quality.
-         * @param allowBiometric whether to allow biometic screen lock.
          * @param hideDisabled whether to hide disable screen lock options.
          */
         protected void disableUnusablePreferencesImpl(final int quality,
-                MutableBoolean allowBiometric, boolean hideDisabled) {
+                boolean hideDisabled) {
             final PreferenceScreen entries = getPreferenceScreen();
-            final Intent intent = getActivity().getIntent();
-            final boolean onlyShowFallback = intent.getBooleanExtra(
-                    LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
-            final boolean weakBiometricAvailable =
-                    mChooseLockSettingsHelper.utils().isBiometricWeakInstalled();
-
-            // if there are multiple users, disable "None" setting
-            UserManager mUm = (UserManager) getSystemService(Context.USER_SERVICE);
-            List<UserInfo> users = mUm.getUsers(true);
-            final boolean singleUser = users.size() == 1;
 
             for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
                 Preference pref = entries.getPreference(i);
                 if (pref instanceof PreferenceScreen) {
-                    final String key = ((PreferenceScreen) pref).getKey();
+                    final String key = pref.getKey();
                     boolean enabled = true;
                     boolean visible = true;
                     if (KEY_UNLOCK_SET_OFF.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                        visible = singleUser; // don't show when there's more than 1 user
                     } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                    } else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK ||
-                                allowBiometric.value;
-                        visible = weakBiometricAvailable; // If not available, then don't show it.
                     } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
                     } else if (KEY_UNLOCK_SET_PIN.equals(key)) {
@@ -343,9 +351,9 @@
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
                     }
                     if (hideDisabled) {
-                        visible = visible && enabled;
+                        visible = enabled;
                     }
-                    if (!visible || (onlyShowFallback && !allowedForFallback(key))) {
+                    if (!visible) {
                         entries.removePreference(pref);
                     } else if (!enabled) {
                         pref.setSummary(R.string.unlock_set_unlock_disabled_summary);
@@ -381,49 +389,42 @@
             }
         }
 
-        /**
-         * Check whether the key is allowed for fallback (e.g. bio sensor). Returns true if it's
-         * supported as a backup.
-         *
-         * @param key
-         * @return true if allowed
-         */
-        private boolean allowedForFallback(String key) {
-            return KEY_UNLOCK_BACKUP_INFO.equals(key)  ||
-                    KEY_UNLOCK_SET_PATTERN.equals(key) || KEY_UNLOCK_SET_PIN.equals(key);
-        }
-
-        private Intent getBiometricSensorIntent() {
-            Intent fallBackIntent = new Intent().setClass(getActivity(),
-                    ChooseLockGeneric.InternalActivity.class);
-            fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true);
-            fallBackIntent.putExtra(CONFIRM_CREDENTIALS, false);
-            fallBackIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE,
-                    R.string.backup_lock_settings_picker_title);
-
-            boolean showTutorial = ALWAY_SHOW_TUTORIAL ||
-                    !mChooseLockSettingsHelper.utils().isBiometricWeakEverChosen();
-            Intent intent = new Intent();
-            intent.setClassName("com.android.facelock", "com.android.facelock.SetupIntro");
-            intent.putExtra("showTutorial", showTutorial);
-            PendingIntent pending = PendingIntent.getActivity(getActivity(), 0, fallBackIntent, 0);
-            intent.putExtra("PendingIntent", pending);
-            return intent;
-        }
-
         protected Intent getLockPasswordIntent(Context context, int quality,
-                final boolean isFallback, int minLength, final int maxLength,
+                int minLength, final int maxLength,
                 boolean requirePasswordToDecrypt, boolean confirmCredentials) {
-            return ChooseLockPassword.createIntent(context, quality, isFallback, minLength,
+            return ChooseLockPassword.createIntent(context, quality, minLength,
                     maxLength, requirePasswordToDecrypt, confirmCredentials);
         }
 
-        protected Intent getLockPatternIntent(Context context, final boolean isFallback,
-                final boolean requirePassword, final boolean confirmCredentials) {
-            return ChooseLockPattern.createIntent(context, isFallback, requirePassword,
+        protected Intent getLockPasswordIntent(Context context, int quality,
+                int minLength, final int maxLength,
+                boolean requirePasswordToDecrypt, long challenge) {
+            return ChooseLockPassword.createIntent(context, quality, minLength,
+                    maxLength, requirePasswordToDecrypt, challenge);
+        }
+
+        protected Intent getLockPasswordIntent(Context context, int quality, int minLength,
+                final int maxLength, boolean requirePasswordToDecrypt, String password) {
+            return ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
+                    requirePasswordToDecrypt, password);
+        }
+
+        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
+                final boolean confirmCredentials) {
+            return ChooseLockPattern.createIntent(context, requirePassword,
                     confirmCredentials);
         }
 
+        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
+               long challenge) {
+            return ChooseLockPattern.createIntent(context, requirePassword, challenge);
+        }
+
+        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
+                final String pattern) {
+            return ChooseLockPattern.createIntent(context, requirePassword, pattern);
+        }
+
         protected Intent getEncryptionInterstitialIntent(Context context, int quality,
                 boolean required) {
             return EncryptionInterstitial.createStartIntent(context, quality, required);
@@ -444,10 +445,7 @@
                 throw new IllegalStateException("Tried to update password without confirming it");
             }
 
-            final boolean isFallback = getActivity().getIntent()
-                .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
-
-            quality = upgradeQuality(quality, null);
+            quality = upgradeQuality(quality);
 
             final Context context = getActivity();
             if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
@@ -456,41 +454,48 @@
                     minLength = MIN_PASSWORD_LENGTH;
                 }
                 final int maxLength = mDPM.getPasswordMaximumLength(quality);
-                Intent intent = getLockPasswordIntent(context, quality, isFallback, minLength,
-                        maxLength, mRequirePassword,  /* confirm credentials */false);
-                if (isFallback) {
-                    startActivityForResult(intent, FALLBACK_REQUEST);
-                    return;
+                Intent intent;
+                if (mHasChallenge) {
+                    intent = getLockPasswordIntent(context, quality, minLength,
+                            maxLength, mRequirePassword, mChallenge);
                 } else {
-                    mFinishPending = true;
-                    intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-                    startActivity(intent);
+                    intent = getLockPasswordIntent(context, quality, minLength,
+                        maxLength, mRequirePassword, mUserPassword);
                 }
+                startActivityForResult(intent, CHOOSE_LOCK_REQUEST);
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-                Intent intent = getLockPatternIntent(context, isFallback, mRequirePassword,
-                        /* confirm credentials */false);
-                if (isFallback) {
-                    startActivityForResult(intent, FALLBACK_REQUEST);
-                    return;
+                Intent intent;
+                if (mHasChallenge) {
+                    intent = getLockPatternIntent(context, mRequirePassword,
+                        mChallenge);
                 } else {
-                    mFinishPending = true;
-                    intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-                    startActivity(intent);
+                    intent = getLockPatternIntent(context, mRequirePassword,
+                        mUserPassword);
                 }
-            } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) {
-                Intent intent = getBiometricSensorIntent();
-                mFinishPending = true;
-                startActivity(intent);
+                startActivityForResult(intent, CHOOSE_LOCK_REQUEST);
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
-                mChooseLockSettingsHelper.utils().clearLock(false);
+                mChooseLockSettingsHelper.utils().clearLock();
                 mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled);
+                removeAllFingerprintTemplates();
                 getActivity().setResult(Activity.RESULT_OK);
                 finish();
             } else {
+                removeAllFingerprintTemplates();
                 finish();
             }
         }
 
+        private void removeAllFingerprintTemplates() {
+            if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) {
+                mFingerprintManager.remove(new Fingerprint(null, 0, 0, 0), mRemovalCallback);
+            }
+        }
+
+        @Override
+        public void onDestroy() {
+            super.onDestroy();
+        }
+
         @Override
         protected int getHelpResource() {
             return R.string.help_url_choose_lockscreen;
@@ -526,9 +531,6 @@
             } else if (KEY_UNLOCK_SET_NONE.equals(unlockMethod)) {
                 updateUnlockMethodAndFinish(
                         DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, false /* disabled */ );
-            } else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(unlockMethod)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK, false);
             } else if (KEY_UNLOCK_SET_PATTERN.equals(unlockMethod)) {
                 maybeEnableEncryption(
                         DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false);
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index fa1c678..e15d3fc 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.PasswordEntryKeyboardHelper;
 import com.android.internal.widget.PasswordEntryKeyboardView;
@@ -63,7 +64,7 @@
         return modIntent;
     }
 
-    public static Intent createIntent(Context context, int quality, final boolean isFallback,
+    public static Intent createIntent(Context context, int quality,
             int minLength, final int maxLength, boolean requirePasswordToDecrypt,
             boolean confirmCredentials) {
         Intent intent = new Intent().setClass(context, ChooseLockPassword.class);
@@ -71,11 +72,27 @@
         intent.putExtra(PASSWORD_MIN_KEY, minLength);
         intent.putExtra(PASSWORD_MAX_KEY, maxLength);
         intent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, confirmCredentials);
-        intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, isFallback);
         intent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, requirePasswordToDecrypt);
         return intent;
     }
 
+    public static Intent createIntent(Context context, int quality,
+            int minLength, final int maxLength, boolean requirePasswordToDecrypt, String password) {
+        Intent intent = createIntent(context, quality, minLength, maxLength,
+                requirePasswordToDecrypt, false);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, password);
+        return intent;
+    }
+
+    public static Intent createIntent(Context context, int quality,
+            int minLength, final int maxLength, boolean requirePasswordToDecrypt, long challenge) {
+        Intent intent = createIntent(context, quality, minLength, maxLength,
+                requirePasswordToDecrypt, false);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        return intent;
+    }
+
     @Override
     protected boolean isValidFragment(String fragmentName) {
         if (ChooseLockPasswordFragment.class.getName().equals(fragmentName)) return true;
@@ -97,12 +114,17 @@
         setTitle(msg);
     }
 
-    public static class ChooseLockPasswordFragment extends Fragment
+    public static class ChooseLockPasswordFragment extends InstrumentedFragment
             implements OnClickListener, OnEditorActionListener,  TextWatcher {
         private static final String KEY_FIRST_PIN = "first_pin";
         private static final String KEY_UI_STAGE = "ui_stage";
+        private static final String KEY_CURRENT_PASSWORD = "current_password";
+
+        private String mCurrentPassword;
+        private boolean mHasChallenge;
+        private long mChallenge;
         private TextView mPasswordEntry;
-        private int mPasswordMinLength = 4;
+        private int mPasswordMinLength = LockPatternUtils.MIN_LOCK_PASSWORD_SIZE;
         private int mPasswordMaxLength = 16;
         private int mPasswordMinLetters = 0;
         private int mPasswordMinUpperCase = 0;
@@ -179,9 +201,10 @@
             }
             mRequestedQuality = Math.max(intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
                     mRequestedQuality), mLockPatternUtils.getRequestedPasswordQuality());
-            mPasswordMinLength = Math.max(
-                    intent.getIntExtra(PASSWORD_MIN_KEY, mPasswordMinLength), mLockPatternUtils
-                            .getRequestedMinimumPasswordLength());
+            mPasswordMinLength = Math.max(Math.max(
+                    LockPatternUtils.MIN_LOCK_PASSWORD_SIZE,
+                    intent.getIntExtra(PASSWORD_MIN_KEY, mPasswordMinLength)),
+                    mLockPatternUtils.getRequestedMinimumPasswordLength());
             mPasswordMaxLength = intent.getIntExtra(PASSWORD_MAX_KEY, mPasswordMaxLength);
             mPasswordMinLetters = Math.max(intent.getIntExtra(PASSWORD_MIN_LETTERS_KEY,
                     mPasswordMinLetters), mLockPatternUtils.getRequestedPasswordMinimumLetters());
@@ -237,20 +260,30 @@
                     : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
 
             Intent intent = getActivity().getIntent();
-            final boolean confirmCredentials = intent.getBooleanExtra("confirm_credentials", true);
+            final boolean confirmCredentials = intent.getBooleanExtra(
+                    ChooseLockGeneric.CONFIRM_CREDENTIALS, true);
+            mCurrentPassword = intent.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+            mHasChallenge = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+            mChallenge = intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
             if (savedInstanceState == null) {
                 updateStage(Stage.Introduction);
                 if (confirmCredentials) {
                     mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
-                            null, null);
+                            getString(R.string.unlock_set_unlock_launch_picker_title), true);
                 }
             } else {
+                // restore from previous state
                 mFirstPin = savedInstanceState.getString(KEY_FIRST_PIN);
                 final String state = savedInstanceState.getString(KEY_UI_STAGE);
                 if (state != null) {
                     mUiStage = Stage.valueOf(state);
                     updateStage(mUiStage);
                 }
+
+                if (mCurrentPassword == null) {
+                    mCurrentPassword = savedInstanceState.getString(KEY_CURRENT_PASSWORD);
+                }
             }
             mDone = false;
             if (activity instanceof SettingsActivity) {
@@ -263,6 +296,11 @@
         }
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CHOOSE_LOCK_PASSWORD;
+        }
+
+        @Override
         public void onResume() {
             super.onResume();
             updateStage(mUiStage);
@@ -281,6 +319,7 @@
             super.onSaveInstanceState(outState);
             outState.putString(KEY_UI_STAGE, mUiStage.name());
             outState.putString(KEY_FIRST_PIN, mFirstPin);
+            outState.putString(KEY_CURRENT_PASSWORD, mCurrentPassword);
         }
 
         @Override
@@ -292,6 +331,9 @@
                     if (resultCode != Activity.RESULT_OK) {
                         getActivity().setResult(RESULT_FINISHED);
                         getActivity().finish();
+                    } else {
+                        mCurrentPassword = data.getStringExtra(
+                                ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
                     }
                     break;
             }
@@ -431,15 +473,20 @@
                 }
             } else if (mUiStage == Stage.NeedToConfirm) {
                 if (mFirstPin.equals(pin)) {
-                    final boolean isFallback = getActivity().getIntent().getBooleanExtra(
-                            LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
                     boolean wasSecureBefore = mLockPatternUtils.isSecure();
-                    mLockPatternUtils.clearLock(isFallback);
                     final boolean required = getActivity().getIntent().getBooleanExtra(
                             EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
                     mLockPatternUtils.setCredentialRequiredToDecrypt(required);
-                    mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);
-                    getActivity().setResult(RESULT_FINISHED);
+                    mLockPatternUtils.saveLockPassword(pin, mCurrentPassword, mRequestedQuality);
+
+                    if (mHasChallenge) {
+                        Intent intent = new Intent();
+                        byte[] token = mLockPatternUtils.verifyPassword(pin, mChallenge);
+                        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                        getActivity().setResult(RESULT_FINISHED, intent);
+                    } else {
+                        getActivity().setResult(RESULT_FINISHED);
+                    }
                     getActivity().finish();
                     mDone = true;
                     if (!wasSecureBefore) {
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 38f908e..e3b7d4b 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.google.android.collect.Lists;
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
 import com.android.internal.widget.LockPatternUtils;
@@ -27,11 +28,9 @@
 
 import android.app.Activity;
 import android.app.Fragment;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -69,16 +68,31 @@
         return modIntent;
     }
 
-    public static Intent createIntent(Context context, final boolean isFallback,
+    public static Intent createIntent(Context context,
             boolean requirePassword, boolean confirmCredentials) {
         Intent intent = new Intent(context, ChooseLockPattern.class);
         intent.putExtra("key_lock_method", "pattern");
         intent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, confirmCredentials);
-        intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, isFallback);
         intent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, requirePassword);
         return intent;
     }
 
+    public static Intent createIntent(Context context,
+            boolean requirePassword, String pattern) {
+        Intent intent = createIntent(context, requirePassword, false);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pattern);
+        return intent;
+    }
+
+
+    public static Intent createIntent(Context context,
+            boolean requirePassword, long challenge) {
+        Intent intent = createIntent(context, requirePassword, false);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        return intent;
+    }
+
     @Override
     protected boolean isValidFragment(String fragmentName) {
         if (ChooseLockPatternFragment.class.getName().equals(fragmentName)) return true;
@@ -104,7 +118,7 @@
         return super.onKeyDown(keyCode, event);
     }
 
-    public static class ChooseLockPatternFragment extends Fragment
+    public static class ChooseLockPatternFragment extends InstrumentedFragment
             implements View.OnClickListener {
 
         public static final int CONFIRM_EXISTING_REQUEST = 55;
@@ -117,6 +131,9 @@
 
         private static final int ID_EMPTY_MESSAGE = -1;
 
+        private String mCurrentPattern;
+        private boolean mHasChallenge;
+        private long mChallenge;
         protected TextView mHeaderText;
         protected LockPatternView mLockPatternView;
         protected TextView mFooterText;
@@ -144,7 +161,11 @@
                     if (resultCode != Activity.RESULT_OK) {
                         getActivity().setResult(RESULT_FINISHED);
                         getActivity().finish();
+                    } else {
+                        mCurrentPattern = data.getStringExtra(
+                                ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
                     }
+
                     updateStage(Stage.Introduction);
                     break;
             }
@@ -208,6 +229,11 @@
                 }
          };
 
+        @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CHOOSE_LOCK_PATTERN;
+        }
+
 
         /**
          * The states of the left footer button.
@@ -326,6 +352,7 @@
 
         private static final String KEY_UI_STAGE = "uiStage";
         private static final String KEY_PATTERN_CHOICE = "chosenPattern";
+        private static final String KEY_CURRENT_PATTERN = "currentPattern";
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -368,6 +395,11 @@
 
             final boolean confirmCredentials = getActivity().getIntent()
                     .getBooleanExtra("confirm_credentials", true);
+            Intent intent = getActivity().getIntent();
+            mCurrentPattern = intent.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+            mHasChallenge = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+            mChallenge = intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
 
             if (savedInstanceState == null) {
                 if (confirmCredentials) {
@@ -376,7 +408,8 @@
                     updateStage(Stage.NeedToConfirm);
                     boolean launchedConfirmationActivity =
                         mChooseLockSettingsHelper.launchConfirmationActivity(
-                                CONFIRM_EXISTING_REQUEST, null, null);
+                                CONFIRM_EXISTING_REQUEST,
+                                getString(R.string.unlock_set_unlock_launch_picker_title), true);
                     if (!launchedConfirmationActivity) {
                         updateStage(Stage.Introduction);
                     }
@@ -389,6 +422,10 @@
                 if (patternString != null) {
                     mChosenPattern = LockPatternUtils.stringToPattern(patternString);
                 }
+
+                if (mCurrentPattern == null) {
+                    mCurrentPattern = savedInstanceState.getString(KEY_CURRENT_PATTERN);
+                }
                 updateStage(Stage.values()[savedInstanceState.getInt(KEY_UI_STAGE)]);
             }
             mDone = false;
@@ -468,6 +505,11 @@
                 outState.putString(KEY_PATTERN_CHOICE,
                         LockPatternUtils.patternToString(mChosenPattern));
             }
+
+            if (mCurrentPattern != null) {
+                outState.putString(KEY_CURRENT_PATTERN,
+                        mCurrentPattern);
+            }
         }
 
         /**
@@ -563,16 +605,13 @@
             LockPatternUtils utils = mChooseLockSettingsHelper.utils();
             final boolean lockVirgin = !utils.isPatternEverChosen();
 
-            final boolean isFallback = getActivity().getIntent()
-                .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
-
             boolean wasSecureBefore = utils.isSecure();
 
             final boolean required = getActivity().getIntent().getBooleanExtra(
                     EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
+
             utils.setCredentialRequiredToDecrypt(required);
-            utils.setLockPatternEnabled(true);
-            utils.saveLockPattern(mChosenPattern, isFallback);
+            utils.saveLockPattern(mChosenPattern, mCurrentPattern);
 
             if (lockVirgin) {
                 utils.setVisiblePatternEnabled(true);
@@ -581,7 +620,16 @@
             if (!wasSecureBefore) {
                 startActivity(getRedactionInterstitialIntent(getActivity()));
             }
-            getActivity().setResult(RESULT_FINISHED);
+
+            if (mHasChallenge) {
+                Intent intent = new Intent();
+                byte[] token = utils.verifyPattern(mChosenPattern, mChallenge);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                getActivity().setResult(RESULT_FINISHED, intent);
+            } else {
+                getActivity().setResult(RESULT_FINISHED);
+            }
+
             getActivity().finish();
             mDone = true;
         }
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java
index 3086a7a..c113b1d 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/ChooseLockSettingsHelper.java
@@ -16,17 +16,22 @@
 
 package com.android.settings;
 
-import com.android.internal.widget.LockPatternUtils;
-
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 
+import com.android.internal.widget.LockPatternUtils;
+
 public final class ChooseLockSettingsHelper {
 
     static final String EXTRA_KEY_TYPE = "type";
     static final String EXTRA_KEY_PASSWORD = "password";
+    static final String EXTRA_KEY_HAS_CHALLENGE = "has_challenge";
+    static final String EXTRA_KEY_CHALLENGE = "challenge";
+    static final String EXTRA_KEY_CHALLENGE_TOKEN = "hw_auth_token";
+
 
     private LockPatternUtils mLockPatternUtils;
     private Activity mActivity;
@@ -48,64 +53,106 @@
 
     /**
      * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     * @param message optional message to display about the action about to be done
-     * @param details optional detail message to display
+     *
+     * @param title title of the confirmation screen; shown in the action bar
      * @return true if one exists and we launched an activity to confirm it
-     * @see #onActivityResult(int, int, android.content.Intent)
+     * @see Activity#onActivityResult(int, int, android.content.Intent)
      */
-    boolean launchConfirmationActivity(int request, CharSequence message, CharSequence details) {
-        return launchConfirmationActivity(request, message, details, false);
+    boolean launchConfirmationActivity(int request, CharSequence title) {
+        return launchConfirmationActivity(request, title, null, null, false, false);
+    }
+
+    /**
+     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
+     *
+     * @param title title of the confirmation screen; shown in the action bar
+     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
+     *                          this can only be called internally.
+     * @return true if one exists and we launched an activity to confirm it
+     * @see Activity#onActivityResult(int, int, android.content.Intent)
+     */
+    boolean launchConfirmationActivity(int request, CharSequence title, boolean returnCredentials) {
+        return launchConfirmationActivity(request, title, null, null, returnCredentials, false);
+    }
+
+    /**
+     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
+     *
+     * @param title title of the confirmation screen; shown in the action bar
+     * @param header header of the confirmation screen; shown as large text
+     * @param description description of the confirmation screen
+     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
+     *                          this can only be called internally.
+     * @param external specifies whether this activity is launched externally, meaning that it will
+     *                 get a dark theme and allow fingerprint authentication
+     * @return true if one exists and we launched an activity to confirm it
+     * @see Activity#onActivityResult(int, int, android.content.Intent)
+     */
+    boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
+            @Nullable CharSequence header, @Nullable CharSequence description,
+            boolean returnCredentials, boolean external) {
+        return launchConfirmationActivity(request, title, header, description,
+                returnCredentials, external, false, 0);
     }
 
     /**
      * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
      * @param message optional message to display about the action about to be done
      * @param details optional detail message to display
-     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
-                                this can only be called internally.
+     * @param challenge a challenge to be verified against the device credential.
+     *                  This method can only be called internally.
      * @return true if one exists and we launched an activity to confirm it
      * @see #onActivityResult(int, int, android.content.Intent)
      */
-    boolean launchConfirmationActivity(int request, CharSequence message, CharSequence details,
-                                       boolean returnCredentials) {
+    boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
+            @Nullable CharSequence header, @Nullable CharSequence description,
+            long challenge) {
+        return launchConfirmationActivity(request, title, header, description,
+                false, false, true, challenge);
+    }
+
+    private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
+            @Nullable CharSequence header, @Nullable CharSequence description,
+            boolean returnCredentials, boolean external, boolean hasChallenge,
+            long challenge) {
         boolean launched = false;
         switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) {
             case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
-                launched = confirmPattern(request, message, details, returnCredentials);
+                launched = launchConfirmationActivity(request, title, header, description,
+                        returnCredentials || hasChallenge
+                                ? ConfirmLockPattern.InternalActivity.class
+                                : ConfirmLockPattern.class, external,
+                                hasChallenge, challenge);
                 break;
             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:
-                // TODO: update UI layout for ConfirmPassword to show message and details
-                launched = confirmPassword(request, message, returnCredentials);
+                launched = launchConfirmationActivity(request, title, header, description,
+                        returnCredentials || hasChallenge
+                                ? ConfirmLockPassword.InternalActivity.class
+                                : ConfirmLockPassword.class, external,
+                                hasChallenge, challenge);
                 break;
         }
         return launched;
     }
 
-    /**
-     * Launch screen to confirm the existing lock pattern.
-     * @param message shown in header of ConfirmLockPattern if not null
-     * @param details shown in footer of ConfirmLockPattern if not null
-     * @param returnCredentials if true, put credentials into intent.
-     * @see #onActivityResult(int, int, android.content.Intent)
-     * @return true if we launched an activity to confirm pattern
-     */
-    private boolean confirmPattern(int request, CharSequence message,
-                                   CharSequence details, boolean returnCredentials) {
-        if (!mLockPatternUtils.isLockPatternEnabled() || !mLockPatternUtils.savedPatternExists()) {
-            return false;
-        }
+    private boolean launchConfirmationActivity(int request, CharSequence title, CharSequence header,
+            CharSequence message, Class<?> activityClass, boolean external, boolean hasChallenge,
+            long challenge) {
         final Intent intent = new Intent();
-        // supply header and footer text in the intent
-        intent.putExtra(ConfirmLockPattern.HEADER_TEXT, message);
-        intent.putExtra(ConfirmLockPattern.FOOTER_TEXT, details);
-        intent.setClassName("com.android.settings",
-                            returnCredentials
-                            ? ConfirmLockPattern.InternalActivity.class.getName()
-                            : ConfirmLockPattern.class.getName());
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.TITLE_TEXT, title);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.HEADER_TEXT, header);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT, message);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, external);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, external);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, external);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, external);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, hasChallenge);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        intent.setClassName(ConfirmDeviceCredentialBaseFragment.PACKAGE, activityClass.getName());
         if (mFragment != null) {
             mFragment.startActivityForResult(intent, request);
         } else {
@@ -113,31 +160,4 @@
         }
         return true;
     }
-
-    /**
-     * Launch screen to confirm the existing lock password.
-     * @param message shown in header of ConfirmLockPassword if not null
-     * @param returnCredentials if true, put credentials into intent.
-     * @see #onActivityResult(int, int, android.content.Intent)
-     * @return true if we launched an activity to confirm password
-     */
-    private boolean confirmPassword(int request, CharSequence message,
-            boolean returnCredentials) {
-        if (!mLockPatternUtils.isLockPasswordEnabled()) return false;
-        final Intent intent = new Intent();
-        // supply header text in the intent
-        intent.putExtra(ConfirmLockPattern.HEADER_TEXT, message);
-        intent.setClassName("com.android.settings",
-                            returnCredentials
-                            ? ConfirmLockPassword.InternalActivity.class.getName()
-                            : ConfirmLockPassword.class.getName());
-        if (mFragment != null) {
-            mFragment.startActivityForResult(intent, request);
-        } else {
-            mActivity.startActivityForResult(intent, request);
-        }
-        return true;
-    }
-
-
 }
diff --git a/src/com/android/settings/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
index beb2d97..7653603 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
@@ -39,6 +39,17 @@
         return intent;
     }
 
+    public static Intent createIntent(CharSequence title, CharSequence details, long challenge) {
+        Intent intent = new Intent();
+        intent.setClassName("com.android.settings",
+                ConfirmDeviceCredentialActivity.class.getName());
+        intent.putExtra(KeyguardManager.EXTRA_TITLE, title);
+        intent.putExtra(KeyguardManager.EXTRA_DESCRIPTION, details);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+        return intent;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -48,7 +59,8 @@
         String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
 
         ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
-        if (!helper.launchConfirmationActivity(0 /* request code */, title, details)) {
+        if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,
+                details, false /* returnCredentials */, true /* isExternal */)) {
             Log.d(TAG, "No pattern, password or PIN set.");
             setResult(Activity.RESULT_OK);
             finish();
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
new file mode 100644
index 0000000..fe3de97
--- /dev/null
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings;
+
+import android.app.KeyguardManager;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.WindowManager;
+
+public class ConfirmDeviceCredentialBaseActivity extends SettingsActivity {
+
+    @Override
+    protected void onCreate(Bundle savedState) {
+        if (getIntent().getBooleanExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, false)) {
+            setTheme(R.style.Theme_ConfirmDeviceCredentialsDark);
+        }
+        super.onCreate(savedState);
+        boolean deviceLocked = getSystemService(KeyguardManager.class).isKeyguardLocked();
+        if (deviceLocked && getIntent().getBooleanExtra(
+                ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false)) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+        }
+        CharSequence msg = getIntent().getStringExtra(
+                ConfirmDeviceCredentialBaseFragment.TITLE_TEXT);
+        setTitle(msg);
+        if (getActionBar() != null) {
+            getActionBar().setDisplayHomeAsUpEnabled(true);
+            getActionBar().setHomeButtonEnabled(true);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
new file mode 100644
index 0000000..fc8edf8
--- /dev/null
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -0,0 +1,102 @@
+/*
+ * 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.annotation.Nullable;
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+/**
+ * Base fragment to be shared for PIN/Pattern/Password confirmation fragments.
+ */
+public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFragment
+        implements FingerprintUiHelper.Callback {
+
+    public static final String PACKAGE = "com.android.settings";
+    public static final String TITLE_TEXT = PACKAGE + ".ConfirmCredentials.title";
+    public static final String HEADER_TEXT = PACKAGE + ".ConfirmCredentials.header";
+    public static final String DETAILS_TEXT = PACKAGE + ".ConfirmCredentials.details";
+    public static final String ALLOW_FP_AUTHENTICATION =
+            PACKAGE + ".ConfirmCredentials.allowFpAuthentication";
+    public static final String DARK_THEME = PACKAGE + ".ConfirmCredentials.darkTheme";
+    public static final String SHOW_CANCEL_BUTTON =
+            PACKAGE + ".ConfirmCredentials.showCancelButton";
+    public static final String SHOW_WHEN_LOCKED =
+            PACKAGE + ".ConfirmCredentials.showWhenLocked";
+
+    private FingerprintUiHelper mFingerprintHelper;
+    private boolean mAllowFpAuthentication;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mAllowFpAuthentication = getActivity().getIntent().getBooleanExtra(
+                ALLOW_FP_AUTHENTICATION, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mFingerprintHelper = new FingerprintUiHelper(
+                (ImageView) view.findViewById(R.id.fingerprintIcon),
+                (TextView) view.findViewById(R.id.errorText), this);
+        boolean showCancelButton = getActivity().getIntent().getBooleanExtra(
+                SHOW_CANCEL_BUTTON, false);
+        Button cancelButton = (Button) view.findViewById(R.id.cancelButton);
+        cancelButton.setVisibility(showCancelButton ? View.VISIBLE : View.GONE);
+        cancelButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getActivity().finish();
+            }
+        });
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mAllowFpAuthentication) {
+            mFingerprintHelper.startListening();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mAllowFpAuthentication) {
+            mFingerprintHelper.stopListening();
+        }
+    }
+
+    @Override
+    public void onAuthenticated() {
+        // Check whether we are still active.
+        if (getActivity() != null && getActivity().isResumed()) {
+            authenticationSucceeded();
+        }
+    }
+
+    protected abstract void authenticationSucceeded();
+
+    @Override
+    public void onFingerprintIconVisibilityChanged(boolean visible) {
+    }
+}
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index c74e861..bec3a45 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -16,13 +16,11 @@
 
 package com.android.settings;
 
+import android.annotation.Nullable;
 import android.text.TextUtils;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.PasswordEntryKeyboardHelper;
-import com.android.internal.widget.PasswordEntryKeyboardView;
 
-import android.app.Activity;
-import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 import android.os.Bundle;
@@ -30,23 +28,18 @@
 import android.os.Handler;
 import android.os.SystemClock;
 import android.os.storage.StorageManager;
-import android.text.Editable;
 import android.text.InputType;
-import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-public class ConfirmLockPassword extends SettingsActivity {
-
-    public static final String PACKAGE = "com.android.settings";
-    public static final String HEADER_TEXT = PACKAGE + ".ConfirmLockPattern.header";
+public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
 
     public static class InternalActivity extends ConfirmLockPassword {
     }
@@ -64,28 +57,17 @@
         return false;
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        // Disable IME on our window since we provide our own keyboard
-        //getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
-                //WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
-        super.onCreate(savedInstanceState);
-        CharSequence msg = getText(R.string.lockpassword_confirm_your_password_header);
-        setTitle(msg);
-    }
-
-    public static class ConfirmLockPasswordFragment extends Fragment implements OnClickListener,
-            OnEditorActionListener, TextWatcher {
+    public static class ConfirmLockPasswordFragment extends ConfirmDeviceCredentialBaseFragment
+            implements OnClickListener, OnEditorActionListener {
         private static final String KEY_NUM_WRONG_CONFIRM_ATTEMPTS
                 = "confirm_lock_password_fragment.key_num_wrong_confirm_attempts";
         private static final long ERROR_MESSAGE_TIMEOUT = 3000;
         private TextView mPasswordEntry;
         private LockPatternUtils mLockPatternUtils;
-        private TextView mHeaderText;
+        private TextView mHeaderTextView;
+        private TextView mDetailsTextView;
+        private TextView mErrorTextView;
         private Handler mHandler = new Handler();
-        private PasswordEntryKeyboardHelper mKeyboardHelper;
-        private PasswordEntryKeyboardView mKeyboardView;
-        private Button mContinueButton;
         private int mNumWrongConfirmAttempts;
         private CountDownTimer mCountdownTimer;
         private boolean mIsAlpha;
@@ -110,51 +92,35 @@
                 Bundle savedInstanceState) {
             final int storedQuality = mLockPatternUtils.getKeyguardStoredPasswordQuality();
             View view = inflater.inflate(R.layout.confirm_lock_password, null);
-            // Disable IME on our window since we provide our own keyboard
-
-            view.findViewById(R.id.cancel_button).setOnClickListener(this);
-            mContinueButton = (Button) view.findViewById(R.id.next_button);
-            mContinueButton.setOnClickListener(this);
-            mContinueButton.setEnabled(false); // disable until the user enters at least one char
 
             mPasswordEntry = (TextView) view.findViewById(R.id.password_entry);
             mPasswordEntry.setOnEditorActionListener(this);
-            mPasswordEntry.addTextChangedListener(this);
 
-            mKeyboardView = (PasswordEntryKeyboardView) view.findViewById(R.id.keyboard);
-            mHeaderText = (TextView) view.findViewById(R.id.headerText);
+            mHeaderTextView = (TextView) view.findViewById(R.id.headerText);
+            mDetailsTextView = (TextView) view.findViewById(R.id.detailsText);
+            mErrorTextView = (TextView) view.findViewById(R.id.errorText);
             mIsAlpha = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == storedQuality
                     || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == storedQuality
                     || DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == storedQuality;
 
             Intent intent = getActivity().getIntent();
             if (intent != null) {
-                CharSequence headerMessage = intent.getCharSequenceExtra(HEADER_TEXT);
+                CharSequence headerMessage = intent.getCharSequenceExtra(
+                        ConfirmDeviceCredentialBaseFragment.HEADER_TEXT);
+                CharSequence detailsMessage = intent.getCharSequenceExtra(
+                        ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);
                 if (TextUtils.isEmpty(headerMessage)) {
                     headerMessage = getString(getDefaultHeader());
                 }
-                mHeaderText.setText(headerMessage);
+                if (TextUtils.isEmpty(detailsMessage)) {
+                    detailsMessage = getString(getDefaultDetails());
+                }
+                mHeaderTextView.setText(headerMessage);
+                mDetailsTextView.setText(detailsMessage);
             }
-
-            final Activity activity = getActivity();
-            mKeyboardHelper = new PasswordEntryKeyboardHelper(activity,
-                    mKeyboardView, mPasswordEntry);
-            mKeyboardHelper.setKeyboardMode(mIsAlpha ?
-                    PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA
-                    : PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC);
-            mKeyboardView.requestFocus();
-
             int currentType = mPasswordEntry.getInputType();
             mPasswordEntry.setInputType(mIsAlpha ? currentType
                     : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
-
-            if (activity instanceof SettingsActivity) {
-                final SettingsActivity sa = (SettingsActivity) activity;
-                int id = getDefaultHeader();
-                CharSequence title = getText(id);
-                sa.setTitle(title);
-            }
-
             return view;
         }
 
@@ -163,10 +129,19 @@
                     : R.string.lockpassword_confirm_your_pin_header;
         }
 
+        private int getDefaultDetails() {
+            return mIsAlpha ? R.string.lockpassword_confirm_your_password_generic
+                    : R.string.lockpassword_confirm_your_pin_generic;
+        }
+
+        private int getErrorMessage() {
+            return mIsAlpha ? R.string.lockpassword_invalid_password
+                    : R.string.lockpassword_invalid_pin;
+        }
+
         @Override
         public void onPause() {
             super.onPause();
-            mKeyboardView.requestFocus();
             if (mCountdownTimer != null) {
                 mCountdownTimer.cancel();
                 mCountdownTimer = null;
@@ -174,10 +149,13 @@
         }
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CONFIRM_LOCK_PASSWORD;
+        }
+
+        @Override
         public void onResume() {
-            // TODO Auto-generated method stub
             super.onResume();
-            mKeyboardView.requestFocus();
             long deadline = mLockPatternUtils.getLockoutAttemptDeadline();
             if (deadline != 0) {
                 handleAttemptLockout(deadline);
@@ -190,18 +168,40 @@
             outState.putInt(KEY_NUM_WRONG_CONFIRM_ATTEMPTS, mNumWrongConfirmAttempts);
         }
 
+        @Override
+        protected void authenticationSucceeded() {
+            Intent intent = new Intent();
+            getActivity().setResult(RESULT_OK, intent);
+            getActivity().finish();
+        }
+
         private void handleNext() {
             final String pin = mPasswordEntry.getText().toString();
-            if (mLockPatternUtils.checkPassword(pin)) {
-
-                Intent intent = new Intent();
+            final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+            boolean matched = false;
+            Intent intent = new Intent();
+            if (verifyChallenge)  {
+                if (getActivity() instanceof ConfirmLockPassword.InternalActivity) {
+                    long challenge = getActivity().getIntent().getLongExtra(
+                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+                    byte[] token = mLockPatternUtils.verifyPassword(pin, challenge);
+                    if (token != null) {
+                        matched = true;
+                        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                    }
+                }
+            } else if (mLockPatternUtils.checkPassword(pin)) {
+                matched = true;
                 if (getActivity() instanceof ConfirmLockPassword.InternalActivity) {
                     intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,
                                     mIsAlpha ? StorageManager.CRYPT_TYPE_PASSWORD
                                              : StorageManager.CRYPT_TYPE_PIN);
                     intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pin);
                 }
+            }
 
+            if (matched) {
                 getActivity().setResult(RESULT_OK, intent);
                 getActivity().finish();
             } else {
@@ -209,14 +209,13 @@
                     long deadline = mLockPatternUtils.setLockoutAttemptDeadline();
                     handleAttemptLockout(deadline);
                 } else {
-                    showError(R.string.lockpattern_need_to_unlock_wrong);
+                    showError(getErrorMessage());
                 }
             }
         }
 
         private void handleAttemptLockout(long elapsedRealtimeDeadline) {
             long elapsedRealtime = SystemClock.elapsedRealtime();
-            showError(R.string.lockpattern_too_many_failed_confirmation_attempts_header, 0);
             mPasswordEntry.setEnabled(false);
             mCountdownTimer = new CountDownTimer(
                     elapsedRealtimeDeadline - elapsedRealtime,
@@ -225,15 +224,15 @@
                 @Override
                 public void onTick(long millisUntilFinished) {
                     final int secondsCountdown = (int) (millisUntilFinished / 1000);
-                    mHeaderText.setText(getString(
-                            R.string.lockpattern_too_many_failed_confirmation_attempts_footer,
-                            secondsCountdown));
+                    showError(getString(
+                            R.string.lockpattern_too_many_failed_confirmation_attempts,
+                            secondsCountdown), 0);
                 }
 
                 @Override
                 public void onFinish() {
                     mPasswordEntry.setEnabled(true);
-                    mHeaderText.setText(getDefaultHeader());
+                    mErrorTextView.setText("");
                     mNumWrongConfirmAttempts = 0;
                 }
             }.start();
@@ -258,13 +257,13 @@
 
         private final Runnable mResetErrorRunnable = new Runnable() {
             public void run() {
-                mHeaderText.setText(getDefaultHeader());
+                mErrorTextView.setText("");
             }
         };
 
-        private void showError(int msg, long timeout) {
-            mHeaderText.setText(msg);
-            mHeaderText.announceForAccessibility(mHeaderText.getText());
+        private void showError(CharSequence msg, long timeout) {
+            mErrorTextView.setText(msg);
+            mErrorTextView.announceForAccessibility(mErrorTextView.getText());
             mPasswordEntry.setText(null);
             mHandler.removeCallbacks(mResetErrorRunnable);
             if (timeout != 0) {
@@ -272,6 +271,10 @@
             }
         }
 
+        private void showError(int msg, long timeout) {
+            showError(getText(msg), timeout);
+        }
+
         // {@link OnEditorActionListener} methods.
         public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
             // Check if this was the result of hitting the enter or "done" key
@@ -283,16 +286,5 @@
             }
             return false;
         }
-
-        // {@link TextWatcher} methods.
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        }
-
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-        }
-
-        public void afterTextChanged(Editable s) {
-            mContinueButton.setEnabled(mPasswordEntry.getText().length() > 0);
-        }
     }
 }
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index caf691d..420a7f8 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -16,18 +16,20 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
 import com.android.internal.widget.LockPatternView.Cell;
 
+import android.annotation.Nullable;
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Intent;
 import android.os.CountDownTimer;
 import android.os.SystemClock;
 import android.os.Bundle;
 import android.os.storage.StorageManager;
+import android.view.MenuItem;
 import android.widget.TextView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -41,23 +43,11 @@
  * Sets an activity result of {@link Activity#RESULT_OK} when the user
  * successfully confirmed their pattern.
  */
-public class ConfirmLockPattern extends SettingsActivity {
+public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
 
     public static class InternalActivity extends ConfirmLockPattern {
     }
 
-    /**
-     * Names of {@link CharSequence} fields within the originating {@link Intent}
-     * that are used to configure the keyguard confirmation view's labeling.
-     * The view will use the system-defined resource strings for any labels that
-     * the caller does not supply.
-     */
-    public static final String PACKAGE = "com.android.settings";
-    public static final String HEADER_TEXT = PACKAGE + ".ConfirmLockPattern.header";
-    public static final String FOOTER_TEXT = PACKAGE + ".ConfirmLockPattern.footer";
-    public static final String HEADER_WRONG_TEXT = PACKAGE + ".ConfirmLockPattern.header_wrong";
-    public static final String FOOTER_WRONG_TEXT = PACKAGE + ".ConfirmLockPattern.footer_wrong";
-
     private enum Stage {
         NeedToUnlock,
         NeedToUnlockWrong,
@@ -65,13 +55,6 @@
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        CharSequence msg = getText(R.string.lockpassword_confirm_your_pattern_header);
-        setTitle(msg);
-    }
-
-    @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
         modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ConfirmLockPatternFragment.class.getName());
@@ -84,7 +67,7 @@
         return false;
     }
 
-    public static class ConfirmLockPatternFragment extends Fragment {
+    public static class ConfirmLockPatternFragment extends ConfirmDeviceCredentialBaseFragment {
 
         // how long we wait to clear a wrong pattern
         private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;
@@ -97,13 +80,14 @@
         private CountDownTimer mCountdownTimer;
 
         private TextView mHeaderTextView;
-        private TextView mFooterTextView;
+        private TextView mDetailsTextView;
+        private TextView mErrorTextView;
+        private View mLeftSpacerLandscape;
+        private View mRightSpacerLandscape;
 
         // caller-supplied text for various prompts
         private CharSequence mHeaderText;
-        private CharSequence mFooterText;
-        private CharSequence mHeaderWrongText;
-        private CharSequence mFooterWrongText;
+        private CharSequence mDetailsText;
 
         // required constructor for fragments
         public ConfirmLockPatternFragment() {
@@ -122,7 +106,10 @@
             View view = inflater.inflate(R.layout.confirm_lock_pattern, null);
             mHeaderTextView = (TextView) view.findViewById(R.id.headerText);
             mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
-            mFooterTextView = (TextView) view.findViewById(R.id.footerText);
+            mDetailsTextView = (TextView) view.findViewById(R.id.detailsText);
+            mErrorTextView = (TextView) view.findViewById(R.id.errorText);
+            mLeftSpacerLandscape = view.findViewById(R.id.leftSpacer);
+            mRightSpacerLandscape = view.findViewById(R.id.rightSpacer);
 
             // make it so unhandled touch events within the unlock screen go to the
             // lock pattern view.
@@ -132,10 +119,10 @@
 
             Intent intent = getActivity().getIntent();
             if (intent != null) {
-                mHeaderText = intent.getCharSequenceExtra(HEADER_TEXT);
-                mFooterText = intent.getCharSequenceExtra(FOOTER_TEXT);
-                mHeaderWrongText = intent.getCharSequenceExtra(HEADER_WRONG_TEXT);
-                mFooterWrongText = intent.getCharSequenceExtra(FOOTER_WRONG_TEXT);
+                mHeaderText = intent.getCharSequenceExtra(
+                        ConfirmDeviceCredentialBaseFragment.HEADER_TEXT);
+                mDetailsText = intent.getCharSequenceExtra(
+                        ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);
             }
 
             mLockPatternView.setTactileFeedbackEnabled(mLockPatternUtils.isTactileFeedbackEnabled());
@@ -148,7 +135,7 @@
                 // on first launch, if no lock pattern is set, then finish with
                 // success (don't want user to get stuck confirming something that
                 // doesn't exist).
-                if (!mLockPatternUtils.savedPatternExists()) {
+                if (!mLockPatternUtils.isLockPatternEnabled()) {
                     getActivity().setResult(Activity.RESULT_OK);
                     getActivity().finish();
                 }
@@ -172,6 +159,11 @@
         }
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CONFIRM_LOCK_PATTERN;
+        }
+
+        @Override
         public void onResume() {
             super.onResume();
 
@@ -193,28 +185,21 @@
                     if (mHeaderText != null) {
                         mHeaderTextView.setText(mHeaderText);
                     } else {
-                        mHeaderTextView.setText(R.string.lockpattern_need_to_unlock);
+                        mHeaderTextView.setText(R.string.lockpassword_confirm_your_pattern_header);
                     }
-                    if (mFooterText != null) {
-                        mFooterTextView.setText(mFooterText);
+                    if (mDetailsText != null) {
+                        mDetailsTextView.setText(mDetailsText);
                     } else {
-                        mFooterTextView.setText(R.string.lockpattern_need_to_unlock_footer);
+                        mDetailsTextView.setText(
+                                R.string.lockpassword_confirm_your_pattern_generic);
                     }
+                    mErrorTextView.setText("");
 
                     mLockPatternView.setEnabled(true);
                     mLockPatternView.enableInput();
                     break;
                 case NeedToUnlockWrong:
-                    if (mHeaderWrongText != null) {
-                        mHeaderTextView.setText(mHeaderWrongText);
-                    } else {
-                        mHeaderTextView.setText(R.string.lockpattern_need_to_unlock_wrong);
-                    }
-                    if (mFooterWrongText != null) {
-                        mFooterTextView.setText(mFooterWrongText);
-                    } else {
-                        mFooterTextView.setText(R.string.lockpattern_need_to_unlock_wrong_footer);
-                    }
+                    mErrorTextView.setText(R.string.lockpattern_need_to_unlock_wrong);
 
                     mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
                     mLockPatternView.setEnabled(true);
@@ -246,6 +231,23 @@
             mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
         }
 
+        @Override
+        protected void authenticationSucceeded() {
+            Intent intent = new Intent();
+            getActivity().setResult(Activity.RESULT_OK, intent);
+            getActivity().finish();
+        }
+
+        @Override
+        public void onFingerprintIconVisibilityChanged(boolean visible) {
+            if (mLeftSpacerLandscape != null && mRightSpacerLandscape != null) {
+
+                // In landscape, adjust spacing depending on fingerprint icon visibility.
+                mLeftSpacerLandscape.setVisibility(visible ? View.GONE : View.VISIBLE);
+                mRightSpacerLandscape.setVisibility(visible ? View.GONE : View.VISIBLE);
+            }
+        }
+
         /**
          * The pattern listener that responds according to a user confirming
          * an existing lock pattern.
@@ -266,9 +268,22 @@
             }
 
             public void onPatternDetected(List<LockPatternView.Cell> pattern) {
-                if (mLockPatternUtils.checkPattern(pattern)) {
-
-                    Intent intent = new Intent();
+                final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+                boolean matched = false;
+                Intent intent = new Intent();
+                if (verifyChallenge) {
+                    if (getActivity() instanceof ConfirmLockPattern.InternalActivity) {
+                        long challenge = getActivity().getIntent().getLongExtra(
+                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+                        byte[] token = mLockPatternUtils.verifyPattern(pattern, challenge);
+                        if (token != null) {
+                            matched = true;
+                            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                        }
+                    }
+                } else if (mLockPatternUtils.checkPattern(pattern)) {
+                    matched = true;
                     if (getActivity() instanceof ConfirmLockPattern.InternalActivity) {
                         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,
                                         StorageManager.CRYPT_TYPE_PATTERN);
@@ -276,6 +291,9 @@
                                         LockPatternUtils.patternToString(pattern));
                     }
 
+                }
+
+                if (matched) {
                     getActivity().setResult(Activity.RESULT_OK, intent);
                     getActivity().finish();
                 } else {
@@ -302,10 +320,9 @@
 
                 @Override
                 public void onTick(long millisUntilFinished) {
-                    mHeaderTextView.setText(R.string.lockpattern_too_many_failed_confirmation_attempts_header);
                     final int secondsCountdown = (int) (millisUntilFinished / 1000);
-                    mFooterTextView.setText(getString(
-                            R.string.lockpattern_too_many_failed_confirmation_attempts_footer,
+                    mErrorTextView.setText(getString(
+                            R.string.lockpattern_too_many_failed_confirmation_attempts,
                             secondsCountdown));
                 }
 
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index 0bf265f..fa2ce7c 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -23,6 +23,7 @@
 import android.widget.ListView;
 
 import com.android.settings.Settings.TetherSettingsActivity;
+import com.android.settingslib.TetherUtil;
 
 import java.util.List;
 
@@ -64,7 +65,7 @@
         for (int i = activities.size() - 1; i >= 0; i--) {
             ResolveInfo info = activities.get(i);
             if (info.activityInfo.name.endsWith(TetherSettingsActivity.class.getSimpleName())) {
-                if (!TetherSettings.showInShortcuts(this)) {
+                if (!TetherUtil.isTetheringSupported(this)) {
                     activities.remove(i);
                 }
             }
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 60803dc..8506964 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -135,7 +135,13 @@
                 handleUnlockOrInstall();
             }
         } else {
-            finish();
+            // Users can set a screen lock if there is none even if they can't modify the
+            // credentials store.
+            if (ACTION_UNLOCK.equals(action) && mKeyStore.state() == KeyStore.State.UNINITIALIZED) {
+                ensureKeyGuard();
+            } else {
+                finish();
+            }
         }
     }
 
@@ -433,9 +439,8 @@
     private boolean confirmKeyGuard() {
         Resources res = getResources();
         boolean launched = new ChooseLockSettingsHelper(this)
-                .launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST, null,
-                                            res.getText(R.string.credentials_install_gesture_explanation),
-                                            true);
+                .launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST,
+                        res.getText(R.string.credentials_title), true);
         return launched;
     }
 
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index f08ed5a..7005ece 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -48,10 +48,10 @@
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.WindowManager;
 import android.view.View.OnClickListener;
 import android.view.View.OnKeyListener;
 import android.view.View.OnTouchListener;
+import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
@@ -66,10 +66,10 @@
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
 
-import static com.android.internal.widget.LockPatternView.DisplayMode;
-
 import java.util.List;
 
+import static com.android.internal.widget.LockPatternView.DisplayMode;
+
 /**
  * Settings screens to show the UI flows for encrypting/decrypting the device.
  *
@@ -408,11 +408,7 @@
         // If we are not encrypted or encrypting, get out quickly.
         final String state = SystemProperties.get("vold.decrypt");
         if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) {
-            // Disable the crypt keeper.
-            PackageManager pm = getPackageManager();
-            ComponentName name = new ComponentName(this, CryptKeeper.class);
-            pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                    PackageManager.DONT_KILL_APP);
+            disableCryptKeeperComponent(this);
             // Typically CryptKeeper is launched as the home app.  We didn't
             // want to be running, so need to finish this activity.  We can count
             // on the activity manager re-launching the new home app upon finishing
@@ -1021,4 +1017,12 @@
     public void afterTextChanged(Editable s) {
         return;
     }
+
+    private static void disableCryptKeeperComponent(Context context) {
+        PackageManager pm = context.getPackageManager();
+        ComponentName name = new ComponentName(context, CryptKeeper.class);
+        Log.d(TAG, "Disabling component " + name);
+        pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP);
+    }
 }
diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java
index 4d6f26b..77a1c45 100644
--- a/src/com/android/settings/CryptKeeperConfirm.java
+++ b/src/com/android/settings/CryptKeeperConfirm.java
@@ -33,14 +33,20 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 
 import java.util.Locale;
 
-public class CryptKeeperConfirm extends Fragment {
+public class CryptKeeperConfirm extends InstrumentedFragment {
 
     private static final String TAG = "CryptKeeperConfirm";
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.CRYPT_KEEPER_CONFIRM;
+    }
+
     public static class Blank extends Activity {
         private Handler mHandler = new Handler();
 
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index d962446..2e4aeb8 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -34,8 +34,9 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import com.android.internal.logging.MetricsLogger;
 
-public class CryptKeeperSettings extends Fragment {
+public class CryptKeeperSettings extends InstrumentedFragment {
     private static final String TAG = "CryptKeeper";
 
     private static final int KEYGUARD_REQUEST = 55;
@@ -111,6 +112,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.CRYPT_KEEPER;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         getActivity().registerReceiver(mIntentReceiver, mIntentFilter);
@@ -160,9 +166,8 @@
             return true;
         }
 
-        return helper.launchConfirmationActivity(request, null,
-                res.getText(R.string.crypt_keeper_confirm_encrypt),
-                true);
+        return helper.launchConfirmationActivity(request,
+                res.getText(R.string.crypt_keeper_encrypt_title), true);
     }
 
     @Override
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index c4c79d1..27a486c 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -62,9 +62,9 @@
 import android.content.Loader;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -120,12 +120,14 @@
 import android.widget.Spinner;
 import android.widget.Switch;
 import android.widget.TabHost;
+import android.widget.Toast;
 import android.widget.TabHost.OnTabChangeListener;
 import android.widget.TabHost.TabContentFactory;
 import android.widget.TabHost.TabSpec;
 import android.widget.TabWidget;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.drawable.InsetBoundsDrawable;
 import com.android.settings.net.ChartData;
@@ -138,11 +140,9 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.sim.SimSettings;
 import com.android.settings.widget.ChartDataUsageView;
 import com.android.settings.widget.ChartDataUsageView.DataUsageChartListener;
 import com.android.settings.widget.ChartNetworkSeriesView;
-
 import com.google.android.collect.Lists;
 
 import libcore.util.Objects;
@@ -191,6 +191,8 @@
             "data_usage_disable_mobile_limit";
     private static final String DATA_USAGE_CYCLE_KEY = "data_usage_cycle";
 
+    public static final String EXTRA_SHOW_APP_IMMEDIATE_PKG = "showAppImmediatePkg";
+
     private static final int LOADER_CHART_DATA = 2;
     private static final int LOADER_SUMMARY = 3;
 
@@ -281,12 +283,20 @@
 
     private UidDetailProvider mUidDetailProvider;
 
+    // Indicates request to show app immediately rather than list.
+    private String mShowAppImmediatePkg;
+
     /**
      * Local cache of data enabled for subId, used to work around delays.
      */
     private final Map<String, Boolean> mMobileDataEnabled = new HashMap<String, Boolean>();
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DATA_USAGE_SUMMARY;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         final Context context = getActivity();
@@ -332,6 +342,13 @@
             mShowEthernet = true;
         }
 
+        mUidDetailProvider = new UidDetailProvider(context);
+
+        Bundle arguments = getArguments();
+        if (arguments != null) {
+            mShowAppImmediatePkg = arguments.getString(EXTRA_SHOW_APP_IMMEDIATE_PKG);
+        }
+
         setHasOptionsMenu(true);
     }
 
@@ -342,7 +359,6 @@
         final Context context = inflater.getContext();
         final View view = inflater.inflate(R.layout.data_usage_summary, container, false);
 
-        mUidDetailProvider = new UidDetailProvider(context);
 
         mTabHost = (TabHost) view.findViewById(android.R.id.tabhost);
         mTabsContainer = (ViewGroup) view.findViewById(R.id.tabs_container);
@@ -448,9 +464,34 @@
         mListView.setOnItemClickListener(mListListener);
         mListView.setAdapter(mAdapter);
 
+        showRequestedAppIfNeeded();
+
         return view;
     }
 
+    private void showRequestedAppIfNeeded() {
+        if (mShowAppImmediatePkg == null) {
+            return;
+        }
+        try {
+            int uid = getActivity().getPackageManager().getPackageUid(mShowAppImmediatePkg,
+                UserHandle.myUserId());
+            AppItem app = new AppItem(uid);
+            app.addUid(uid);
+
+            final UidDetail detail = mUidDetailProvider.getUidDetail(app.key, true);
+            // When we are going straight to an app then we are coming from App Info and want
+            // a header at the top.
+            AppHeader.createAppHeader(getActivity(), detail.icon, detail.label, null);
+            AppDetailsFragment.show(DataUsageSummary.this, app, detail.label, false);
+        } catch (NameNotFoundException e) {
+            Log.w(TAG, "Could not find " + mShowAppImmediatePkg, e);
+            Toast.makeText(getActivity(), getString(R.string.unknown_app), Toast.LENGTH_LONG)
+                    .show();
+            getActivity().finish();
+        }
+    }
+
     @Override
     public void onViewStateRestored(Bundle savedInstanceState) {
         super.onViewStateRestored(savedInstanceState);
@@ -639,6 +680,10 @@
      * only be assigned after initial layout is complete.
      */
     private void ensureLayoutTransitions() {
+        if (mShowAppImmediatePkg != null) {
+            // If we are skipping right to showing an app, we don't care about transitions.
+            return;
+        }
         // skip when already setup
         if (mChart.getLayoutTransition() != null) return;
 
@@ -672,9 +717,9 @@
 
         int simCount = mTelephonyManager.getSimCount();
 
-        for (int i = 0; i < simCount; i++) {
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(context, i);
-            if (sir != null) {
+        List<SubscriptionInfo> sirs = mSubscriptionManager.getActiveSubscriptionInfoList();
+        if (sirs != null) {
+            for (SubscriptionInfo sir : sirs) {
                 addMobileTab(context, sir, (simCount > 1));
             }
         }
@@ -831,12 +876,12 @@
 
         mBinding = false;
 
-        int seriesColor = resources.getColor(R.color.sim_noitification);
+        int seriesColor = context.getColor(R.color.sim_noitification);
         if (mCurrentTab != null && mCurrentTab.length() > TAB_MOBILE.length() ){
             final int slotId = Integer.parseInt(mCurrentTab.substring(TAB_MOBILE.length(),
                     mCurrentTab.length()));
-            final SubscriptionInfo sir = com.android.settings.Utils.findRecordBySlotId(context,
-                    slotId);
+            final SubscriptionInfo sir = mSubscriptionManager
+                    .getActiveSubscriptionInfoForSimSlotIndex(slotId);
 
             if (sir != null) {
                 seriesColor = sir.getIconTint();
@@ -1200,8 +1245,7 @@
             return;
         }
 
-        final SubscriptionInfo nextSir = mSubscriptionManager.getActiveSubscriptionInfo(
-                mSubscriptionManager.getDefaultDataSubId());
+        final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo();
 
         // If the device is single SIM or is enabling data on the active data SIM then forgo
         // the pop-up.
@@ -1837,8 +1881,8 @@
             final AppItem item = mItems.get(position);
             if (getItemViewType(position) == 1) {
                 if (convertView == null) {
-                    convertView = inflateCategoryHeader(LayoutInflater.from(parent.getContext()),
-                            parent);
+                    convertView = Utils.inflateCategoryHeader(LayoutInflater.from(
+                            parent.getContext()), parent);
                 }
 
                 final TextView title = (TextView) convertView.findViewById(android.R.id.title);
@@ -1887,6 +1931,11 @@
         private static final String EXTRA_APP = "app";
 
         public static void show(DataUsageSummary parent, AppItem app, CharSequence label) {
+            show(parent, app, label, true);
+        }
+
+        public static void show(DataUsageSummary parent, AppItem app, CharSequence label,
+                boolean addToBack) {
             if (!parent.isAdded()) return;
 
             final Bundle args = new Bundle();
@@ -1897,7 +1946,9 @@
             fragment.setTargetFragment(parent, 0);
             final FragmentTransaction ft = parent.getFragmentManager().beginTransaction();
             ft.add(fragment, TAG_APP_DETAILS);
-            ft.addToBackStack(TAG_APP_DETAILS);
+            if (addToBack) {
+                ft.addToBackStack(TAG_APP_DETAILS);
+            }
             ft.setBreadCrumbTitle(
                     parent.getResources().getString(R.string.data_usage_app_summary_title));
             ft.commitAllowingStateLoss();
@@ -2529,14 +2580,6 @@
         return view;
     }
 
-    private static View inflateCategoryHeader(LayoutInflater inflater, ViewGroup root) {
-        final TypedArray a = inflater.getContext().obtainStyledAttributes(null,
-                com.android.internal.R.styleable.Preference,
-                com.android.internal.R.attr.preferenceCategoryStyle, 0);
-        final int resId = a.getResourceId(com.android.internal.R.styleable.Preference_layout, 0);
-        return inflater.inflate(resId, root, false);
-    }
-
     /**
      * Test if any networks are currently limited.
      */
@@ -2740,22 +2783,7 @@
             return -1;
         }
 
-        //SUB SELECT
-        private boolean isMobileDataAvailable(long subId) {
-            int[] subIds = SubscriptionManager.getSubId(PhoneConstants.SUB1);
-            if (subIds != null && subIds[0] == subId) {
-                return true;
-            }
-
-            subIds = SubscriptionManager.getSubId(PhoneConstants.SUB2);
-            if (subIds != null && subIds[0] == subId) {
-                return true;
-            }
-
-            subIds = SubscriptionManager.getSubId(PhoneConstants.SUB3);
-            if (subIds != null && subIds[0] == subId) {
-                return true;
-            }
-            return false;
+        private boolean isMobileDataAvailable(int subId) {
+            return mSubscriptionManager.getActiveSubscriptionInfo(subId) != null;
         }
 }
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 6f41fd5..a3926a3 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -29,7 +29,6 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
-import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
@@ -42,6 +41,8 @@
 import android.view.View;
 import android.widget.DatePicker;
 import android.widget.TimePicker;
+import com.android.internal.logging.MetricsLogger;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -76,6 +77,11 @@
     private Preference mDatePref;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DATE_TIME;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index bb2c6da..9ad75be 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -18,14 +18,10 @@
 
 import android.app.Activity;
 import android.app.AlarmManager;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
@@ -42,10 +38,8 @@
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.DatePicker;
-import android.widget.LinearLayout;
 import android.widget.ListPopupWindow;
 import android.widget.SimpleAdapter;
-import android.widget.TextView;
 import android.widget.TimePicker;
 
 import java.util.Calendar;
diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index 0801b1f..4607bcd 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -23,7 +23,6 @@
 import android.net.Uri;
 import android.preference.RingtonePreference;
 import android.util.AttributeSet;
-import android.util.Log;
 
 public class DefaultRingtonePreference extends RingtonePreference {
     private static final String TAG = "DefaultRingtonePreference";
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 51177e1..5c7e0e9 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -23,16 +23,20 @@
 import android.app.admin.DevicePolicyManager;
 import android.app.backup.IBackupManager;
 import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 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;
@@ -58,11 +62,14 @@
 import android.util.Log;
 import android.view.HardwareRenderer;
 import android.view.IWindowManager;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.widget.SwitchBar;
@@ -133,6 +140,7 @@
     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 ENABLE_MULTI_WINDOW_KEY = "enable_multi_window";
     private static final String DEBUG_DEBUGGING_CATEGORY_KEY = "debug_debugging_category";
     private static final String DEBUG_APPLICATIONS_CATEGORY_KEY = "debug_applications_category";
     private static final String SELECT_LOGD_SIZE_KEY = "select_logd_size";
@@ -144,6 +152,8 @@
     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 SELECT_USB_CONFIGURATION_PROPERTY = "sys.usb.config";
     private static final String WIFI_LEGACY_DHCP_CLIENT_KEY = "legacy_dhcp_client";
 
     private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";
@@ -156,8 +166,6 @@
 
     private static final String PROCESS_STATS = "proc_stats";
 
-    private static final String TAG_CONFIRM_ENFORCE = "confirm_enforce";
-
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
 
     private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
@@ -170,6 +178,7 @@
 
     private static String DEFAULT_LOG_RING_BUFFER_SIZE_IN_BYTES = "262144"; // 256K
 
+    private static final String MULTI_WINDOW_SYSTEM_PROPERTY = "persist.sys.debug.multi_window";
     private IWindowManager mWindowManager;
     private IBackupManager mBackupManager;
     private DevicePolicyManager mDpm;
@@ -208,6 +217,7 @@
     private SwitchPreference mShowTouches;
     private SwitchPreference mShowScreenUpdates;
     private SwitchPreference mDisableOverlays;
+    private SwitchPreference mEnableMultiWindow;
     private SwitchPreference mShowCpuUsage;
     private SwitchPreference mForceHardwareUi;
     private SwitchPreference mForceMsaa;
@@ -217,6 +227,7 @@
     private SwitchPreference mForceRtlLayout;
     private ListPreference mDebugHwOverdraw;
     private ListPreference mLogdSize;
+    private ListPreference mUsbConfiguration;
     private ListPreference mTrackFrameTime;
     private ListPreference mShowNonRectClip;
     private ListPreference mWindowAnimationScale;
@@ -251,6 +262,11 @@
     private boolean mUnavailable;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVELOPMENT;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
@@ -273,7 +289,6 @@
 
         final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
                 findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
-
         mEnableAdb = findAndInitSwitchPref(ENABLE_ADB);
         mClearAdbKeys = findPreference(CLEAR_ADB_KEYS);
         if (!SystemProperties.getBoolean("ro.adb.secure", false)) {
@@ -342,11 +357,24 @@
         mWifiAllowScansWithTraffic = findAndInitSwitchPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY);
         mLegacyDhcpClient = findAndInitSwitchPref(WIFI_LEGACY_DHCP_CLIENT_KEY);
         mLogdSize = addListPreference(SELECT_LOGD_SIZE_KEY);
+        mUsbConfiguration = addListPreference(USB_CONFIGURATION_KEY);
 
         mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
         mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
         mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
         mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY);
+        mEnableMultiWindow = findAndInitSwitchPref(ENABLE_MULTI_WINDOW_KEY);
+        if (!showEnableMultiWindowPreference()) {
+            final PreferenceGroup drawingGroup =
+                    (PreferenceGroup)findPreference("debug_drawing_category");
+            if (drawingGroup != null) {
+                drawingGroup.removePreference(mEnableMultiWindow);
+            } else {
+                mEnableMultiWindow.setEnabled(false);
+            }
+            removePreference(mEnableMultiWindow);
+            mEnableMultiWindow = null;
+        }
         mOpenGLTraces = addListPreference(OPENGL_TRACES_KEY);
         mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE);
         mUseAwesomePlayer = findAndInitSwitchPref(USE_AWESOMEPLAYER_KEY);
@@ -424,6 +452,7 @@
     private void removePreference(Preference preference) {
         getPreferenceScreen().removePreference(preference);
         mAllPrefs.remove(preference);
+        mResetSwitchPrefs.remove(preference);
     }
 
     private void setPrefsEnabledState(boolean enabled) {
@@ -479,6 +508,15 @@
     }
 
     @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(UsbManager.ACTION_USB_STATE);
+        getActivity().registerReceiver(mUsbReceiver, filter);
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+
+    @Override
     public void onDestroyView() {
         super.onDestroyView();
 
@@ -487,6 +525,7 @@
         }
         mSwitchBar.removeOnSwitchChangeListener(this);
         mSwitchBar.hide();
+        getActivity().unregisterReceiver(mUsbReceiver);
     }
 
     void updateSwitchPreference(SwitchPreference switchPreference, boolean value) {
@@ -536,6 +575,10 @@
         updateDebugLayoutOptions();
         updateAnimationScaleOptions();
         updateOverlayDisplayDevicesOptions();
+        if (mEnableMultiWindow != null) {
+            updateSwitchPreference(mEnableMultiWindow,
+                    SystemProperties.getBoolean(MULTI_WINDOW_SYSTEM_PROPERTY, false));
+        }
         updateOpenGLTracesOptions();
         updateImmediatelyDestroyActivitiesOptions();
         updateAppProcessLimitOptions();
@@ -699,7 +742,19 @@
         return !SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("");
     }
 
+    private static boolean showEnableMultiWindowPreference() {
+        return !"user".equals(Build.TYPE);
+    }
+
+    private void setEnableMultiWindow(boolean value) {
+        SystemProperties.set(MULTI_WINDOW_SYSTEM_PROPERTY, String.valueOf(value));
+        pokeSystemProperties();
+    }
+
     private void updateBugreportOptions() {
+        final ComponentName bugreportStorageProviderComponentName =
+                new ComponentName("com.android.shell",
+                        "com.android.shell.BugreportStorageProvider");
         if ("user".equals(Build.TYPE)) {
             final ContentResolver resolver = getActivity().getContentResolver();
             final boolean adbEnabled = Settings.Global.getInt(
@@ -707,14 +762,23 @@
             if (adbEnabled) {
                 mBugreport.setEnabled(true);
                 mBugreportInPower.setEnabled(true);
+                getPackageManager().setComponentEnabledSetting(
+                        bugreportStorageProviderComponentName,
+                        PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
             } else {
                 mBugreport.setEnabled(false);
                 mBugreportInPower.setEnabled(false);
                 mBugreportInPower.setChecked(false);
                 Settings.Secure.putInt(resolver, Settings.Secure.BUGREPORT_IN_POWER_MENU, 0);
+                getPackageManager().setComponentEnabledSetting(
+                        bugreportStorageProviderComponentName,
+                        PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
             }
         } else {
             mBugreportInPower.setEnabled(true);
+            getPackageManager().setComponentEnabledSetting(
+                    bugreportStorageProviderComponentName,
+                    PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
         }
     }
 
@@ -749,7 +813,8 @@
     }
 
     private void updatePointerLocationOptions() {
-        updateSwitchPreference(mPointerLocation, Settings.System.getInt(getActivity().getContentResolver(),
+        updateSwitchPreference(mPointerLocation,
+                Settings.System.getInt(getActivity().getContentResolver(),
                 Settings.System.POINTER_LOCATION, 0) != 0);
     }
 
@@ -759,7 +824,8 @@
     }
 
     private void updateShowTouchesOptions() {
-        updateSwitchPreference(mShowTouches, Settings.System.getInt(getActivity().getContentResolver(),
+        updateSwitchPreference(mShowTouches,
+                Settings.System.getInt(getActivity().getContentResolver(),
                 Settings.System.SHOW_TOUCHES, 0) != 0);
     }
 
@@ -1028,7 +1094,8 @@
     }
 
     private void updateForceRtlOptions() {
-        updateSwitchPreference(mForceRtlLayout, Settings.Global.getInt(getActivity().getContentResolver(),
+        updateSwitchPreference(mForceRtlLayout,
+                Settings.Global.getInt(getActivity().getContentResolver(),
                 Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0);
     }
 
@@ -1140,8 +1207,45 @@
         updateLogdSizeValues();
     }
 
+    private void updateUsbConfigurationValues() {
+        if (mUsbConfiguration != null) {
+            String currentValue = SystemProperties.get(SELECT_USB_CONFIGURATION_PROPERTY);
+
+            // Ignore adb interface. The USB Manager adds or removes adb automatically
+            // depending on if USB debugging is enabled.
+            int adbIndex = currentValue.indexOf(",adb");
+            if (adbIndex > 0) {
+                currentValue = currentValue.substring(0, adbIndex);
+            }
+
+            String[] values = getResources().getStringArray(R.array.usb_configuration_values);
+            String[] titles = getResources().getStringArray(R.array.usb_configuration_titles);
+            int index = 1; // punt to second entry if not found
+            for (int i = 0; i < titles.length; i++) {
+                if (currentValue.equals(values[i])) {
+                    index = i;
+                    break;
+                }
+            }
+            if (index >= 0) {
+                mUsbConfiguration.setValue(values[index]);
+                mUsbConfiguration.setSummary(titles[index]);
+            } else {
+                mUsbConfiguration.setValue("");
+                mUsbConfiguration.setSummary("");
+            }
+            mUsbConfiguration.setOnPreferenceChangeListener(this);
+        }
+    }
+
+    private void writeUsbConfigurationOption(Object newValue) {
+        UsbManager manager = (UsbManager)getActivity().getSystemService(Context.USB_SERVICE);
+        manager.setCurrentFunction(newValue.toString(), false);
+    }
+
     private void updateCpuUsageOptions() {
-        updateSwitchPreference(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(),
+        updateSwitchPreference(mShowCpuUsage,
+                Settings.Global.getInt(getActivity().getContentResolver(),
                 Settings.Global.SHOW_PROCESSES, 0) != 0);
     }
 
@@ -1315,6 +1419,24 @@
                 .show();
     }
 
+    private void confirmEnableMultiWindowMode() {
+        DialogInterface.OnClickListener onConfirmListener = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                setEnableMultiWindow((which == DialogInterface.BUTTON_POSITIVE) ? true : false);
+                updateAllOptions();
+            }
+        };
+
+        new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.confirm_enable_multi_window_title)
+                .setMessage(R.string.confirm_enable_multi_window_text)
+                .setPositiveButton(R.string.enable_text, onConfirmListener)
+                .setNegativeButton(android.R.string.cancel, onConfirmListener)
+                .create()
+                .show();
+    }
+
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
         if (switchView != mSwitchBar.getSwitch()) {
@@ -1442,6 +1564,12 @@
             writeShowUpdatesOption();
         } else if (preference == mDisableOverlays) {
             writeDisableOverlaysOption();
+        } else if (preference == mEnableMultiWindow) {
+            if (mEnableMultiWindow.isChecked()) {
+                confirmEnableMultiWindowMode();
+            } else {
+                setEnableMultiWindow(false);
+            }
         } else if (preference == mShowCpuUsage) {
             writeCpuUsageOptions();
         } else if (preference == mImmediatelyDestroyActivities) {
@@ -1482,10 +1610,8 @@
     }
 
     private boolean showKeyguardConfirmation(Resources resources, int requestCode) {
-        return new ChooseLockSettingsHelper(getActivity(), this)
-                .launchConfirmationActivity(requestCode,
-                        resources.getString(R.string.oem_unlock_enable_pin_prompt),
-                        resources.getString(R.string.oem_unlock_enable_pin_description));
+        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
+                requestCode, resources.getString(R.string.oem_unlock_enable));
     }
 
     @Override
@@ -1498,6 +1624,9 @@
         } else if (preference == mLogdSize) {
             writeLogdSizeOption(newValue);
             return true;
+        } else if (preference == mUsbConfiguration) {
+            writeUsbConfigurationOption(newValue);
+            return true;
         } else if (preference == mWindowAnimationScale) {
             writeAnimationScaleOption(0, mWindowAnimationScale, newValue);
             return true;
@@ -1612,6 +1741,13 @@
         }
     }
 
+    private BroadcastReceiver mUsbReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            updateUsbConfigurationValues();
+        }
+    };
+
     static class SystemPropPoker extends AsyncTask<Void, Void, Void> {
         @Override
         protected Void doInBackground(Void... params) {
@@ -1683,6 +1819,9 @@
                     if (!showEnableOemUnlockPreference()) {
                         keys.add(ENABLE_OEM_UNLOCK);
                     }
+                    if (!showEnableMultiWindowPreference()) {
+                        keys.add(ENABLE_MULTI_WINDOW_KEY);
+                    }
                     return keys;
                 }
             };
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index ed95500..83b222b 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -88,13 +88,11 @@
     Button mActionButton;
     Button mCancelButton;
 
-    final ArrayList<View> mAddingPolicies = new ArrayList<View>();
-    final ArrayList<View> mActivePolicies = new ArrayList<View>();
-
     boolean mAdding;
     boolean mRefreshing;
     boolean mWaitingForRemoveMsg;
     boolean mAddingProfileOwner;
+    boolean mAdminPoliciesInitialized;
     int mCurSysAppOpMode;
     int mCurToastAppOpMode;
 
@@ -259,6 +257,7 @@
         mAdminWarning = (TextView) findViewById(R.id.admin_warning);
         mAdminPolicies = (ViewGroup) findViewById(R.id.admin_policies);
         mCancelButton = (Button) findViewById(R.id.cancel_button);
+        mCancelButton.setFilterTouchesWhenObscured(true);
         mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 EventLog.writeEvent(EventLogTags.EXP_DET_DEVICE_ADMIN_DECLINED_BY_USER,
@@ -267,6 +266,7 @@
             }
         });
         mActionButton = (Button) findViewById(R.id.action_button);
+        mActionButton.setFilterTouchesWhenObscured(true);
         mActionButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 if (mAdding) {
@@ -384,8 +384,7 @@
         switch (id) {
             case DIALOG_WARNING: {
                 CharSequence msg = args.getCharSequence(DeviceAdminReceiver.EXTRA_DISABLE_WARNING);
-                AlertDialog.Builder builder = new AlertDialog.Builder(
-                        DeviceAdminAdd.this);
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
                 builder.setMessage(msg);
                 builder.setPositiveButton(R.string.dlg_ok,
                         new DialogInterface.OnClickListener() {
@@ -407,13 +406,6 @@
         }
     }
 
-    static void setViewVisibility(ArrayList<View> views, int visibility) {
-        final int N = views.size();
-        for (int i=0; i<N; i++) {
-            views.get(i).setVisibility(visibility);
-        }
-    }
-
     void updateInterface() {
         mAdminIcon.setImageDrawable(mDeviceAdmin.loadIcon(getPackageManager()));
         mAdminName.setText(mDeviceAdmin.loadLabel(getPackageManager()));
@@ -436,36 +428,14 @@
         }
         if (!mRefreshing && !mAddingProfileOwner
                 && mDPM.isAdminActive(mDeviceAdmin.getComponent())) {
-            if (mActivePolicies.size() == 0) {
-                ArrayList<DeviceAdminInfo.PolicyInfo> policies = mDeviceAdmin.getUsedPolicies();
-                for (int i=0; i<policies.size(); i++) {
-                    DeviceAdminInfo.PolicyInfo pi = policies.get(i);
-                    View view = AppSecurityPermissions.getPermissionItemView(
-                            this, getText(pi.label), "", true);
-                    mActivePolicies.add(view);
-                    mAdminPolicies.addView(view);
-                }
-            }
-            setViewVisibility(mActivePolicies, View.VISIBLE);
-            setViewVisibility(mAddingPolicies, View.GONE);
+            addDeviceAdminPolicies(false /* showDescription */);
             mAdminWarning.setText(getString(R.string.device_admin_status,
                     mDeviceAdmin.getActivityInfo().applicationInfo.loadLabel(getPackageManager())));
             setTitle(getText(R.string.active_device_admin_msg));
             mActionButton.setText(getText(R.string.remove_device_admin));
             mAdding = false;
         } else {
-            if (mAddingPolicies.size() == 0) {
-                ArrayList<DeviceAdminInfo.PolicyInfo> policies = mDeviceAdmin.getUsedPolicies();
-                for (int i=0; i<policies.size(); i++) {
-                    DeviceAdminInfo.PolicyInfo pi = policies.get(i);
-                    View view = AppSecurityPermissions.getPermissionItemView(
-                            this, getText(pi.label), getText(pi.description), true);
-                    mAddingPolicies.add(view);
-                    mAdminPolicies.addView(view);
-                }
-            }
-            setViewVisibility(mAddingPolicies, View.VISIBLE);
-            setViewVisibility(mActivePolicies, View.GONE);
+            addDeviceAdminPolicies(true /* showDescription */);
             mAdminWarning.setText(getString(R.string.device_admin_warning,
                     mDeviceAdmin.getActivityInfo().applicationInfo.loadLabel(getPackageManager())));
             if (mAddingProfileOwner) {
@@ -478,6 +448,19 @@
         }
     }
 
+    private void addDeviceAdminPolicies(boolean showDescription) {
+        if (!mAdminPoliciesInitialized) {
+            boolean isOwner = UserHandle.getCallingUserHandle().isOwner();
+            for (DeviceAdminInfo.PolicyInfo pi : mDeviceAdmin.getUsedPolicies()) {
+                int descriptionId = isOwner ? pi.description : pi.descriptionForSecondaryUsers;
+                int labelId = isOwner ? pi.label : pi.labelForSecondaryUsers;
+                View view = AppSecurityPermissions.getPermissionItemView(this, getText(labelId),
+                        showDescription ? getText(descriptionId) : "", true);
+                mAdminPolicies.addView(view);
+            }
+            mAdminPoliciesInitialized = true;
+        }
+    }
 
     void toggleMessageEllipsis(View v) {
         TextView tv = (TextView) v;
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 334d18f..f0b3070 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -32,7 +32,6 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -303,7 +302,7 @@
                 bindView(convertView, (DeviceAdminInfo) o);
             } else {
                 if (convertView == null) {
-                    convertView = newTitleView(parent);
+                    convertView = Utils.inflateCategoryHeader(mInflater, parent);
                 }
                 final TextView title = (TextView) convertView.findViewById(android.R.id.title);
                 title.setText((String)o);
@@ -322,15 +321,6 @@
             return v;
         }
 
-        private View newTitleView(ViewGroup parent) {
-            final TypedArray a = mInflater.getContext().obtainStyledAttributes(null,
-                    com.android.internal.R.styleable.Preference,
-                    com.android.internal.R.attr.preferenceCategoryStyle, 0);
-            final int resId = a.getResourceId(com.android.internal.R.styleable.Preference_layout,
-                    0);
-            return mInflater.inflate(resId, parent, false);
-        }
-
         private void bindView(View view, DeviceAdminInfo item) {
             final Activity activity = getActivity();
             ViewHolder vh = (ViewHolder) view.getTag();
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index f79707a..37d9c9c 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -22,11 +22,8 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Parcel;
-import android.os.RemoteException;
 import android.os.SELinux;
 import android.os.SystemClock;
 import android.os.SystemProperties;
@@ -40,6 +37,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
 import com.android.settings.search.Indexable;
@@ -87,6 +85,16 @@
     Toast mDevHitToast;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_about;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index ddd6728..7ad3832 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -16,9 +16,9 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.view.RotationPolicy;
-import com.android.settings.notification.DropDownPreference;
-import com.android.settings.notification.DropDownPreference.Callback;
+import com.android.settings.DropDownPreference.Callback;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 
@@ -32,6 +32,7 @@
 import android.app.Activity;
 import android.app.ActivityManagerNative;
 import android.app.Dialog;
+import android.app.UiModeManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -70,6 +71,7 @@
     private static final String KEY_DOZE = "doze";
     private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
     private static final String KEY_AUTO_ROTATE = "auto_rotate";
+    private static final String KEY_NIGHT_MODE = "night_mode";
 
     private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
 
@@ -78,12 +80,18 @@
     private final Configuration mCurConfig = new Configuration();
 
     private ListPreference mScreenTimeoutPreference;
+    private ListPreference mNightModePreference;
     private Preference mScreenSaverPreference;
     private SwitchPreference mLiftToWakePreference;
     private SwitchPreference mDozePreference;
     private SwitchPreference mAutoBrightnessPreference;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DISPLAY;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         final Activity activity = getActivity();
@@ -165,6 +173,13 @@
         } else {
             removePreference(KEY_AUTO_ROTATE);
         }
+
+        mNightModePreference = (ListPreference) findPreference(KEY_NIGHT_MODE);
+        final UiModeManager uiManager = (UiModeManager) getSystemService(
+                Context.UI_MODE_SERVICE);
+        final int currentNightMode = uiManager.getNightMode();
+        mNightModePreference.setValue(String.valueOf(currentNightMode));
+        mNightModePreference.setOnPreferenceChangeListener(this);
     }
 
     private static boolean allowAllRotations(Context context) {
@@ -381,6 +396,16 @@
             boolean value = (Boolean) objValue;
             Settings.Secure.putInt(getContentResolver(), DOZE_ENABLED, value ? 1 : 0);
         }
+        if (preference == mNightModePreference) {
+            try {
+                final int value = Integer.parseInt((String) objValue);
+                final UiModeManager uiManager = (UiModeManager) getSystemService(
+                        Context.UI_MODE_SERVICE);
+                uiManager.setNightMode(value);
+            } catch (NumberFormatException e) {
+                Log.e(TAG, "could not persist night mode setting", e);
+            }
+        }
         return true;
     }
 
@@ -397,6 +422,11 @@
         return false;
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_display;
+    }
+
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 38cba7a..8137cd4 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -43,6 +43,7 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.DreamBackend.DreamInfo;
 import com.android.settings.widget.SwitchBar;
 
@@ -77,6 +78,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DREAM;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         logd("onCreate(%s)", icicle);
         super.onCreate(icicle);
diff --git a/src/com/android/settings/notification/DropDownPreference.java b/src/com/android/settings/DropDownPreference.java
similarity index 98%
rename from src/com/android/settings/notification/DropDownPreference.java
rename to src/com/android/settings/DropDownPreference.java
index 1d1b366..8f8ec78 100644
--- a/src/com/android/settings/notification/DropDownPreference.java
+++ b/src/com/android/settings/DropDownPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings;
 
 import android.content.Context;
 import android.preference.Preference;
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index dfbed77..9b6444c 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -78,6 +79,11 @@
         private boolean mPasswordRequired;
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.ENCRYPTION;
+        }
+
+        @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
             final int layoutId = R.layout.encryption_interstitial;
diff --git a/src/com/android/settings/FingerprintEnroll.java b/src/com/android/settings/FingerprintEnroll.java
new file mode 100644
index 0000000..c5ea7b4
--- /dev/null
+++ b/src/com/android/settings/FingerprintEnroll.java
@@ -0,0 +1,460 @@
+/*
+ * 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.animation.Animator;
+import android.animation.Animator.AnimatorListener;
+import android.animation.ObjectAnimator;
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.Drawable;
+import android.media.AudioAttributes;
+import android.os.Bundle;
+import android.os.CancellationSignal;
+import android.os.PowerManager;
+import android.os.SystemClock;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.widget.LockPatternUtils;
+
+/**
+ * Wizard to enroll a fingerprint
+ */
+public class FingerprintEnroll extends SettingsActivity {
+    /**
+     * Used by the choose fingerprint wizard to indicate the wizard is
+     * finished, and each activity in the wizard should finish.
+     * <p>
+     * Previously, each activity in the wizard would finish itself after
+     * starting the next activity. However, this leads to broken 'Back'
+     * behavior. So, now an activity does not finish itself until it gets this
+     * result.
+     */
+    static final int RESULT_FINISHED = RESULT_FIRST_USER;
+
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, FingerprintEnrollFragment.class.getName());
+        return modIntent;
+    }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (FingerprintEnrollFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        super.onCreate(savedInstanceState);
+        CharSequence msg = getText(R.string.security_settings_fingerprint_preference_title);
+        setTitle(msg);
+    }
+
+    public static class FingerprintEnrollFragment extends InstrumentedFragment
+            implements View.OnClickListener {
+        private static final String EXTRA_PROGRESS = "progress";
+        private static final String EXTRA_STAGE = "stage";
+        private static final int PROGRESS_BAR_MAX = 10000;
+        private static final String TAG = "FingerprintEnroll";
+        private static final boolean DEBUG = true;
+        private static final int CONFIRM_REQUEST = 101;
+        private static final int CHOOSE_LOCK_GENERIC_REQUEST = 102;
+        private static final int FINISH_DELAY = 250;
+
+        private PowerManager mPowerManager;
+        private FingerprintManager mFingerprintManager;
+        private View mContentView;
+        private TextView mTitleText;
+        private TextView mMessageText;
+        private Stage mStage;
+        private int mEnrollmentSteps;
+        private boolean mEnrolling;
+        private ProgressBar mProgressBar;
+        private ImageView mFingerprintAnimator;
+        private ObjectAnimator mProgressAnim;
+        private byte[] mToken;
+
+        // Give the user a chance to see progress completed before jumping to the next stage.
+        Runnable mDelayedFinishRunnable = new Runnable() {
+            @Override
+            public void run() {
+                updateStage(Stage.EnrollingFinish);
+            }
+        };
+
+        private final AnimatorListener mProgressAnimationListener = new AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) { }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) { }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                if (mProgressBar.getProgress() >= PROGRESS_BAR_MAX) {
+                    mContentView.postDelayed(mDelayedFinishRunnable, FINISH_DELAY);
+                }
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) { }
+        };
+        private CancellationSignal mEnrollmentCancel = new CancellationSignal();
+
+        // This contains a list of all views managed by the UI. Used to determine which views
+        // need to be shown/hidden at each stage. It should be the union of the lists that follow
+        private static final int MANAGED_VIEWS[] = {
+            R.id.fingerprint_sensor_location,
+            R.id.fingerprint_animator,
+            R.id.fingerprint_enroll_button_area,
+            R.id.fingerprint_in_app_indicator,
+            R.id.fingerprint_enroll_button_add,
+            R.id.fingerprint_enroll_button_next,
+            R.id.fingerprint_progress_bar
+        };
+
+        private static final int VIEWS_ENROLL_ONBOARD[] = {
+            R.id.fingerprint_enroll_button_area,
+            R.id.fingerprint_enroll_button_next
+        };
+
+        private static final int VIEWS_ENROLL_FIND_SENSOR[] = {
+            R.id.fingerprint_sensor_location,
+            R.id.fingerprint_enroll_button_area,
+            R.id.fingerprint_enroll_button_next
+        };
+
+        private static final int VIEWS_ENROLL_START[] = {
+            R.id.fingerprint_animator,
+        };
+
+        private static final int VIEWS_ENROLL_REPEAT[] = {
+            R.id.fingerprint_animator,
+            R.id.fingerprint_progress_bar
+        };
+
+        private static final int VIEWS_ENROLL_FINISH[] = {
+            R.id.fingerprint_enroll_button_area,
+            R.id.fingerprint_in_app_indicator,
+            R.id.fingerprint_enroll_button_add,
+            R.id.fingerprint_enroll_button_next
+        };
+        private static final boolean ALWAYS_SHOW_FIND_SCREEN = true;
+
+        @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.FINGERPRINT_ENROLL;
+        }
+
+        private enum Stage {
+            EnrollingOnboard(R.string.security_settings_fingerprint_enroll_onboard_title,
+                    R.string.security_settings_fingerprint_enroll_onboard_message,
+                    VIEWS_ENROLL_ONBOARD),
+            EnrollingFindSensor(R.string.security_settings_fingerprint_enroll_find_sensor_title,
+                    R.string.security_settings_fingerprint_enroll_find_sensor_message,
+                    VIEWS_ENROLL_FIND_SENSOR),
+            EnrollingStart(R.string.security_settings_fingerprint_enroll_start_title,
+                    R.string.security_settings_fingerprint_enroll_start_message,
+                    VIEWS_ENROLL_START),
+            EnrollingRepeat(R.string.security_settings_fingerprint_enroll_repeat_title,
+                    R.string.security_settings_fingerprint_enroll_repeat_message,
+                    VIEWS_ENROLL_REPEAT),
+            EnrollingFinish(R.string.security_settings_fingerprint_enroll_finish_title,
+                    R.string.security_settings_fingerprint_enroll_finish_message,
+                    VIEWS_ENROLL_FINISH);
+
+            Stage(int title, int message, int[] enabledViewIds) {
+                this.title = title;
+                this.message = message;
+                this.enabledViewIds = enabledViewIds;
+            }
+
+            public int title;
+            public int message;
+            public int[] enabledViewIds;
+        };
+
+        void updateStage(Stage stage) {
+            if (DEBUG) Log.v(TAG, "updateStage(" + stage.toString() + ")");
+
+            // Show/hide views
+            for (int i = 0; i < MANAGED_VIEWS.length; i++) {
+                mContentView.findViewById(MANAGED_VIEWS[i]).setVisibility(View.INVISIBLE);
+            }
+            for (int i = 0; i < stage.enabledViewIds.length; i++) {
+                mContentView.findViewById(stage.enabledViewIds[i]).setVisibility(View.VISIBLE);
+            }
+
+            setTitleMessage(stage.title);
+            setMessage(stage.message);
+
+            if (mStage != stage) {
+                onStageChanged(stage);
+                mStage = stage;
+            }
+        }
+
+        private void startFingerprintAnimator() {
+            final Drawable d = mFingerprintAnimator.getDrawable();
+            if (d instanceof AnimationDrawable) {
+                ((AnimationDrawable) d).start();
+            }
+        }
+
+        private void stopFingerprintAnimator() {
+            final Drawable d = mFingerprintAnimator.getDrawable();
+            if (d instanceof AnimationDrawable) {
+                final AnimationDrawable drawable = (AnimationDrawable) d;
+                drawable.stop();
+                drawable.setLevel(0);
+            }
+        }
+
+        private void onStageChanged(Stage stage) {
+            // Update state
+            switch (stage) {
+                case EnrollingOnboard: // pass through
+                case EnrollingFindSensor:
+                    mEnrollmentSteps = -1;
+                    mEnrolling = false;
+                    break;
+
+                case EnrollingStart:
+                    mEnrollmentSteps = -1;
+                    mFingerprintManager.enroll(mToken, mEnrollmentCancel, mEnrollmentCallback, 0);
+                    mProgressBar.setProgress(0);
+                    mEnrolling = true;
+                    startFingerprintAnimator(); // XXX hack - this should follow fingerprint detection
+                    break;
+
+                case EnrollingRepeat:
+                    break;
+
+                case EnrollingFinish:
+                    stopFingerprintAnimator(); // XXX hack - this should follow fingerprint detection
+                    mEnrolling = false;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        private void cancelEnrollment() {
+            if (mEnrolling) {
+                if (DEBUG) Log.v(TAG, "Cancel enrollment\n");
+                mEnrollmentCancel.cancel();
+                mEnrolling = false;
+            }
+        }
+
+        @Override
+        public void onDetach() {
+            super.onDetach();
+            cancelEnrollment(); // Do a little cleanup
+        }
+
+        private void updateProgress(int progress) {
+            if (DEBUG) Log.v(TAG, "Progress: " + progress);
+            if (mProgressAnim != null) {
+                mProgressAnim.cancel();
+            }
+            ObjectAnimator anim = ObjectAnimator.ofInt(mProgressBar, "progress",
+                    mProgressBar.getProgress(), progress);
+            anim.addListener(mProgressAnimationListener);
+            anim.start();
+            mProgressAnim = anim;
+        }
+
+        protected void setMessage(CharSequence msg) {
+            if (msg != null) mMessageText.setText(msg);
+        }
+
+        private void setMessage(int id) {
+            if (id != 0) mMessageText.setText(id);
+        }
+
+        private void setTitleMessage(int title) {
+            if (title != 0) mTitleText.setText(title);
+        }
+
+        private EnrollmentCallback mEnrollmentCallback = new EnrollmentCallback() {
+
+            @Override
+            public void onEnrollmentProgress(int remaining) {
+                if (DEBUG) Log.v(TAG, "onEnrollResult(id=" + ", rem=" + remaining);
+                if (mEnrollmentSteps == -1) {
+                    mEnrollmentSteps = remaining;
+                    updateStage(Stage.EnrollingRepeat);
+                }
+                if (remaining >= 0) {
+                    int progress = Math.max(0, mEnrollmentSteps + 1 - remaining);
+                    updateProgress(PROGRESS_BAR_MAX * progress / (mEnrollmentSteps + 1));
+                    // Treat fingerprint like a touch event
+                    mPowerManager.userActivity(SystemClock.uptimeMillis(),
+                            PowerManager.USER_ACTIVITY_EVENT_OTHER,
+                            PowerManager.USER_ACTIVITY_FLAG_NO_CHANGE_LIGHTS);
+                }
+            }
+
+            @Override
+            public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
+                setMessage(helpString);
+            }
+
+            @Override
+            public void onEnrollmentError(int errMsgId, CharSequence errString) {
+                setMessage(errString);
+            }
+        };
+
+        @Override
+        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+            super.onActivityResult(requestCode, resultCode, data);
+
+            if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST
+                    || requestCode == CONFIRM_REQUEST) {
+                if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
+                    // The lock pin/pattern/password was set. Start enrolling!
+                    mToken = data.getByteArrayExtra(
+                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+                    updateStage(Stage.EnrollingFindSensor);
+                }
+            }
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            final Activity activity = getActivity();
+            mFingerprintManager = (FingerprintManager)activity
+                    .getSystemService(Context.FINGERPRINT_SERVICE);
+            mPowerManager = (PowerManager) activity.getSystemService(Context.POWER_SERVICE);
+
+            mContentView = inflater.inflate(R.layout.fingerprint_enroll, null);
+            mTitleText = (TextView) mContentView.findViewById(R.id.fingerprint_enroll_title);
+            mMessageText = (TextView) mContentView.findViewById(R.id.fingerprint_enroll_message);
+            mProgressBar = (ProgressBar) mContentView.findViewById(R.id.fingerprint_progress_bar);
+            mFingerprintAnimator = (ImageView) mContentView.findViewById(R.id.fingerprint_animator);
+
+            final int buttons[] = {
+                R.id.fingerprint_enroll_button_add,
+                R.id.fingerprint_enroll_button_next };
+            for (int i = 0; i < buttons.length; i++) {
+                mContentView.findViewById(buttons[i]).setOnClickListener(this);
+            }
+
+            if (mToken == null) {
+                mToken = getActivity().getIntent().getByteArrayExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+            }
+
+            if (mToken == null) {
+                // need to choose or confirm lock
+                updateStage(Stage.EnrollingOnboard);
+            } else if (ALWAYS_SHOW_FIND_SCREEN
+                    || mFingerprintManager.getEnrolledFingerprints().size() == 0) {
+                updateStage(Stage.EnrollingFindSensor);
+            } else {
+                updateStage(Stage.EnrollingStart);
+            }
+            return mContentView;
+        }
+
+        @Override
+        public void onSaveInstanceState(final Bundle outState) {
+            super.onSaveInstanceState(outState);
+            outState.putString(EXTRA_STAGE, mStage.toString());
+            outState.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
+                    mToken);
+            if (mStage == Stage.EnrollingRepeat) {
+                outState.putInt(EXTRA_PROGRESS, mProgressBar.getProgress());
+            }
+        }
+
+        @Override
+        public void onActivityCreated(Bundle savedInstanceState) {
+            super.onActivityCreated(savedInstanceState);
+            if (savedInstanceState != null) {
+                mToken = savedInstanceState.getByteArray(
+                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+                //probably orientation change
+                String stageSaved = savedInstanceState.getString(EXTRA_STAGE, null);
+                if (stageSaved != null) {
+                    Stage stage = Stage.valueOf(stageSaved);
+                    updateStage(stage);
+                    if (stage == Stage.EnrollingRepeat) {
+                        mProgressBar.setProgress(savedInstanceState.getInt(EXTRA_PROGRESS));
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            switch(v.getId()) {
+                case R.id.fingerprint_enroll_button_add:
+                    updateStage(Stage.EnrollingStart);
+                    break;
+                case R.id.fingerprint_enroll_button_next:
+                    if (mStage == Stage.EnrollingOnboard) {
+                        launchChooseOrConfirmLock();
+                    } else if (mStage == Stage.EnrollingFindSensor) {
+                        updateStage(Stage.EnrollingStart);
+                    } else if (mStage == Stage.EnrollingFinish) {
+                        getActivity().finish();
+                    } else {
+                        Log.v(TAG, "No idea what to do next!");
+                    }
+                    break;
+            }
+        }
+
+        private void launchChooseOrConfirmLock() {
+            Intent intent = new Intent();
+            long challenge = mFingerprintManager.preEnroll();
+            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
+            if (!helper.launchConfirmationActivity(CONFIRM_REQUEST, null,
+                        null, null, challenge)) {
+                intent.setClassName("com.android.settings", ChooseLockGeneric.class.getName());
+                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+                startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/FingerprintSettings.java b/src/com/android/settings/FingerprintSettings.java
new file mode 100644
index 0000000..00f4b43
--- /dev/null
+++ b/src/com/android/settings/FingerprintSettings.java
@@ -0,0 +1,489 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.CancellationSignal;
+import android.os.Handler;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.hardware.fingerprint.Fingerprint;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintManager.AuthenticationCallback;
+import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
+import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.search.Indexable;
+
+import java.util.List;
+
+/**
+ * Settings screen for fingerprints
+ */
+public class FingerprintSettings extends SettingsActivity {
+    /**
+     * Used by the FP settings wizard to indicate the wizard is
+     * finished, and each activity in the wizard should finish.
+     * <p>
+     * Previously, each activity in the wizard would finish itself after
+     * starting the next activity. However, this leads to broken 'Back'
+     * behavior. So, now an activity does not finish itself until it gets this
+     * result.
+     */
+    static final int RESULT_FINISHED = RESULT_FIRST_USER;
+
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, FingerprintSettingsFragment.class.getName());
+        return modIntent;
+    }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (FingerprintSettingsFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        CharSequence msg = getText(R.string.security_settings_fingerprint_preference_title);
+        setTitle(msg);
+    }
+
+    public static class FingerprintSettingsFragment extends SettingsPreferenceFragment
+        implements OnPreferenceChangeListener, Indexable {
+        private static final int MAX_RETRY_ATTEMPTS = 5;
+        private static final String TAG = "FingerprintSettings";
+        private static final String KEY_FINGERPRINT_ITEM_PREFIX = "key_fingerprint_item";
+        private static final String KEY_USAGE_CATEGORY = "fingerprint_usage_category";
+        private static final String KEY_FINGERPRINT_ADD = "key_fingerprint_add";
+        private static final String KEY_MANAGE_CATEGORY = "fingerprint_manage_category";
+        private static final String KEY_FINGERPRINT_ENABLE_KEYGUARD_TOGGLE =
+                "fingerprint_enable_keyguard_toggle";
+        private static final String KEY_LAUNCHED_CONFIRM = "launched_confirm";
+
+        private static final int MSG_REFRESH_FINGERPRINT_TEMPLATES = 1000;
+        private static final int MSG_HIGHLIGHT_FINGERPRINT_ITEM = 1001;
+
+        private static final int CONFIRM_REQUEST = 101;
+        private static final int CHOOSE_LOCK_GENERIC_REQUEST = 102;
+
+        private static final int ADD_FINGERPRINT_REQUEST = 10;
+
+        private static final boolean ENABLE_USAGE_CATEGORY = false;
+        protected static final boolean DEBUG = true;
+
+        private FingerprintManager mFingerprintManager;
+        private EditText mDialogTextField;
+        private PreferenceGroup mManageCategory;
+        private CancellationSignal mFingerprintCancel;
+        private int mMaxFingerprintAttempts;
+        private byte[] mToken;
+        private boolean mLaunchedConfirm;
+
+        private AuthenticationCallback mAuthCallback = new AuthenticationCallback() {
+            @Override
+            public void onAuthenticationSucceeded(AuthenticationResult result) {
+                mHandler.obtainMessage(MSG_HIGHLIGHT_FINGERPRINT_ITEM,
+                        result.getFingerprint().getFingerId(), 0).sendToTarget();
+                retryFingerprint(true);
+            }
+
+            public void onAuthenticationFailed() {
+                retryFingerprint(true);
+            };
+
+            @Override
+            public void onAuthenticationError(int errMsgId, CharSequence errString) {
+                // get activity will be null on a screen rotation
+                if (getActivity() != null) {
+                    Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
+                    if (errMsgId != FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
+                        retryFingerprint(false);
+                    }
+                }
+            }
+
+            @Override
+            public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
+                Toast.makeText(getActivity(), helpString, Toast.LENGTH_SHORT);
+            }
+        };
+        private RemovalCallback mRemoveCallback = new RemovalCallback() {
+
+            @Override
+            public void onRemovalSucceeded(Fingerprint fingerprint) {
+                mHandler.obtainMessage(MSG_REFRESH_FINGERPRINT_TEMPLATES,
+                        fingerprint.getFingerId(), 0).sendToTarget();
+            }
+
+            @Override
+            public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
+                Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
+            }
+        };
+        private final Handler mHandler = new Handler() {
+            public void handleMessage(android.os.Message msg) {
+                switch (msg.what) {
+                    case MSG_REFRESH_FINGERPRINT_TEMPLATES:
+                        removeFingerprintPreference(msg.arg1);
+                    break;
+                    case MSG_HIGHLIGHT_FINGERPRINT_ITEM:
+                        highlightFingerprintItem(msg.arg1);
+                    break;
+                }
+            };
+        };
+
+        private void stopFingerprint() {
+            if (mFingerprintCancel != null) {
+                mFingerprintCancel.cancel();
+                mFingerprintCancel = null;
+            }
+        }
+
+        private void retryFingerprint(boolean resetAttempts) {
+            if (resetAttempts) {
+                mMaxFingerprintAttempts = 0;
+            }
+            if (mMaxFingerprintAttempts < MAX_RETRY_ATTEMPTS) {
+                mFingerprintCancel = new CancellationSignal();
+                mFingerprintManager.authenticate(null, mFingerprintCancel, mAuthCallback, 0);
+            }
+            mMaxFingerprintAttempts++;
+        }
+
+        @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.FINGERPRINT;
+        }
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            if (savedInstanceState != null) {
+                mToken = savedInstanceState.getByteArray(
+                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+                mLaunchedConfirm = savedInstanceState.getBoolean(
+                        KEY_LAUNCHED_CONFIRM, false);
+            }
+
+            mFingerprintManager = (FingerprintManager) getActivity().getSystemService(
+                    Context.FINGERPRINT_SERVICE);
+
+            // Need to authenticate a session token if none
+            if (mToken == null && mLaunchedConfirm == false) {
+                mLaunchedConfirm = true;
+                launchChooseOrConfirmLock();
+            }
+        }
+
+        protected void removeFingerprintPreference(int fingerprintId) {
+            String name = genKey(fingerprintId);
+            Preference prefToRemove = mManageCategory.findPreference(name);
+            if (prefToRemove != null) {
+                if (!mManageCategory.removePreference(prefToRemove)) {
+                    Log.w(TAG, "Failed to remove preference with key " + name);
+                }
+            } else {
+                Log.w(TAG, "Can't find preference to remove: " + name);
+            }
+        }
+
+        private void highlightFingerprintItem(int fpId) {
+            String prefName = genKey(fpId);
+            Preference pref = mManageCategory.findPreference(prefName);
+            if (pref instanceof FingerprintPreference) {
+                final FingerprintPreference fpref = (FingerprintPreference) pref;
+                fpref.highlight();
+            } else {
+                Log.w(TAG, "Wrong pref " + (pref != null ? pref.getKey() : "null"));
+            }
+        }
+
+        /**
+         * 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_fingerprint);
+            root = getPreferenceScreen();
+
+            // Fingerprint items
+            mManageCategory = (PreferenceGroup) root.findPreference(KEY_MANAGE_CATEGORY);
+            if (mManageCategory != null) {
+                addFingerprintItemPreferences(mManageCategory);
+            }
+
+            // Fingerprint usage options
+            PreferenceGroup usageCategory = (PreferenceGroup) root.findPreference(
+                    KEY_USAGE_CATEGORY);
+            if (usageCategory != null) {
+                Preference toggle = root.findPreference(KEY_FINGERPRINT_ENABLE_KEYGUARD_TOGGLE);
+                toggle.setOnPreferenceChangeListener(this);
+                if (!ENABLE_USAGE_CATEGORY) {
+                    root.removePreference(usageCategory);
+                } else {
+                    toggle.setOnPreferenceChangeListener(this);
+                }
+            }
+
+            return root;
+        }
+
+        private void addFingerprintItemPreferences(PreferenceGroup manageFingerprintCategory) {
+            manageFingerprintCategory.removeAll();
+            final List<Fingerprint> items = mFingerprintManager.getEnrolledFingerprints();
+            final int fingerprintCount = items.size();
+            for (int i = 0; i < fingerprintCount; i++) {
+                final Fingerprint item = items.get(i);
+                FingerprintPreference pref = new FingerprintPreference(
+                        manageFingerprintCategory.getContext());
+                pref.setKey(genKey(item.getFingerId()));
+                pref.setTitle(item.getName());
+                pref.setFingerprint(item);
+                pref.setPersistent(false);
+                manageFingerprintCategory.addPreference(pref);
+                pref.setOnPreferenceChangeListener(this);
+            }
+            Preference addPreference = new Preference(manageFingerprintCategory.getContext());
+            addPreference.setKey(KEY_FINGERPRINT_ADD);
+            addPreference.setTitle(R.string.fingerprint_add_title);
+            manageFingerprintCategory.addPreference(addPreference);
+            addPreference.setOnPreferenceChangeListener(this);
+        }
+
+        private static String genKey(int id) {
+            return KEY_FINGERPRINT_ITEM_PREFIX + "_" + id;
+        }
+
+        @Override
+        public void onResume() {
+            super.onResume();
+            // Make sure we reload the preference hierarchy since fingerprints may be added,
+            // deleted or renamed.
+            createPreferenceHierarchy();
+
+            retryFingerprint(true);
+        }
+
+        @Override
+        public void onPause() {
+            super.onPause();
+            stopFingerprint();
+        }
+
+        @Override
+        public void onSaveInstanceState(final Bundle outState) {
+            outState.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
+                    mToken);
+            outState.putBoolean(KEY_LAUNCHED_CONFIRM, mLaunchedConfirm);
+        }
+
+        @Override
+        public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference pref) {
+            final String key = pref.getKey();
+            if (KEY_FINGERPRINT_ADD.equals(key)) {
+                Intent intent = new Intent();
+                intent.setClassName("com.android.settings", FingerprintEnroll.class.getName());
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
+                stopFingerprint();
+                startActivityForResult(intent, ADD_FINGERPRINT_REQUEST);
+            } else if (pref instanceof FingerprintPreference) {
+                FingerprintPreference fpref = (FingerprintPreference) pref;
+                final Fingerprint fp =fpref.getFingerprint();
+                showRenameDeleteDialog(pref, fp);
+                return super.onPreferenceTreeClick(preferenceScreen, pref);
+            }
+            return true;
+        }
+
+        private void showRenameDeleteDialog(Preference pref, final Fingerprint fp) {
+            final Activity activity = getActivity();
+            AlertDialog dialog = new AlertDialog.Builder(activity)
+                    .setView(R.layout.fingerprint_rename_dialog)
+                    .setPositiveButton(R.string.security_settings_fingerprint_enroll_dialog_ok,
+                            new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    final String newName = mDialogTextField.getText().toString();
+                                    final CharSequence name = fp.getName();
+                                    if (!newName.equals(name)) {
+                                        if (DEBUG) Log.v(TAG, "rename " + name + " to " + newName);
+                                        mFingerprintManager.rename(fp.getFingerId(), newName);
+                                    }
+                                    dialog.dismiss();
+                                }
+                            })
+                    .setNegativeButton(R.string.security_settings_fingerprint_enroll_dialog_delete,
+                            new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    if (DEBUG) Log.v(TAG, "Removing fpId=" + fp.getFingerId());
+                                    mFingerprintManager.remove(fp, mRemoveCallback);
+                                    dialog.dismiss();
+                                }
+                            })
+                    .create();
+            dialog.show();
+            mDialogTextField = (EditText) dialog.findViewById(R.id.fingerprint_rename_field);
+            mDialogTextField.setText(fp.getName());
+            mDialogTextField.selectAll();
+        }
+
+        @Override
+        public boolean onPreferenceChange(Preference preference, Object value) {
+            boolean result = true;
+            final String key = preference.getKey();
+            if (KEY_FINGERPRINT_ENABLE_KEYGUARD_TOGGLE.equals(key)) {
+                // TODO
+            } else {
+                Log.v(TAG, "Unknown key:" + key);
+            }
+            return result;
+        }
+
+        @Override
+        protected int getHelpResource() {
+            return R.string.help_url_security;
+        }
+
+        @Override
+        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+            super.onActivityResult(requestCode, resultCode, data);
+            if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST
+                    || requestCode == CONFIRM_REQUEST) {
+                if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
+                    // The lock pin/pattern/password was set. Start enrolling!
+                    if (data != null) {
+                        mToken = data.getByteArrayExtra(
+                                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+                    }
+                }
+            }
+
+            if (mToken == null) {
+                // Didn't get an authentication, finishing
+                getActivity().finish();
+            }
+        }
+
+        private void launchChooseOrConfirmLock() {
+            Intent intent = new Intent();
+            long challenge = mFingerprintManager.preEnroll();
+            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
+            // TODO: update text or remove params from method
+            if (!helper.launchConfirmationActivity(CONFIRM_REQUEST, null,
+                        null, null, challenge)) {
+                intent.setClassName("com.android.settings", ChooseLockGeneric.class.getName());
+                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+                startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);
+            }
+        }
+    }
+
+    public static class FingerprintPreference extends Preference {
+        private static final int RESET_HIGHLIGHT_DELAY_MS = 500;
+        private Fingerprint mFingerprint;
+        private View mView;
+        private Drawable mHighlightDrawable;
+        private Context mContext;
+
+        public FingerprintPreference(Context context, AttributeSet attrs, int defStyleAttr,
+                int defStyleRes) {
+            super(context, attrs, defStyleAttr, defStyleRes);
+            mContext = context;
+        }
+        public FingerprintPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+            this(context, attrs, defStyleAttr, 0);
+        }
+
+        public FingerprintPreference(Context context, AttributeSet attrs) {
+            this(context, attrs, com.android.internal.R.attr.preferenceStyle);
+        }
+
+        public FingerprintPreference(Context context) {
+            this(context, null);
+        }
+
+        public void setFingerprint(Fingerprint item) {
+            mFingerprint = item;
+        }
+
+        public Fingerprint getFingerprint() {
+            return mFingerprint;
+        }
+
+        private Drawable getHighlightDrawable() {
+            if (mHighlightDrawable == null) {
+                mHighlightDrawable = mContext.getDrawable(R.drawable.preference_highlight);
+            }
+            return mHighlightDrawable;
+        }
+
+        public void highlight() {
+            Drawable highlight = getHighlightDrawable();
+            final View view = mView;
+            view.setBackground(highlight);
+            final int centerX = view.getWidth() / 2;
+            final int centerY = view.getHeight() / 2;
+            highlight.setHotspot(centerX, centerY);
+            view.setPressed(true);
+            view.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    view.setPressed(false);
+                    view.setBackground(null);
+                }
+            }, RESET_HIGHLIGHT_DELAY_MS);
+        }
+
+        @Override
+        protected void onBindView(View view) {
+            super.onBindView(view);
+            mView = view;
+        }
+    };
+}
diff --git a/src/com/android/settings/FingerprintUiHelper.java b/src/com/android/settings/FingerprintUiHelper.java
new file mode 100644
index 0000000..f4a0275
--- /dev/null
+++ b/src/com/android/settings/FingerprintUiHelper.java
@@ -0,0 +1,121 @@
+/*
+ * 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.hardware.fingerprint.FingerprintManager;
+import android.os.CancellationSignal;
+import android.os.Vibrator;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+/**
+ * Small helper class to manage text/icon around fingerprint authentication UI.
+ */
+public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallback {
+
+    private static final long ERROR_TIMEOUT = 1300;
+    private static final long[] FP_ERROR_VIBRATE_PATTERN = new long[] {0, 30, 100, 30};
+    private static final long[] FP_SUCCESS_VIBRATE_PATTERN = new long[] {0, 30};
+
+    private ImageView mIcon;
+    private TextView mErrorTextView;
+    private CancellationSignal mCancellationSignal;
+
+    private Callback mCallback;
+    private FingerprintManager mFingerprintManager;
+
+    public FingerprintUiHelper(ImageView icon, TextView errorTextView, Callback callback) {
+        mFingerprintManager = icon.getContext().getSystemService(FingerprintManager.class);
+        mIcon = icon;
+        mErrorTextView = errorTextView;
+        mCallback = callback;
+    }
+
+    public void startListening() {
+        if (mFingerprintManager.getEnrolledFingerprints().size() > 0) {
+            mCancellationSignal = new CancellationSignal();
+            mFingerprintManager.authenticate(null, mCancellationSignal, this, 0 /* flags */);
+            setFingerprintIconVisibility(true);
+            mIcon.setImageResource(R.drawable.ic_fingerprint);
+        }
+    }
+
+    public void stopListening() {
+        if (mCancellationSignal != null) {
+            mCancellationSignal.cancel();
+            mCancellationSignal = null;
+        }
+    }
+
+    private void setFingerprintIconVisibility(boolean visible) {
+        mIcon.setVisibility(visible ? View.VISIBLE : View.GONE);
+        mCallback.onFingerprintIconVisibilityChanged(visible);
+    }
+
+    @Override
+    public void onAuthenticationError(int errMsgId, CharSequence errString) {
+        showError(errString);
+        setFingerprintIconVisibility(false);
+    }
+
+    @Override
+    public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
+        showError(helpString);
+    }
+
+    @Override
+    public void onAuthenticationFailed() {
+        showError(mIcon.getResources().getString(
+                R.string.fingerprint_not_recognized));
+    }
+
+    @Override
+    public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+        vibrateFingerprintSuccess();
+        mCallback.onAuthenticated();
+    }
+
+    private void showError(CharSequence error) {
+        vibrateFingerprintError();
+        mIcon.setImageResource(R.drawable.ic_fingerprint_error);
+        mErrorTextView.setText(error);
+        mErrorTextView.removeCallbacks(mResetErrorTextRunnable);
+        mErrorTextView.postDelayed(mResetErrorTextRunnable, ERROR_TIMEOUT);
+    }
+
+    private void vibrateFingerprintError() {
+        mIcon.getContext().getSystemService(Vibrator.class).vibrate(FP_ERROR_VIBRATE_PATTERN, -1);
+    }
+
+    private void vibrateFingerprintSuccess() {
+        mIcon.getContext().getSystemService(Vibrator.class).vibrate(FP_SUCCESS_VIBRATE_PATTERN, -1);
+    }
+
+    private Runnable mResetErrorTextRunnable = new Runnable() {
+        @Override
+        public void run() {
+            mErrorTextView.setText("");
+            mIcon.setImageResource(R.drawable.ic_fingerprint);
+        }
+    };
+
+    public interface Callback {
+        void onAuthenticated();
+        void onFingerprintIconVisibilityChanged(boolean visible);
+    }
+}
diff --git a/src/com/android/settings/HelpUtils.java b/src/com/android/settings/HelpUtils.java
index 22e2f76..36fb194 100644
--- a/src/com/android/settings/HelpUtils.java
+++ b/src/com/android/settings/HelpUtils.java
@@ -24,8 +24,10 @@
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Menu;
 import android.view.MenuItem;
 
+import java.net.URISyntaxException;
 import java.util.Locale;
 
 /**
@@ -33,7 +35,9 @@
  * browser to a particular URL, while taking into account the preferred language and app version.
  */
 public class HelpUtils {
-    private final static String TAG = HelpUtils.class.getName();
+    private final static String TAG = HelpUtils.class.getSimpleName();
+
+    private static final int MENU_HELP = Menu.FIRST + 100;
 
     /**
      * Help URL query parameter key for the preferred language.
@@ -53,6 +57,16 @@
     /** Static helper that is not instantiable*/
     private HelpUtils() { }
 
+    public static boolean prepareHelpMenuItem(Context context, Menu menu, String helpUri) {
+        MenuItem helpItem = menu.add(0, MENU_HELP, 0, R.string.help_label);
+        return prepareHelpMenuItem(context, helpItem, helpUri);
+    }
+
+    public static boolean prepareHelpMenuItem(Context context, Menu menu, int helpUriResource) {
+        MenuItem helpItem = menu.add(0, MENU_HELP, 0, R.string.help_label);
+        return prepareHelpMenuItem(context, helpItem, context.getString(helpUriResource));
+    }
+
     /**
      * Prepares the help menu item by doing the following.
      * - If the string corresponding to the helpUrlResourceId is empty or null, then the help menu
@@ -77,22 +91,15 @@
      * @return returns whether the help menu item has been made visible.
      */
     public static boolean prepareHelpMenuItem(Context context, MenuItem helpMenuItem,
-            String helpUrlString) {
-        if (TextUtils.isEmpty(helpUrlString)) {
+            String helpUriString) {
+        if (TextUtils.isEmpty(helpUriString)) {
             // The help url string is empty or null, so set the help menu item to be invisible.
             helpMenuItem.setVisible(false);
 
             // return that the help menu item is not visible (i.e. false)
             return false;
         } else {
-            // The help url string exists, so first add in some extra query parameters.
-            final Uri fullUri = uriWithAddedParameters(context, Uri.parse(helpUrlString));
-
-            // Then, create an intent that will be fired when the user
-            // selects this help menu item.
-            Intent intent = new Intent(Intent.ACTION_VIEW, fullUri);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+            Intent intent = getHelpIntent(context, helpUriString);
 
             // Set the intent to the help menu item, show the help menu item in the overflow
             // menu, and make it visible.
@@ -111,6 +118,24 @@
         }
     }
 
+    private static Intent getHelpIntent(Context context, String helpUriString) {
+        // Try to handle as Intent Uri, otherwise just treat as Uri.
+        try {
+            return Intent.parseUri(helpUriString,
+                    Intent.URI_ANDROID_APP_SCHEME | Intent.URI_INTENT_SCHEME);
+        } catch (URISyntaxException e) {
+        }
+        // The help url string exists, so first add in some extra query parameters.
+        final Uri fullUri = uriWithAddedParameters(context, Uri.parse(helpUriString));
+
+        // Then, create an intent that will be fired when the user
+        // selects this help menu item.
+        Intent intent = new Intent(Intent.ACTION_VIEW, fullUri);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+        return intent;
+    }
+
     /**
      * Adds two query parameters into the Uri, namely the language code and the version code
      * of the app's package as gotten via the context.
diff --git a/src/com/android/settings/HighlightingFragment.java b/src/com/android/settings/HighlightingFragment.java
index 4a233b4..ef2fbf3 100644
--- a/src/com/android/settings/HighlightingFragment.java
+++ b/src/com/android/settings/HighlightingFragment.java
@@ -23,7 +23,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-public class HighlightingFragment extends Fragment {
+public abstract class HighlightingFragment extends InstrumentedFragment {
 
     private static final String TAG = "HighlightSettingsFragment";
 
diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java
index 6da1848..22d4cdc 100644
--- a/src/com/android/settings/HomeSettings.java
+++ b/src/com/android/settings/HomeSettings.java
@@ -51,6 +51,7 @@
 import android.view.View.OnClickListener;
 import android.widget.ImageView;
 import android.widget.RadioButton;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
 import com.android.settings.search.Indexable;
@@ -253,6 +254,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.HOME;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.home_selection);
diff --git a/src/com/android/settings/HotspotOffReceiver.java b/src/com/android/settings/HotspotOffReceiver.java
index 3ab3f9d..06ced1f 100644
--- a/src/com/android/settings/HotspotOffReceiver.java
+++ b/src/com/android/settings/HotspotOffReceiver.java
@@ -6,6 +6,8 @@
 import android.content.Intent;
 import android.net.wifi.WifiManager;
 
+import com.android.settingslib.TetherUtil;
+
 /**
  * This receiver catches when quick settings turns off the hotspot, so we can
  * cancel the alarm in that case.  All other cancels are handled in tethersettings.
@@ -18,7 +20,7 @@
             WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
             if (wifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_DISABLED) {
                 // The hotspot has been turned off, we don't need to recheck tethering.
-                TetherService.cancelRecheckAlarmIfNecessary(context, TetherSettings.WIFI_TETHERING);
+                TetherService.cancelRecheckAlarmIfNecessary(context, TetherUtil.TETHERING_WIFI);
             }
         }
     }
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index c389f5e..168d3c8 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -42,13 +42,11 @@
 import android.widget.TabWidget;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.TelephonyIntents;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Implements the preference screen to enable/disable ICC lock and
  * also the dialogs to change the ICC PIN. In the former case, enabling/disabling
@@ -58,7 +56,7 @@
  * these operations.
  *
  */
-public class IccLockSettings extends PreferenceActivity
+public class IccLockSettings extends InstrumentedPreferenceActivity
         implements EditPinPreference.OnPinEnteredListener {
     private static final String TAG = "IccLockSettings";
     private static final boolean DBG = true;
@@ -214,14 +212,15 @@
             mTabHost.setOnTabChangedListener(mTabListener);
             mTabHost.clearAllTabs();
 
+            SubscriptionManager sm = SubscriptionManager.from(this);
             for (int i = 0; i < numSims; ++i) {
-                final SubscriptionInfo subInfo = Utils.findRecordBySlotId(this, i);
+                final SubscriptionInfo subInfo = sm.getActiveSubscriptionInfoForSimSlotIndex(i);
                 mTabHost.addTab(buildTabSpec(String.valueOf(i),
                         String.valueOf(subInfo == null
                             ? context.getString(R.string.sim_editor_title, i + 1)
                             : subInfo.getDisplayName())));
             }
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(getBaseContext(), 0);
+            final SubscriptionInfo sir = sm.getActiveSubscriptionInfoForSimSlotIndex(0);
 
             mPhone = (sir == null) ? null
                 : PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId()));
@@ -242,6 +241,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ICC_LOCK;
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
 
@@ -473,7 +477,8 @@
         @Override
         public void onTabChanged(String tabId) {
             final int slotId = Integer.parseInt(tabId);
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(getBaseContext(), slotId);
+            final SubscriptionInfo sir = SubscriptionManager.from(getBaseContext())
+                    .getActiveSubscriptionInfoForSimSlotIndex(slotId);
 
             mPhone = (sir == null) ? null
                 : PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId()));
diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java
new file mode 100644
index 0000000..d239d4e
--- /dev/null
+++ b/src/com/android/settings/InstrumentedFragment.java
@@ -0,0 +1,53 @@
+/*
+ * 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.preference.PreferenceFragment;
+import com.android.internal.logging.MetricsLogger;
+
+/**
+ * Instrumented fragment that logs visibility state.
+ */
+public abstract class InstrumentedFragment extends PreferenceFragment {
+    // Declare new temporary categories here, starting after this value.
+    public static final int VIEW_CATEGORY_UNDECLARED = 100000;
+
+    public static final int VIEW_CATEGORY_DEFAULT_APPS = VIEW_CATEGORY_UNDECLARED + 1;
+    public static final int VIEW_CATEGORY_STORAGE_APPS = VIEW_CATEGORY_UNDECLARED + 2;
+    public static final int VIEW_CATEGORY_USAGE_ACCESS_DETAIL = VIEW_CATEGORY_UNDECLARED + 3;
+
+    /**
+     * Declare the view of this category.
+     *
+     * Categories are defined in {@link com.android.internal.logging.MetricsLogger}
+     * or if there is no relevant existing category you may define one in
+     * {@link com.android.settings.InstrumentedFragment}.
+     */
+    protected abstract int getMetricsCategory();
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        MetricsLogger.visible(getActivity(), getMetricsCategory());
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        MetricsLogger.hidden(getActivity(), getMetricsCategory());
+    }
+}
diff --git a/src/com/android/settings/InstrumentedPreferenceActivity.java b/src/com/android/settings/InstrumentedPreferenceActivity.java
new file mode 100644
index 0000000..480d5c7
--- /dev/null
+++ b/src/com/android/settings/InstrumentedPreferenceActivity.java
@@ -0,0 +1,46 @@
+/*
+ * 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.preference.PreferenceActivity;
+import com.android.internal.logging.MetricsLogger;
+
+/**
+ * Instrumented activity that logs visibility state.
+ */
+public abstract class InstrumentedPreferenceActivity extends PreferenceActivity {
+    /**
+     * Declare the view of this category.
+     *
+     * Categories are defined in {@link com.android.internal.logging.MetricsLogger}
+     * or if there is no relevant existing category you may define one in
+     * {@link com.android.settings.InstrumentedFragment}.
+     */
+    protected abstract int getMetricsCategory();
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MetricsLogger.visible(this, getMetricsCategory());
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        MetricsLogger.hidden(this, getMetricsCategory());
+    }
+}
diff --git a/src/com/android/settings/InstrumentedPreferenceFragment.java b/src/com/android/settings/InstrumentedPreferenceFragment.java
new file mode 100644
index 0000000..f56bce0
--- /dev/null
+++ b/src/com/android/settings/InstrumentedPreferenceFragment.java
@@ -0,0 +1,46 @@
+/*
+ * 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.preference.PreferenceFragment;
+import com.android.internal.logging.MetricsLogger;
+
+/**
+ * Instrumented preference fragment that logs visibility state.
+ */
+public abstract class InstrumentedPreferenceFragment extends PreferenceFragment {
+    /**
+     * Declare the view of this category.
+     *
+     * Categories are defined in {@link com.android.internal.logging.MetricsLogger}
+     * or if there is no relevant existing category you may define one in
+     * {@link com.android.settings.InstrumentedFragment}.
+     */
+    protected abstract int getMetricsCategory();
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        MetricsLogger.visible(getActivity(), getMetricsCategory());
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        MetricsLogger.hidden(getActivity(), getMetricsCategory());
+    }
+}
diff --git a/src/com/android/settings/LinkifyUtils.java b/src/com/android/settings/LinkifyUtils.java
new file mode 100644
index 0000000..5550db5
--- /dev/null
+++ b/src/com/android/settings/LinkifyUtils.java
@@ -0,0 +1,84 @@
+/*
+ * 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.text.Spannable;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.TextView.BufferType;
+
+/**
+ * Utility class to create clickable links inside {@link TextView TextViews}.
+ */
+public class LinkifyUtils {
+    private static final String PLACE_HOLDER_LINK_BEGIN = "LINK_BEGIN";
+    private static final String PLACE_HOLDER_LINK_END = "LINK_END";
+
+    private LinkifyUtils() {
+    }
+
+    /** Interface that handles the click event of the link */
+    public interface OnClickListener {
+        void onClick();
+    }
+
+    /**
+     * Applies the text into the {@link TextView} and part of it a clickable link.
+     * The text surrounded with "LINK_BEGIN" and "LINK_END" will become a clickable link. Only
+     * supports at most one link.
+     * @return true if the link has been successfully applied, or false if the original text
+     *         contains no link place holders.
+     */
+    public static boolean linkify(TextView textView, StringBuilder text,
+            final OnClickListener listener) {
+        // Remove place-holders from the string and record their positions
+        final int beginIndex = text.indexOf(PLACE_HOLDER_LINK_BEGIN);
+        if (beginIndex == -1) {
+            textView.setText(text);
+            return false;
+        }
+        text.delete(beginIndex, beginIndex + PLACE_HOLDER_LINK_BEGIN.length());
+        final int endIndex = text.indexOf(PLACE_HOLDER_LINK_END);
+        if (endIndex == -1) {
+            textView.setText(text);
+            return false;
+        }
+        text.delete(endIndex, endIndex + PLACE_HOLDER_LINK_END.length());
+
+        textView.setText(text.toString(), BufferType.SPANNABLE);
+        textView.setMovementMethod(LinkMovementMethod.getInstance());
+        Spannable spannableContent = (Spannable) textView.getText();
+        ClickableSpan spannableLink = new ClickableSpan() {
+            @Override
+            public void onClick(View widget) {
+                listener.onClick();
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setUnderlineText(false);
+            }
+        };
+        spannableContent.setSpan(spannableLink, beginIndex, endIndex,
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java
index c6158b1..7a8f120 100644
--- a/src/com/android/settings/LocalePicker.java
+++ b/src/com/android/settings/LocalePicker.java
@@ -23,11 +23,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
-import android.content.Context;
-
 import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
-import com.android.settings.DevelopmentSettings;
-
 import java.util.Locale;
 
 public class LocalePicker extends com.android.internal.app.LocalePicker
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 2b086a6..23f6812 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -26,7 +26,6 @@
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Environment;
@@ -34,9 +33,7 @@
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.preference.Preference;
 import android.util.Log;
-import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -44,6 +41,7 @@
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.android.internal.logging.MetricsLogger;
 
 import java.util.List;
 
@@ -57,7 +55,7 @@
  *
  * This is the initial screen.
  */
-public class MasterClear extends Fragment {
+public class MasterClear extends InstrumentedFragment {
     private static final String TAG = "MasterClear";
 
     private static final int KEYGUARD_REQUEST = 55;
@@ -77,9 +75,8 @@
      */
     private boolean runKeyguardConfirmation(int request) {
         Resources res = getActivity().getResources();
-        return new ChooseLockSettingsHelper(getActivity(), this)
-                .launchConfirmationActivity(request, null,
-                        res.getText(R.string.master_clear_gesture_explanation));
+        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
+                request, res.getText(R.string.master_clear_title));
     }
 
     @Override
@@ -100,11 +97,10 @@
     }
 
     private void showFinalConfirmation() {
-        Preference preference = new Preference(getActivity());
-        preference.setFragment(MasterClearConfirm.class.getName());
-        preference.setTitle(R.string.master_clear_confirm_title);
-        preference.getExtras().putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
-        ((SettingsActivity) getActivity()).onPreferenceStartFragment(null, preference);
+        Bundle args = new Bundle();
+        args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
+        ((SettingsActivity) getActivity()).startPreferencePanel(MasterClearConfirm.class.getName(),
+                args, R.string.master_clear_confirm_title, null, null, 0);
     }
 
     /**
@@ -209,7 +205,7 @@
                     .getAuthenticatorTypesAsUser(profileId);
             final int M = descs.length;
 
-            View titleView = newTitleView(contents, inflater);
+            View titleView = Utils.inflateCategoryHeader(inflater, contents);
             final TextView titleText = (TextView) titleView.findViewById(android.R.id.title);
             titleText.setText(userInfo.isManagedProfile() ? R.string.category_work
                     : R.string.category_personal);
@@ -276,12 +272,8 @@
         return mContentView;
     }
 
-    private View newTitleView(ViewGroup parent, LayoutInflater inflater) {
-        final TypedArray a = inflater.getContext().obtainStyledAttributes(null,
-                com.android.internal.R.styleable.Preference,
-                com.android.internal.R.attr.preferenceCategoryStyle, 0);
-        final int resId = a.getResourceId(com.android.internal.R.styleable.Preference_layout,
-                0);
-        return inflater.inflate(resId, parent, false);
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.MASTER_CLEAR;
     }
 }
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 3521aa3..bc3656a 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -21,6 +21,7 @@
 import android.content.pm.ActivityInfo;
 import android.os.AsyncTask;
 import android.service.persistentdata.PersistentDataBlockManager;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.os.storage.ExternalStorageFormatter;
 
 import android.app.Fragment;
@@ -42,7 +43,7 @@
  *
  * This is the confirmation screen.
  */
-public class MasterClearConfirm extends Fragment {
+public class MasterClearConfirm extends InstrumentedFragment {
 
     private View mContentView;
     private boolean mEraseSdCard;
@@ -144,4 +145,9 @@
         Bundle args = getArguments();
         mEraseSdCard = args != null && args.getBoolean(MasterClear.ERASE_EXTERNAL_EXTRA);
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.MASTER_CLEAR_CONFIRM;
+    }
 }
diff --git a/src/com/android/settings/MediaFormat.java b/src/com/android/settings/MediaFormat.java
index 20dac8e..517ec2d 100644
--- a/src/com/android/settings/MediaFormat.java
+++ b/src/com/android/settings/MediaFormat.java
@@ -72,9 +72,8 @@
      * component as a subactivity
      */
     private boolean runKeyguardConfirmation(int request) {
-        return new ChooseLockSettingsHelper(this)
-                .launchConfirmationActivity(request, null,
-                        getText(R.string.media_format_gesture_explanation));
+        return new ChooseLockSettingsHelper(this).launchConfirmationActivity(request,
+                getText(R.string.media_format_title));
     }
 
     @Override
diff --git a/src/com/android/settings/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java
index 0761f38..56da637 100644
--- a/src/com/android/settings/OwnerInfoSettings.java
+++ b/src/com/android/settings/OwnerInfoSettings.java
@@ -16,106 +16,105 @@
 
 package com.android.settings;
 
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
 import android.app.Fragment;
-import android.content.ContentResolver;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.Settings;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.EditText;
-import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.TextView;
 
 import com.android.internal.widget.LockPatternUtils;
 
-public class OwnerInfoSettings extends Fragment {
+public class OwnerInfoSettings extends DialogFragment implements OnClickListener {
 
-    public static final String EXTRA_SHOW_NICKNAME = "show_nickname";
+    private static final String TAG_OWNER_INFO = "ownerInfo";
+
+    private static final int MAX_CHARS = 100;
 
     private View mView;
-    private CheckBox mCheckbox;
     private int mUserId;
     private LockPatternUtils mLockPatternUtils;
     private EditText mOwnerInfo;
-    private EditText mNickname;
-    private boolean mShowNickname;
+    private TextView mOwnerInfoStatus;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Bundle args = getArguments();
-        if (args != null && args.containsKey(EXTRA_SHOW_NICKNAME)) {
-            mShowNickname = args.getBoolean(EXTRA_SHOW_NICKNAME);
-        }
+        mUserId = UserHandle.myUserId();
+        mLockPatternUtils = new LockPatternUtils(getActivity());
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        mView = inflater.inflate(R.layout.ownerinfo, container, false);
-        mUserId = UserHandle.myUserId();
-        mLockPatternUtils = new LockPatternUtils(getActivity());
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        mView = LayoutInflater.from(getActivity()).inflate(R.layout.ownerinfo, null);
         initView();
-        return mView;
+        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() {
-        mNickname = (EditText) mView.findViewById(R.id.owner_info_nickname);
-        if (!mShowNickname) {
-            mNickname.setVisibility(View.GONE);
-        } else {
-            mNickname.setText(UserManager.get(getActivity()).getUserName());
-            mNickname.setSelected(true);
-        }
-
-        final boolean enabled = mLockPatternUtils.isOwnerInfoEnabled();
-
-        mCheckbox = (CheckBox) mView.findViewById(R.id.show_owner_info_on_lockscreen_checkbox);
-        mCheckbox.setChecked(enabled);
-        if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
-            if (UserManager.get(getActivity()).isLinkedUser()) {
-                mCheckbox.setText(R.string.show_profile_info_on_lockscreen_label);
-            } else {
-                mCheckbox.setText(R.string.show_user_info_on_lockscreen_label);
-            }
-        }
-        mCheckbox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                mLockPatternUtils.setOwnerInfoEnabled(isChecked);
-                mOwnerInfo.setEnabled(isChecked); // disable text field if not enabled
-            }
-        });
-
         String info = mLockPatternUtils.getOwnerInfo(mUserId);
 
         mOwnerInfo = (EditText) mView.findViewById(R.id.owner_info_edit_text);
-        mOwnerInfo.setEnabled(enabled);
         if (!TextUtils.isEmpty(info)) {
             mOwnerInfo.setText(info);
         }
+        mOwnerInfoStatus = (TextView) mView.findViewById(R.id.owner_info_status);
+        updateOwnerInfoStatus();
+
+        mOwnerInfo.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                updateOwnerInfoStatus();
+            }
+        });
+    }
+
+    private void updateOwnerInfoStatus() {
+        String status = getString(R.string.owner_info_settings_status,
+                mOwnerInfo.getText().toString().length(), MAX_CHARS);
+        mOwnerInfoStatus.setText(status);
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
-        saveChanges();
-    }
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == AlertDialog.BUTTON_POSITIVE) {
+            String info = mOwnerInfo.getText().toString();
+            mLockPatternUtils.setOwnerInfoEnabled(!TextUtils.isEmpty(info));
+            mLockPatternUtils.setOwnerInfo(info, mUserId);
 
-    void saveChanges() {
-        String info = mOwnerInfo.getText().toString();
-        mLockPatternUtils.setOwnerInfo(info, mUserId);
-        if (mShowNickname) {
-            String oldName = UserManager.get(getActivity()).getUserName();
-            CharSequence newName = mNickname.getText();
-            if (!TextUtils.isEmpty(newName) && !newName.equals(oldName)) {
-                UserManager.get(getActivity()).setUserName(UserHandle.myUserId(),
-                        newName.toString());
+            if (getTargetFragment() instanceof SecuritySettings) {
+                ((SecuritySettings) getTargetFragment()).updateOwnerInfo();
             }
         }
     }
+
+    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);
+    }
 }
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 8df78c5..6eb22fb 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -30,7 +30,6 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
-import android.preference.PreferenceCategory;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
@@ -38,12 +37,14 @@
 import android.provider.Settings;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settings.search.Indexable.SearchIndexProvider;
-
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Gesture lock pattern settings.
@@ -53,12 +54,11 @@
 
     // Vendor specific
     private static final String GSETTINGS_PROVIDER = "com.google.settings";
-    private static final String BACKUP_CATEGORY = "backup_category";
     private static final String BACKUP_DATA = "backup_data";
     private static final String AUTO_RESTORE = "auto_restore";
     private static final String CONFIGURE_ACCOUNT = "configure_account";
     private static final String BACKUP_INACTIVE = "backup_inactive";
-    private static final String PERSONAL_DATA_CATEGORY = "personal_data_category";
+    private static final String FACTORY_RESET = "factory_reset";
     private static final String TAG = "PrivacySettings";
     private IBackupManager mBackupManager;
     private SwitchPreference mBackup;
@@ -71,6 +71,11 @@
     private int mDialogType;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.PRIVACY;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         // Don't allow any access if this is a secondary user
@@ -92,7 +97,8 @@
 
         mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT);
 
-        ArrayList<String> keysToRemove = getNonVisibleKeys(getActivity());
+        Set<String> keysToRemove = new HashSet<>();
+        getNonVisibleKeys(getActivity(), keysToRemove);
         final int screenPreferenceCount = screen.getPreferenceCount();
         for (int i = screenPreferenceCount - 1; i >= 0; --i) {
             Preference preference = screen.getPreference(i);
@@ -100,16 +106,7 @@
                 screen.removePreference(preference);
             }
         }
-        PreferenceCategory backupCategory = (PreferenceCategory) findPreference(BACKUP_CATEGORY);
-        if (backupCategory != null) {
-            final int backupCategoryPreferenceCount = backupCategory.getPreferenceCount();
-            for (int i = backupCategoryPreferenceCount - 1; i >= 0; --i) {
-                Preference preference = backupCategory.getPreference(i);
-                if (keysToRemove.contains(preference.getKey())) {
-                    backupCategory.removePreference(preference);
-                }
-            }
-        }
+
         updateToggles();
     }
 
@@ -207,7 +204,7 @@
         if (summary != null) {
             mConfigure.setSummary(summary);
         } else {
-            mConfigure.setSummary(R.string.backup_configure_account_default_summary);
+            //mConfigure.setSummary(R.string.backup_configure_account_default_summary);
         }
     }
 
@@ -300,12 +297,13 @@
 
         @Override
         public List<String> getNonIndexableKeys(Context context) {
-            return getNonVisibleKeys(context);
+            final List<String> nonVisibleKeys = new ArrayList<>();
+            getNonVisibleKeys(context, nonVisibleKeys);
+            return nonVisibleKeys;
         }
     }
 
-    private static ArrayList<String> getNonVisibleKeys(Context context) {
-        final ArrayList<String> nonVisibleKeys = new ArrayList<String>();
+    private static void getNonVisibleKeys(Context context, Collection<String> nonVisibleKeys) {
         final IBackupManager backupManager = IBackupManager.Stub.asInterface(
                 ServiceManager.getService(Context.BACKUP_SERVICE));
         boolean isServiceActive = false;
@@ -315,22 +313,19 @@
             Log.w(TAG, "Failed querying backup manager service activity status. " +
                     "Assuming it is inactive.");
         }
-        if (isServiceActive) {
+        boolean vendorSpecific = context.getPackageManager().
+                resolveContentProvider(GSETTINGS_PROVIDER, 0) == null;
+        if (vendorSpecific || isServiceActive) {
             nonVisibleKeys.add(BACKUP_INACTIVE);
-        } else {
+        }
+        if (vendorSpecific || !isServiceActive) {
+            nonVisibleKeys.add(BACKUP_DATA);
             nonVisibleKeys.add(AUTO_RESTORE);
             nonVisibleKeys.add(CONFIGURE_ACCOUNT);
-            nonVisibleKeys.add(BACKUP_DATA);
         }
         if (UserManager.get(context).hasUserRestriction(
                 UserManager.DISALLOW_FACTORY_RESET)) {
-            nonVisibleKeys.add(PERSONAL_DATA_CATEGORY);
+            nonVisibleKeys.add(FACTORY_RESET);
         }
-        // Vendor specific
-        if (context.getPackageManager().
-                resolveContentProvider(GSETTINGS_PROVIDER, 0) == null) {
-            nonVisibleKeys.add(BACKUP_CATEGORY);
-        }
-        return nonVisibleKeys;
     }
 }
diff --git a/src/com/android/settings/ProfileSelectDialog.java b/src/com/android/settings/ProfileSelectDialog.java
new file mode 100644
index 0000000..99f962f
--- /dev/null
+++ b/src/com/android/settings/ProfileSelectDialog.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;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.settings.dashboard.DashboardTile;
+
+public class ProfileSelectDialog extends DialogFragment implements OnClickListener {
+
+    private static final String ARG_SELECTED_TILE = "selectedTile";
+
+    private DashboardTile mSelectedTile;
+
+    public static void show(FragmentManager manager, DashboardTile tile) {
+        ProfileSelectDialog dialog = new ProfileSelectDialog();
+        Bundle args = new Bundle();
+        args.putParcelable(ARG_SELECTED_TILE, tile);
+        dialog.setArguments(args);
+        dialog.show(manager, "select_profile");
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mSelectedTile = getArguments().getParcelable(ARG_SELECTED_TILE);
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Context context = getActivity();
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        UserAdapter adapter = Utils.createUserAdapter(UserManager.get(context), context,
+                mSelectedTile.userHandle);
+        builder.setTitle(R.string.choose_profile)
+                .setAdapter(adapter, this);
+
+        return builder.create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        UserHandle user = mSelectedTile.userHandle.get(which);
+        getActivity().startActivityAsUser(mSelectedTile.intent, user);
+    }
+}
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index 6941271..7e83f66 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
 
 import android.app.Activity;
@@ -23,14 +24,12 @@
 import android.app.Dialog;
 import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.Proxy;
 import android.net.ProxyInfo;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.text.Selection;
 import android.text.Spannable;
 import android.text.TextUtils;
@@ -44,9 +43,7 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
-import java.net.InetSocketAddress;
-
-public class ProxySelector extends Fragment implements DialogCreatable {
+public class ProxySelector extends InstrumentedFragment implements DialogCreatable {
     private static final String TAG = "ProxySelector";
 
     EditText    mHostnameField;
@@ -274,4 +271,9 @@
                 }
             }
         };
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.PROXY_SELECTOR;
+    }
 }
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index a296564..fa98bac 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -18,7 +18,6 @@
 
 import android.app.Activity;
 import android.app.QueuedWork;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -59,10 +58,8 @@
 import com.android.ims.ImsConfig;
 import com.android.ims.ImsException;
 import com.android.ims.ImsManager;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
+import java.net.HttpURLConnection;
+import java.net.URL;
 
 import java.io.IOException;
 import java.net.UnknownHostException;
@@ -754,18 +751,22 @@
      * This function checks for basic functionality of HTTP Client.
      */
     private void httpClientTest() {
-        HttpClient client = new DefaultHttpClient();
+        HttpURLConnection urlConnection = null;
         try {
-            HttpGet request = new HttpGet("http://www.google.com");
-            HttpResponse response = client.execute(request);
-            if (response.getStatusLine().getStatusCode() == 200) {
+            // TODO: Hardcoded for now, make it UI configurable
+            URL url = new URL("https://www.google.com");
+            urlConnection = (HttpURLConnection) url.openConnection();
+            if (urlConnection.getResponseCode() == 200) {
                 mHttpClientTestResult = "Pass";
             } else {
-                mHttpClientTestResult = "Fail: Code: " + String.valueOf(response);
+                mHttpClientTestResult = "Fail: Code: " + urlConnection.getResponseMessage();
             }
-            request.abort();
         } catch (IOException e) {
             mHttpClientTestResult = "Fail: IOException";
+        } finally {
+            if (urlConnection != null) {
+                urlConnection.disconnect();
+            }
         }
     }
 
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
new file mode 100644
index 0000000..587b8e8
--- /dev/null
+++ b/src/com/android/settings/ResetNetwork.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.SystemProperties;
+import android.os.UserManager;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.telephony.PhoneConstants;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Confirm and execute a reset of the device's network settings to a clean "just out of the box"
+ * state.  Multiple confirmations are required: first, a general "are you sure you want to do this?"
+ * prompt, followed by a keyguard pattern trace if the user has defined one, followed by a final
+ * strongly-worded "THIS WILL RESET EVERYTHING" prompt.  If at any time the phone is allowed to go
+ * to sleep, is locked, et cetera, then the confirmation sequence is abandoned.
+ *
+ * This is the initial screen.
+ */
+public class ResetNetwork extends InstrumentedFragment {
+    private static final String TAG = "ResetNetwork";
+
+    // Arbitrary to avoid conficts
+    private static final int KEYGUARD_REQUEST = 55;
+
+    private List<SubscriptionInfo> mSubscriptions;
+
+    private View mContentView;
+    private Spinner mSubscriptionSpinner;
+    private Button mInitiateButton;
+
+    /**
+     * 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();
+        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
+                request, res.getText(R.string.reset_network_title));
+    }
+
+    @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) {
+            showFinalConfirmation();
+        } else {
+            establishInitialState();
+        }
+    }
+
+    private void showFinalConfirmation() {
+        Bundle args = new Bundle();
+        if (mSubscriptions != null && mSubscriptions.size() > 0) {
+            int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition();
+            SubscriptionInfo subscription = mSubscriptions.get(selectedIndex);
+            args.putInt(PhoneConstants.SUBSCRIPTION_KEY, subscription.getSubscriptionId());
+        }
+        ((SettingsActivity) getActivity()).startPreferencePanel(ResetNetworkConfirm.class.getName(),
+                args, R.string.reset_network_confirm_title, null, null, 0);
+    }
+
+    /**
+     * If the user clicks to begin the reset sequence, we next require a
+     * keyguard confirmation if the user has currently enabled one.  If there
+     * is no keyguard available, we simply go to the final confirmation prompt.
+     */
+    private final Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
+
+        @Override
+        public void onClick(View v) {
+            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+                showFinalConfirmation();
+            }
+        }
+    };
+
+    /**
+     * In its initial state, the activity presents a button for the user to
+     * click in order to initiate a confirmation sequence.  This method is
+     * called from various other points in the code to reset the activity to
+     * this base state.
+     *
+     * <p>Reinflating views from resources is expensive and prevents us from
+     * caching widget pointers, so we use a single-inflate pattern:  we lazy-
+     * inflate each view, caching all of the widget pointers we'll need at the
+     * time, then simply reuse the inflated views directly whenever we need
+     * to change contents.
+     */
+    private void establishInitialState() {
+        mSubscriptionSpinner = (Spinner) mContentView.findViewById(R.id.reset_network_subscription);
+
+        mSubscriptions = SubscriptionManager.from(getActivity()).getActiveSubscriptionInfoList();
+        if (mSubscriptions != null && mSubscriptions.size() > 0) {
+            // Get the default subscription in the order of data, voice, sms, first up.
+            int defaultSubscription = SubscriptionManager.getDefaultDataSubId();
+            if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
+                defaultSubscription = SubscriptionManager.getDefaultVoiceSubId();
+            }
+            if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
+                defaultSubscription = SubscriptionManager.getDefaultSmsSubId();
+            }
+            if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
+                defaultSubscription = SubscriptionManager.getDefaultSubId();
+            }
+
+            int selectedIndex = 0;
+            int size = mSubscriptions.size();
+            List<String> subscriptionNames = new ArrayList<>();
+            for (SubscriptionInfo record : mSubscriptions) {
+                if (record.getSubscriptionId() == defaultSubscription) {
+                    // Set the first selected value to the default
+                    selectedIndex = subscriptionNames.size();
+                }
+                String name = record.getDisplayName().toString();
+                if (TextUtils.isEmpty(name)) {
+                    name = record.getNumber();
+                }
+                if (TextUtils.isEmpty(name)) {
+                    name = record.getCarrierName().toString();
+                }
+                if (TextUtils.isEmpty(name)) {
+                    name = String.format("MCC:%s MNC:%s Slot:%s Id:%s", record.getMcc(),
+                            record.getMnc(), record.getSimSlotIndex(), record.getSubscriptionId());
+                }
+                subscriptionNames.add(name);
+            }
+            ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(),
+                    android.R.layout.simple_spinner_item, subscriptionNames);
+            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+            mSubscriptionSpinner.setAdapter(adapter);
+            mSubscriptionSpinner.setSelection(selectedIndex);
+            mSubscriptionSpinner.setVisibility(View.VISIBLE);
+        } else {
+            mSubscriptionSpinner.setVisibility(View.INVISIBLE);
+        }
+        mInitiateButton = (Button) mContentView.findViewById(R.id.initiate_reset_network);
+        mInitiateButton.setOnClickListener(mInitiateListener);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mContentView = inflater.inflate(R.layout.reset_network, null);
+
+        establishInitialState();
+        return mContentView;
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.RESET_NETWORK;
+    }
+}
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
new file mode 100644
index 0000000..f67467b
--- /dev/null
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkPolicyManager;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Spinner;
+import android.widget.Toast;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.telephony.PhoneConstants;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Confirm and execute a reset of the network settings to a clean "just out of the box"
+ * state.  Multiple confirmations are required: first, a general "are you sure
+ * you want to do this?" prompt, followed by a keyguard pattern trace if the user
+ * has defined one, followed by a final strongly-worded "THIS WILL RESET EVERYTHING"
+ * prompt.  If at any time the phone is allowed to go to sleep, is
+ * locked, et cetera, then the confirmation sequence is abandoned.
+ *
+ * This is the confirmation screen.
+ */
+public class ResetNetworkConfirm extends InstrumentedFragment {
+
+    private View mContentView;
+    private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+
+    /**
+     * The user has gone through the multiple confirmation, so now we go ahead
+     * and reset the network settings to its factory-default state.
+     */
+    private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
+
+        @Override
+        public void onClick(View v) {
+            if (Utils.isMonkeyRunning()) {
+                return;
+            }
+            // TODO maybe show a progress dialog if this ends up taking a while
+            Context context = getActivity();
+
+            ConnectivityManager connectivityManager = (ConnectivityManager)
+                    context.getSystemService(Context.CONNECTIVITY_SERVICE);
+            if (connectivityManager != null) {
+                connectivityManager.factoryReset();
+            }
+
+            WifiManager wifiManager = (WifiManager)
+                    context.getSystemService(Context.WIFI_SERVICE);
+            if (wifiManager != null) {
+                wifiManager.factoryReset();
+            }
+
+            TelephonyManager telephonyManager = (TelephonyManager)
+                    context.getSystemService(Context.TELEPHONY_SERVICE);
+            if (telephonyManager != null) {
+                telephonyManager.factoryReset(mSubId);
+            }
+
+            NetworkPolicyManager policyManager = (NetworkPolicyManager)
+                    context.getSystemService(Context.NETWORK_POLICY_SERVICE);
+            if (policyManager != null) {
+                String subscriberId = telephonyManager.getSubscriberId(mSubId);
+                policyManager.factoryReset(subscriberId);
+            }
+
+            Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
+                    .show();
+        }
+    };
+
+    /**
+     * Configure the UI for the final confirmation interaction
+     */
+    private void establishFinalConfirmationState() {
+        mContentView.findViewById(R.id.execute_reset_network)
+                .setOnClickListener(mFinalClickListener);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mContentView = inflater.inflate(R.layout.reset_network_confirm, null);
+        establishFinalConfirmationState();
+        return mContentView;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Bundle args = getArguments();
+        if (args != null) {
+            mSubId = args.getInt(PhoneConstants.SUBSCRIPTION_KEY,
+                    SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        }
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.RESET_NETWORK_CONFIRM;
+    }
+}
diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
index 64e1e3f..c78d6e2 100644
--- a/src/com/android/settings/RestrictedSettingsFragment.java
+++ b/src/com/android/settings/RestrictedSettingsFragment.java
@@ -37,7 +37,7 @@
  * {@link RestrictionsManager.hasRestrictionsProvider()} returns true, pass in
  * {@link RESTRICT_IF_OVERRIDABLE} to the constructor instead of a restrictions key.
  */
-public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
+public abstract class RestrictedSettingsFragment extends SettingsPreferenceFragment {
 
     protected static final String RESTRICT_IF_OVERRIDABLE = "restrict_if_overridable";
 
diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index 3f39088..adda01b 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -30,6 +30,7 @@
 import android.view.ViewGroup;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
@@ -53,6 +54,11 @@
     private LockPatternUtils mLockPatternUtils;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.SCREEN_PINNING;
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index c2990e5..59816ac 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -17,6 +17,8 @@
 package com.android.settings;
 
 
+import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.admin.DevicePolicyManager;
@@ -26,28 +28,30 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
 import android.content.res.Resources;
+import android.hardware.fingerprint.Fingerprint;
+import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.preference.SwitchPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
 import android.security.KeyStore;
 import android.service.trust.TrustAgentService;
-import android.telephony.TelephonyManager;
-import android.telephony.SubscriptionManager;
 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.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -58,24 +62,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
 /**
  * Gesture lock pattern settings.
  */
 public class SecuritySettings extends SettingsPreferenceFragment
         implements OnPreferenceChangeListener, DialogInterface.OnClickListener, Indexable {
+
+    private static final String TAG = "SecuritySettings";
     private static final String TRUST_AGENT_CLICK_INTENT = "trust_agent_click_intent";
-    static final String TAG = "SecuritySettings";
     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_BIOMETRIC_WEAK_IMPROVE_MATCHING =
-            "biometric_weak_improve_matching";
-    private static final String KEY_BIOMETRIC_WEAK_LIVELINESS = "biometric_weak_liveliness";
-    private static final String KEY_LOCK_ENABLED = "lockenabled";
     private static final String KEY_VISIBLE_PATTERN = "visiblepattern";
     private static final String KEY_SECURITY_CATEGORY = "security_category";
     private static final String KEY_DEVICE_ADMIN_CATEGORY = "device_admin_category";
@@ -83,10 +82,9 @@
     private static final String KEY_OWNER_INFO_SETTINGS = "owner_info_settings";
     private static final String KEY_ADVANCED_SECURITY = "advanced_security";
     private static final String KEY_MANAGE_TRUST_AGENTS = "manage_trust_agents";
+    private static final String KEY_FINGERPRINT_SETTINGS = "fingerprint_settings";
 
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
-    private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST = 124;
-    private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF = 125;
     private static final int CHANGE_TRUST_AGENT_SETTINGS = 126;
 
     // Misc Settings
@@ -104,8 +102,8 @@
 
     // 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_LOCK_ENABLED, KEY_VISIBLE_PATTERN, KEY_BIOMETRIC_WEAK_LIVELINESS,
-            KEY_POWER_INSTANTLY_LOCKS, KEY_SHOW_PASSWORD, KEY_TOGGLE_INSTALL_APPLICATIONS };
+            KEY_VISIBLE_PATTERN, KEY_POWER_INSTANTLY_LOCKS, KEY_SHOW_PASSWORD,
+            KEY_TOGGLE_INSTALL_APPLICATIONS };
 
     // Only allow one trust agent on the platform.
     private static final boolean ONLY_ONE_TRUST_AGENT = true;
@@ -117,7 +115,6 @@
     private LockPatternUtils mLockPatternUtils;
     private ListPreference mLockAfter;
 
-    private SwitchPreference mBiometricWeakLiveliness;
     private SwitchPreference mVisiblePattern;
 
     private SwitchPreference mShowPassword;
@@ -132,6 +129,12 @@
     private boolean mIsPrimary;
 
     private Intent mTrustAgentClickIntent;
+    private Preference mOwnerInfoPref;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.SECURITY;
+    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -155,19 +158,11 @@
             LockPatternUtils lockPatternUtils) {
         int resid = 0;
         if (!lockPatternUtils.isSecure()) {
-            // if there are multiple users, disable "None" setting
-            UserManager mUm = (UserManager) context. getSystemService(Context.USER_SERVICE);
-            List<UserInfo> users = mUm.getUsers(true);
-            final boolean singleUser = users.size() == 1;
-
-            if (singleUser && lockPatternUtils.isLockScreenDisabled()) {
+            if (lockPatternUtils.isLockScreenDisabled()) {
                 resid = R.xml.security_settings_lockscreen;
             } else {
                 resid = R.xml.security_settings_chooser;
             }
-        } else if (lockPatternUtils.usingBiometricWeak() &&
-                lockPatternUtils.isBiometricWeakInstalled()) {
-            resid = R.xml.security_settings_biometric_weak;
         } else {
             switch (lockPatternUtils.getKeyguardStoredPasswordQuality()) {
                 case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
@@ -208,16 +203,15 @@
         // Add options for device encryption
         mIsPrimary = UserHandle.myUserId() == UserHandle.USER_OWNER;
 
-        if (!mIsPrimary) {
-            // Rename owner info settings
-            Preference ownerInfoPref = findPreference(KEY_OWNER_INFO_SETTINGS);
-            if (ownerInfoPref != null) {
-                if (UserManager.get(getActivity()).isLinkedUser()) {
-                    ownerInfoPref.setTitle(R.string.profile_info_settings_title);
-                } else {
-                    ownerInfoPref.setTitle(R.string.user_info_settings_title);
+        mOwnerInfoPref = findPreference(KEY_OWNER_INFO_SETTINGS);
+        if (mOwnerInfoPref != null) {
+            mOwnerInfoPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    OwnerInfoSettings.show(SecuritySettings.this);
+                    return true;
                 }
-            }
+            });
         }
 
         if (mIsPrimary) {
@@ -230,32 +224,12 @@
             }
         }
 
-        // Trust Agent preferences
+        // Fingerprint and trust agents
         PreferenceGroup securityCategory = (PreferenceGroup)
                 root.findPreference(KEY_SECURITY_CATEGORY);
         if (securityCategory != null) {
-            final boolean hasSecurity = mLockPatternUtils.isSecure();
-            ArrayList<TrustAgentComponentInfo> agents =
-                    getActiveTrustAgents(getPackageManager(), mLockPatternUtils);
-            for (int i = 0; i < agents.size(); i++) {
-                final TrustAgentComponentInfo agent = agents.get(i);
-                Preference trustAgentPreference =
-                        new Preference(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);
-                if (!hasSecurity) {
-                    trustAgentPreference.setEnabled(false);
-                    trustAgentPreference.setSummary(R.string.disabled_because_no_backup_security);
-                }
-            }
+            maybeAddFingerprintPreference(securityCategory);
+            addTrustAgentSettings(securityCategory);
         }
 
         // lock after preference
@@ -265,10 +239,6 @@
             updateLockAfterPreferenceSummary();
         }
 
-        // biometric weak liveliness
-        mBiometricWeakLiveliness =
-                (SwitchPreference) root.findPreference(KEY_BIOMETRIC_WEAK_LIVELINESS);
-
         // visible pattern
         mVisiblePattern = (SwitchPreference) root.findPreference(KEY_VISIBLE_PATTERN);
 
@@ -284,15 +254,6 @@
                     trustAgentPreference.getTitle()));
         }
 
-        // don't display visible pattern if biometric and backup is not pattern
-        if (resid == R.xml.security_settings_biometric_weak &&
-                mLockPatternUtils.getKeyguardStoredPasswordQuality() !=
-                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-            if (securityCategory != null && mVisiblePattern != null) {
-                securityCategory.removePreference(root.findPreference(KEY_VISIBLE_PATTERN));
-            }
-        }
-
         // Append the rest of the settings
         addPreferencesFromResource(R.xml.security_settings_misc);
 
@@ -370,6 +331,63 @@
         return root;
     }
 
+    private void maybeAddFingerprintPreference(PreferenceGroup securityCategory) {
+        FingerprintManager fpm = (FingerprintManager) getActivity().getSystemService(
+                Context.FINGERPRINT_SERVICE);
+        if (!fpm.isHardwareDetected()) {
+            Log.v(TAG, "No fingerprint hardware detected!!");
+            return;
+        }
+        Preference fingerprintPreference = new Preference(securityCategory.getContext());
+        fingerprintPreference.setKey(KEY_FINGERPRINT_SETTINGS);
+        fingerprintPreference.setTitle(R.string.security_settings_fingerprint_preference_title);
+        Intent intent = new Intent();
+        final List<Fingerprint> items = fpm.getEnrolledFingerprints();
+        final int fingerprintCount = items != null ? items.size() : 0;
+        final String clazz;
+        if (fingerprintCount > 0) {
+            fingerprintPreference.setSummary(getResources().getQuantityString(
+                    R.plurals.security_settings_fingerprint_preference_summary,
+                    fingerprintCount, fingerprintCount));
+            clazz = FingerprintSettings.class.getName();
+        } else {
+            // No fingerprints registered, launch directly into enrollment wizard
+            clazz = FingerprintEnroll.class.getName();
+        }
+        intent.setClassName("com.android.settings", clazz);
+        fingerprintPreference.setIntent(intent);
+        securityCategory.addPreference(fingerprintPreference);
+    }
+
+    private void addTrustAgentSettings(PreferenceGroup securityCategory) {
+        final boolean hasSecurity = mLockPatternUtils.isSecure();
+        ArrayList<TrustAgentComponentInfo> agents =
+                getActiveTrustAgents(getPackageManager(), mLockPatternUtils, mDPM);
+        for (int i = 0; i < agents.size(); i++) {
+            final TrustAgentComponentInfo agent = agents.get(i);
+            Preference trustAgentPreference =
+                    new Preference(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);
+
+            if (agent.disabledByAdministrator) {
+                trustAgentPreference.setEnabled(false);
+                trustAgentPreference.setSummary(R.string.trust_agent_disabled_device_admin);
+            } else if (!hasSecurity) {
+                trustAgentPreference.setEnabled(false);
+                trustAgentPreference.setSummary(R.string.disabled_because_no_backup_security);
+            }
+        }
+    }
+
     /* Return true if a there is a Slot that has Icc.
      */
     private boolean isSimIccReady() {
@@ -408,11 +426,15 @@
     }
 
     private static ArrayList<TrustAgentComponentInfo> getActiveTrustAgents(
-            PackageManager pm, LockPatternUtils utils) {
+            PackageManager pm, LockPatternUtils utils, DevicePolicyManager dpm) {
         ArrayList<TrustAgentComponentInfo> result = new ArrayList<TrustAgentComponentInfo>();
         List<ResolveInfo> resolveInfos = pm.queryIntentServices(TRUST_AGENT_INTENT,
                 PackageManager.GET_META_DATA);
         List<ComponentName> enabledTrustAgents = utils.getEnabledTrustAgents();
+
+        boolean disableTrustAgents = (dpm.getKeyguardDisabledFeatures(null)
+                & DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS) != 0;
+
         if (enabledTrustAgents != null && !enabledTrustAgents.isEmpty()) {
             for (int i = 0; i < resolveInfos.size(); i++) {
                 ResolveInfo resolveInfo = resolveInfos.get(i);
@@ -424,6 +446,10 @@
                         !enabledTrustAgents.contains(
                                 TrustAgentUtils.getComponentName(resolveInfo)) ||
                         TextUtils.isEmpty(trustAgentComponentInfo.title)) continue;
+                if (disableTrustAgents && dpm.getTrustAgentConfiguration(
+                        null, TrustAgentUtils.getComponentName(resolveInfo)) == null) {
+                    trustAgentComponentInfo.disabledByAdministrator = true;
+                }
                 result.add(trustAgentComponentInfo);
                 if (ONLY_ONE_TRUST_AGENT) break;
             }
@@ -562,10 +588,6 @@
         createPreferenceHierarchy();
 
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
-        if (mBiometricWeakLiveliness != null) {
-            mBiometricWeakLiveliness.setChecked(
-                    lockPatternUtils.isBiometricWeakLivelinessEnabled());
-        }
         if (mVisiblePattern != null) {
             mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled());
         }
@@ -581,6 +603,16 @@
         if (mResetCredentials != null) {
             mResetCredentials.setEnabled(!mKeyStore.isEmpty());
         }
+
+        updateOwnerInfo();
+    }
+
+    public void updateOwnerInfo() {
+        if (mOwnerInfoPref != null) {
+            mOwnerInfoPref.setSummary(mLockPatternUtils.isOwnerInfoEnabled()
+                    ? mLockPatternUtils.getOwnerInfo(UserHandle.myUserId())
+                    : getString(R.string.owner_info_settings_summary));
+        }
     }
 
     @Override
@@ -589,23 +621,13 @@
         if (KEY_UNLOCK_SET_OR_CHANGE.equals(key)) {
             startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
                     R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
-        } else if (KEY_BIOMETRIC_WEAK_IMPROVE_MATCHING.equals(key)) {
-            ChooseLockSettingsHelper helper =
-                    new ChooseLockSettingsHelper(this.getActivity(), this);
-            if (!helper.launchConfirmationActivity(
-                    CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST, null, null)) {
-                // If this returns false, it means no password confirmation is required, so
-                // go ahead and start improve.
-                // Note: currently a backup is required for biometric_weak so this code path
-                // can't be reached, but is here in case things change in the future
-                startBiometricWeakImprove();
-            }
         } else if (KEY_TRUST_AGENT.equals(key)) {
             ChooseLockSettingsHelper helper =
                     new ChooseLockSettingsHelper(this.getActivity(), this);
             mTrustAgentClickIntent = preference.getIntent();
-            if (!helper.launchConfirmationActivity(CHANGE_TRUST_AGENT_SETTINGS, null, null) &&
-                    mTrustAgentClickIntent != null) {
+            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;
@@ -623,19 +645,7 @@
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST &&
-                resultCode == Activity.RESULT_OK) {
-            startBiometricWeakImprove();
-            return;
-        } else if (requestCode == CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF &&
-                resultCode == Activity.RESULT_OK) {
-            final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
-            lockPatternUtils.setBiometricWeakLivelinessEnabled(false);
-            // Setting the mBiometricWeakLiveliness checked value to false is handled when onResume
-            // is called by grabbing the value from lockPatternUtils.  We can't set it here
-            // because mBiometricWeakLiveliness could be null
-            return;
-        } else if (requestCode == CHANGE_TRUST_AGENT_SETTINGS && resultCode == Activity.RESULT_OK) {
+        if (requestCode == CHANGE_TRUST_AGENT_SETTINGS && resultCode == Activity.RESULT_OK) {
             if (mTrustAgentClickIntent != null) {
                 startActivity(mTrustAgentClickIntent);
                 mTrustAgentClickIntent = null;
@@ -659,30 +669,8 @@
                 Log.e("SecuritySettings", "could not persist lockAfter timeout setting", e);
             }
             updateLockAfterPreferenceSummary();
-        } else if (KEY_LOCK_ENABLED.equals(key)) {
-            lockPatternUtils.setLockPatternEnabled((Boolean) value);
         } else if (KEY_VISIBLE_PATTERN.equals(key)) {
             lockPatternUtils.setVisiblePatternEnabled((Boolean) value);
-        } else  if (KEY_BIOMETRIC_WEAK_LIVELINESS.equals(key)) {
-            if ((Boolean) value) {
-                lockPatternUtils.setBiometricWeakLivelinessEnabled(true);
-            } else {
-                // In this case the user has just unchecked the checkbox, but this action requires
-                // them to confirm their password.  We need to re-check the checkbox until
-                // they've confirmed their password
-                mBiometricWeakLiveliness.setChecked(true);
-                ChooseLockSettingsHelper helper =
-                        new ChooseLockSettingsHelper(this.getActivity(), this);
-                if (!helper.launchConfirmationActivity(
-                                CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF, null, null)) {
-                    // If this returns false, it means no password confirmation is required, so
-                    // go ahead and uncheck it here.
-                    // Note: currently a backup is required for biometric_weak so this code path
-                    // can't be reached, but is here in case things change in the future
-                    lockPatternUtils.setBiometricWeakLivelinessEnabled(false);
-                    mBiometricWeakLiveliness.setChecked(false);
-                }
-            }
         } else if (KEY_POWER_INSTANTLY_LOCKS.equals(key)) {
             mLockPatternUtils.setPowerButtonInstantlyLocks((Boolean) value);
         } else if (KEY_SHOW_PASSWORD.equals(key)) {
@@ -706,12 +694,6 @@
         return R.string.help_url_security;
     }
 
-    public void startBiometricWeakImprove(){
-        Intent intent = new Intent();
-        intent.setClassName("com.android.facelock", "com.android.facelock.AddToSetup");
-        startActivity(intent);
-    }
-
     /**
      * For Search. Please keep it in sync when updating "createPreferenceHierarchy()"
      */
@@ -812,7 +794,8 @@
             final LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
             if (lockPatternUtils.isSecure()) {
                 ArrayList<TrustAgentComponentInfo> agents =
-                        getActiveTrustAgents(context.getPackageManager(), lockPatternUtils);
+                        getActiveTrustAgents(context.getPackageManager(), lockPatternUtils,
+                                context.getSystemService(DevicePolicyManager.class));
                 for (int i = 0; i < agents.size(); i++) {
                     final TrustAgentComponentInfo agent = agents.get(i);
                     data = new SearchIndexableRaw(context);
@@ -832,13 +815,6 @@
             // Add options for lock/unlock screen
             int resId = getResIdForLockUnlockScreen(context, lockPatternUtils);
 
-            // don't display visible pattern if biometric and backup is not pattern
-            if (resId == R.xml.security_settings_biometric_weak &&
-                    lockPatternUtils.getKeyguardStoredPasswordQuality() !=
-                            DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-                keys.add(KEY_VISIBLE_PATTERN);
-            }
-
             // Do not display SIM lock for devices without an Icc card
             TelephonyManager tm = TelephonyManager.getDefault();
             if (!mIsPrimary || !tm.hasIccCard()) {
diff --git a/src/com/android/settings/SelectableEditTextPreference.java b/src/com/android/settings/SelectableEditTextPreference.java
index 503db13..c14709f 100644
--- a/src/com/android/settings/SelectableEditTextPreference.java
+++ b/src/com/android/settings/SelectableEditTextPreference.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.preference.EditTextPreference;
-import android.preference.ListPreference;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index ebb7491..ba08036 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -33,6 +33,7 @@
     public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DateTimeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class StorageSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class StorageVolumeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ }
     public static class InputMethodAndLanguageSettingsActivity extends SettingsActivity { /* empty */ }
@@ -47,6 +48,7 @@
     public static class DeviceInfoSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }
+    public static class AllApplicationsActivity extends SettingsActivity { /* empty */ }
     public static class AppOpsSummaryActivity extends SettingsActivity {
         @Override
         public boolean isValidFragment(String className) {
@@ -93,11 +95,15 @@
     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 ZenModeAutomationSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ZenModeExternalRuleSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
     public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class QuickLaunchSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class DomainsURLsAppListActivity extends SettingsActivity { /* empty */ }
 
     public static class TopLevelSettings extends SettingsActivity { /* empty */ }
     public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index cbffa86..caf2491 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.settings;
 
+import static com.android.settings.dashboard.DashboardTile.TILE_ID_UNDEFINED;
+
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.Fragment;
@@ -49,8 +51,10 @@
 import android.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.transition.TransitionManager;
+import android.util.ArrayMap;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.Pair;
 import android.util.TypedValue;
 import android.util.Xml;
 import android.view.Menu;
@@ -62,6 +66,7 @@
 import android.widget.Button;
 import android.widget.SearchView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.XmlUtils;
 import com.android.settings.accessibility.AccessibilitySettings;
@@ -71,21 +76,18 @@
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.applications.ManageApplications;
 import com.android.settings.applications.ProcessStatsUi;
+import com.android.settings.applications.UsageAccessDetails;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.dashboard.DashboardCategory;
 import com.android.settings.dashboard.DashboardSummary;
 import com.android.settings.dashboard.DashboardTile;
 import com.android.settings.dashboard.NoHomeDialogFragment;
 import com.android.settings.dashboard.SearchResultsSummary;
-import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.PublicVolumeSettings;
+import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.deviceinfo.UsbSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
-import com.android.settings.notification.NotificationAppList;
-import com.android.settings.notification.OtherSoundSettings;
-import com.android.settings.quicklaunch.QuickLaunchSettings;
-import com.android.settings.search.DynamicIndexableContentMonitor;
-import com.android.settings.search.Index;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.inputmethod.KeyboardLayoutPickerFragment;
 import com.android.settings.inputmethod.SpellCheckersSettings;
@@ -94,13 +96,18 @@
 import com.android.settings.nfc.AndroidBeam;
 import com.android.settings.nfc.PaymentSettings;
 import com.android.settings.notification.AppNotificationSettings;
-import com.android.settings.notification.ConditionProviderSettings;
 import com.android.settings.notification.NotificationAccessSettings;
 import com.android.settings.notification.NotificationSettings;
 import com.android.settings.notification.NotificationStation;
+import com.android.settings.notification.OtherSoundSettings;
+import com.android.settings.notification.ZenModeExternalRuleSettings;
+import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.notification.ZenModeScheduleRuleSettings;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.search.DynamicIndexableContentMonitor;
+import com.android.settings.search.Index;
 import com.android.settings.sim.SimSettings;
 import com.android.settings.tts.TextToSpeechSettings;
 import com.android.settings.users.UserSettings;
@@ -112,7 +119,6 @@
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
-import com.android.settings.WifiCallingSettings;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -120,10 +126,9 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
-import static com.android.settings.dashboard.DashboardTile.TILE_ID_UNDEFINED;
-
 public class SettingsActivity extends Activity
         implements PreferenceManager.OnPreferenceTreeClickListener,
         PreferenceFragment.OnPreferenceStartFragmentCallback,
@@ -205,6 +210,35 @@
 
     private static final String EMPTY_QUERY = "";
 
+    /**
+     * Settings will search for system activities of this action and add them as a top level
+     * settings tile using the following parameters.
+     *
+     * <p>A category must be specified in the meta-data for the activity named
+     * {@link #EXTRA_CATEGORY_KEY}
+     *
+     * <p>The title may be defined by meta-data named {@link Utils#META_DATA_PREFERENCE_TITLE}
+     * otherwise the label for the activity will be used.
+     *
+     * <p>The icon may be defined by meta-data named {@link Utils#META_DATA_PREFERENCE_ICON}
+     * otherwise the icon for the activity will be used.
+     *
+     * <p>A summary my be defined by meta-data named {@link Utils#META_DATA_PREFERENCE_SUMMARY}
+     */
+    private static final String EXTRA_SETTINGS_ACTION =
+            "com.android.settings.action.EXTRA_SETTINGS";
+
+    /**
+     * The key used to get the category from metadata of activities of action
+     * {@link #EXTRA_SETTINGS_ACTION}
+     * The value must be one of:
+     * <li>com.android.settings.category.wireless</li>
+     * <li>com.android.settings.category.device</li>
+     * <li>com.android.settings.category.personal</li>
+     * <li>com.android.settings.category.system</li>
+     */
+    private static final String EXTRA_CATEGORY_KEY = "com.android.settings.category";
+
     private static boolean sShowNoHomeNotice = false;
 
     private String mFragmentClass;
@@ -267,14 +301,15 @@
             NotificationStation.class.getName(),
             LocationSettings.class.getName(),
             SecuritySettings.class.getName(),
-            UsageAccessSettings.class.getName(),
+            UsageAccessDetails.class.getName(),
             PrivacySettings.class.getName(),
             DeviceAdminSettings.class.getName(),
             AccessibilitySettings.class.getName(),
             CaptionPropertiesFragment.class.getName(),
             com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.class.getName(),
             TextToSpeechSettings.class.getName(),
-            Memory.class.getName(),
+            StorageSettings.class.getName(),
+            PublicVolumeSettings.class.getName(),
             DevelopmentSettings.class.getName(),
             UsbSettings.class.getName(),
             AndroidBeam.class.getName(),
@@ -287,7 +322,6 @@
             DreamSettings.class.getName(),
             UserSettings.class.getName(),
             NotificationAccessSettings.class.getName(),
-            ConditionProviderSettings.class.getName(),
             PrintSettingsFragment.class.getName(),
             PrintJobSettingsFragment.class.getName(),
             TrustedCredentialsSettings.class.getName(),
@@ -299,12 +333,13 @@
             ChooseLockPattern.ChooseLockPatternFragment.class.getName(),
             InstalledAppDetails.class.getName(),
             BatterySaverSettings.class.getName(),
-            NotificationAppList.class.getName(),
             AppNotificationSettings.class.getName(),
             OtherSoundSettings.class.getName(),
-            QuickLaunchSettings.class.getName(),
             ApnSettings.class.getName(),
-            WifiCallingSettings.class.getName()
+            WifiCallingSettings.class.getName(),
+            ZenModePrioritySettings.class.getName(),
+            ZenModeScheduleRuleSettings.class.getName(),
+            ZenModeExternalRuleSettings.class.getName(),
     };
 
 
@@ -536,7 +571,12 @@
         getFragmentManager().addOnBackStackChangedListener(this);
 
         if (mIsShowingDashboard) {
-            Index.getInstance(getApplicationContext()).update();
+            // Run the Index update only if we have some space
+            if (!Utils.isLowStorage(this)) {
+                Index.getInstance(getApplicationContext()).update();
+            } else {
+                Log.w(LOG_TAG, "Cannot update the Indexer as we are running low on storage space!");
+            }
         }
 
         if (savedState != null) {
@@ -755,6 +795,9 @@
     @Override
     public void onResume() {
         super.onResume();
+        if (mIsShowingDashboard) {
+            MetricsLogger.visible(this, MetricsLogger.MAIN_SETTINGS);
+        }
 
         final int newHomeActivityCount = getHomeActivitiesCount();
         if (newHomeActivityCount != mHomeActivitiesCount) {
@@ -783,7 +826,9 @@
     @Override
     public void onPause() {
         super.onPause();
-
+        if (mIsShowingDashboard) {
+            MetricsLogger.hidden(this, MetricsLogger.MAIN_SETTINGS);
+        }
         unregisterReceiver(mBatteryInfoReceiver);
         mDynamicIndexableContentMonitor.unregister();
     }
@@ -896,17 +941,31 @@
      */
     public void startPreferencePanelAsUser(String fragmentClass, Bundle args, int titleRes,
             CharSequence titleText, UserHandle userHandle) {
-        String title = null;
-        if (titleRes < 0) {
-            if (titleText != null) {
-                title = titleText.toString();
-            } else {
-                // There not much we can do in that case
-                title = "";
+        // This is a workaround.
+        //
+        // Calling startWithFragmentAsUser() without specifying FLAG_ACTIVITY_NEW_TASK to the intent
+        // starting the fragment could cause a native stack corruption. See b/17523189. However,
+        // adding that flag and start the preference panel with the same UserHandler will make it
+        // impossible to use back button to return to the previous screen. See b/20042570.
+        //
+        // We work around this issue by adding FLAG_ACTIVITY_NEW_TASK to the intent, while doing
+        // another check here to call startPreferencePanel() instead of startWithFragmentAsUser()
+        // when we're calling it as the same user.
+        if (userHandle.getIdentifier() == UserHandle.myUserId()) {
+            startPreferencePanel(fragmentClass, args, titleRes, titleText, null, 0);
+        } else {
+            String title = null;
+            if (titleRes < 0) {
+                if (titleText != null) {
+                    title = titleText.toString();
+                } else {
+                    // There not much we can do in that case
+                    title = "";
+                }
             }
+            Utils.startWithFragmentAsUser(this, fragmentClass, args,
+                    titleRes, title, mIsShortcut, userHandle);
         }
-        Utils.startWithFragmentAsUser(this, fragmentClass, args,
-                titleRes, title, mIsShortcut, userHandle);
     }
 
     /**
@@ -1036,6 +1095,17 @@
                         }
                     }
                     sa.recycle();
+                    sa = obtainStyledAttributes(attrs, com.android.internal.R.styleable.Preference);
+                    tv = sa.peekValue(
+                            com.android.internal.R.styleable.Preference_key);
+                    if (tv != null && tv.type == TypedValue.TYPE_STRING) {
+                        if (tv.resourceId != 0) {
+                            category.key = getString(tv.resourceId);
+                        } else {
+                            category.key = tv.string.toString();
+                        }
+                    }
+                    sa.recycle();
 
                     final int innerDepth = parser.getDepth();
                     while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
@@ -1111,6 +1181,8 @@
                                 category.addTile(tile);
                             }
 
+                        } else if (innerNodeName.equals("external-tiles")) {
+                            category.externalIndex = category.getTilesCount();
                         } else {
                             XmlUtils.skipCurrentTag(parser);
                         }
@@ -1232,6 +1304,73 @@
                 n--;
             }
         }
+        addExternalTiles(target);
+    }
+
+    private void addExternalTiles(List<DashboardCategory> target) {
+        Map<Pair<String, String>, DashboardTile> addedCache =
+                new ArrayMap<Pair<String, String>, DashboardTile>();
+        UserManager userManager = UserManager.get(this);
+        for (UserHandle user : userManager.getUserProfiles()) {
+            addExternalTiles(target, user, addedCache);
+        }
+    }
+
+    private void addExternalTiles(List<DashboardCategory> target, UserHandle user,
+            Map<Pair<String, String>, DashboardTile> addedCache) {
+        PackageManager pm = getPackageManager();
+        Intent intent = new Intent(EXTRA_SETTINGS_ACTION);
+        List<ResolveInfo> results = pm.queryIntentActivitiesAsUser(intent,
+                PackageManager.GET_META_DATA, user.getIdentifier());
+        for (ResolveInfo resolved : results) {
+            if (!resolved.system) {
+                // Do not allow any app to add to settings, only system ones.
+                continue;
+            }
+            ActivityInfo activityInfo = resolved.activityInfo;
+            Bundle metaData = activityInfo.metaData;
+            if ((metaData == null) || !metaData.containsKey(EXTRA_CATEGORY_KEY)) {
+                Log.w(LOG_TAG, "Found " + resolved.activityInfo.name + " for action "
+                        + EXTRA_SETTINGS_ACTION + " missing metadata " +
+                        (metaData == null ? "" : EXTRA_CATEGORY_KEY));
+                continue;
+            }
+            String categoryKey = metaData.getString(EXTRA_CATEGORY_KEY);
+            DashboardCategory category = getCategory(target, categoryKey);
+            if (category == null) {
+                Log.w(LOG_TAG, "Activity " + resolved.activityInfo.name + " has unknown "
+                        + "category key " + categoryKey);
+                continue;
+            }
+            Pair<String, String> key = new Pair<String, String>(activityInfo.packageName,
+                    activityInfo.name);
+            DashboardTile tile = addedCache.get(key);
+            if (tile == null) {
+                tile = new DashboardTile();
+                tile.intent = new Intent().setClassName(
+                        activityInfo.packageName, activityInfo.name);
+                Utils.updateTileToSpecificActivityFromMetaDataOrRemove(this, tile);
+
+                if (category.externalIndex == -1) {
+                    // If no location for external tiles has been specified for this category,
+                    // then just put them at the end.
+                    category.addTile(tile);
+                } else {
+                    category.addTile(category.externalIndex, tile);
+                }
+                addedCache.put(key, tile);
+            }
+            tile.userHandle.add(user);
+        }
+    }
+
+    private DashboardCategory getCategory(List<DashboardCategory> target, String categoryKey) {
+        for (DashboardCategory category : target) {
+            if (categoryKey.equals(category.key)) {
+                return category;
+            }
+        }
+        return null;
     }
 
     private boolean updateHomeSettingTiles(DashboardTile tile) {
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index e87f676..17ff4b2 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -29,7 +29,6 @@
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroupAdapter;
 import android.text.TextUtils;
 import android.util.Log;
@@ -43,21 +42,23 @@
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
+import com.android.settings.widget.FloatingActionButton;
+
 /**
  * Base class for Settings fragments, with some helper functions and dialog management.
  */
-public class SettingsPreferenceFragment extends PreferenceFragment implements DialogCreatable {
+public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceFragment
+        implements DialogCreatable {
 
     private static final String TAG = "SettingsPreferenceFragment";
 
-    private static final int MENU_HELP = Menu.FIRST + 100;
     private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 600;
 
     private static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";
 
     private SettingsDialogFragment mDialogFragment;
 
-    private String mHelpUrl;
+    private String mHelpUri;
 
     // Cache the content resolver for async callbacks
     private ContentResolver mContentResolver;
@@ -81,6 +82,7 @@
     };
 
     private ViewGroup mPinnedHeaderFrameLayout;
+    private FloatingActionButton mFloatingActionButton;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -93,7 +95,7 @@
         // Prepare help url and enable menu if necessary
         int helpResource = getHelpResource();
         if (helpResource != 0) {
-            mHelpUrl = getResources().getString(helpResource);
+            mHelpUri = getResources().getString(helpResource);
         }
     }
 
@@ -102,9 +104,14 @@
             Bundle savedInstanceState) {
         final View root = super.onCreateView(inflater, container, savedInstanceState);
         mPinnedHeaderFrameLayout = (ViewGroup) root.findViewById(R.id.pinned_header);
+        mFloatingActionButton = (FloatingActionButton) root.findViewById(R.id.fab);
         return root;
     }
 
+    public FloatingActionButton getFloatingActionButton() {
+        return mFloatingActionButton;
+    }
+
     public void setPinnedHeaderView(View pinnedHeader) {
         mPinnedHeaderFrameLayout.addView(pinnedHeader);
         mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE);
@@ -125,7 +132,7 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        if (!TextUtils.isEmpty(mHelpUrl)) {
+        if (!TextUtils.isEmpty(mHelpUri)) {
             setHasOptionsMenu(true);
         }
     }
@@ -158,6 +165,11 @@
         unregisterObserverIfNeeded();
     }
 
+    public void showLoadingWhenEmpty() {
+        View loading = getView().findViewById(R.id.loading_container);
+        getListView().setEmptyView(loading);
+    }
+
     public void registerObserverIfNeeded() {
         if (!mIsDataSetObserverRegistered) {
             if (mCurrentRootAdapter != null) {
@@ -273,14 +285,13 @@
      * @return the resource id for the help url
      */
     protected int getHelpResource() {
-        return 0;
+        return R.string.help_uri_default;
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (mHelpUrl != null && getActivity() != null) {
-            MenuItem helpItem = menu.add(0, MENU_HELP, 0, R.string.help_label);
-            HelpUtils.prepareHelpMenuItem(getActivity(), helpItem, mHelpUrl);
+        if (mHelpUri != null && getActivity() != null) {
+            HelpUtils.prepareHelpMenuItem(getActivity(), menu, mHelpUri);
         }
     }
 
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java
index 42e2baa..82157c0 100644
--- a/src/com/android/settings/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/SetupChooseLockGeneric.java
@@ -16,15 +16,17 @@
 
 package com.android.settings;
 
-import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+import com.android.setupwizardlib.SetupWizardListLayout;
+import com.android.setupwizardlib.view.NavigationBar;
 
+import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
-import android.util.MutableBoolean;
+import android.hardware.fingerprint.FingerprintManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -37,8 +39,7 @@
  * Other changes should be done to ChooseLockGeneric class instead and let this class inherit
  * those changes.
  */
-public class SetupChooseLockGeneric extends ChooseLockGeneric
-        implements SetupWizardNavBar.NavigationBarListener {
+public class SetupChooseLockGeneric extends ChooseLockGeneric {
 
     @Override
     protected boolean isValidFragment(String fragmentName) {
@@ -52,46 +53,48 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
-    @Override
-    public void onNavigationBarCreated(SetupWizardNavBar bar) {
-        SetupWizardUtils.setImmersiveMode(this, bar);
-        bar.getNextButton().setEnabled(false);
-    }
-
-    @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
-    }
-
-    public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment {
+    public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment
+            implements NavigationBar.NavigationBarListener {
 
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
-            final View view = inflater.inflate(R.layout.setup_preference, container, false);
-            ListView list = (ListView) view.findViewById(android.R.id.list);
-            View title = view.findViewById(R.id.title);
-            if (title == null) {
-                final View header = inflater.inflate(R.layout.setup_wizard_header, list, false);
-                list.addHeaderView(header, null, false);
+            final SetupWizardListLayout layout = (SetupWizardListLayout) inflater.inflate(
+                    R.layout.setup_choose_lock_generic, container, false);
+            layout.setHeaderText(getActivity().getTitle());
+            ListView list = layout.getListView();
+            final FingerprintManager fpm = (FingerprintManager)
+                    getActivity().getSystemService(Context.FINGERPRINT_SERVICE);
+            if (fpm != null && fpm.isHardwareDetected()) {
+                final View footer = inflater.inflate(
+                        R.layout.setup_screen_lock_fingerprint_details, list, false);
+                list.addFooterView(footer, null, false);
             }
-            return view;
+
+            final NavigationBar navigationBar = layout.getNavigationBar();
+            navigationBar.getNextButton().setEnabled(false);
+            navigationBar.setNavigationBarListener(this);
+
+            return layout;
         }
 
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
-            SetupWizardUtils.setIllustration(getActivity(),
-                    R.drawable.setup_illustration_lock_screen);
-            SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle());
+            SetupWizardUtils.setImmersiveMode(getActivity());
+        }
+
+        @Override
+        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+            if (resultCode != RESULT_CANCELED) {
+                super.onActivityResult(requestCode, resultCode, data);
+            }
+            // If the started activity was cancelled (e.g. the user presses back), then this
+            // activity will be resumed to foreground.
         }
 
         /***
@@ -99,11 +102,9 @@
          * screen lock options here.
          *
          * @param quality the requested quality.
-         * @param allowBiometric whether to allow biometic screen lock
          */
         @Override
-        protected void disableUnusablePreferences(final int quality,
-                MutableBoolean allowBiometric) {
+        protected void disableUnusablePreferences(final int quality, boolean hideDisabled) {
             // At this part of the flow, the user has already indicated they want to add a pin,
             // pattern or password, so don't show "None" or "Slide". We disable them here and set
             // the HIDE_DISABLED flag to true to hide them. This only happens for setup wizard.
@@ -111,25 +112,61 @@
             // installed with a policy we need to honor.
             final int newQuality = Math.max(quality,
                     DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-            super.disableUnusablePreferencesImpl(newQuality, allowBiometric,
-                    true /* hideDisabled */);
+            super.disableUnusablePreferencesImpl(newQuality, true /* hideDisabled */);
         }
 
         @Override
-        protected Intent getLockPasswordIntent(Context context, int quality, boolean isFallback,
-                int minLength, int maxLength, boolean requirePasswordToDecrypt,
-                boolean confirmCredentials) {
-            final Intent intent = SetupChooseLockPassword.createIntent(context, quality,
-                    isFallback, minLength, maxLength, requirePasswordToDecrypt, confirmCredentials);
+        protected Intent getLockPasswordIntent(Context context, int quality,
+                int minLength, final int maxLength,
+                boolean requirePasswordToDecrypt, boolean confirmCredentials) {
+            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
+                    maxLength, requirePasswordToDecrypt, confirmCredentials);
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
 
         @Override
-        protected Intent getLockPatternIntent(Context context, boolean isFallback,
-                boolean requirePassword, boolean confirmCredentials) {
-            final Intent intent = SetupChooseLockPattern.createIntent(context, isFallback,
-                    requirePassword, confirmCredentials);
+        protected Intent getLockPasswordIntent(Context context, int quality,
+                int minLength, final int maxLength,
+                boolean requirePasswordToDecrypt, long challenge) {
+            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
+                    maxLength, requirePasswordToDecrypt, challenge);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getLockPasswordIntent(Context context, int quality, int minLength,
+                final int maxLength, boolean requirePasswordToDecrypt, String password) {
+            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
+                    maxLength, requirePasswordToDecrypt, password);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
+                final boolean confirmCredentials) {
+            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
+                    confirmCredentials);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
+                long challenge) {
+            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
+                    challenge);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
+                final String pattern) {
+            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
+                    pattern);
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
@@ -142,5 +179,17 @@
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
+
+        @Override
+        public void onNavigateBack() {
+            Activity activity = getActivity();
+            if (activity != null) {
+                activity.onBackPressed();
+            }
+        }
+
+        @Override
+        public void onNavigateNext() {
+        }
     }
 }
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
index 4274205..6f384a4 100644
--- a/src/com/android/settings/SetupChooseLockPassword.java
+++ b/src/com/android/settings/SetupChooseLockPassword.java
@@ -16,8 +16,11 @@
 
 package com.android.settings;
 
-import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+import com.android.setupwizardlib.SetupWizardLayout;
+import com.android.setupwizardlib.util.SystemBarHelper;
+import com.android.setupwizardlib.view.NavigationBar;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
@@ -26,7 +29,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowInsets;
 
 /**
  * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
@@ -35,21 +37,35 @@
  * Other changes should be done to ChooseLockPassword class instead and let this class inherit
  * those changes.
  */
-public class SetupChooseLockPassword extends ChooseLockPassword
-        implements SetupWizardNavBar.NavigationBarListener {
+public class SetupChooseLockPassword extends ChooseLockPassword {
 
-    public static Intent createIntent(Context context, int quality, final boolean isFallback,
+    public static Intent createIntent(Context context, int quality,
             int minLength, final int maxLength, boolean requirePasswordToDecrypt,
             boolean confirmCredentials) {
-        Intent intent = ChooseLockPassword.createIntent(context, quality, isFallback, minLength,
+        Intent intent = ChooseLockPassword.createIntent(context, quality, minLength,
                 maxLength, requirePasswordToDecrypt, confirmCredentials);
         intent.setClass(context, SetupChooseLockPassword.class);
         intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
         return intent;
     }
 
-    private SetupWizardNavBar mNavigationBar;
-    private SetupChooseLockPasswordFragment mFragment;
+    public static Intent createIntent(Context context, int quality,
+            int minLength, final int maxLength, boolean requirePasswordToDecrypt, String password) {
+        Intent intent = ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
+                requirePasswordToDecrypt, password);
+        intent.setClass(context, SetupChooseLockPassword.class);
+        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
+        return intent;
+    }
+
+    public static Intent createIntent(Context context, int quality,
+            int minLength, final int maxLength, boolean requirePasswordToDecrypt, long challenge) {
+        Intent intent = ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
+                requirePasswordToDecrypt, challenge);
+        intent.setClass(context, SetupChooseLockPassword.class);
+        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
+        return intent;
+    }
 
     @Override
     protected boolean isValidFragment(String fragmentName) {
@@ -63,56 +79,26 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
-    @Override
-    public void onNavigationBarCreated(SetupWizardNavBar bar) {
-        mNavigationBar = bar;
-        SetupWizardUtils.setImmersiveMode(this, bar);
-    }
-
-    @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
-        if (mFragment != null) {
-            mFragment.handleNext();
-        }
-    }
-
-    @Override
-    public void onAttachFragment(Fragment fragment) {
-        super.onAttachFragment(fragment);
-        if (fragment instanceof SetupChooseLockPasswordFragment) {
-            mFragment = (SetupChooseLockPasswordFragment) fragment;
-        }
-    }
-
     public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment
-            implements View.OnApplyWindowInsetsListener {
+            implements NavigationBar.NavigationBarListener {
+
+        private NavigationBar mNavigationBar;
 
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
-            final View view = inflater.inflate(R.layout.setup_template, container, false);
-            View scrollView = view.findViewById(R.id.bottom_scroll_view);
-            scrollView.setOnApplyWindowInsetsListener(this);
-            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
-            inflater.inflate(R.layout.setup_choose_lock_password, setupContent, true);
-            return view;
-        }
-
-        @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            SetupWizardUtils.setIllustration(getActivity(),
-                    R.drawable.setup_illustration_lock_screen);
-            SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle());
+            final SetupWizardLayout layout = (SetupWizardLayout) inflater.inflate(
+                    R.layout.setup_choose_lock_password, container, false);
+            SystemBarHelper.setImeInsetView(layout.findViewById(R.id.suw_bottom_scroll_view));
+            mNavigationBar = layout.getNavigationBar();
+            mNavigationBar.setNavigationBarListener(this);
+            layout.setHeaderText(getActivity().getTitle());
+            SetupWizardUtils.setImmersiveMode(getActivity());
+            return layout;
         }
 
         @Override
@@ -124,29 +110,25 @@
 
         @Override
         protected void setNextEnabled(boolean enabled) {
-            SetupChooseLockPassword activity = (SetupChooseLockPassword) getActivity();
-            activity.mNavigationBar.getNextButton().setEnabled(enabled);
+            mNavigationBar.getNextButton().setEnabled(enabled);
         }
 
         @Override
         protected void setNextText(int text) {
-            SetupChooseLockPassword activity = (SetupChooseLockPassword) getActivity();
-            activity.mNavigationBar.getNextButton().setText(text);
+            mNavigationBar.getNextButton().setText(text);
         }
 
         @Override
-        public WindowInsets onApplyWindowInsets(View view, WindowInsets insets) {
-            SetupChooseLockPassword activity = (SetupChooseLockPassword) getActivity();
-            final int bottomMargin = Math.max(insets.getSystemWindowInsetBottom()
-                    - activity.mNavigationBar.getView().getHeight(), 0);
-            ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
-            lp.setMargins(lp.leftMargin, lp.topMargin, lp.rightMargin, bottomMargin);
-            view.setLayoutParams(lp);
-            return insets.replaceSystemWindowInsets(
-                    insets.getSystemWindowInsetLeft(),
-                    insets.getSystemWindowInsetTop(),
-                    insets.getSystemWindowInsetRight(),
-                    0 /* bottom */);
+        public void onNavigateBack() {
+            final Activity activity = getActivity();
+            if (activity != null) {
+                activity.onBackPressed();
+            }
+        }
+
+        @Override
+        public void onNavigateNext() {
+            handleNext();
         }
     }
 }
diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java
index 7f2480b..2ea8d4a 100644
--- a/src/com/android/settings/SetupChooseLockPattern.java
+++ b/src/com/android/settings/SetupChooseLockPattern.java
@@ -16,8 +16,10 @@
 
 package com.android.settings;
 
-import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+import com.android.setupwizardlib.SetupWizardLayout;
+import com.android.setupwizardlib.view.NavigationBar;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
@@ -35,19 +37,27 @@
  * Other changes should be done to ChooseLockPattern class instead and let this class inherit
  * those changes.
  */
-public class SetupChooseLockPattern extends ChooseLockPattern
-        implements SetupWizardNavBar.NavigationBarListener {
+public class SetupChooseLockPattern extends ChooseLockPattern {
 
-    public static Intent createIntent(Context context, final boolean isFallback,
-            boolean requirePassword, boolean confirmCredentials) {
-        Intent intent = ChooseLockPattern.createIntent(context, isFallback, requirePassword,
+    public static Intent createIntent(Context context, boolean requirePassword,
+            boolean confirmCredentials) {
+        Intent intent = ChooseLockPattern.createIntent(context, requirePassword,
                 confirmCredentials);
         intent.setClass(context, SetupChooseLockPattern.class);
         return intent;
     }
 
-    private SetupWizardNavBar mNavigationBar;
-    private SetupChooseLockPatternFragment mFragment;
+    public static Intent createIntent(Context context, boolean requirePassword, String pattern) {
+        Intent intent = ChooseLockPattern.createIntent(context, requirePassword, pattern);
+        intent.setClass(context, SetupChooseLockPattern.class);
+        return intent;
+    }
+
+    public static Intent createIntent(Context context, boolean requirePassword, long challenge) {
+        Intent intent = ChooseLockPattern.createIntent(context, requirePassword, challenge);
+        intent.setClass(context, SetupChooseLockPattern.class);
+        return intent;
+    }
 
     @Override
     protected boolean isValidFragment(String fragmentName) {
@@ -61,47 +71,25 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
-    @Override
-    public void onNavigationBarCreated(SetupWizardNavBar bar) {
-        mNavigationBar = bar;
-        SetupWizardUtils.setImmersiveMode(this, bar);
-    }
+    public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment
+            implements NavigationBar.NavigationBarListener {
 
-    @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
-        if (mFragment != null) {
-            mFragment.handleRightButton();
-        }
-    }
-
-    @Override
-    public void onAttachFragment(Fragment fragment) {
-        super.onAttachFragment(fragment);
-        if (fragment instanceof ChooseLockPatternFragment) {
-            mFragment = (SetupChooseLockPatternFragment) fragment;
-        }
-    }
-
-    public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment {
-
+        private NavigationBar mNavigationBar;
         private Button mRetryButton;
 
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
-            final View view = inflater.inflate(R.layout.setup_template, container, false);
-            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
-            inflater.inflate(R.layout.setup_choose_lock_pattern, setupContent, true);
-            return view;
+            final SetupWizardLayout layout = (SetupWizardLayout) inflater.inflate(
+                    R.layout.setup_choose_lock_pattern, container, false);
+            mNavigationBar = layout.getNavigationBar();
+            mNavigationBar.setNavigationBarListener(this);
+            layout.setHeaderText(getActivity().getTitle());
+            return layout;
         }
 
         @Override
@@ -109,9 +97,7 @@
             mRetryButton = (Button) view.findViewById(R.id.retryButton);
             mRetryButton.setOnClickListener(this);
             super.onViewCreated(view, savedInstanceState);
-            SetupWizardUtils.setIllustration(getActivity(),
-                    R.drawable.setup_illustration_lock_screen);
-            SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle());
+            SetupWizardUtils.setImmersiveMode(getActivity());
         }
 
         @Override
@@ -132,14 +118,12 @@
 
         @Override
         protected void setRightButtonEnabled(boolean enabled) {
-            SetupChooseLockPattern activity = (SetupChooseLockPattern) getActivity();
-            activity.mNavigationBar.getNextButton().setEnabled(enabled);
+            mNavigationBar.getNextButton().setEnabled(enabled);
         }
 
         @Override
         protected void setRightButtonText(int text) {
-            SetupChooseLockPattern activity = (SetupChooseLockPattern) getActivity();
-            activity.mNavigationBar.getNextButton().setText(text);
+            mNavigationBar.getNextButton().setText(text);
         }
 
         @Override
@@ -148,5 +132,18 @@
             // Only enable the button for retry
             mRetryButton.setEnabled(stage == Stage.FirstChoiceValid);
         }
+
+        @Override
+        public void onNavigateBack() {
+            final Activity activity = getActivity();
+            if (activity != null) {
+                activity.onBackPressed();
+            }
+        }
+
+        @Override
+        public void onNavigateNext() {
+            handleRightButton();
+        }
     }
 }
diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java
index 41782da..61ff81c 100644
--- a/src/com/android/settings/SetupEncryptionInterstitial.java
+++ b/src/com/android/settings/SetupEncryptionInterstitial.java
@@ -16,8 +16,10 @@
 
 package com.android.settings;
 
-import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+import com.android.setupwizardlib.SetupWizardLayout;
+import com.android.setupwizardlib.view.NavigationBar;
 
+import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
@@ -34,8 +36,7 @@
  * Setup Wizard. Other changes should be done to EncryptionInterstitial class instead and let this
  * class inherit those changes.
  */
-public class SetupEncryptionInterstitial extends EncryptionInterstitial
-        implements SetupWizardNavBar.NavigationBarListener{
+public class SetupEncryptionInterstitial extends EncryptionInterstitial {
 
     public static Intent createStartIntent(Context ctx, int quality,
             boolean requirePasswordDefault) {
@@ -62,36 +63,33 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
-    @Override
-    public void onNavigationBarCreated(SetupWizardNavBar bar) {
-        SetupWizardUtils.setImmersiveMode(this, bar);
-    }
-
-    @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
-        setResult(RESULT_OK, getResultIntentData());
-        finish();
-    }
-
-    public static class SetupEncryptionInterstitialFragment extends EncryptionInterstitialFragment {
+    public static class SetupEncryptionInterstitialFragment extends EncryptionInterstitialFragment
+            implements NavigationBar.NavigationBarListener {
 
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
-            View view = inflater.inflate(R.layout.setup_template, container, false);
-            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
-            View content = super.onCreateView(inflater, setupContent, savedInstanceState);
-            setupContent.addView(content);
-            return view;
+            final SetupWizardLayout layout = new SetupWizardLayout(inflater.getContext());
+            layout.setIllustration(R.drawable.setup_illustration_lock_screen,
+                    R.drawable.setup_illustration_horizontal_tile);
+            layout.setBackgroundTile(R.drawable.setup_illustration_tile);
+            final int headerTextResource = getHeaderTextResource();
+            layout.setHeaderText(headerTextResource);
+
+            View content = super.onCreateView(inflater, layout, savedInstanceState);
+            layout.addView(content);
+            layout.getNavigationBar().setNavigationBarListener(this);
+
+            Activity activity = getActivity();
+            if (activity != null) {
+                activity.setTitle(headerTextResource);
+                SetupWizardUtils.setImmersiveMode(activity);
+            }
+            return layout;
         }
 
         private int getHeaderTextResource() {
@@ -108,13 +106,21 @@
         }
 
         @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            SetupWizardUtils.setIllustration(getActivity(),
-                    R.drawable.setup_illustration_lock_screen);
-            final int title = getHeaderTextResource();
-            getActivity().setTitle(title);
-            SetupWizardUtils.setHeaderText(getActivity(), title);
+        public void onNavigateBack() {
+            final Activity activity = getActivity();
+            if (activity != null) {
+                activity.onBackPressed();
+            }
+        }
+
+        @Override
+        public void onNavigateNext() {
+            final SetupEncryptionInterstitial activity =
+                    (SetupEncryptionInterstitial) getActivity();
+            if (activity != null) {
+                activity.setResult(RESULT_OK, activity.getResultIntentData());
+                finish();
+            }
         }
     }
 }
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
index 453e729..c6437e0 100644
--- a/src/com/android/settings/SetupRedactionInterstitial.java
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -17,8 +17,10 @@
 package com.android.settings;
 
 import com.android.settings.notification.RedactionInterstitial;
-import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+import com.android.setupwizardlib.SetupWizardLayout;
+import com.android.setupwizardlib.view.NavigationBar;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -34,8 +36,7 @@
  * Wizard. Other changes should be done to RedactionInterstitial class instead and let this class
  * inherit those changes.
  */
-public class SetupRedactionInterstitial extends RedactionInterstitial
-        implements SetupWizardNavBar.NavigationBarListener{
+public class SetupRedactionInterstitial extends RedactionInterstitial {
 
     public static Intent createStartIntent(Context ctx) {
         Intent startIntent = RedactionInterstitial.createStartIntent(ctx);
@@ -60,44 +61,47 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
-    @Override
-    public void onNavigationBarCreated(SetupWizardNavBar bar) {
-        SetupWizardUtils.setImmersiveMode(this, bar);
-    }
-
-    @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
-        setResult(RESULT_OK, getResultIntentData());
-        finish();
-    }
-
-    public static class SetupEncryptionInterstitialFragment extends RedactionInterstitialFragment {
+    public static class SetupEncryptionInterstitialFragment extends RedactionInterstitialFragment
+            implements NavigationBar.NavigationBarListener {
 
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
-            View view = inflater.inflate(R.layout.setup_template, container, false);
-            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
-            View content = super.onCreateView(inflater, setupContent, savedInstanceState);
-            setupContent.addView(content);
-            return view;
+            final SetupWizardLayout layout = new SetupWizardLayout(inflater.getContext());
+            layout.setIllustration(R.drawable.setup_illustration_lock_screen,
+                    R.drawable.setup_illustration_horizontal_tile);
+            layout.setBackgroundTile(R.drawable.setup_illustration_tile);
+            layout.setHeaderText(R.string.notification_section_header);
+
+            View content = super.onCreateView(inflater, layout, savedInstanceState);
+            layout.addView(content);
+
+            final NavigationBar navigationBar = layout.getNavigationBar();
+            navigationBar.setNavigationBarListener(this);
+            navigationBar.getBackButton().setEnabled(false);
+            SetupWizardUtils.setImmersiveMode(getActivity());
+            return layout;
         }
 
         @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            SetupWizardUtils.setIllustration(getActivity(),
-                    R.drawable.setup_illustration_lock_screen);
-            SetupWizardUtils.setHeaderText(getActivity(), R.string.notification_section_header);
+        public void onNavigateBack() {
+            final Activity activity = getActivity();
+            if (activity != null) {
+                activity.onBackPressed();
+            }
+        }
+
+        @Override
+        public void onNavigateNext() {
+            final SetupRedactionInterstitial activity = (SetupRedactionInterstitial) getActivity();
+            if (activity != null) {
+                activity.setResult(RESULT_OK, activity.getResultIntentData());
+                finish();
+            }
         }
     }
 }
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index 3d44125..61043ca 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -16,122 +16,51 @@
 
 package com.android.settings;
 
-import com.android.settings.widget.SetupWizardIllustration;
-import com.android.setupwizard.navigationbar.SetupWizardNavBar;
-
+import com.android.setupwizardlib.util.SystemBarHelper;
+import com.android.setupwizardlib.util.WizardManagerHelper;
 
 import android.app.Activity;
+import android.app.Dialog;
 import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.view.Gravity;
-import android.view.Window;
-import android.widget.TextView;
 
 public class SetupWizardUtils {
     private static final String TAG = "SetupWizardUtils";
 
-    // Extra containing the resource name of the theme to be used
-    public static final String EXTRA_THEME = "theme";
-    public static final String THEME_HOLO = "holo";
-    public static final String THEME_HOLO_LIGHT = "holo_light";
-    public static final String THEME_MATERIAL = "material";
-    public static final String THEME_MATERIAL_LIGHT = "material_light";
-
-    public static final String EXTRA_USE_IMMERSIVE_MODE = "useImmersiveMode";
-
     // From WizardManager (must match constants maintained there)
-    public static final String ACTION_NEXT = "com.android.wizard.NEXT";
     public static final String EXTRA_SCRIPT_URI = "scriptUri";
-    public static final String EXTRA_ACTION_ID = "actionId";
-    public static final String EXTRA_RESULT_CODE = "com.android.setupwizard.ResultCode";
-    public static final int NEXT_REQUEST = 10000;
 
     public static boolean isUsingWizardManager(Activity activity) {
         return activity.getIntent().hasExtra(EXTRA_SCRIPT_URI);
     }
 
-    /**
-     * Send the results of this activity to WizardManager, which will then send out the next
-     * scripted activity. WizardManager does not actually return an activity result, but if we
-     * invoke WizardManager without requesting a result, the framework will choose not to issue a
-     * call to onActivityResult with RESULT_CANCELED when navigating backward.
-     */
-    public static void sendResultsToSetupWizard(Activity activity, int resultCode) {
-        final Intent intent = activity.getIntent();
-        final Intent nextIntent = new Intent(ACTION_NEXT);
-        nextIntent.putExtra(EXTRA_SCRIPT_URI, intent.getStringExtra(EXTRA_SCRIPT_URI));
-        nextIntent.putExtra(EXTRA_ACTION_ID, intent.getStringExtra(EXTRA_ACTION_ID));
-        nextIntent.putExtra(EXTRA_THEME, intent.getStringExtra(EXTRA_THEME));
-        nextIntent.putExtra(EXTRA_RESULT_CODE, resultCode);
-        activity.startActivityForResult(nextIntent, NEXT_REQUEST);
-    }
-
-    public static int getTheme(Intent intent, int defaultResId) {
-        final String themeName = intent.getStringExtra(EXTRA_THEME);
-        int resid = defaultResId;
-        if (THEME_HOLO_LIGHT.equalsIgnoreCase(themeName) ||
-                THEME_MATERIAL_LIGHT.equalsIgnoreCase(themeName)) {
-            resid = R.style.SetupWizardTheme_Light;
-        } else if (THEME_HOLO.equalsIgnoreCase(themeName) ||
-                THEME_MATERIAL.equalsIgnoreCase(themeName)) {
-            resid = R.style.SetupWizardTheme;
+    public static int getTheme(Intent intent) {
+        if (WizardManagerHelper.isLightTheme(intent, true)) {
+            return R.style.SetupWizardTheme_Light;
+        } else {
+            return R.style.SetupWizardTheme;
         }
-        return resid;
     }
 
     /**
      * Sets the immersive mode related flags based on the extra in the intent which started the
      * activity.
      */
-    public static void setImmersiveMode(Activity activity, SetupWizardNavBar navBar) {
-        final boolean useImmersiveMode =
-                activity.getIntent().getBooleanExtra(EXTRA_USE_IMMERSIVE_MODE, false);
-        navBar.setUseImmersiveMode(useImmersiveMode);
+    public static void setImmersiveMode(Activity activity) {
+        final boolean useImmersiveMode = activity.getIntent().getBooleanExtra(
+                WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, false);
         if (useImmersiveMode) {
-            final Window window = activity.getWindow();
-            window.setNavigationBarColor(Color.TRANSPARENT);
-            window.setStatusBarColor(Color.TRANSPARENT);
+            SystemBarHelper.hideSystemBars(activity.getWindow());
         }
     }
 
-    public static TextView getHeader(Activity activity) {
-        return (TextView) activity.findViewById(R.id.title);
-    }
-
-    public static void setHeaderText(Activity activity, int text) {
-        getHeader(activity).setText(text);
-    }
-
-    public static void setHeaderText(Activity activity, CharSequence text) {
-        getHeader(activity).setText(text);
+    public static void applyImmersiveFlags(final Dialog dialog) {
+        SystemBarHelper.hideSystemBars(dialog);
     }
 
     public static void copySetupExtras(Intent fromIntent, Intent toIntent) {
-        toIntent.putExtra(EXTRA_THEME, fromIntent.getStringExtra(EXTRA_THEME));
-        toIntent.putExtra(EXTRA_USE_IMMERSIVE_MODE,
-                fromIntent.getBooleanExtra(EXTRA_USE_IMMERSIVE_MODE, false));
-    }
-
-    public static void setIllustration(Activity activity, int asset) {
-        SetupWizardIllustration illustration =
-                (SetupWizardIllustration) activity.findViewById(R.id.setup_illustration);
-        if (illustration != null) {
-            Drawable drawable = activity.getDrawable(R.drawable.setup_illustration);
-            Drawable newIllustration = activity.getDrawable(asset);
-            if (drawable instanceof LayerDrawable) {
-                LayerDrawable layers = (LayerDrawable) drawable;
-                Drawable oldIllustration = layers.findDrawableByLayerId(R.id.illustration_image);
-                if (newIllustration instanceof BitmapDrawable
-                        && oldIllustration instanceof BitmapDrawable) {
-                    final int gravity = ((BitmapDrawable) oldIllustration).getGravity();
-                    ((BitmapDrawable) newIllustration).setGravity(gravity);
-                }
-                layers.setDrawableByLayerId(R.id.illustration_image, newIllustration);
-                illustration.setForeground(layers);
-            }
-        }
+        toIntent.putExtra(WizardManagerHelper.EXTRA_THEME,
+                fromIntent.getStringExtra(WizardManagerHelper.EXTRA_THEME));
+        toIntent.putExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE,
+                fromIntent.getBooleanExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, false));
     }
 }
diff --git a/src/com/android/settings/SingleLineSummaryPreference.java b/src/com/android/settings/SingleLineSummaryPreference.java
new file mode 100644
index 0000000..420fe08
--- /dev/null
+++ b/src/com/android/settings/SingleLineSummaryPreference.java
@@ -0,0 +1,41 @@
+/*
+ * 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.preference.Preference;
+import android.text.TextUtils.TruncateAt;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+public class SingleLineSummaryPreference extends Preference {
+
+    public SingleLineSummaryPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        final TextView summaryView = (TextView) view.findViewById(
+                com.android.internal.R.id.summary);
+        summaryView.setSingleLine();
+        summaryView.setEllipsize(TruncateAt.END);
+    }
+
+}
diff --git a/src/com/android/settings/SmsDefaultDialog.java b/src/com/android/settings/SmsDefaultDialog.java
index 3a3848b..e2a3faf 100644
--- a/src/com/android/settings/SmsDefaultDialog.java
+++ b/src/com/android/settings/SmsDefaultDialog.java
@@ -20,8 +20,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.provider.Telephony.Sms.Intents;
 import android.telephony.TelephonyManager;
diff --git a/src/com/android/settings/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
index 3c40453..37e0b50 100644
--- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java
+++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
@@ -1,13 +1,10 @@
 package com.android.settings;
 
-import android.provider.Telephony;
 import static com.android.internal.telephony.TelephonyIntents.SECRET_CODE_ACTION;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.BroadcastReceiver;
-import android.util.Log;
-import android.view.KeyEvent;
 
 
 public class TestingSettingsBroadcastReceiver extends BroadcastReceiver {
diff --git a/src/com/android/settings/TetherService.java b/src/com/android/settings/TetherService.java
index 9323c33..459dc27 100644
--- a/src/com/android/settings/TetherService.java
+++ b/src/com/android/settings/TetherService.java
@@ -30,13 +30,12 @@
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
 import android.os.IBinder;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.settings.wifi.WifiApEnabler;
+import com.android.settingslib.TetherUtil;
 
 import java.util.ArrayList;
 
@@ -44,12 +43,6 @@
     private static final String TAG = "TetherService";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
-    public static final String EXTRA_ADD_TETHER_TYPE = "extraAddTetherType";
-    public static final String EXTRA_REM_TETHER_TYPE = "extraRemTetherType";
-    public static final String EXTRA_SET_ALARM = "extraSetAlarm";
-    public static final String EXTRA_RUN_PROVISION = "extraRunProvision";
-    public static final String EXTRA_ENABLE_WIFI_TETHER = "extraEnableWifiTether";
-
     private static final String EXTRA_RESULT = "EntitlementResult";
 
     // Activity results to match the activity provision protocol.
@@ -88,15 +81,17 @@
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        if (intent.hasExtra(EXTRA_ADD_TETHER_TYPE)) {
-            int type = intent.getIntExtra(EXTRA_ADD_TETHER_TYPE, TetherSettings.INVALID);
+        if (intent.hasExtra(TetherUtil.EXTRA_ADD_TETHER_TYPE)) {
+            int type = intent.getIntExtra(TetherUtil.EXTRA_ADD_TETHER_TYPE,
+                    TetherUtil.TETHERING_INVALID);
             if (!mCurrentTethers.contains(type)) {
                 if (DEBUG) Log.d(TAG, "Adding tether " + type);
                 mCurrentTethers.add(type);
             }
         }
-        if (intent.hasExtra(EXTRA_REM_TETHER_TYPE)) {
-            int type = intent.getIntExtra(EXTRA_REM_TETHER_TYPE, TetherSettings.INVALID);
+        if (intent.hasExtra(TetherUtil.EXTRA_REM_TETHER_TYPE)) {
+            int type = intent.getIntExtra(TetherUtil.EXTRA_REM_TETHER_TYPE,
+                    TetherUtil.TETHERING_INVALID);
             if (DEBUG) Log.d(TAG, "Removing tether " + type);
             int index = mCurrentTethers.indexOf(type);
             if (index >= 0) {
@@ -112,16 +107,16 @@
         // Only set the alarm if we have one tether, meaning the one just added,
         // to avoid setting it when it was already set previously for another
         // type.
-        if (intent.getBooleanExtra(EXTRA_SET_ALARM, false)
+        if (intent.getBooleanExtra(TetherUtil.EXTRA_SET_ALARM, false)
                 && mCurrentTethers.size() == 1) {
             scheduleAlarm();
         }
 
-        if (intent.getBooleanExtra(EXTRA_ENABLE_WIFI_TETHER, false)) {
+        if (intent.getBooleanExtra(TetherUtil.EXTRA_ENABLE_WIFI_TETHER, false)) {
             mEnableWifiAfterCheck = true;
         }
 
-        if (intent.getBooleanExtra(EXTRA_RUN_PROVISION, false)) {
+        if (intent.getBooleanExtra(TetherUtil.EXTRA_RUN_PROVISION, false)) {
             startProvisioning(mCurrentTypeIndex);
         } else if (!mInProvisionCheck) {
             // If we aren't running any provisioning, no reason to stay alive.
@@ -172,14 +167,13 @@
     }
 
     private void enableWifiTetheringIfNeeded() {
-        if (!isHotspotEnabled(this)) {
-            new WifiApEnabler(this, null).setSoftapEnabled(true);
+        if (!TetherUtil.isWifiTetherEnabled(this)) {
+            TetherUtil.setWifiTethering(true, this);
         }
     }
 
     private void disableWifiTethering() {
-        WifiApEnabler enabler = new WifiApEnabler(this, null);
-        enabler.setSoftapEnabled(false);
+        TetherUtil.setWifiTethering(false, this);
     }
 
     private void disableUsbTethering() {
@@ -216,21 +210,16 @@
         mInProvisionCheck = true;
     }
 
-    private static boolean isHotspotEnabled(Context context) {
-        WifiManager wifiManager = (WifiManager) context.getSystemService(WIFI_SERVICE);
-        return wifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED;
-    }
-
     public static void scheduleRecheckAlarm(Context context, int type) {
         Intent intent = new Intent(context, TetherService.class);
-        intent.putExtra(EXTRA_ADD_TETHER_TYPE, type);
-        intent.putExtra(EXTRA_SET_ALARM, true);
+        intent.putExtra(TetherUtil.EXTRA_ADD_TETHER_TYPE, type);
+        intent.putExtra(TetherUtil.EXTRA_SET_ALARM, true);
         context.startService(intent);
     }
 
     private void scheduleAlarm() {
         Intent intent = new Intent(this, TetherService.class);
-        intent.putExtra(EXTRA_RUN_PROVISION, true);
+        intent.putExtra(TetherUtil.EXTRA_RUN_PROVISION, true);
 
         PendingIntent pendingIntent = PendingIntent.getService(this, 0, intent, 0);
         AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
@@ -250,7 +239,7 @@
      */
     public static void cancelRecheckAlarmIfNecessary(final Context context, int type) {
         Intent intent = new Intent(context, TetherService.class);
-        intent.putExtra(EXTRA_REM_TETHER_TYPE, type);
+        intent.putExtra(TetherUtil.EXTRA_REM_TETHER_TYPE, type);
         context.startService(intent);
     }
 
@@ -276,19 +265,19 @@
                 mInProvisionCheck = false;
                 int checkType = mCurrentTethers.get(mCurrentTypeIndex);
                 if (intent.getIntExtra(EXTRA_RESULT, RESULT_DEFAULT) == RESULT_OK) {
-                    if (checkType == TetherSettings.WIFI_TETHERING && mEnableWifiAfterCheck) {
+                    if (checkType == TetherUtil.TETHERING_WIFI && mEnableWifiAfterCheck) {
                         enableWifiTetheringIfNeeded();
                         mEnableWifiAfterCheck = false;
                     }
                 } else {
                     switch (checkType) {
-                        case TetherSettings.WIFI_TETHERING:
+                        case TetherUtil.TETHERING_WIFI:
                             disableWifiTethering();
                             break;
-                        case TetherSettings.BLUETOOTH_TETHERING:
+                        case TetherUtil.TETHERING_BLUETOOTH:
                             disableBtTethering();
                             break;
-                        case TetherSettings.USB_TETHERING:
+                        case TetherUtil.TETHERING_USB:
                             disableUsbTethering();
                             break;
                     }
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index e33ddb0..125411a 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -16,6 +16,11 @@
 
 package com.android.settings;
 
+import static com.android.settingslib.TetherUtil.TETHERING_INVALID;
+import static com.android.settingslib.TetherUtil.TETHERING_WIFI;
+import static com.android.settingslib.TetherUtil.TETHERING_USB;
+import static com.android.settingslib.TetherUtil.TETHERING_BLUETOOTH;
+
 import android.app.Activity;
 import android.app.Dialog;
 import android.bluetooth.BluetoothAdapter;
@@ -33,16 +38,16 @@
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.SystemProperties;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.wifi.WifiApDialog;
 import com.android.settings.wifi.WifiApEnabler;
+import com.android.settingslib.TetherUtil;
 
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicReference;
@@ -93,13 +98,8 @@
 
     private boolean mBluetoothEnableForTether;
 
-    public static final int INVALID             = -1;
-    public static final int WIFI_TETHERING      = 0;
-    public static final int USB_TETHERING       = 1;
-    public static final int BLUETOOTH_TETHERING = 2;
-
     /* One of INVALID, WIFI_TETHERING, USB_TETHERING or BLUETOOTH_TETHERING */
-    private int mTetherChoice = INVALID;
+    private int mTetherChoice = TETHERING_INVALID;
 
     /* Stores the package name and the class name of the provisioning app */
     private String[] mProvisionApp;
@@ -108,6 +108,11 @@
     private boolean mUnavailable;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.TETHER;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
@@ -454,10 +459,10 @@
         boolean enable = (Boolean) value;
 
         if (enable) {
-            startProvisioningIfNecessary(WIFI_TETHERING);
+            startProvisioningIfNecessary(TETHERING_WIFI);
         } else {
-            if (isProvisioningNeeded(mProvisionApp)) {
-                TetherService.cancelRecheckAlarmIfNecessary(getActivity(), WIFI_TETHERING);
+            if (TetherUtil.isProvisioningNeeded(getActivity())) {
+                TetherService.cancelRecheckAlarmIfNecessary(getActivity(), TETHERING_WIFI);
             }
             mWifiApEnabler.setSoftapEnabled(false);
         }
@@ -465,16 +470,13 @@
     }
 
     public static boolean isProvisioningNeededButUnavailable(Context context) {
-        String[] provisionApp = context.getResources().getStringArray(
-                com.android.internal.R.array.config_mobile_hotspot_provision_app);
-        return (isProvisioningNeeded(provisionApp)
-                && !isIntentAvailable(context, provisionApp));
+        return (TetherUtil.isProvisioningNeeded(context)
+                && !isIntentAvailable(context));
     }
 
-    private static boolean isIntentAvailable(Context context, String[] provisionApp) {
-        if (provisionApp.length <  2) {
-            throw new IllegalArgumentException("provisionApp length should at least be 2");
-        }
+    private static boolean isIntentAvailable(Context context) {
+        String[] provisionApp = context.getResources().getStringArray(
+                com.android.internal.R.array.config_mobile_hotspot_provision_app);
         final PackageManager packageManager = context.getPackageManager();
         Intent intent = new Intent(Intent.ACTION_MAIN);
         intent.setClassName(provisionApp[0], provisionApp[1]);
@@ -483,18 +485,9 @@
                 PackageManager.MATCH_DEFAULT_ONLY).size() > 0);
     }
 
-
-    private static boolean isProvisioningNeeded(String[] provisionApp) {
-        if (SystemProperties.getBoolean("net.tethering.noprovisioning", false)
-                || provisionApp == null) {
-            return false;
-        }
-        return (provisionApp.length == 2);
-    }
-
     private void startProvisioningIfNecessary(int choice) {
         mTetherChoice = choice;
-        if (isProvisioningNeeded(mProvisionApp)) {
+        if (TetherUtil.isProvisioningNeeded(getActivity())) {
             Intent intent = new Intent(Intent.ACTION_MAIN);
             intent.setClassName(mProvisionApp[0], mProvisionApp[1]);
             intent.putExtra(TETHER_CHOICE, mTetherChoice);
@@ -514,24 +507,24 @@
                 //BT and USB need switch turned off on failure
                 //Wifi tethering is never turned on until afterwards
                 switch (mTetherChoice) {
-                    case BLUETOOTH_TETHERING:
+                    case TETHERING_BLUETOOTH:
                         mBluetoothTether.setChecked(false);
                         break;
-                    case USB_TETHERING:
+                    case TETHERING_USB:
                         mUsbTether.setChecked(false);
                         break;
                 }
-                mTetherChoice = INVALID;
+                mTetherChoice = TETHERING_INVALID;
             }
         }
     }
 
     private void startTethering() {
         switch (mTetherChoice) {
-            case WIFI_TETHERING:
+            case TETHERING_WIFI:
                 mWifiApEnabler.setSoftapEnabled(true);
                 break;
-            case BLUETOOTH_TETHERING:
+            case TETHERING_BLUETOOTH:
                 // turn on Bluetooth first
                 BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
                 if (adapter.getState() == BluetoothAdapter.STATE_OFF) {
@@ -545,7 +538,7 @@
                     mBluetoothTether.setSummary(R.string.bluetooth_tethering_available_subtext);
                 }
                 break;
-            case USB_TETHERING:
+            case TETHERING_USB:
                 setUsbTethering(true);
                 break;
             default:
@@ -574,10 +567,10 @@
             boolean newState = mUsbTether.isChecked();
 
             if (newState) {
-                startProvisioningIfNecessary(USB_TETHERING);
+                startProvisioningIfNecessary(TETHERING_USB);
             } else {
-                if (isProvisioningNeeded(mProvisionApp)) {
-                    TetherService.cancelRecheckAlarmIfNecessary(getActivity(), USB_TETHERING);
+                if (TetherUtil.isProvisioningNeeded(getActivity())) {
+                    TetherService.cancelRecheckAlarmIfNecessary(getActivity(), TETHERING_USB);
                 }
                 setUsbTethering(newState);
             }
@@ -585,10 +578,10 @@
             boolean bluetoothTetherState = mBluetoothTether.isChecked();
 
             if (bluetoothTetherState) {
-                startProvisioningIfNecessary(BLUETOOTH_TETHERING);
+                startProvisioningIfNecessary(TETHERING_BLUETOOTH);
             } else {
-                if (isProvisioningNeeded(mProvisionApp)) {
-                    TetherService.cancelRecheckAlarmIfNecessary(getActivity(), BLUETOOTH_TETHERING);
+                if (TetherUtil.isProvisioningNeeded(getActivity())) {
+                    TetherService.cancelRecheckAlarmIfNecessary(getActivity(), TETHERING_BLUETOOTH);
                 }
                 boolean errored = false;
 
@@ -652,17 +645,4 @@
     public int getHelpResource() {
         return R.string.help_url_tether;
     }
-
-    /**
-     * Checks whether this screen will have anything to show on this device. This is called by
-     * the shortcut picker for Settings shortcuts (home screen widget).
-     * @param context a context object for getting a system service.
-     * @return whether Tether & portable hotspot should be shown in the shortcuts picker.
-     */
-    public static boolean showInShortcuts(Context context) {
-        final ConnectivityManager cm =
-                (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER;
-        return !isSecondaryUser && cm.isTetheringSupported();
-    }
 }
diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java
index 54fef36..4c6b4ee 100644
--- a/src/com/android/settings/TrustAgentSettings.java
+++ b/src/com/android/settings/TrustAgentSettings.java
@@ -18,6 +18,7 @@
 
 import java.util.List;
 
+import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -32,14 +33,17 @@
 import android.util.ArrayMap;
 import android.util.ArraySet;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 
 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;
 
     public static final class AgentInfo {
         CharSequence label;
@@ -61,8 +65,14 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.TRUST_AGENT;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        mDpm = getActivity().getSystemService(DevicePolicyManager.class);
         addPreferencesFromResource(R.xml.trust_agent_settings);
     }
 
@@ -83,6 +93,10 @@
         PreferenceGroup category =
                 (PreferenceGroup) getPreferenceScreen().findPreference("trust_agents");
         category.removeAll();
+
+        boolean disabledByDevicePolicy = (mDpm.getKeyguardDisabledFeatures(null)
+                & DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS) != 0;
+
         final int count = mAvailableAgents.size();
         for (int i = 0; i < count; i++) {
             AgentInfo agent = mAvailableAgents.valueAt(i);
@@ -94,6 +108,13 @@
             preference.setPersistent(false);
             preference.setOnPreferenceChangeListener(this);
             preference.setChecked(mActiveAgents.contains(agent.component));
+
+            if (disabledByDevicePolicy
+                    && mDpm.getTrustAgentConfiguration(null, agent.component) == null) {
+                preference.setEnabled(false);
+                preference.setSummary(R.string.trust_agent_disabled_device_admin);
+            }
+
             category.addPreference(agent.preference);
         }
     }
diff --git a/src/com/android/settings/TrustAgentUtils.java b/src/com/android/settings/TrustAgentUtils.java
index 31a073c..109663a 100644
--- a/src/com/android/settings/TrustAgentUtils.java
+++ b/src/com/android/settings/TrustAgentUtils.java
@@ -57,6 +57,7 @@
         ComponentName componentName;
         String title;
         String summary;
+        boolean disabledByAdministrator;
     }
 
     public static ComponentName getComponentName(ResolveInfo resolveInfo) {
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index e2b49d6..d3935db 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -22,7 +22,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.pm.UserInfo;
-import android.content.res.TypedArray;
 import android.net.http.SslCertificate;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -52,6 +51,7 @@
 import android.widget.TabHost;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.util.ParcelableString;
 
 import java.security.cert.CertificateEncodingException;
@@ -61,7 +61,7 @@
 import java.util.List;
 import java.util.HashMap;
 
-public class TrustedCredentialsSettings extends Fragment {
+public class TrustedCredentialsSettings extends InstrumentedFragment {
 
     private static final String TAG = "TrustedCredentialsSettings";
 
@@ -69,6 +69,11 @@
 
     private static final String USER_ACTION = "com.android.settings.TRUSTED_CREDENTIALS_USER";
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.TRUSTED_CREDENTIALS;
+    }
+
     private enum Tab {
         SYSTEM("system",
                R.string.trusted_credentials_system_tab,
@@ -321,7 +326,7 @@
             if (convertView == null) {
                 LayoutInflater inflater = (LayoutInflater) getActivity()
                         .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-                convertView = inflateCategoryHeader(inflater, parent);
+                convertView = Utils.inflateCategoryHeader(inflater, parent);
             }
 
             final TextView title = (TextView) convertView.findViewById(android.R.id.title);
@@ -354,15 +359,6 @@
         public int getListViewId(Tab tab) {
             return tab.mExpandableList;
         }
-        private View inflateCategoryHeader(LayoutInflater inflater, ViewGroup parent) {
-            final TypedArray a = inflater.getContext().obtainStyledAttributes(null,
-                    com.android.internal.R.styleable.Preference,
-                    com.android.internal.R.attr.preferenceCategoryStyle, 0);
-            final int resId = a.getResourceId(com.android.internal.R.styleable.Preference_layout,
-                    0);
-            return inflater.inflate(resId, parent, false);
-        }
-
     }
 
     private class TrustedCertificateAdapter extends BaseAdapter implements
diff --git a/src/com/android/settings/UsageAccessSettings.java b/src/com/android/settings/UsageAccessSettings.java
deleted file mode 100644
index 89e184e..0000000
--- a/src/com/android/settings/UsageAccessSettings.java
+++ /dev/null
@@ -1,394 +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 com.android.internal.content.PackageMonitor;
-
-import android.Manifest;
-import android.app.ActivityThread;
-import android.app.AlertDialog;
-import android.app.AppOpsManager;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Looper;
-import android.os.RemoteException;
-import android.preference.Preference;
-import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
-import android.util.ArrayMap;
-import android.util.Log;
-
-import java.util.List;
-
-public class UsageAccessSettings extends SettingsPreferenceFragment implements
-        Preference.OnPreferenceChangeListener {
-
-    private static final String TAG = "UsageAccessSettings";
-
-    private static final String[] PM_USAGE_STATS_PERMISSION = new String[] {
-            Manifest.permission.PACKAGE_USAGE_STATS
-    };
-
-    private static final int[] APP_OPS_OP_CODES = new int[] {
-            AppOpsManager.OP_GET_USAGE_STATS
-    };
-
-    private static class PackageEntry {
-        public PackageEntry(String packageName) {
-            this.packageName = packageName;
-            this.appOpMode = AppOpsManager.MODE_DEFAULT;
-        }
-
-        final String packageName;
-        PackageInfo packageInfo;
-        boolean permissionGranted;
-        int appOpMode;
-
-        SwitchPreference preference;
-    }
-
-    /**
-     * Fetches the list of Apps that are requesting access to the UsageStats API and updates
-     * the PreferenceScreen with the results when complete.
-     */
-    private class AppsRequestingAccessFetcher extends
-            AsyncTask<Void, Void, ArrayMap<String, PackageEntry>> {
-
-        private final Context mContext;
-        private final PackageManager mPackageManager;
-        private final IPackageManager mIPackageManager;
-
-        public AppsRequestingAccessFetcher(Context context) {
-            mContext = context;
-            mPackageManager = context.getPackageManager();
-            mIPackageManager = ActivityThread.getPackageManager();
-        }
-
-        @Override
-        protected ArrayMap<String, PackageEntry> doInBackground(Void... params) {
-            final String[] packages;
-            try {
-                packages = mIPackageManager.getAppOpPermissionPackages(
-                        Manifest.permission.PACKAGE_USAGE_STATS);
-            } catch (RemoteException e) {
-                Log.w(TAG, "PackageManager is dead. Can't get list of packages requesting "
-                        + Manifest.permission.PACKAGE_USAGE_STATS);
-                return null;
-            }
-
-            if (packages == null) {
-                // No packages are requesting permission to use the UsageStats API.
-                return null;
-            }
-
-            ArrayMap<String, PackageEntry> entries = new ArrayMap<>();
-            for (final String packageName : packages) {
-                if (!shouldIgnorePackage(packageName)) {
-                    entries.put(packageName, new PackageEntry(packageName));
-                }
-            }
-
-             // Load the packages that have been granted the PACKAGE_USAGE_STATS permission.
-            final List<PackageInfo> packageInfos = mPackageManager.getPackagesHoldingPermissions(
-                    PM_USAGE_STATS_PERMISSION, 0);
-            final int packageInfoCount = packageInfos != null ? packageInfos.size() : 0;
-            for (int i = 0; i < packageInfoCount; i++) {
-                final PackageInfo packageInfo = packageInfos.get(i);
-                final PackageEntry pe = entries.get(packageInfo.packageName);
-                if (pe != null) {
-                    pe.packageInfo = packageInfo;
-                    pe.permissionGranted = true;
-                }
-            }
-
-            // Load the remaining packages that have requested but don't have the
-            // PACKAGE_USAGE_STATS permission.
-            int packageCount = entries.size();
-            for (int i = 0; i < packageCount; i++) {
-                final PackageEntry pe = entries.valueAt(i);
-                if (pe.packageInfo == null) {
-                    try {
-                        pe.packageInfo = mPackageManager.getPackageInfo(pe.packageName, 0);
-                    } catch (PackageManager.NameNotFoundException e) {
-                        // This package doesn't exist. This may occur when an app is uninstalled for
-                        // one user, but it is not removed from the system.
-                        entries.removeAt(i);
-                        i--;
-                        packageCount--;
-                    }
-                }
-            }
-
-            // Find out which packages have been granted permission from AppOps.
-            final List<AppOpsManager.PackageOps> packageOps = mAppOpsManager.getPackagesForOps(
-                    APP_OPS_OP_CODES);
-            final int packageOpsCount = packageOps != null ? packageOps.size() : 0;
-            for (int i = 0; i < packageOpsCount; i++) {
-                final AppOpsManager.PackageOps packageOp = packageOps.get(i);
-                final PackageEntry pe = entries.get(packageOp.getPackageName());
-                if (pe == null) {
-                    Log.w(TAG, "AppOp permission exists for package " + packageOp.getPackageName()
-                            + " but package doesn't exist or did not request UsageStats access");
-                    continue;
-                }
-
-                if (packageOp.getUid() != pe.packageInfo.applicationInfo.uid) {
-                    // This AppOp does not belong to this user.
-                    continue;
-                }
-
-                if (packageOp.getOps().size() < 1) {
-                    Log.w(TAG, "No AppOps permission exists for package "
-                            + packageOp.getPackageName());
-                    continue;
-                }
-
-                pe.appOpMode = packageOp.getOps().get(0).getMode();
-            }
-
-            return entries;
-        }
-
-        @Override
-        protected void onPostExecute(ArrayMap<String, PackageEntry> newEntries) {
-            mLastFetcherTask = null;
-
-            if (getActivity() == null) {
-                // We must have finished the Activity while we were processing in the background.
-                return;
-            }
-
-            if (newEntries == null) {
-                mPackageEntryMap.clear();
-                mPreferenceScreen.removeAll();
-                return;
-            }
-
-            // Find the deleted entries and remove them from the PreferenceScreen.
-            final int oldPackageCount = mPackageEntryMap.size();
-            for (int i = 0; i < oldPackageCount; i++) {
-                final PackageEntry oldPackageEntry = mPackageEntryMap.valueAt(i);
-                final PackageEntry newPackageEntry = newEntries.get(oldPackageEntry.packageName);
-                if (newPackageEntry == null) {
-                    // This package has been removed.
-                    mPreferenceScreen.removePreference(oldPackageEntry.preference);
-                } else {
-                    // This package already exists in the preference hierarchy, so reuse that
-                    // Preference.
-                    newPackageEntry.preference = oldPackageEntry.preference;
-                }
-            }
-
-            // Now add new packages to the PreferenceScreen.
-            final int packageCount = newEntries.size();
-            for (int i = 0; i < packageCount; i++) {
-                final PackageEntry packageEntry = newEntries.valueAt(i);
-                if (packageEntry.preference == null) {
-                    packageEntry.preference = new SwitchPreference(mContext);
-                    packageEntry.preference.setPersistent(false);
-                    packageEntry.preference.setOnPreferenceChangeListener(UsageAccessSettings.this);
-                    mPreferenceScreen.addPreference(packageEntry.preference);
-                }
-                updatePreference(packageEntry);
-            }
-
-            mPackageEntryMap.clear();
-            mPackageEntryMap = newEntries;
-        }
-
-        private void updatePreference(PackageEntry pe) {
-            pe.preference.setIcon(pe.packageInfo.applicationInfo.loadIcon(mPackageManager));
-            pe.preference.setTitle(pe.packageInfo.applicationInfo.loadLabel(mPackageManager));
-            pe.preference.setKey(pe.packageName);
-
-            boolean check = false;
-            if (pe.appOpMode == AppOpsManager.MODE_ALLOWED) {
-                check = true;
-            } else if (pe.appOpMode == AppOpsManager.MODE_DEFAULT) {
-                // If the default AppOps mode is set, then fall back to
-                // whether the app has been granted permission by PackageManager.
-                check = pe.permissionGranted;
-            }
-
-            if (check != pe.preference.isChecked()) {
-                pe.preference.setChecked(check);
-            }
-        }
-    }
-
-    static boolean shouldIgnorePackage(String packageName) {
-        return packageName.equals("android") || packageName.equals("com.android.settings");
-    }
-
-    private AppsRequestingAccessFetcher mLastFetcherTask;
-    ArrayMap<String, PackageEntry> mPackageEntryMap = new ArrayMap<>();
-    AppOpsManager mAppOpsManager;
-    PreferenceScreen mPreferenceScreen;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        addPreferencesFromResource(R.xml.usage_access_settings);
-        mPreferenceScreen = getPreferenceScreen();
-        mPreferenceScreen.setOrderingAsAdded(false);
-        mAppOpsManager = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        updateInterestedApps();
-        mPackageMonitor.register(getActivity(), Looper.getMainLooper(), false);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-
-        mPackageMonitor.unregister();
-        if (mLastFetcherTask != null) {
-            mLastFetcherTask.cancel(true);
-            mLastFetcherTask = null;
-        }
-    }
-
-    private void updateInterestedApps() {
-        if (mLastFetcherTask != null) {
-            // Canceling can only fail for some obscure reason since mLastFetcherTask would be
-            // null if the task has already completed. So we ignore the result of cancel and
-            // spawn a new task to get fresh data. AsyncTask executes tasks serially anyways,
-            // so we are safe from running two tasks at the same time.
-            mLastFetcherTask.cancel(true);
-        }
-
-        mLastFetcherTask = new AppsRequestingAccessFetcher(getActivity());
-        mLastFetcherTask.execute();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final String packageName = preference.getKey();
-        final PackageEntry pe = mPackageEntryMap.get(packageName);
-        if (pe == null) {
-            Log.w(TAG, "Preference change event for package " + packageName
-                    + " but that package is no longer valid.");
-            return false;
-        }
-
-        if (!(newValue instanceof Boolean)) {
-            Log.w(TAG, "Preference change event for package " + packageName
-                    + " had non boolean value of type " + newValue.getClass().getName());
-            return false;
-        }
-
-        final int newMode = (Boolean) newValue ?
-                AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED;
-
-        // Check if we need to do any work.
-        if (pe.appOpMode != newMode) {
-            if (newMode != AppOpsManager.MODE_ALLOWED) {
-                // Turning off the setting has no warning.
-                setNewMode(pe, newMode);
-                return true;
-            }
-
-            // Turning on the setting has a Warning.
-            FragmentTransaction ft = getChildFragmentManager().beginTransaction();
-            Fragment prev = getChildFragmentManager().findFragmentByTag("warning");
-            if (prev != null) {
-                ft.remove(prev);
-            }
-            WarningDialogFragment.newInstance(pe.packageName).show(ft, "warning");
-            return false;
-        }
-        return true;
-    }
-
-    void setNewMode(PackageEntry pe, int newMode) {
-        mAppOpsManager.setMode(AppOpsManager.OP_GET_USAGE_STATS,
-        pe.packageInfo.applicationInfo.uid, pe.packageName, newMode);
-        pe.appOpMode = newMode;
-    }
-
-    void allowAccess(String packageName) {
-        final PackageEntry entry = mPackageEntryMap.get(packageName);
-        if (entry == null) {
-            Log.w(TAG, "Unable to give access to package " + packageName + ": it does not exist.");
-            return;
-        }
-
-        setNewMode(entry, AppOpsManager.MODE_ALLOWED);
-        entry.preference.setChecked(true);
-    }
-
-    private final PackageMonitor mPackageMonitor = new PackageMonitor() {
-        @Override
-        public void onPackageAdded(String packageName, int uid) {
-            updateInterestedApps();
-        }
-
-        @Override
-        public void onPackageRemoved(String packageName, int uid) {
-            updateInterestedApps();
-        }
-    };
-
-    public static class WarningDialogFragment extends DialogFragment
-            implements DialogInterface.OnClickListener {
-        private static final String ARG_PACKAGE_NAME = "package";
-
-        public static WarningDialogFragment newInstance(String packageName) {
-            WarningDialogFragment dialog = new WarningDialogFragment();
-            Bundle args = new Bundle();
-            args.putString(ARG_PACKAGE_NAME, packageName);
-            dialog.setArguments(args);
-            return dialog;
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            return new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.allow_usage_access_title)
-                    .setMessage(R.string.allow_usage_access_message)
-                    .setIconAttribute(android.R.attr.alertDialogIcon)
-                    .setNegativeButton(R.string.cancel, this)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .create();
-        }
-
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            if (which == DialogInterface.BUTTON_POSITIVE) {
-                ((UsageAccessSettings) getParentFragment()).allowAccess(
-                        getArguments().getString(ARG_PACKAGE_NAME));
-            } else {
-                dialog.cancel();
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/UserSpinnerAdapter.java b/src/com/android/settings/UserAdapter.java
similarity index 76%
rename from src/com/android/settings/UserSpinnerAdapter.java
rename to src/com/android/settings/UserAdapter.java
index eb4a118..dcdc7eb 100644
--- a/src/com/android/settings/UserSpinnerAdapter.java
+++ b/src/com/android/settings/UserAdapter.java
@@ -16,9 +16,9 @@
 
 package com.android.settings;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.UserInfo;
-import android.content.res.Resources;
 import android.database.DataSetObserver;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
@@ -28,33 +28,36 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.ListAdapter;
 import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
 import com.android.internal.util.UserIcons;
+import com.android.settings.drawable.CircleFramedDrawable;
 
 import java.util.ArrayList;
 
 /**
  * Adapter for a spinner that shows a list of users.
  */
-public class UserSpinnerAdapter implements SpinnerAdapter {
+public class UserAdapter implements SpinnerAdapter, ListAdapter {
     // TODO: Update UI. See: http://b/16518801
     /** Holder for user details */
     public static class UserDetails {
         private final UserHandle mUserHandle;
-        private final String name;
-        private final Drawable icon;
+        private final String mName;
+        private final Drawable mIcon;
 
         public UserDetails(UserHandle userHandle, UserManager um, Context context) {
             mUserHandle = userHandle;
             UserInfo userInfo = um.getUserInfo(mUserHandle.getIdentifier());
+            Drawable icon;
             if (userInfo.isManagedProfile()) {
-                name = context.getString(R.string.managed_user_title);
+                mName = context.getString(R.string.managed_user_title);
                 icon = context.getDrawable(
                     com.android.internal.R.drawable.ic_corp_icon);
             } else {
-                name = userInfo.name;
+                mName = userInfo.name;
                 final int userId = userInfo.id;
                 if (um.getUserIcon(userId) != null) {
                     icon = new BitmapDrawable(context.getResources(), um.getUserIcon(userId));
@@ -62,12 +65,17 @@
                     icon = UserIcons.getDefaultUserIcon(userId, /* light= */ false);
                 }
             }
+            this.mIcon = encircle(context, icon);
+        }
+
+        private static Drawable encircle(Context context, Drawable icon) {
+            return CircleFramedDrawable.getInstance(context, UserIcons.convertToBitmap(icon));
         }
     }
     private ArrayList<UserDetails> data;
     private final LayoutInflater mInflater;
 
-    public UserSpinnerAdapter(Context context, ArrayList<UserDetails> users) {
+    public UserAdapter(Context context, ArrayList<UserDetails> users) {
         if (users == null) {
             throw new IllegalArgumentException("A list of user details must be provided");
         }
@@ -87,11 +95,21 @@
         final View row = convertView != null ? convertView : createUser(parent);
 
         UserDetails user = data.get(position);
-        ((ImageView) row.findViewById(android.R.id.icon)).setImageDrawable(user.icon);
-        ((TextView) row.findViewById(android.R.id.title)).setText(user.name);
+        ((ImageView) row.findViewById(android.R.id.icon)).setImageDrawable(user.mIcon);
+        ((TextView) row.findViewById(android.R.id.title)).setText(getTitle(user));
         return row;
     }
 
+    private int getTitle(UserDetails user) {
+        int userHandle = user.mUserHandle.getIdentifier();
+        if (userHandle == UserHandle.USER_CURRENT
+                || userHandle == ActivityManager.getCurrentUser()) {
+            return R.string.category_personal;
+        } else {
+            return R.string.category_work;
+        }
+    }
+
     private View createUser(ViewGroup parent) {
         return mInflater.inflate(R.layout.user_preference, parent, false);
     }
@@ -145,4 +163,14 @@
     public boolean isEmpty() {
         return data.isEmpty();
     }
+
+    @Override
+    public boolean areAllItemsEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnabled(int position) {
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 6517ffe..d05160c 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -25,10 +25,12 @@
 import android.app.Dialog;
 import android.app.Fragment;
 import android.app.IActivityManager;
+import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -38,10 +40,12 @@
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
+import android.content.res.TypedArray;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
+import android.hardware.usb.IUsbManager;
 import android.net.ConnectivityManager;
 import android.net.LinkProperties;
 import android.net.Uri;
@@ -51,6 +55,7 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.os.storage.StorageManager;
 import android.preference.Preference;
 import android.preference.PreferenceFrameLayout;
 import android.preference.PreferenceGroup;
@@ -65,13 +70,19 @@
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.SparseArray;
+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.ListView;
 import android.widget.TabWidget;
 
 import com.android.internal.util.UserIcons;
-import com.android.settings.UserSpinnerAdapter.UserDetails;
+import com.android.settings.UserAdapter.UserDetails;
+import com.android.settings.applications.ApplicationsState;
 import com.android.settings.dashboard.DashboardTile;
 import com.android.settings.drawable.CircleFramedDrawable;
 
@@ -80,6 +91,7 @@
 import java.net.InetAddress;
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -110,19 +122,19 @@
      * Name of the meta-data item that should be set in the AndroidManifest.xml
      * to specify the icon that should be displayed for the preference.
      */
-    private static final String META_DATA_PREFERENCE_ICON = "com.android.settings.icon";
+    public static final String META_DATA_PREFERENCE_ICON = "com.android.settings.icon";
 
     /**
      * Name of the meta-data item that should be set in the AndroidManifest.xml
      * to specify the title that should be displayed for the preference.
      */
-    private static final String META_DATA_PREFERENCE_TITLE = "com.android.settings.title";
+    public static final String META_DATA_PREFERENCE_TITLE = "com.android.settings.title";
 
     /**
      * Name of the meta-data item that should be set in the AndroidManifest.xml
      * to specify the summary text that should be displayed for the preference.
      */
-    private static final String META_DATA_PREFERENCE_SUMMARY = "com.android.settings.summary";
+    public static final String META_DATA_PREFERENCE_SUMMARY = "com.android.settings.summary";
 
     private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";
 
@@ -130,6 +142,8 @@
     private static final int SECONDS_PER_HOUR = 60 * 60;
     private static final int SECONDS_PER_DAY = 24 * 60 * 60;
 
+    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.
@@ -192,14 +206,17 @@
         if (intent != null) {
             // Find the activity that is in the system image
             PackageManager pm = context.getPackageManager();
-            List<ResolveInfo> list = pm.queryIntentActivities(intent, PackageManager.GET_META_DATA);
+            List<ResolveInfo> list = tile.userHandle.size() != 0
+                    ? pm.queryIntentActivitiesAsUser(intent, PackageManager.GET_META_DATA,
+                            tile.userHandle.get(0).getIdentifier())
+                    : pm.queryIntentActivities(intent, PackageManager.GET_META_DATA);
             int listSize = list.size();
             for (int i = 0; i < listSize; i++) {
                 ResolveInfo resolveInfo = list.get(i);
                 if ((resolveInfo.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM)
                         != 0) {
-                    Drawable icon = null;
-                    String title = null;
+                    int icon = 0;
+                    CharSequence title = null;
                     String summary = null;
 
                     // Get the activity's meta-data
@@ -209,14 +226,18 @@
                         Bundle metaData = resolveInfo.activityInfo.metaData;
 
                         if (res != null && metaData != null) {
-                            icon = res.getDrawable(
-                                    metaData.getInt(META_DATA_PREFERENCE_ICON), null);
-                            title = res.getString(metaData.getInt(META_DATA_PREFERENCE_TITLE));
-                            summary = res.getString(metaData.getInt(META_DATA_PREFERENCE_SUMMARY));
+                            if (metaData.containsKey(META_DATA_PREFERENCE_ICON)) {
+                                icon = metaData.getInt(META_DATA_PREFERENCE_ICON);
+                            }
+                            if (metaData.containsKey(META_DATA_PREFERENCE_TITLE)) {
+                                title = res.getString(metaData.getInt(META_DATA_PREFERENCE_TITLE));
+                            }
+                            if (metaData.containsKey(META_DATA_PREFERENCE_SUMMARY)) {
+                                summary = res.getString(
+                                        metaData.getInt(META_DATA_PREFERENCE_SUMMARY));
+                            }
                         }
-                    } catch (NameNotFoundException e) {
-                        // Ignore
-                    } catch (NotFoundException e) {
+                    } catch (NameNotFoundException | NotFoundException e) {
                         // Ignore
                     }
 
@@ -225,10 +246,13 @@
                     if (TextUtils.isEmpty(title)) {
                         title = resolveInfo.loadLabel(pm).toString();
                     }
+                    if (icon == 0) {
+                        icon = resolveInfo.activityInfo.icon;
+                    }
 
                     // Set icon, title and summary for the preference
-                    // TODO:
-                    //tile.icon = icon;
+                    tile.iconRes = icon;
+                    tile.iconPkg = resolveInfo.activityInfo.packageName;
                     tile.title = title;
                     tile.summary = summary;
                     // Replace the intent with this specific activity
@@ -722,14 +746,14 @@
     }
 
     /**
-     * Creates a {@link UserSpinnerAdapter} if there is more than one profile on the device.
+     * Creates a {@link UserAdapter} if there is more than one profile on the device.
      *
      * <p> The adapter can be used to populate a spinner that switches between the Settings
      * app on the different profiles.
      *
-     * @return a {@link UserSpinnerAdapter} or null if there is only one profile.
+     * @return a {@link UserAdapter} or null if there is only one profile.
      */
-    public static UserSpinnerAdapter createUserSpinnerAdapter(UserManager userManager,
+    public static UserAdapter createUserSpinnerAdapter(UserManager userManager,
             Context context) {
         List<UserHandle> userProfiles = userManager.getUserProfiles();
         if (userProfiles.size() < 2) {
@@ -741,12 +765,17 @@
         userProfiles.remove(myUserHandle);
         userProfiles.add(0, myUserHandle);
 
+        return createUserAdapter(userManager, context, userProfiles);
+    }
+
+    public static UserAdapter createUserAdapter(UserManager userManager,
+            Context context, List<UserHandle> userProfiles) {
         ArrayList<UserDetails> userDetails = new ArrayList<UserDetails>(userProfiles.size());
         final int count = userProfiles.size();
         for (int i = 0; i < count; i++) {
             userDetails.add(new UserDetails(userProfiles.get(i), userManager, context));
         }
-        return new UserSpinnerAdapter(context, userDetails);
+        return new UserAdapter(context, userDetails);
     }
 
     /**
@@ -846,43 +875,6 @@
                || um.getUserProfiles().contains(otherUser);
    }
 
-    /**
-     * Creates a dialog to confirm with the user if it's ok to remove the user
-     * and delete all the data.
-     *
-     * @param context a Context object
-     * @param removingUserId The userId of the user to remove
-     * @param onConfirmListener Callback object for positive action
-     * @return the created Dialog
-     */
-    public static Dialog createRemoveConfirmationDialog(Context context, int removingUserId,
-            DialogInterface.OnClickListener onConfirmListener) {
-        UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        UserInfo userInfo = um.getUserInfo(removingUserId);
-        int titleResId;
-        int messageResId;
-        if (UserHandle.myUserId() == removingUserId) {
-            titleResId = R.string.user_confirm_remove_self_title;
-            messageResId = R.string.user_confirm_remove_self_message;
-        } else if (userInfo.isRestricted()) {
-            titleResId = R.string.user_profile_confirm_remove_title;
-            messageResId = R.string.user_profile_confirm_remove_message;
-        } else if (userInfo.isManagedProfile()) {
-            titleResId = R.string.work_profile_confirm_remove_title;
-            messageResId = R.string.work_profile_confirm_remove_message;
-        } else {
-            titleResId = R.string.user_confirm_remove_title;
-            messageResId = R.string.user_confirm_remove_message;
-        }
-        Dialog dlg = new AlertDialog.Builder(context)
-                .setTitle(titleResId)
-                .setMessage(messageResId)
-                .setPositiveButton(R.string.user_delete_button,
-                        onConfirmListener)
-                .setNegativeButton(android.R.string.cancel, null)
-                .create();
-        return dlg;
-    }
 
     /**
      * Returns whether or not this device is able to be OEM unlocked.
@@ -919,7 +911,8 @@
                 return CircleFramedDrawable.getInstance(context, icon);
             }
         }
-        return UserIcons.getDefaultUserIcon(user.id, /* light= */ false);
+        return CircleFramedDrawable.getInstance(context, UserIcons.convertToBitmap(
+                UserIcons.getDefaultUserIcon(user.id, /* light= */ false)));
     }
 
     /**
@@ -1036,49 +1029,6 @@
     }
 
     /**
-     * finds a record with subId.
-     * Since the number of SIMs are few, an array is fine.
-     */
-    public static SubscriptionInfo findRecordBySubId(Context context, final int subId) {
-        final List<SubscriptionInfo> subInfoList =
-                SubscriptionManager.from(context).getActiveSubscriptionInfoList();
-        if (subInfoList != null) {
-            final int subInfoLength = subInfoList.size();
-
-            for (int i = 0; i < subInfoLength; ++i) {
-                final SubscriptionInfo sir = subInfoList.get(i);
-                if (sir != null && sir.getSubscriptionId() == subId) {
-                    return sir;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * finds a record with slotId.
-     * Since the number of SIMs are few, an array is fine.
-     */
-    public static SubscriptionInfo findRecordBySlotId(Context context, final int slotId) {
-        final List<SubscriptionInfo> subInfoList =
-                SubscriptionManager.from(context).getActiveSubscriptionInfoList();
-        if (subInfoList != null) {
-            final int subInfoLength = subInfoList.size();
-
-            for (int i = 0; i < subInfoLength; ++i) {
-                final SubscriptionInfo sir = subInfoList.get(i);
-                if (sir.getSimSlotIndex() == slotId) {
-                    //Right now we take the first subscription on a SIM.
-                    return sir;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
      * 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.
@@ -1095,4 +1045,112 @@
         return null;
     }
 
+    public static View inflateCategoryHeader(LayoutInflater inflater, ViewGroup parent) {
+        final TypedArray a = inflater.getContext().obtainStyledAttributes(null,
+                com.android.internal.R.styleable.Preference,
+                com.android.internal.R.attr.preferenceCategoryStyle, 0);
+        final int resId = a.getResourceId(com.android.internal.R.styleable.Preference_layout,
+                0);
+        a.recycle();
+        return inflater.inflate(resId, parent, false);
+    }
+
+    /**
+     * Return if we are running low on storage space or not.
+     *
+     * @param context The context
+     * @return true if we are running low on storage space
+     */
+    public static boolean isLowStorage(Context context) {
+        final StorageManager sm = StorageManager.from(context);
+        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 hasUsbDefaults(IUsbManager usbManager, String packageName) {
+        try {
+            if (usbManager != null) {
+                return usbManager.hasDefaults(packageName, UserHandle.myUserId());
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "mUsbManager.hasDefaults", e);
+        }
+        return false;
+    }
+
+    public static boolean hasPreferredActivities(PackageManager pm, String packageName) {
+        // Get list of preferred activities
+        List<ComponentName> prefActList = new ArrayList<>();
+        // Intent list cannot be null. so pass empty list
+        List<IntentFilter> intentList = new ArrayList<>();
+        pm.getPreferredActivities(intentList, prefActList, packageName);
+        Log.d(TAG, "Have " + prefActList.size() + " number of activities in preferred list");
+        return prefActList.size() > 0;
+    }
+
+    public static CharSequence getLaunchByDeafaultSummary(ApplicationsState.AppEntry appEntry,
+            IUsbManager usbManager, PackageManager pm, Context context) {
+        String packageName = appEntry.info.packageName;
+        boolean hasPreferred = hasPreferredActivities(pm, packageName)
+                || hasUsbDefaults(usbManager, packageName);
+        int status = pm.getIntentVerificationStatus(packageName, UserHandle.myUserId());
+        boolean hasDomainURLsPreference =
+                (status == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS) ||
+                (status == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER);
+        return context.getString(hasPreferred || hasDomainURLsPreference
+                ? R.string.launch_defaults_some
+                : R.string.launch_defaults_none);
+    }
+
+    public static void handleLoadingContainer(View loading, View doneLoading, boolean done,
+            boolean animate) {
+        setViewShown(loading, !done, animate);
+        setViewShown(doneLoading, done, animate);
+    }
+
+    private static void setViewShown(final View view, boolean shown, boolean animate) {
+        if (animate) {
+            Animation animation = AnimationUtils.loadAnimation(view.getContext(),
+                    shown ? android.R.anim.fade_in : android.R.anim.fade_out);
+            if (shown) {
+                view.setVisibility(View.VISIBLE);
+            } else {
+                animation.setAnimationListener(new AnimationListener() {
+                    @Override
+                    public void onAnimationStart(Animation animation) {
+                    }
+
+                    @Override
+                    public void onAnimationRepeat(Animation animation) {
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animation animation) {
+                        view.setVisibility(View.INVISIBLE);
+                    }
+                });
+            }
+            view.startAnimation(animation);
+        } else {
+            view.clearAnimation();
+            view.setVisibility(shown ? View.VISIBLE : View.INVISIBLE);
+        }
+    }
 }
diff --git a/src/com/android/settings/VoiceSettingsActivity.java b/src/com/android/settings/VoiceSettingsActivity.java
deleted file mode 100644
index b5e8ede..0000000
--- a/src/com/android/settings/VoiceSettingsActivity.java
+++ /dev/null
@@ -1,51 +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.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-/**
- * Activity for modifying a setting using the Voice Interaction API. This activity
- * MUST only modify the setting if the intent was sent using
- * {@link android.service.voice.VoiceInteractionSession#startVoiceActivity startVoiceActivity}.
- */
-abstract public class VoiceSettingsActivity extends Activity {
-
-    private static final String TAG = "VoiceSettingsActivity";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (isVoiceInteraction()) {
-            // Only permit if this is a voice interaction.
-            onVoiceSettingInteraction(getIntent());
-        } else {
-            Log.v(TAG, "Cannot modify settings without voice interaction");
-        }
-        finish();
-    }
-
-    /**
-     * Modify the setting as a voice interaction. The activity will finish
-     * after this method is called.
-     */
-    abstract protected void onVoiceSettingInteraction(Intent intent);
-}
diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java
index 7b2dcbf..9046bfb 100644
--- a/src/com/android/settings/WallpaperTypeSettings.java
+++ b/src/com/android/settings/WallpaperTypeSettings.java
@@ -24,6 +24,7 @@
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -34,6 +35,16 @@
 public class WallpaperTypeSettings extends SettingsPreferenceFragment implements Indexable {
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WALLPAPER_TYPE;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_wallpaper;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 740dc9f..24e2db4 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -34,6 +34,7 @@
 
 import com.android.ims.ImsConfig;
 import com.android.ims.ImsManager;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.imsphone.ImsPhone;
 import com.android.settings.widget.SwitchBar;
 
@@ -143,6 +144,11 @@
     };
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI_CALLING;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 9152870..e8c3e15 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -22,7 +22,6 @@
 import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
 import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -38,7 +37,6 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.provider.SearchIndexableResource;
@@ -47,24 +45,19 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.ims.ImsConfig;
 import com.android.ims.ImsManager;
-import com.android.internal.telephony.SmsApplication;
-import com.android.internal.telephony.SmsApplication.SmsApplicationData;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.settings.nfc.NfcEnabler;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settings.WifiCallingSettings;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
-public class WirelessSettings extends SettingsPreferenceFragment
-        implements OnPreferenceChangeListener, Indexable {
+public class WirelessSettings extends SettingsPreferenceFragment implements Indexable {
     private static final String TAG = "WirelessSettings";
 
     private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
@@ -76,7 +69,6 @@
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
     private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";
-    private static final String KEY_SMS_APPLICATION = "sms_application";
     private static final String KEY_TOGGLE_NSD = "toggle_nsd"; //network service discovery
     private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
     private static final String KEY_WFC_SETTINGS = "wifi_calling_settings";
@@ -98,7 +90,6 @@
     private static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;
     private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
 
-    private AppListPreference mSmsApplicationPreference;
     private PreferenceScreen mButtonWfc;
 
     /**
@@ -189,27 +180,6 @@
         }
     }
 
-    private void initSmsApplicationSetting() {
-        log("initSmsApplicationSetting:");
-        Collection<SmsApplicationData> smsApplications =
-                SmsApplication.getApplicationCollection(getActivity());
-
-        // If the list is empty the dialog will be empty, but we will not crash.
-        int count = smsApplications.size();
-        String[] packageNames = new String[count];
-        int i = 0;
-        for (SmsApplicationData smsApplicationData : smsApplications) {
-            packageNames[i] = smsApplicationData.mPackageName;
-            i++;
-        }
-        String defaultPackageName = null;
-        ComponentName appName = SmsApplication.getDefaultSmsApplication(getActivity(), true);
-        if (appName != null) {
-            defaultPackageName = appName.getPackageName();
-        }
-        mSmsApplicationPreference.setPackageNames(packageNames, defaultPackageName);
-    }
-
     @Override
     public Dialog onCreateDialog(int dialogId) {
         log("onCreateDialog: dialogId=" + dialogId);
@@ -235,19 +205,9 @@
         Log.d(TAG, s);
     }
 
-    public static boolean isRadioAllowed(Context context, String type) {
-        if (!AirplaneModeEnabler.isAirplaneModeOn(context)) {
-            return true;
-        }
-        // Here we use the same logic in onCreate().
-        String toggleable = Settings.Global.getString(context.getContentResolver(),
-                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
-        return toggleable != null && toggleable.contains(type);
-    }
-
-    private boolean isSmsSupported() {
-        // Some tablet has sim card but could not do telephony operations. Skip those.
-        return mTm.isSmsCapable();
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIRELESS;
     }
 
     @Override
@@ -267,7 +227,6 @@
 
         final int myUserId = UserHandle.myUserId();
         final boolean isSecondaryUser = myUserId != UserHandle.USER_OWNER;
-        final boolean isRestrictedUser = mUm.getUserInfo(myUserId).isRestricted();
 
         final Activity activity = getActivity();
         mAirplaneModePreference = (SwitchPreference) findPreference(KEY_TOGGLE_AIRPLANE);
@@ -278,15 +237,6 @@
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
 
-        mSmsApplicationPreference = (AppListPreference) findPreference(KEY_SMS_APPLICATION);
-        // Restricted users cannot currently read/write SMS.
-        if (isRestrictedUser) {
-            removePreference(KEY_SMS_APPLICATION);
-        } else {
-            mSmsApplicationPreference.setOnPreferenceChangeListener(this);
-            initSmsApplicationSetting();
-        }
-
         if (ImsManager.isWfcEnabledByPlatform(activity)) {
             mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS);
         } else {
@@ -362,11 +312,6 @@
             }
         }
 
-        // Remove SMS Application if the device does not support SMS
-        if (!isSmsSupported()) {
-            removePreference(KEY_SMS_APPLICATION);
-        }
-
         // Remove Airplane Mode settings if it's a stationary device such as a TV.
         if (mPm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
             removePreference(KEY_TOGGLE_AIRPLANE);
@@ -417,13 +362,6 @@
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-
-        initSmsApplicationSetting();
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
 
@@ -480,15 +418,6 @@
         return R.string.help_url_more_networks;
     }
 
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mSmsApplicationPreference && newValue != null) {
-            SmsApplication.setDefaultApplication(newValue.toString(), getActivity());
-            return true;
-        }
-        return false;
-    }
-
     /**
      * For Search.
      */
@@ -511,7 +440,6 @@
                 final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
                 final int myUserId = UserHandle.myUserId();
                 final boolean isSecondaryUser = myUserId != UserHandle.USER_OWNER;
-                final boolean isRestrictedUser = um.getUserInfo(myUserId).isRestricted();
                 final boolean isWimaxEnabled = !isSecondaryUser
                         && context.getResources().getBoolean(
                         com.android.internal.R.bool.config_wimaxEnabled);
@@ -549,13 +477,6 @@
                     result.add(KEY_MANAGE_MOBILE_PLAN);
                 }
 
-                // Remove SMS Application if the device does not support SMS
-                TelephonyManager tm =
-                        (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-                if (!tm.isSmsCapable() || isRestrictedUser) {
-                    result.add(KEY_SMS_APPLICATION);
-                }
-
                 final PackageManager pm = context.getPackageManager();
 
                 // Remove Airplane Mode settings if it's a stationary device such as a TV.
diff --git a/src/com/android/settings/ZonePicker.java b/src/com/android/settings/ZonePicker.java
index 0a9173f..72e4a03 100644
--- a/src/com/android/settings/ZonePicker.java
+++ b/src/com/android/settings/ZonePicker.java
@@ -46,7 +46,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
-import libcore.icu.ICU;
 import libcore.icu.TimeZoneNames;
 
 /**
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 7d51712..96577a0 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -41,11 +41,9 @@
 import android.text.TextUtils.SimpleStringSplitter;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
-import android.view.View;
 import android.view.accessibility.AccessibilityManager;
-import android.widget.TextView;
-
 import com.android.internal.content.PackageMonitor;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.view.RotationPolicy;
 import com.android.internal.view.RotationPolicy.RotationPolicyListener;
 import com.android.settings.DialogCreatable;
@@ -201,6 +199,16 @@
     private DevicePolicyManager mDpm;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_accessibility;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.accessibility_settings);
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index 9822fc3..ff9c9eb 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -35,6 +35,7 @@
 import android.view.accessibility.CaptioningManager;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.SubtitleView;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -95,6 +96,11 @@
     private boolean mShowingCustom;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY_CAPTION_PROPERTIES;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/accessibility/LocalePreference.java b/src/com/android/settings/accessibility/LocalePreference.java
index 0a94817..10e94a8 100644
--- a/src/com/android/settings/accessibility/LocalePreference.java
+++ b/src/com/android/settings/accessibility/LocalePreference.java
@@ -17,17 +17,13 @@
 package com.android.settings.accessibility;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
 
 import com.android.internal.app.LocalePicker;
 import com.android.settings.R;
 
-import java.text.Collator;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 
 /**
  * List preference that allows the user to pick a locale from the list of
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 0b7600b..6092532 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -32,12 +32,15 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.ConfirmDeviceCredentialActivity;
 import com.android.settings.R;
@@ -72,6 +75,11 @@
     private int mShownDialogId;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY_SERVICE;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mLockPatternUtils = new LockPatternUtils(getActivity());
@@ -168,11 +176,13 @@
         switch (dialogId) {
             case DIALOG_ID_ENABLE_WARNING: {
                 mShownDialogId = DIALOG_ID_ENABLE_WARNING;
-                AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+
+                final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
                 if (info == null) {
                     return null;
                 }
-                AlertDialog ad = new AlertDialog.Builder(getActivity())
+
+                final AlertDialog ad = new AlertDialog.Builder(getActivity())
                         .setTitle(getString(R.string.enable_service_title,
                                 info.getResolveInfo().loadLabel(getPackageManager())))
                         .setView(createEnableDialogContentView(info))
@@ -180,8 +190,24 @@
                         .setPositiveButton(android.R.string.ok, this)
                         .setNegativeButton(android.R.string.cancel, this)
                         .create();
+
+                final View.OnTouchListener filterTouchListener = new View.OnTouchListener() {
+                    @Override
+                    public boolean onTouch(View v, MotionEvent event) {
+                        // Filter obscured touches by consuming them.
+                        if ((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_OBSCURED) != 0) {
+                            if (event.getAction() == MotionEvent.ACTION_UP) {
+                                Toast.makeText(v.getContext(), R.string.touch_filtered_warning,
+                                        Toast.LENGTH_SHORT).show();
+                            }
+                            return true;
+                        }
+                        return false;
+                    }
+                };
+
                 ad.create();
-                ad.getButton(AlertDialog.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true);
+                ad.getButton(AlertDialog.BUTTON_POSITIVE).setOnTouchListener(filterTouchListener);
                 return ad;
             }
             case DIALOG_ID_DISABLE_WARNING: {
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 1f7ecf7..c7ed1a1 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -24,6 +24,7 @@
 import android.view.accessibility.AccessibilityManager;
 
 import android.widget.Switch;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.widget.SwitchBar;
 
@@ -36,6 +37,11 @@
     private ListPreference mType;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY_TOGGLE_DALTONIZER;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
index 7fb1625..740f8c6 100644
--- a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
@@ -18,6 +18,7 @@
 
 import android.provider.Settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.widget.ToggleSwitch;
 import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
 
@@ -42,4 +43,9 @@
             }
         });
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
+    }
 }
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 4650c06..44355c6 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -18,6 +18,7 @@
 
 import android.provider.Settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.widget.ToggleSwitch;
 import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
 
@@ -42,4 +43,9 @@
             }
         });
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
+    }
 }
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index bb60871..a34be22 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -41,7 +41,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 
-class AccountPreferenceBase extends SettingsPreferenceFragment
+abstract class AccountPreferenceBase extends SettingsPreferenceFragment
         implements AuthenticatorHelper.OnAccountsUpdateListener {
 
     protected static final String TAG = "AccountSettings";
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index ffcb3b8..1bf83f3 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -46,9 +46,11 @@
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.users.UserDialogs;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -114,6 +116,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCOUNT;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -203,7 +210,7 @@
             }
             if (preference == profileData.removeWorkProfilePreference) {
                 final int userId = profileData.userInfo.id;
-                Utils.createRemoveConfirmationDialog(getActivity(), userId,
+                UserDialogs.createRemoveDialog(getActivity(), userId,
                         new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 858880b..2de8e4a 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accounts;
 
+import com.android.internal.logging.MetricsLogger;
 import com.google.android.collect.Lists;
 
 import android.accounts.Account;
@@ -34,7 +35,6 @@
 import android.content.SyncInfo;
 import android.content.SyncStatusInfo;
 import android.content.pm.ProviderInfo;
-import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -142,6 +142,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCOUNTS_ACCOUNT_SYNC;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
@@ -440,12 +445,8 @@
                     !initialSync);
 
             syncPref.setFailed(lastSyncFailed);
-            ConnectivityManager connManager =
-                (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-            final boolean masterSyncAutomatically =
-                    ContentResolver.getMasterSyncAutomaticallyAsUser(userId);
-            final boolean backgroundDataEnabled = connManager.getBackgroundDataSetting();
-            final boolean oneTimeSyncMode = !masterSyncAutomatically || !backgroundDataEnabled;
+            final boolean oneTimeSyncMode = !ContentResolver.getMasterSyncAutomaticallyAsUser(
+                userId);
             syncPref.setOneTimeSyncMode(oneTimeSyncMode);
             syncPref.setChecked(oneTimeSyncMode || syncEnabled);
         }
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
index 5e7e81e..c4dace8 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -34,7 +34,9 @@
 import android.preference.PreferenceScreen;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.util.CharSequences;
+import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -54,7 +56,7 @@
  * An extra {@link UserHandle} can be specified in the intent as {@link EXTRA_USER}, if the user for
  * which the action needs to be performed is different to the one the Settings App will run in.
  */
-public class ChooseAccountActivity extends PreferenceActivity {
+public class ChooseAccountActivity extends InstrumentedPreferenceActivity {
 
     private static final String TAG = "ChooseAccountActivity";
     private String[] mAuthorities;
@@ -89,6 +91,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY;
+    }
+
+    @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 85ecd90..bbb8c14 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -47,6 +47,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.AccountPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -87,6 +88,11 @@
     private Account mFirstAccount;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCOUNTS_MANAGE_ACCOUNTS;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/accounts/ProviderPreference.java b/src/com/android/settings/accounts/ProviderPreference.java
index 3996523..257cd1c 100644
--- a/src/com/android/settings/accounts/ProviderPreference.java
+++ b/src/com/android/settings/accounts/ProviderPreference.java
@@ -16,13 +16,9 @@
 
 package com.android.settings.accounts;
 
-import com.android.settings.R;
-
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.preference.Preference;
-import android.view.View;
-import android.widget.ImageView;
 
 /**
  * ProviderPreference is used to display an image to the left of a provider name.
diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java
new file mode 100644
index 0000000..52a8b85
--- /dev/null
+++ b/src/com/android/settings/applications/AdvancedAppSettings.java
@@ -0,0 +1,134 @@
+/*
+ * 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.Activity;
+import android.content.pm.ApplicationInfo;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.util.Log;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+import com.android.settings.applications.ApplicationsState.Session;
+import com.android.settingslib.applications.PermissionsInfo;
+
+import java.util.ArrayList;
+
+public class AdvancedAppSettings extends SettingsPreferenceFragment implements
+        ApplicationsState.Callbacks, PermissionsInfo.Callback {
+
+    static final String TAG = "AdvancedAppSettings";
+    static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    private static final String KEY_APP_PERM = "manage_perms";
+    private static final String KEY_APP_DOMAIN_URLS = "domain_urls";
+
+    private ApplicationsState mApplicationsState;
+    private Session mSession;
+    private Preference mAppPermsPreference;
+    private Preference mAppDomainURLsPreference;
+    private PermissionsInfo mPermissionsInfo;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.advanced_apps);
+
+        mApplicationsState = ApplicationsState.getInstance(getActivity().getApplication());
+        mSession = mApplicationsState.newSession(this);
+
+        mAppPermsPreference = findPreference(KEY_APP_PERM);
+        mAppDomainURLsPreference = findPreference(KEY_APP_DOMAIN_URLS);
+        updateUI();
+    }
+
+    private void updateUI() {
+        ArrayList<AppEntry> allApps = mSession.getAllApps();
+
+        int countAppWithDomainURLs = 0;
+        for (AppEntry entry : allApps) {
+            boolean hasDomainURLs =
+                    (entry.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS) != 0;
+            if (hasDomainURLs) countAppWithDomainURLs++;
+        }
+        String summary = getResources().getQuantityString(
+                R.plurals.domain_urls_apps_summary, countAppWithDomainURLs, countAppWithDomainURLs);
+        mAppDomainURLsPreference.setSummary(summary);
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_ADVANCED;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mPermissionsInfo = new PermissionsInfo(getActivity(), this);
+    }
+
+    @Override
+    public void onRunningStateChanged(boolean running) {
+        // No-op.
+    }
+
+    @Override
+    public void onPackageListChanged() {
+        updateUI();
+    }
+
+    @Override
+    public void onRebuildComplete(ArrayList<AppEntry> apps) {
+        // No-op.
+    }
+
+    @Override
+    public void onPackageIconChanged() {
+        // No-op.
+    }
+
+    @Override
+    public void onPackageSizeChanged(String packageName) {
+        // No-op.
+    }
+
+    @Override
+    public void onAllSizesComputed() {
+        // No-op.
+    }
+
+    @Override
+    public void onLauncherInfoChanged() {
+        // No-op.
+    }
+
+    @Override
+    public void onLoadEntriesCompleted() {
+        // No-op.
+    }
+
+    @Override
+    public void onPermissionLoadComplete() {
+        Activity activity = getActivity();
+        if (activity == null) return;
+        mAppPermsPreference.setSummary(activity.getString(R.string.app_permissions_summary,
+                mPermissionsInfo.getRuntimePermAppsGrantedCount(),
+                mPermissionsInfo.getRuntimePermAppsCount()));
+    }
+}
diff --git a/src/com/android/settings/applications/AppDomainsPreference.java b/src/com/android/settings/applications/AppDomainsPreference.java
new file mode 100644
index 0000000..7e29a20
--- /dev/null
+++ b/src/com/android/settings/applications/AppDomainsPreference.java
@@ -0,0 +1,44 @@
+/*
+ * 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.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+import com.android.settings.accessibility.ListDialogPreference;
+
+import com.android.settings.R;
+
+public class AppDomainsPreference extends ListDialogPreference {
+
+    public AppDomainsPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        setDialogLayoutResource(R.layout.app_domains_dialog);
+        setListItemLayoutResource(R.layout.app_domains_item);
+    }
+
+    @Override
+    protected void onBindListItem(View view, int index) {
+        final CharSequence title = getTitleAt(index);
+        if (title != null) {
+            final TextView domainName = (TextView) view.findViewById(R.id.domain_name);
+            domainName.setText(title);
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
new file mode 100644
index 0000000..56fe885
--- /dev/null
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -0,0 +1,216 @@
+/*
+ * 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.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.admin.DevicePolicyManager;
+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.hardware.usb.IUsbManager;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.util.Log;
+
+import com.android.settings.InstrumentedPreferenceFragment;
+import com.android.settings.SettingsActivity;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+
+import java.util.ArrayList;
+
+public abstract class AppInfoBase extends InstrumentedPreferenceFragment
+        implements ApplicationsState.Callbacks {
+
+    public static final String ARG_PACKAGE_NAME = "package";
+
+    protected static final String TAG = AppInfoBase.class.getSimpleName();
+    protected static final boolean localLOGV = false;
+
+    protected boolean mAppControlRestricted = false;
+
+    protected ApplicationsState mState;
+    private ApplicationsState.Session mSession;
+    protected ApplicationsState.AppEntry mAppEntry;
+    protected PackageInfo mPackageInfo;
+    protected int mUserId;
+    protected String mPackageName;
+
+    protected IUsbManager mUsbManager;
+    protected DevicePolicyManager mDpm;
+    protected UserManager mUserManager;
+    protected PackageManager mPm;
+
+    // Dialog identifiers used in showDialog
+    protected static final int DLG_BASE = 0;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mState = ApplicationsState.getInstance(getActivity().getApplication());
+        mSession = mState.newSession(this);
+        Context context = getActivity();
+        mDpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mPm = context.getPackageManager();
+        IBinder b = ServiceManager.getService(Context.USB_SERVICE);
+        mUsbManager = IUsbManager.Stub.asInterface(b);
+
+        // Need to make sure we have loaded applications at this point.
+        mSession.resume();
+
+        retrieveAppEntry();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mAppControlRestricted = mUserManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL);
+        mSession.resume();
+
+        if (!refreshUi()) {
+            setIntentAndFinish(true, true);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mSession.pause();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mSession.release();
+    }
+
+    protected String retrieveAppEntry() {
+        final Bundle args = getArguments();
+        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();
+            }
+        }
+        mUserId = UserHandle.myUserId();
+        mAppEntry = mState.getEntry(mPackageName, mUserId);
+        if (mAppEntry != null) {
+            // Get application info again to refresh changed properties of application
+            try {
+                mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName,
+                        PackageManager.GET_DISABLED_COMPONENTS |
+                        PackageManager.GET_UNINSTALLED_PACKAGES |
+                        PackageManager.GET_SIGNATURES);
+            } catch (NameNotFoundException e) {
+                Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e);
+            }
+        } else {
+            Log.w(TAG, "Missing AppEntry; maybe reinstalling?");
+            mPackageInfo = null;
+        }
+
+        return mPackageName;
+    }
+
+    protected 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);
+    }
+
+    protected void showDialogInner(int id, int moveErrorCode) {
+        DialogFragment newFragment = new MyAlertDialogFragment(id, moveErrorCode);
+        newFragment.setTargetFragment(this, 0);
+        newFragment.show(getFragmentManager(), "dialog " + id);
+    }
+
+    protected abstract boolean refreshUi();
+    protected abstract AlertDialog createDialog(int id, int errorCode);
+
+    @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 onPackageSizeChanged(String packageName) {
+        // No op.
+    }
+
+    @Override
+    public void onAllSizesComputed() {
+        // No op.
+    }
+
+    @Override
+    public void onLauncherInfoChanged() {
+        // No op.
+    }
+
+    @Override
+    public void onLoadEntriesCompleted() {
+        // No op.
+    }
+
+    @Override
+    public void onPackageListChanged() {
+        refreshUi();
+    }
+
+    public class MyAlertDialogFragment extends DialogFragment {
+        public MyAlertDialogFragment(int id, int errorCode) {
+            Bundle args = new Bundle();
+            args.putInt("id", id);
+            args.putInt("moveError", errorCode);
+            setArguments(args);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            int id = getArguments().getInt("id");
+            int errorCode = getArguments().getInt("moveError");
+            Dialog dialog = createDialog(id, errorCode);
+            if (dialog == null) {
+                throw new IllegalArgumentException("unknown id " + id);
+            }
+            return dialog;
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java
new file mode 100644
index 0000000..f7546f2
--- /dev/null
+++ b/src/com/android/settings/applications/AppInfoWithHeader.java
@@ -0,0 +1,40 @@
+/*
+ * 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.os.Bundle;
+import android.util.Log;
+
+import com.android.settings.AppHeader;
+
+public abstract class AppInfoWithHeader extends AppInfoBase {
+
+    private boolean mCreated;
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        if (mCreated) {
+            Log.w(TAG, "onActivityCreated: ignoring duplicate call");
+            return;
+        }
+        mCreated = true;
+        if (mPackageInfo == null) return;
+        AppHeader.createAppHeader(getActivity(), mPackageInfo.applicationInfo.loadIcon(mPm),
+                mPackageInfo.applicationInfo.loadLabel(mPm), null);
+    }
+}
diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java
new file mode 100644
index 0000000..05a1fca
--- /dev/null
+++ b/src/com/android/settings/applications/AppLaunchSettings.java
@@ -0,0 +1,152 @@
+/*
+ * 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.AlertDialog;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IntentFilterVerificationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.preference.Preference;
+import android.preference.SwitchPreference;
+import android.util.ArraySet;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.R;
+
+import java.util.List;
+
+import static android.content.pm.PackageManager.GET_ACTIVITIES;
+import static android.content.pm.PackageManager.GET_META_DATA;
+import static android.content.pm.PackageManager.GET_RESOLVED_FILTER;
+
+public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListener,
+        Preference.OnPreferenceChangeListener {
+
+    private static final String KEY_OPEN_DOMAIN_URLS = "app_launch_open_domain_urls";
+    private static final String KEY_SUPPORTED_DOMAIN_URLS = "app_launch_supported_domain_urls";
+    private static final String KEY_CLEAR_DEFAULTS = "app_launch_clear_defaults";
+
+    private PackageManager mPm;
+
+    private SwitchPreference mOpenDomainUrls;
+    private AppDomainsPreference mAppDomainUrls;
+    private ClearDefaultsPreference mClearDefaultsPreference;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.installed_app_launch_settings);
+
+        mPm = getActivity().getPackageManager();
+        final int myUserId = UserHandle.myUserId();
+
+        mOpenDomainUrls = (SwitchPreference) findPreference(KEY_OPEN_DOMAIN_URLS);
+        mOpenDomainUrls.setOnPreferenceChangeListener(this);
+
+        boolean hasDomainUrls =
+                (mAppEntry.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS) != 0;
+        List<IntentFilterVerificationInfo> iviList = mPm.getIntentFilterVerifications(mPackageName);
+
+        boolean enabled = hasDomainUrls && (iviList.size() != 0);
+
+        mOpenDomainUrls.setEnabled(enabled);
+        if (enabled) {
+            final int status = mPm.getIntentVerificationStatus(mPackageName, myUserId);
+            boolean checked =
+                    (status == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS);
+            mOpenDomainUrls.setChecked(checked);
+        }
+
+        List<IntentFilter> filters = mPm.getAllIntentFilters(mPackageName);
+
+        mAppDomainUrls = (AppDomainsPreference) findPreference(KEY_SUPPORTED_DOMAIN_URLS);
+        CharSequence[] entries = getEntries(iviList, filters);
+        mAppDomainUrls.setTitles(entries);
+        mAppDomainUrls.setValues(new int[entries.length]);
+
+        mClearDefaultsPreference = (ClearDefaultsPreference) findPreference(KEY_CLEAR_DEFAULTS);
+    }
+
+    private CharSequence[] getEntries(List<IntentFilterVerificationInfo> iviList,
+            List<IntentFilter> filters) {
+        ArraySet<String> result = new ArraySet<>();
+        if (iviList.size() > 0) {
+            for (IntentFilterVerificationInfo ivi : iviList) {
+                for (String host : ivi.getDomains()) {
+                    result.add(host);
+                }
+            }
+        }
+        if (filters != null && filters.size() > 0) {
+            for (IntentFilter filter : filters) {
+                if (filter.hasDataScheme(IntentFilter.SCHEME_HTTP) ||
+                        filter.hasDataScheme(IntentFilter.SCHEME_HTTPS)) {
+                    result.addAll(filter.getHostsList());
+                }
+            }
+        }
+        return result.toArray(new CharSequence[0]);
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        mClearDefaultsPreference.setPackageName(mPackageName);
+        mClearDefaultsPreference.setAppEntry(mAppEntry);
+
+        return true;
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        // No dialogs for preferred launch settings.
+        return null;
+    }
+
+
+    @Override
+    public void onClick(View v) {
+        // Nothing to do
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        boolean ret = false;
+        final String key = preference.getKey();
+        if (KEY_OPEN_DOMAIN_URLS.equals(key)) {
+            SwitchPreference pref = (SwitchPreference) preference;
+            int status = !pref.isChecked() ?
+                    PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS :
+                    PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER;
+            ret = mPm.updateIntentVerificationStatus(mPackageName, status, UserHandle.myUserId());
+        }
+        return ret;
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_APP_LAUNCH;
+    }
+}
diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java
index d9dec19..88591d7 100644
--- a/src/com/android/settings/applications/AppOpsDetails.java
+++ b/src/com/android/settings/applications/AppOpsDetails.java
@@ -38,13 +38,15 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 
 import java.util.List;
 
-public class AppOpsDetails extends Fragment {
+public class AppOpsDetails extends InstrumentedFragment {
     static final String TAG = "AppOpsDetails";
 
     public static final String ARG_PACKAGE_NAME = "package";
@@ -192,6 +194,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APP_OPS_DETAILS;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         if (!refreshUi()) {
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 1ab3c73..77c4582 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -191,7 +191,9 @@
                     AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
                     AppOpsManager.OP_WAKE_LOCK,
                     AppOpsManager.OP_PROJECT_MEDIA,
-                    AppOpsManager.OP_ACTIVATE_VPN, },
+                    AppOpsManager.OP_ACTIVATE_VPN,
+                    AppOpsManager.OP_ASSIST_STRUCTURE,
+                    AppOpsManager.OP_ASSIST_SCREENSHOT},
             new boolean[] { false,
                     true,
                     true,
@@ -199,7 +201,9 @@
                     true,
                     true,
                     false,
-                    false, }
+                    false,
+                    false,
+                    false }
             );
 
     public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {
diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
index 3401c99..782b8fb 100644
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -18,6 +18,7 @@
 
 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;
@@ -27,9 +28,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 
-public class AppOpsSummary extends Fragment {
+public class AppOpsSummary extends InstrumentedFragment {
     // layout inflater object used to inflate views
     private LayoutInflater mInflater;
     
@@ -48,6 +51,11 @@
 
     int mCurPos;
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APP_OPS_SUMMARY;
+    }
+
     class MyPagerAdapter extends FragmentPagerAdapter implements ViewPager.OnPageChangeListener {
 
         public MyPagerAdapter(FragmentManager fm) {
@@ -103,7 +111,15 @@
         mViewPager.setAdapter(adapter);
         mViewPager.setOnPageChangeListener(adapter);
         PagerTabStrip tabs = (PagerTabStrip) rootView.findViewById(R.id.tabs);
-        tabs.setTabIndicatorColorResource(R.color.theme_accent);
+
+        // 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.
diff --git a/src/com/android/settings/applications/AppPermissionSettings.java b/src/com/android/settings/applications/AppPermissionSettings.java
new file mode 100644
index 0000000..16757d9
--- /dev/null
+++ b/src/com/android/settings/applications/AppPermissionSettings.java
@@ -0,0 +1,236 @@
+/*
+ * 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.AlertDialog;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AppSecurityPermissions;
+import android.widget.ArrayAdapter;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.telephony.ISms;
+import com.android.internal.telephony.SmsUsageMonitor;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+
+import java.util.ArrayList;
+
+public class AppPermissionSettings extends AppInfoWithHeader {
+
+    private ISms mSmsManager;
+    private View mRootView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms"));
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.permission_settings, container, false);
+
+        final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);
+        Utils.forceCustomPadding(allDetails, true /* additive padding */);
+
+        mRootView = view;
+        return view;
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        retrieveAppEntry();
+        // Security permissions section
+        LinearLayout permsView = (LinearLayout) mRootView.findViewById(R.id.permissions_section);
+        AppSecurityPermissions asp = new AppSecurityPermissions(getActivity(), mPackageName);
+        int premiumSmsPermission = getPremiumSmsPermission(mPackageName);
+        // Premium SMS permission implies the app also has SEND_SMS permission, so the original
+        // application permissions list doesn't have to be shown/hidden separately. The premium
+        // SMS subsection should only be visible if the app has tried to send to a premium SMS.
+        if (asp.getPermissionCount() > 0
+                || premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
+            permsView.setVisibility(View.VISIBLE);
+        } else {
+            permsView.setVisibility(View.GONE);
+        }
+        // Premium SMS permission subsection
+        TextView securityBillingDesc = (TextView) permsView.findViewById(
+                R.id.security_settings_billing_desc);
+        LinearLayout securityBillingList = (LinearLayout) permsView.findViewById(
+                R.id.security_settings_billing_list);
+        if (premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
+            // Show the premium SMS permission selector
+            securityBillingDesc.setVisibility(View.VISIBLE);
+            securityBillingList.setVisibility(View.VISIBLE);
+            Spinner spinner = (Spinner) permsView.findViewById(
+                    R.id.security_settings_premium_sms_list);
+            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getActivity(),
+                    R.array.security_settings_premium_sms_values,
+                    android.R.layout.simple_spinner_item);
+            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+            spinner.setAdapter(adapter);
+            // List items are in the same order as SmsUsageMonitor constants, offset by 1.
+            spinner.setSelection(premiumSmsPermission - 1);
+            spinner.setOnItemSelectedListener(new PremiumSmsSelectionListener(
+                    mPackageName, mSmsManager));
+        } else {
+            // Hide the premium SMS permission selector
+            securityBillingDesc.setVisibility(View.GONE);
+            securityBillingList.setVisibility(View.GONE);
+        }
+        // App permissions subsection
+        if (asp.getPermissionCount() > 0) {
+            // Make the security sections header visible
+            LinearLayout securityList = (LinearLayout) permsView.findViewById(
+                    R.id.security_settings_list);
+            securityList.removeAllViews();
+            securityList.addView(asp.getPermissionsViewWithRevokeButtons());
+            // If this app is running under a shared user ID with other apps,
+            // update the description to explain this.
+            String[] packages = mPm.getPackagesForUid(mPackageInfo.applicationInfo.uid);
+            if (packages != null && packages.length > 1) {
+                ArrayList<CharSequence> pnames = new ArrayList<CharSequence>();
+                for (int i=0; i<packages.length; i++) {
+                    String pkg = packages[i];
+                    if (mPackageInfo.packageName.equals(pkg)) {
+                        continue;
+                    }
+                    try {
+                        ApplicationInfo ainfo = mPm.getApplicationInfo(pkg, 0);
+                        pnames.add(ainfo.loadLabel(mPm));
+                    } catch (PackageManager.NameNotFoundException e) {
+                    }
+                }
+                final int N = pnames.size();
+                if (N > 0) {
+                    final Resources res = getActivity().getResources();
+                    String appListStr;
+                    if (N == 1) {
+                        appListStr = pnames.get(0).toString();
+                    } else if (N == 2) {
+                        appListStr = res.getString(R.string.join_two_items, pnames.get(0),
+                                pnames.get(1));
+                    } else {
+                        appListStr = pnames.get(N-2).toString();
+                        for (int i=N-3; i>=0; i--) {
+                            appListStr = res.getString(i == 0 ? R.string.join_many_items_first
+                                    : R.string.join_many_items_middle, pnames.get(i), appListStr);
+                        }
+                        appListStr = res.getString(R.string.join_many_items_last,
+                                appListStr, pnames.get(N-1));
+                    }
+                    TextView descr = (TextView) mRootView.findViewById(
+                            R.id.security_settings_desc);
+                    descr.setText(res.getString(R.string.security_settings_desc_multi,
+                            mPackageInfo.applicationInfo.loadLabel(mPm), appListStr));
+                }
+            }
+        }
+        return true;
+    }
+
+    private int getPremiumSmsPermission(String packageName) {
+        try {
+            if (mSmsManager != null) {
+                return mSmsManager.getPremiumSmsPermission(packageName);
+            }
+        } catch (RemoteException ex) {
+            // ignored
+        }
+        return SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        // No dialogs for Permissions screen.
+        return null;
+    }
+
+    public static CharSequence getSummary(AppEntry appEntry, Context context) {
+        if (appEntry.info.targetSdkVersion > Build.VERSION_CODES.LOLLIPOP_MR1) {
+            AppPermissions appPerms = new AppPermissions(context, appEntry.info.packageName);
+            int count = appPerms.getPermissionCount();
+            int grantedCount = appPerms.getGrantedPermissionsCount();
+            return context.getResources().getQuantityString(R.plurals.runtime_permissions_summary,
+                    count, grantedCount, count);
+        }
+        AppSecurityPermissions asp = new AppSecurityPermissions(context,
+                appEntry.info.packageName);
+        int count = asp.getPermissionCount();
+        return context.getResources().getQuantityString(R.plurals.permissions_summary,
+                count, count);
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_APP_PERMISSION;
+    }
+
+    private static class PremiumSmsSelectionListener implements AdapterView.OnItemSelectedListener {
+        private final String mPackageName;
+        private final ISms mSmsManager;
+
+        PremiumSmsSelectionListener(String packageName, ISms smsManager) {
+            mPackageName = packageName;
+            mSmsManager = smsManager;
+        }
+
+        @Override
+        public void onItemSelected(AdapterView<?> parent, View view, int position,
+                long id) {
+            if (position >= 0 && position < 3) {
+                if (localLOGV) Log.d(TAG, "Selected premium SMS policy " + position);
+                setPremiumSmsPermission(mPackageName, (position + 1));
+            } else {
+                Log.e(TAG, "Error: unknown premium SMS policy " + position);
+            }
+        }
+
+        @Override
+        public void onNothingSelected(AdapterView<?> parent) {
+            // Ignored
+        }
+
+        private void setPremiumSmsPermission(String packageName, int permission) {
+            try {
+                if (mSmsManager != null) {
+                    mSmsManager.setPremiumSmsPermission(packageName, permission);
+                }
+            } catch (RemoteException ex) {
+                // ignored
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/AppPermissions.java b/src/com/android/settings/applications/AppPermissions.java
new file mode 100644
index 0000000..6299921
--- /dev/null
+++ b/src/com/android/settings/applications/AppPermissions.java
@@ -0,0 +1,169 @@
+/*
+ * 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.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.pm.PermissionInfo;
+import android.os.Build;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Based off from
+ * packages/apps/PackageInstaller/src/com/android/packageinstaller/permission/AppPermissions.java
+ * Except we only care about the number rather than the details.
+ */
+public final class AppPermissions {
+    private static final String TAG = "AppPermissions";
+
+    private final ArrayMap<String, PermissionGroup> mGroups = new ArrayMap<>();
+    private final Context mContext;
+    private final PackageInfo mPackageInfo;
+
+    public AppPermissions(Context context, String packageName) {
+        mContext = context;
+        mPackageInfo = getPackageInfo(packageName);
+        refresh();
+    }
+
+    private PackageInfo getPackageInfo(String packageName) {
+        try {
+            return mContext.getPackageManager().getPackageInfo(packageName,
+                    PackageManager.GET_PERMISSIONS);
+        } catch (NameNotFoundException e) {
+            Log.e(TAG, "Unable to find " + packageName, e);
+            return null;
+        }
+    }
+
+    public void refresh() {
+        if (mPackageInfo != null) {
+            loadPermissionGroups();
+        }
+    }
+
+    public int getPermissionCount() {
+        return mGroups.size();
+    }
+
+    public int getGrantedPermissionsCount() {
+        int ct = 0;
+        for (int i = 0; i < mGroups.size(); i++) {
+            if (mGroups.valueAt(i).areRuntimePermissionsGranted()) {
+                ct++;
+            }
+        }
+        return ct;
+    }
+
+    private void loadPermissionGroups() {
+        mGroups.clear();
+        if (mPackageInfo.requestedPermissions == null) {
+            return;
+        }
+
+        final boolean appSupportsRuntimePermissions = appSupportsRuntime(
+                mPackageInfo.applicationInfo);
+
+        for (int i = 0; i < mPackageInfo.requestedPermissions.length; i++) {
+            String requestedPerm = mPackageInfo.requestedPermissions[i];
+
+            final PermissionInfo permInfo;
+            try {
+                permInfo = mContext.getPackageManager().getPermissionInfo(requestedPerm, 0);
+            } catch (NameNotFoundException e) {
+                Log.w(TAG, "Unknown permission: " + requestedPerm);
+                continue;
+            }
+
+            String permName = permInfo.name;
+            String groupName = permInfo.group != null ? permInfo.group : permName;
+
+            PermissionGroup group = mGroups.get(groupName);
+            if (group == null) {
+                group = new PermissionGroup();
+                mGroups.put(groupName, group);
+            }
+
+            final boolean runtime = appSupportsRuntimePermissions
+                    && permInfo.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS;
+            final boolean granted = (mPackageInfo.requestedPermissionsFlags[i]
+                    & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0;
+
+            Permission permission = new Permission(runtime, granted);
+            group.addPermission(permission, permName);
+        }
+        // Only care about runtime perms for now.
+        for (int i = mGroups.size() - 1; i >= 0; i--) {
+            if (!mGroups.valueAt(i).mHasRuntimePermissions) {
+                mGroups.removeAt(i);
+            }
+        }
+    }
+
+    public static boolean appSupportsRuntime(ApplicationInfo info) {
+        return info.targetSdkVersion > Build.VERSION_CODES.LOLLIPOP_MR1;
+    }
+
+    private static final class PermissionGroup {
+        private final ArrayMap<String, Permission> mPermissions = new ArrayMap<>();
+        private boolean mHasRuntimePermissions;
+
+        public boolean hasRuntimePermissions() {
+            return mHasRuntimePermissions;
+        }
+
+        public boolean areRuntimePermissionsGranted() {
+            final int permissionCount = mPermissions.size();
+            for (int i = 0; i < permissionCount; i++) {
+                Permission permission = mPermissions.valueAt(i);
+                if (permission.runtime && !permission.granted) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public List<Permission> getPermissions() {
+            return new ArrayList<>(mPermissions.values());
+        }
+
+        void addPermission(Permission permission, String permName) {
+            mPermissions.put(permName, permission);
+            if (permission.runtime) {
+                mHasRuntimePermissions = true;
+            }
+        }
+    }
+
+    private static final class Permission {
+        private final boolean runtime;
+        private boolean granted;
+
+        public Permission(boolean runtime, boolean granted) {
+            this.runtime = runtime;
+            this.granted = granted;
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/AppStateBaseBridge.java b/src/com/android/settings/applications/AppStateBaseBridge.java
new file mode 100644
index 0000000..04eb77b
--- /dev/null
+++ b/src/com/android/settings/applications/AppStateBaseBridge.java
@@ -0,0 +1,158 @@
+/*
+ * 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.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+import com.android.settings.applications.ApplicationsState.AppEntry;
+import com.android.settings.applications.ApplicationsState.Session;
+
+import java.util.ArrayList;
+
+/**
+ * Common base class for bridging information to ApplicationsState.
+ */
+public abstract class AppStateBaseBridge implements ApplicationsState.Callbacks {
+
+    protected final ApplicationsState mAppState;
+    protected final Session mAppSession;
+    protected final Callback mCallback;
+    protected final BackgroundHandler mHandler;
+    protected final MainHandler mMainHandler;
+
+    public AppStateBaseBridge(ApplicationsState appState, Callback callback) {
+        mAppState = appState;
+        mAppSession = mAppState != null ? mAppState.newSession(this) : null;
+        mCallback = callback;
+        // Running on the same background thread as the ApplicationsState lets
+        // us run in the background and make sure they aren't doing updates at
+        // the same time as us as well.
+        mHandler = new BackgroundHandler(mAppState.getBackgroundLooper());
+        mMainHandler = new MainHandler();
+    }
+
+    public void resume() {
+        mHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ALL);
+        mAppSession.resume();
+    }
+
+    public void pause() {
+        mAppSession.pause();
+    }
+
+    public void release() {
+        mAppSession.release();
+    }
+
+    public void forceUpdate(String pkg, int uid) {
+        mHandler.obtainMessage(BackgroundHandler.MSG_FORCE_LOAD_PKG, uid, 0, pkg).sendToTarget();
+    }
+
+    @Override
+    public void onPackageListChanged() {
+        mHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ALL);
+    }
+
+    @Override
+    public void onLoadEntriesCompleted() {
+        mHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ALL);
+    }
+
+    @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 onPackageSizeChanged(String packageName) {
+        // No op.
+    }
+
+    @Override
+    public void onAllSizesComputed() {
+        // No op.
+    }
+
+    @Override
+    public void onLauncherInfoChanged() {
+        // No op.
+    }
+
+    protected abstract void loadAllExtraInfo();
+    protected abstract void updateExtraInfo(AppEntry app, String pkg, int uid);
+
+    private class MainHandler extends Handler {
+        private static final int MSG_INFO_UPDATED = 1;
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_INFO_UPDATED:
+                    mCallback.onExtraInfoUpdated();
+                    break;
+            }
+        }
+    }
+
+    private class BackgroundHandler extends Handler {
+        private static final int MSG_LOAD_ALL = 1;
+        private static final int MSG_FORCE_LOAD_PKG = 2;
+
+        public BackgroundHandler(Looper looper) {
+            super(looper);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_LOAD_ALL:
+                    loadAllExtraInfo();
+                    mMainHandler.sendEmptyMessage(MainHandler.MSG_INFO_UPDATED);
+                    break;
+                case MSG_FORCE_LOAD_PKG:
+                    ArrayList<AppEntry> apps = mAppSession.getAllApps();
+                    final int N = apps.size();
+                    String pkg = (String) msg.obj;
+                    int uid = msg.arg1;
+                    for (int i = 0; i < N; i++) {
+                        AppEntry app = apps.get(i);
+                        if (app.info.uid == uid && pkg.equals(app.info.packageName)) {
+                            updateExtraInfo(app, pkg, uid);
+                        }
+                    }
+                    mMainHandler.sendEmptyMessage(MainHandler.MSG_INFO_UPDATED);
+                    break;
+            }
+        }
+    }
+
+
+    public interface Callback {
+        void onExtraInfoUpdated();
+    }
+}
diff --git a/src/com/android/settings/applications/AppStateNotificationBridge.java b/src/com/android/settings/applications/AppStateNotificationBridge.java
new file mode 100644
index 0000000..1aa7ebf
--- /dev/null
+++ b/src/com/android/settings/applications/AppStateNotificationBridge.java
@@ -0,0 +1,90 @@
+/*
+ * 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.content.pm.PackageManager;
+
+import com.android.settings.applications.ApplicationsState.AppEntry;
+import com.android.settings.applications.ApplicationsState.AppFilter;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.NotificationBackend.AppRow;
+
+import java.util.ArrayList;
+
+/**
+ * Connects the info provided by ApplicationsState and the NotificationBackend.
+ * Also provides app filters that can use the notification data.
+ */
+public class AppStateNotificationBridge extends AppStateBaseBridge {
+
+    private final NotificationBackend mNotifBackend;
+    private final PackageManager mPm;
+
+    public AppStateNotificationBridge(PackageManager pm, ApplicationsState appState,
+            Callback callback, NotificationBackend notifBackend) {
+        super(appState, callback);
+        mPm = pm;
+        mNotifBackend = notifBackend;
+    }
+
+    @Override
+    protected void loadAllExtraInfo() {
+        ArrayList<AppEntry> apps = mAppSession.getAllApps();
+        final int N = apps.size();
+        for (int i = 0; i < N; i++) {
+            AppEntry app = apps.get(i);
+            app.extraInfo = mNotifBackend.loadAppRow(mPm, app.info);
+        }
+    }
+
+    @Override
+    protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
+        app.extraInfo = mNotifBackend.loadAppRow(mPm, app.info);
+    }
+
+    public static final AppFilter FILTER_APP_NOTIFICATION_BLOCKED = new AppFilter() {
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            return info.extraInfo != null && ((AppRow) info.extraInfo).banned;
+        }
+    };
+
+    public static final AppFilter FILTER_APP_NOTIFICATION_PRIORITY = new AppFilter() {
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            return info.extraInfo != null && ((AppRow) info.extraInfo).priority;
+        }
+    };
+
+    public static final AppFilter FILTER_APP_NOTIFICATION_SENSITIVE = new AppFilter() {
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            return info.extraInfo != null && ((AppRow) info.extraInfo).sensitive;
+        }
+    };
+}
diff --git a/src/com/android/settings/applications/AppStateUsageBridge.java b/src/com/android/settings/applications/AppStateUsageBridge.java
new file mode 100644
index 0000000..22f19b2
--- /dev/null
+++ b/src/com/android/settings/applications/AppStateUsageBridge.java
@@ -0,0 +1,265 @@
+/*
+ * 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.Manifest;
+import android.app.AppGlobals;
+import android.app.AppOpsManager;
+import android.app.AppOpsManager.PackageOps;
+import android.content.Context;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.util.SparseArray;
+
+import com.android.settings.applications.ApplicationsState.AppEntry;
+import com.android.settings.applications.ApplicationsState.AppFilter;
+
+import java.util.List;
+
+/*
+ * Connects app usage info to the ApplicationsState.
+ * Also provides app filters that can use the info.
+ */
+public class AppStateUsageBridge extends AppStateBaseBridge {
+
+    private static final String TAG = "AppStateUsageBridge";
+
+    private static final String[] PM_USAGE_STATS_PERMISSION = {
+            Manifest.permission.PACKAGE_USAGE_STATS
+    };
+
+    private static final int[] APP_OPS_OP_CODES = {
+            AppOpsManager.OP_GET_USAGE_STATS
+    };
+
+    private final IPackageManager mIPackageManager;
+    private final UserManager mUserManager;
+    private final List<UserHandle> mProfiles;
+    private final AppOpsManager mAppOpsManager;
+    private final Context mContext;
+
+    public AppStateUsageBridge(Context context, ApplicationsState appState, Callback callback) {
+        super(appState, callback);
+        mContext = context;
+        mIPackageManager = AppGlobals.getPackageManager();
+        mUserManager = UserManager.get(context);
+        mProfiles = mUserManager.getUserProfiles();
+        mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+    }
+
+    private boolean isThisUserAProfileOfCurrentUser(final int userId) {
+        final int profilesMax = mProfiles.size();
+        for (int i = 0; i < profilesMax; i++) {
+            if (mProfiles.get(i).getIdentifier() == userId) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
+        app.extraInfo = getUsageInfo(pkg, uid);
+    }
+
+    public UsageState getUsageInfo(String pkg, int uid) {
+        UsageState usageState = new UsageState(pkg, new UserHandle(UserHandle.getUserId(uid)));
+        try {
+            usageState.packageInfo = mIPackageManager.getPackageInfo(pkg,
+                    PackageManager.GET_PERMISSIONS, usageState.userHandle.getIdentifier());
+            // Check permission state.
+            String[] requestedPermissions = usageState.packageInfo.requestedPermissions;
+            int[] permissionFlags = usageState.packageInfo.requestedPermissionsFlags;
+            if (requestedPermissions != null) {
+                for (int i = 0; i < requestedPermissions.length; i++) {
+                    if (Manifest.permission.PACKAGE_USAGE_STATS.equals(requestedPermissions[i])
+                            && (permissionFlags[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED)
+                            != 0) {
+                        usageState.permissionGranted = true;
+                        break;
+                    }
+                }
+            }
+            // Check app op state.
+            List<PackageOps> ops = mAppOpsManager.getOpsForPackage(uid, pkg, APP_OPS_OP_CODES);
+            if (ops != null && ops.size() > 0 && ops.get(0).getOps().size() > 0) {
+                usageState.appOpMode = ops.get(0).getOps().get(0).getMode();
+            }
+        } catch (RemoteException e) {
+            Log.w(TAG, "PackageManager is dead. Can't get package info " + pkg, e);
+        }
+        return usageState;
+    }
+
+    @Override
+    protected void loadAllExtraInfo() {
+        SparseArray<ArrayMap<String, UsageState>> entries = getEntries();
+
+        // Load state info.
+        loadPermissionsStates(entries);
+        loadAppOpsStates(entries);
+
+        // Map states to application info.
+        List<AppEntry> apps = mAppSession.getAllApps();
+        final int N = apps.size();
+        for (int i = 0; i < N; i++) {
+            AppEntry app = apps.get(i);
+            int userId = UserHandle.getUserId(app.info.uid);
+            ArrayMap<String, UsageState> userMap = entries.get(userId);
+            app.extraInfo = userMap != null ? userMap.get(app.info.packageName) : null;
+        }
+    }
+
+    private SparseArray<ArrayMap<String, UsageState>> getEntries() {
+        try {
+            final String[] packages = mIPackageManager.getAppOpPermissionPackages(
+                    Manifest.permission.PACKAGE_USAGE_STATS);
+
+            if (packages == null) {
+                // No packages are requesting permission to use the UsageStats API.
+                return null;
+            }
+
+            SparseArray<ArrayMap<String, UsageState>> entries = new SparseArray<>();
+            for (final UserHandle profile : mProfiles) {
+                final ArrayMap<String, UsageState> entriesForProfile = new ArrayMap<>();
+                final int profileId = profile.getIdentifier();
+                entries.put(profileId, entriesForProfile);
+                for (final String packageName : packages) {
+                    final boolean isAvailable = mIPackageManager.isPackageAvailable(packageName,
+                            profileId);
+                    if (!shouldIgnorePackage(packageName) && isAvailable) {
+                        final UsageState newEntry = new UsageState(packageName, profile);
+                        entriesForProfile.put(packageName, newEntry);
+                    }
+                }
+            }
+
+            return entries;
+        } catch (RemoteException e) {
+            Log.w(TAG, "PackageManager is dead. Can't get list of packages requesting "
+                    + Manifest.permission.PACKAGE_USAGE_STATS, e);
+            return null;
+        }
+    }
+
+    private void loadPermissionsStates(SparseArray<ArrayMap<String, UsageState>> entries) {
+         // Load the packages that have been granted the PACKAGE_USAGE_STATS permission.
+        try {
+            for (final UserHandle profile : mProfiles) {
+                final int profileId = profile.getIdentifier();
+                final ArrayMap<String, UsageState> entriesForProfile = entries.get(profileId);
+                if (entriesForProfile == null) {
+                    continue;
+                }
+                @SuppressWarnings("unchecked")
+                final List<PackageInfo> packageInfos = mIPackageManager
+                        .getPackagesHoldingPermissions(PM_USAGE_STATS_PERMISSION, 0, profileId)
+                        .getList();
+                final int packageInfoCount = packageInfos != null ? packageInfos.size() : 0;
+                for (int i = 0; i < packageInfoCount; i++) {
+                    final PackageInfo packageInfo = packageInfos.get(i);
+                    final UsageState pe = entriesForProfile.get(packageInfo.packageName);
+                    if (pe != null) {
+                        pe.packageInfo = packageInfo;
+                        pe.permissionGranted = true;
+                    }
+                }
+            }
+        } catch (RemoteException e) {
+            Log.w(TAG, "PackageManager is dead. Can't get list of packages granted "
+                    + Manifest.permission.PACKAGE_USAGE_STATS, e);
+            return;
+        }
+    }
+
+    private void loadAppOpsStates(SparseArray<ArrayMap<String, UsageState>> entries) {
+        // Find out which packages have been granted permission from AppOps.
+        final List<AppOpsManager.PackageOps> packageOps = mAppOpsManager.getPackagesForOps(
+                APP_OPS_OP_CODES);
+        final int packageOpsCount = packageOps != null ? packageOps.size() : 0;
+        for (int i = 0; i < packageOpsCount; i++) {
+            final AppOpsManager.PackageOps packageOp = packageOps.get(i);
+            final int userId = UserHandle.getUserId(packageOp.getUid());
+            if (!isThisUserAProfileOfCurrentUser(userId)) {
+                // This AppOp does not belong to any of this user's profiles.
+                continue;
+            }
+
+            final ArrayMap<String, UsageState> entriesForProfile = entries.get(userId);
+            if (entriesForProfile == null) {
+                continue;
+            }
+            final UsageState pe = entriesForProfile.get(packageOp.getPackageName());
+            if (pe == null) {
+                Log.w(TAG, "AppOp permission exists for package " + packageOp.getPackageName()
+                        + " of user " + userId +
+                        " but package doesn't exist or did not request UsageStats access");
+                continue;
+            }
+
+            if (packageOp.getOps().size() < 1) {
+                Log.w(TAG, "No AppOps permission exists for package "
+                        + packageOp.getPackageName());
+                continue;
+            }
+
+            pe.appOpMode = packageOp.getOps().get(0).getMode();
+        }
+    }
+
+    private boolean shouldIgnorePackage(String packageName) {
+        return packageName.equals("android") || packageName.equals(mContext.getPackageName());
+    }
+
+    public static class UsageState {
+        public final String packageName;
+        public final UserHandle userHandle;
+        public PackageInfo packageInfo;
+        public boolean permissionGranted;
+        public int appOpMode;
+
+        public UsageState(String packageName, UserHandle userHandle) {
+            this.packageName = packageName;
+            this.appOpMode = AppOpsManager.MODE_DEFAULT;
+            this.userHandle = userHandle;
+        }
+
+        public boolean hasAccess() {
+            if (appOpMode == AppOpsManager.MODE_DEFAULT) {
+                return permissionGranted;
+            }
+            return appOpMode == AppOpsManager.MODE_ALLOWED;
+        }
+    }
+
+    public static final AppFilter FILTER_APP_USAGE = new AppFilter() {
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            return info.extraInfo != null;
+        }
+    };
+}
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
new file mode 100644
index 0000000..5c367d7
--- /dev/null
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -0,0 +1,454 @@
+/*
+ * 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.ActivityManager;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageDataObserver;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.text.format.Formatter;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.DropDownPreference;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+import com.android.settings.applications.ApplicationsState.Callbacks;
+import com.android.settings.deviceinfo.StorageWizardMoveConfirm;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+public class AppStorageSettings extends AppInfoWithHeader
+        implements OnClickListener, Callbacks, DropDownPreference.Callback {
+    private static final String TAG = AppStorageSettings.class.getSimpleName();
+
+    //internal constants used in Handler
+    private static final int OP_SUCCESSFUL = 1;
+    private static final int OP_FAILED = 2;
+    private static final int MSG_CLEAR_USER_DATA = 1;
+    private static final int MSG_CLEAR_CACHE = 3;
+
+    // invalid size value used initially and also when size retrieval through PackageManager
+    // fails for whatever reason
+    private static final int SIZE_INVALID = -1;
+
+    // Result code identifiers
+    public static final int REQUEST_MANAGE_SPACE = 2;
+
+    private static final int DLG_CLEAR_DATA = DLG_BASE + 1;
+    private static final int DLG_CANNOT_CLEAR_DATA = DLG_BASE + 2;
+
+    private static final String KEY_MOVE_PREFERENCE = "app_location_setting";
+    private static final String KEY_STORAGE_SETTINGS = "storage_settings";
+    private static final String KEY_CACHE_SETTINGS = "cache_settings";
+
+    private TextView mTotalSize;
+    private TextView mAppSize;
+    private TextView mDataSize;
+    private TextView mExternalCodeSize;
+    private TextView mExternalDataSize;
+
+    // Views related to cache info
+    private TextView mCacheSize;
+    private Button mClearDataButton;
+    private Button mClearCacheButton;
+
+    private DropDownPreference mMoveDropDown;
+
+    private boolean mCanClearData = true;
+    private boolean mHaveSizes = false;
+
+    private long mLastCodeSize = -1;
+    private long mLastDataSize = -1;
+    private long mLastExternalCodeSize = -1;
+    private long mLastExternalDataSize = -1;
+    private long mLastCacheSize = -1;
+    private long mLastTotalSize = -1;
+
+    private ClearCacheObserver mClearCacheObserver;
+    private ClearUserDataObserver mClearDataObserver;
+
+    // Resource strings
+    private CharSequence mInvalidSizeStr;
+    private CharSequence mComputingStr;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.app_storage_settings);
+        setupViews();
+    }
+
+    private void setupViews() {
+        mComputingStr = getActivity().getText(R.string.computing_size);
+        mInvalidSizeStr = getActivity().getText(R.string.invalid_size_value);
+        LayoutPreference view = (LayoutPreference) findPreference(KEY_STORAGE_SETTINGS);
+
+        // Set default values on sizes
+        mTotalSize = (TextView) view.findViewById(R.id.total_size_text);
+        mAppSize = (TextView) view.findViewById(R.id.application_size_text);
+        mDataSize = (TextView) view.findViewById(R.id.data_size_text);
+        mExternalCodeSize = (TextView) view.findViewById(R.id.external_code_size_text);
+        mExternalDataSize = (TextView) view.findViewById(R.id.external_data_size_text);
+
+        if (Environment.isExternalStorageEmulated()) {
+            ((View) mExternalCodeSize.getParent()).setVisibility(View.GONE);
+            ((View) mExternalDataSize.getParent()).setVisibility(View.GONE);
+        }
+        mClearDataButton = (Button) view.findViewById(R.id.clear_data_button)
+                .findViewById(R.id.button);
+
+        mMoveDropDown = (DropDownPreference) findPreference(KEY_MOVE_PREFERENCE);
+        mMoveDropDown.setCallback(this);
+
+        view = (LayoutPreference) findPreference(KEY_CACHE_SETTINGS);
+        // Cache section
+        mCacheSize = (TextView) view.findViewById(R.id.cache_size_text);
+        mClearCacheButton = (Button) view.findViewById(R.id.clear_cache_button)
+                .findViewById(R.id.button);
+        mClearCacheButton.setText(R.string.clear_cache_btn_text);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v == mClearCacheButton) {
+            // Lazy initialization of observer
+            if (mClearCacheObserver == null) {
+                mClearCacheObserver = new ClearCacheObserver();
+            }
+            mPm.deleteApplicationCacheFiles(mPackageName, mClearCacheObserver);
+        } else if(v == mClearDataButton) {
+            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 boolean onItemSelected(int pos, Object value) {
+        final Context context = getActivity();
+
+        // If not current volume, kick off move wizard
+        final VolumeInfo targetVol = (VolumeInfo) value;
+        final VolumeInfo currentVol = context.getPackageManager().getPackageCurrentVolume(
+                mAppEntry.info);
+        if (!Objects.equals(targetVol, currentVol)) {
+            final Intent intent = new Intent(context, StorageWizardMoveConfirm.class);
+            intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, targetVol.getId());
+            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mAppEntry.info.packageName);
+            startActivity(intent);
+        }
+
+        return true;
+    }
+
+    private String getSizeStr(long size) {
+        if (size == SIZE_INVALID) {
+            return mInvalidSizeStr.toString();
+        }
+        return Formatter.formatFileSize(getActivity(), size);
+    }
+
+    private void refreshSizeInfo() {
+        if (mAppEntry.size == ApplicationsState.SIZE_INVALID
+                || mAppEntry.size == ApplicationsState.SIZE_UNKNOWN) {
+            mLastCodeSize = mLastDataSize = mLastCacheSize = mLastTotalSize = -1;
+            if (!mHaveSizes) {
+                mAppSize.setText(mComputingStr);
+                mDataSize.setText(mComputingStr);
+                mCacheSize.setText(mComputingStr);
+                mTotalSize.setText(mComputingStr);
+            }
+            mClearDataButton.setEnabled(false);
+            mClearCacheButton.setEnabled(false);
+
+        } else {
+            mHaveSizes = true;
+            long codeSize = mAppEntry.codeSize;
+            long dataSize = mAppEntry.dataSize;
+            if (Environment.isExternalStorageEmulated()) {
+                codeSize += mAppEntry.externalCodeSize;
+                dataSize +=  mAppEntry.externalDataSize;
+            } else {
+                if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
+                    mLastExternalCodeSize = mAppEntry.externalCodeSize;
+                    mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
+                }
+                if (mLastExternalDataSize !=  mAppEntry.externalDataSize) {
+                    mLastExternalDataSize =  mAppEntry.externalDataSize;
+                    mExternalDataSize.setText(getSizeStr( mAppEntry.externalDataSize));
+                }
+            }
+            if (mLastCodeSize != codeSize) {
+                mLastCodeSize = codeSize;
+                mAppSize.setText(getSizeStr(codeSize));
+            }
+            if (mLastDataSize != dataSize) {
+                mLastDataSize = dataSize;
+                mDataSize.setText(getSizeStr(dataSize));
+            }
+            long cacheSize = mAppEntry.cacheSize + mAppEntry.externalCacheSize;
+            if (mLastCacheSize != cacheSize) {
+                mLastCacheSize = cacheSize;
+                mCacheSize.setText(getSizeStr(cacheSize));
+            }
+            if (mLastTotalSize != mAppEntry.size) {
+                mLastTotalSize = mAppEntry.size;
+                mTotalSize.setText(getSizeStr(mAppEntry.size));
+            }
+
+            if ((mAppEntry.dataSize+ mAppEntry.externalDataSize) <= 0 || !mCanClearData) {
+                mClearDataButton.setEnabled(false);
+            } else {
+                mClearDataButton.setEnabled(true);
+                mClearDataButton.setOnClickListener(this);
+            }
+            if (cacheSize <= 0) {
+                mClearCacheButton.setEnabled(false);
+            } else {
+                mClearCacheButton.setEnabled(true);
+                mClearCacheButton.setOnClickListener(this);
+            }
+        }
+        if (mAppControlRestricted) {
+            mClearCacheButton.setEnabled(false);
+            mClearDataButton.setEnabled(false);
+        }
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        retrieveAppEntry();
+        refreshButtons();
+        refreshSizeInfo();
+
+        final VolumeInfo currentVol = getActivity().getPackageManager()
+                .getPackageCurrentVolume(mAppEntry.info);
+        mMoveDropDown.setSelectedValue(currentVol);
+
+        return true;
+    }
+
+    private void refreshButtons() {
+        initMoveDropDown();
+        initDataButtons();
+    }
+
+    private void initDataButtons() {
+        // If the app doesn't have its own space management UI
+        // And it's a system app that doesn't allow clearing user data or is an active admin
+        // Then disable the Clear Data button.
+        if (mAppEntry.info.manageSpaceActivityName == null
+                && ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM
+                        | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA))
+                        == ApplicationInfo.FLAG_SYSTEM
+                        || mDpm.packageHasActiveAdmins(mPackageName))) {
+            mClearDataButton.setText(R.string.clear_user_data_text);
+            mClearDataButton.setEnabled(false);
+            mCanClearData = false;
+        } else {
+            if (mAppEntry.info.manageSpaceActivityName != null) {
+                mClearDataButton.setText(R.string.manage_space_text);
+            } else {
+                mClearDataButton.setText(R.string.clear_user_data_text);
+            }
+            mClearDataButton.setOnClickListener(this);
+        }
+
+        if (mAppControlRestricted) {
+            mClearDataButton.setEnabled(false);
+        }
+    }
+
+    private void initMoveDropDown() {
+        final Context context = getActivity();
+        final StorageManager storage = context.getSystemService(StorageManager.class);
+
+        final List<VolumeInfo> candidates = context.getPackageManager()
+                .getPackageCandidateVolumes(mAppEntry.info);
+        Collections.sort(candidates, VolumeInfo.getDescriptionComparator());
+
+        mMoveDropDown.clearItems();
+        for (VolumeInfo vol : candidates) {
+            final String volDescrip = storage.getBestVolumeDescription(vol);
+            mMoveDropDown.addItem(volDescrip, vol);
+        }
+        mMoveDropDown.setSelectable(!mAppControlRestricted);
+    }
+
+    /*
+     * Private method to initiate clearing user data when the user clicks the clear data
+     * button for a system package
+     */
+    private void initiateClearUserData() {
+        mClearDataButton.setEnabled(false);
+        // Invoke uninstall or clear user data based on sysPackage
+        String packageName = mAppEntry.info.packageName;
+        Log.i(TAG, "Clearing user data for package : " + packageName);
+        if (mClearDataObserver == null) {
+            mClearDataObserver = new ClearUserDataObserver();
+        }
+        ActivityManager am = (ActivityManager)
+                getActivity().getSystemService(Context.ACTIVITY_SERVICE);
+        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);
+            showDialogInner(DLG_CANNOT_CLEAR_DATA, 0);
+        } else {
+            mClearDataButton.setText(R.string.recompute_size);
+        }
+    }
+
+    /*
+     * Private method to handle clear message notification from observer when
+     * the async operation from PackageManager is complete
+     */
+    private void processClearMsg(Message msg) {
+        int result = msg.arg1;
+        String packageName = mAppEntry.info.packageName;
+        mClearDataButton.setText(R.string.clear_user_data_text);
+        if (result == OP_SUCCESSFUL) {
+            Log.i(TAG, "Cleared user data for package : "+packageName);
+            mState.requestSize(mPackageName, mUserId);
+        } else {
+            mClearDataButton.setEnabled(true);
+        }
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        switch (id) {
+            case DLG_CLEAR_DATA:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.clear_data_dlg_title))
+                        .setMessage(getActivity().getText(R.string.clear_data_dlg_text))
+                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Clear user data here
+                                initiateClearUserData();
+                            }
+                        })
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
+            case DLG_CANNOT_CLEAR_DATA:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.clear_failed_dlg_title))
+                        .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);
+                                //force to recompute changed value
+                                setIntentAndFinish(false, false);
+                            }
+                        })
+                        .create();
+        }
+        return null;
+    }
+
+    @Override
+    public void onPackageSizeChanged(String packageName) {
+        if (packageName.equals(mAppEntry.info.packageName)) {
+            refreshSizeInfo();
+        }
+    }
+
+    private final Handler mHandler = new Handler() {
+        public void handleMessage(Message msg) {
+            if (getView() == null) {
+                return;
+            }
+            switch (msg.what) {
+                case MSG_CLEAR_USER_DATA:
+                    processClearMsg(msg);
+                    break;
+                case MSG_CLEAR_CACHE:
+                    // Refresh size info
+                    mState.requestSize(mPackageName, mUserId);
+                    break;
+            }
+        }
+    };
+
+    public static CharSequence getSummary(AppEntry appEntry, Context context) {
+        if (appEntry.size == ApplicationsState.SIZE_INVALID
+                || appEntry.size == ApplicationsState.SIZE_UNKNOWN) {
+            return context.getText(R.string.computing_size);
+        } else {
+            CharSequence storageType = context.getString(
+                    (appEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0
+                    ? R.string.storage_type_external
+                    : R.string.storage_type_internal);
+            return context.getString(R.string.storage_summary_format,
+                    getSize(appEntry, context), storageType);
+        }
+    }
+
+    private static CharSequence getSize(AppEntry appEntry, Context context) {
+        long size = appEntry.size;
+        if (size == SIZE_INVALID) {
+            return context.getText(R.string.invalid_size_value);
+        }
+        return Formatter.formatFileSize(context, size);
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_APP_STORAGE;
+    }
+
+    class ClearCacheObserver extends IPackageDataObserver.Stub {
+        public void onRemoveCompleted(final String packageName, final boolean succeeded) {
+            final Message msg = mHandler.obtainMessage(MSG_CLEAR_CACHE);
+            msg.arg1 = succeeded ? OP_SUCCESSFUL : OP_FAILED;
+            mHandler.sendMessage(msg);
+        }
+    }
+
+    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);
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/AppViewHolder.java b/src/com/android/settings/applications/AppViewHolder.java
index d23f187..92aa87a 100644
--- a/src/com/android/settings/applications/AppViewHolder.java
+++ b/src/com/android/settings/applications/AppViewHolder.java
@@ -1,8 +1,23 @@
+/*
+ * 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 com.android.settings.R;
 
-import android.content.Context;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,7 +31,7 @@
     public View rootView;
     public TextView appName;
     public ImageView appIcon;
-    public TextView appSize;
+    public TextView summary;
     public TextView disabled;
     public CheckBox checkBox;
 
@@ -30,7 +45,7 @@
             holder.rootView = convertView;
             holder.appName = (TextView) convertView.findViewById(R.id.app_name);
             holder.appIcon = (ImageView) convertView.findViewById(R.id.app_icon);
-            holder.appSize = (TextView) convertView.findViewById(R.id.app_size);
+            holder.summary = (TextView) convertView.findViewById(R.id.app_size);
             holder.disabled = (TextView) convertView.findViewById(R.id.app_disabled);
             holder.checkBox = (CheckBox) convertView.findViewById(R.id.app_on_sdcard);
             convertView.setTag(holder);
@@ -43,22 +58,22 @@
     }
 
     void updateSizeText(CharSequence invalidSizeStr, int whichSize) {
-        if (ManageApplications.DEBUG) Log.i(ManageApplications.TAG, "updateSizeText of " + entry.label + " " + entry
-                + ": " + entry.sizeStr);
+        if (ManageApplications.DEBUG) Log.i(ManageApplications.TAG, "updateSizeText of "
+                + entry.label + " " + entry + ": " + entry.sizeStr);
         if (entry.sizeStr != null) {
             switch (whichSize) {
                 case ManageApplications.SIZE_INTERNAL:
-                    appSize.setText(entry.internalSizeStr);
+                    summary.setText(entry.internalSizeStr);
                     break;
                 case ManageApplications.SIZE_EXTERNAL:
-                    appSize.setText(entry.externalSizeStr);
+                    summary.setText(entry.externalSizeStr);
                     break;
                 default:
-                    appSize.setText(entry.sizeStr);
+                    summary.setText(entry.sizeStr);
                     break;
             }
         } else if (entry.size == ApplicationsState.SIZE_INVALID) {
-            appSize.setText(invalidSizeStr);
+            summary.setText(invalidSizeStr);
         }
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 9c51181..c5124c6 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -1,15 +1,35 @@
+/*
+ * 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.ActivityManager;
+import android.app.AppGlobals;
 import android.app.Application;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
 import android.content.pm.IPackageStatsObserver;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageStats;
-import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ParceledListSlice;
+import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Handler;
@@ -17,10 +37,13 @@
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
+import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.text.format.Formatter;
 import android.util.Log;
+import android.util.SparseArray;
 
 import java.io.File;
 import java.text.Collator;
@@ -31,6 +54,7 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 /**
@@ -49,11 +73,13 @@
         public void onPackageIconChanged();
         public void onPackageSizeChanged(String packageName);
         public void onAllSizesComputed();
+        public void onLauncherInfoChanged();
+        public void onLoadEntriesCompleted();
     }
 
     public static interface AppFilter {
         public void init();
-        public boolean filterApp(ApplicationInfo info);
+        public boolean filterApp(AppEntry info);
     }
 
     static final int SIZE_UNKNOWN = -1;
@@ -85,7 +111,7 @@
         // for purposes of cleaning them up in the app details UI.
         long externalCacheSize;
     }
-    
+
     public static class AppEntry extends SizeInfo {
         final File apkFile;
         final long id;
@@ -95,7 +121,9 @@
         long externalSize;
 
         boolean mounted;
-        
+
+        boolean hasLauncherEntry;
+
         String getNormalizedLabel() {
             if (normalizedLabel != null) {
                 return normalizedLabel;
@@ -105,7 +133,7 @@
         }
 
         // Need to synchronize on 'this' for the following.
-        ApplicationInfo info;
+        public ApplicationInfo info;
         Drawable icon;
         String sizeStr;
         String internalSizeStr;
@@ -115,6 +143,9 @@
 
         String normalizedLabel;
 
+        // A location where extra info can be placed to be used by custom filters.
+        Object extraInfo;
+
         AppEntry(Context context, ApplicationInfo info, long id) {
             apkFile = new File(info.sourceDir);
             this.id = id;
@@ -123,7 +154,7 @@
             this.sizeStale = true;
             ensureLabel(context);
         }
-        
+
         void ensureLabel(Context context) {
             if (this.label == null || !this.mounted) {
                 if (!this.apkFile.exists()) {
@@ -136,11 +167,11 @@
                 }
             }
         }
-        
+
         boolean ensureIconLocked(Context context, PackageManager pm) {
             if (this.icon == null) {
                 if (this.apkFile.exists()) {
-                    this.icon = this.info.loadIcon(pm);
+                    this.icon = getBadgedIcon(pm);
                     return true;
                 } else {
                     this.mounted = false;
@@ -152,25 +183,24 @@
                 // its icon.
                 if (this.apkFile.exists()) {
                     this.mounted = true;
-                    this.icon = this.info.loadIcon(pm);
+                    this.icon = getBadgedIcon(pm);
                     return true;
                 }
             }
             return false;
         }
+
+        private Drawable getBadgedIcon(PackageManager pm) {
+            // Do badging ourself so that it comes from the user of the app not the current user.
+            return pm.getUserBadgedIcon(pm.loadUnbadgedItemIcon(info, info),
+                    new UserHandle(UserHandle.getUserId(info.uid)));
+        }
     }
 
     public static final Comparator<AppEntry> ALPHA_COMPARATOR = new Comparator<AppEntry>() {
         private final Collator sCollator = Collator.getInstance();
         @Override
         public int compare(AppEntry object1, AppEntry object2) {
-            final boolean normal1 = object1.info.enabled
-                    && (object1.info.flags&ApplicationInfo.FLAG_INSTALLED) != 0;
-            final boolean normal2 = object2.info.enabled
-                    && (object2.info.flags&ApplicationInfo.FLAG_INSTALLED) != 0;
-            if (normal1 != normal2) {
-                return normal1 ? -1 : 1;
-            }
             return sCollator.compare(object1.label, object2.label);
         }
     };
@@ -208,63 +238,147 @@
         }
     };
 
-    public static final AppFilter THIRD_PARTY_FILTER = new AppFilter() {
+    public static final AppFilter FILTER_PERSONAL = new AppFilter() {
+        private int mCurrentUser;
+
+        public void init() {
+            mCurrentUser = ActivityManager.getCurrentUser();
+        }
+
+        @Override
+        public boolean filterApp(AppEntry entry) {
+            return UserHandle.getUserId(entry.info.uid) == mCurrentUser;
+        }
+    };
+
+    public static final AppFilter FILTER_WORK = new AppFilter() {
+        private int mCurrentUser;
+
+        public void init() {
+            mCurrentUser = ActivityManager.getCurrentUser();
+        }
+
+        @Override
+        public boolean filterApp(AppEntry entry) {
+            return UserHandle.getUserId(entry.info.uid) != mCurrentUser;
+        }
+    };
+
+    public static final AppFilter FILTER_DOWNLOADED_AND_LAUNCHER = new AppFilter() {
         public void init() {
         }
-        
+
         @Override
-        public boolean filterApp(ApplicationInfo info) {
-            if ((info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
+        public boolean filterApp(AppEntry entry) {
+            if ((entry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
                 return true;
-            } else if ((info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+            } else if ((entry.info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+                return true;
+            } else if (entry.hasLauncherEntry) {
                 return true;
             }
             return false;
         }
     };
 
-    public static final AppFilter ON_SD_CARD_FILTER = new AppFilter() {
-        final CanBeOnSdCardChecker mCanBeOnSdCardChecker
-                = new CanBeOnSdCardChecker();
-        
+    public static final AppFilter FILTER_THIRD_PARTY = new AppFilter() {
         public void init() {
-            mCanBeOnSdCardChecker.init();
         }
-        
-        @Override
-        public boolean filterApp(ApplicationInfo info) {
-            return mCanBeOnSdCardChecker.check(info);
-        }
-    };
 
-    public static final AppFilter DISABLED_FILTER = new AppFilter() {
-        public void init() {
-        }
-        
         @Override
-        public boolean filterApp(ApplicationInfo info) {
-            if (!info.enabled) {
+        public boolean filterApp(AppEntry entry) {
+            if ((entry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
+                return true;
+            } else if ((entry.info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
                 return true;
             }
             return false;
         }
     };
 
-    public static final AppFilter ALL_ENABLED_FILTER = new AppFilter() {
+    public static final AppFilter FILTER_DISABLED = new AppFilter() {
         public void init() {
         }
-        
+
         @Override
-        public boolean filterApp(ApplicationInfo info) {
-            if (info.enabled) {
-                return true;
-            }
-            return false;
+        public boolean filterApp(AppEntry entry) {
+            return !entry.info.enabled;
         }
     };
 
+    public static final AppFilter FILTER_ALL_ENABLED = new AppFilter() {
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry entry) {
+            return entry.info.enabled;
+        }
+    };
+
+    public static final AppFilter FILTER_EVERYTHING = new AppFilter() {
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry entry) {
+            return true;
+        }
+    };
+
+    public static final AppFilter FILTER_WITH_DOMAIN_URLS = new AppFilter() {
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry entry) {
+            return (entry.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS) != 0;
+        }
+    };
+
+    public static class VolumeFilter implements AppFilter {
+        private final String mVolumeUuid;
+
+        public VolumeFilter(String volumeUuid) {
+            mVolumeUuid = volumeUuid;
+        }
+
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            return Objects.equals(info.info.volumeUuid, mVolumeUuid);
+        }
+    }
+
+    public static class CompoundFilter implements AppFilter {
+        private final AppFilter mFirstFilter;
+        private final AppFilter mSecondFilter;
+
+        public CompoundFilter(AppFilter first, AppFilter second) {
+            mFirstFilter = first;
+            mSecondFilter = second;
+        }
+
+        @Override
+        public void init() {
+            mFirstFilter.init();
+            mSecondFilter.init();
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            return mFirstFilter.filterApp(info) && mSecondFilter.filterApp(info);
+        }
+    }
+
     final Context mContext;
     final PackageManager mPm;
+    final IPackageManager mIpm;
+    final UserManager mUm;
+    final int mOwnerRetrieveFlags;
     final int mRetrieveFlags;
     PackageIntentReceiver mPackageIntentReceiver;
 
@@ -276,11 +390,14 @@
     final ArrayList<Session> mSessions = new ArrayList<Session>();
     final ArrayList<Session> mRebuildingSessions = new ArrayList<Session>();
     final InterestingConfigChanges mInterestingConfigChanges = new InterestingConfigChanges();
-    final HashMap<String, AppEntry> mEntriesMap = new HashMap<String, AppEntry>();
+    // Map: userid => (Map: package name => AppEntry)
+    final SparseArray<HashMap<String, AppEntry>> mEntriesMap =
+            new SparseArray<HashMap<String, AppEntry>>();
     final ArrayList<AppEntry> mAppEntries = new ArrayList<AppEntry>();
     List<ApplicationInfo> mApplications = new ArrayList<ApplicationInfo>();
     long mCurId = 1;
     String mCurComputingSizePkg;
+    int mCurComputingSizeUserId;
     boolean mSessionsChanged;
 
     // Temporary for dispatching session callbacks.  Only touched by main thread.
@@ -301,6 +418,11 @@
              sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE);
              sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE);
              mContext.registerReceiver(this, sdFilter);
+             // Register for events related to user creation/deletion.
+             IntentFilter userFilter = new IntentFilter();
+             userFilter.addAction(Intent.ACTION_USER_ADDED);
+             userFilter.addAction(Intent.ACTION_USER_REMOVED);
+             mContext.registerReceiver(this, userFilter);
          }
          void unregisterReceiver() {
              mContext.unregisterReceiver(this);
@@ -311,15 +433,21 @@
              if (Intent.ACTION_PACKAGE_ADDED.equals(actionStr)) {
                  Uri data = intent.getData();
                  String pkgName = data.getEncodedSchemeSpecificPart();
-                 addPackage(pkgName);
+                 for (int i = 0; i < mEntriesMap.size(); i++) {
+                     addPackage(pkgName, mEntriesMap.keyAt(i));
+                 }
              } else if (Intent.ACTION_PACKAGE_REMOVED.equals(actionStr)) {
                  Uri data = intent.getData();
                  String pkgName = data.getEncodedSchemeSpecificPart();
-                 removePackage(pkgName);
+                 for (int i = 0; i < mEntriesMap.size(); i++) {
+                     removePackage(pkgName, mEntriesMap.keyAt(i));
+                 }
              } else if (Intent.ACTION_PACKAGE_CHANGED.equals(actionStr)) {
                  Uri data = intent.getData();
                  String pkgName = data.getEncodedSchemeSpecificPart();
-                 invalidatePackage(pkgName);
+                 for (int i = 0; i < mEntriesMap.size(); i++) {
+                     invalidatePackage(pkgName, mEntriesMap.keyAt(i));
+                 }
              } else if (Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(actionStr) ||
                      Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(actionStr)) {
                  // When applications become available or unavailable (perhaps because
@@ -336,9 +464,15 @@
                  boolean avail = Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(actionStr);
                  if (avail) {
                      for (String pkgName : pkgList) {
-                         invalidatePackage(pkgName);
+                         for (int i = 0; i < mEntriesMap.size(); i++) {
+                             invalidatePackage(pkgName, mEntriesMap.keyAt(i));
+                         }
                      }
                  }
+             } else if (Intent.ACTION_USER_ADDED.equals(actionStr)) {
+                 addUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL));
+             } else if (Intent.ACTION_USER_REMOVED.equals(actionStr)) {
+                 removeUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL));
              }
          }
     }
@@ -365,6 +499,8 @@
         static final int MSG_PACKAGE_SIZE_CHANGED = 4;
         static final int MSG_ALL_SIZES_COMPUTED = 5;
         static final int MSG_RUNNING_STATE_CHANGED = 6;
+        static final int MSG_LAUNCHER_INFO_CHANGED = 7;
+        static final int MSG_LOAD_ENTRIES_COMPLETE = 8;
 
         @Override
         public void handleMessage(Message msg) {
@@ -403,6 +539,16 @@
                                 msg.arg1 != 0);
                     }
                 } break;
+                case MSG_LAUNCHER_INFO_CHANGED: {
+                    for (int i=0; i<mActiveSessions.size(); i++) {
+                        mActiveSessions.get(i).mCallbacks.onLauncherInfoChanged();
+                    }
+                } break;
+                case MSG_LOAD_ENTRIES_COMPLETE: {
+                    for (int i=0; i<mActiveSessions.size(); i++) {
+                        mActiveSessions.get(i).mCallbacks.onLoadEntriesCompleted();
+                    }
+                } break;
             }
         }
     }
@@ -426,20 +572,22 @@
     private ApplicationsState(Application app) {
         mContext = app;
         mPm = mContext.getPackageManager();
+        mIpm = AppGlobals.getPackageManager();
+        mUm = (UserManager) app.getSystemService(Context.USER_SERVICE);
+        for (UserHandle user : mUm.getUserProfiles()) {
+            mEntriesMap.put(user.getIdentifier(), new HashMap<String, AppEntry>());
+        }
         mThread = new HandlerThread("ApplicationsState.Loader",
                 Process.THREAD_PRIORITY_BACKGROUND);
         mThread.start();
         mBackgroundHandler = new BackgroundHandler(mThread.getLooper());
 
         // Only the owner can see all apps.
-        if (UserHandle.myUserId() == 0) {
-            mRetrieveFlags = PackageManager.GET_UNINSTALLED_PACKAGES |
-                    PackageManager.GET_DISABLED_COMPONENTS |
-                    PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS;
-        } else {
-            mRetrieveFlags = PackageManager.GET_DISABLED_COMPONENTS |
-                    PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS;
-        }
+        mOwnerRetrieveFlags = PackageManager.GET_UNINSTALLED_PACKAGES |
+                PackageManager.GET_DISABLED_COMPONENTS |
+                PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS;
+        mRetrieveFlags = PackageManager.GET_DISABLED_COMPONENTS |
+                PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS;
 
         /**
          * This is a trick to prevent the foreground thread from being delayed.
@@ -449,7 +597,7 @@
          * it keeps running and locking again it can prevent the main thread from
          * acquiring its lock for a long time...  sometimes even > 5 seconds
          * (leading to an ANR).
-         * 
+         *
          * Dalvik will promote a monitor to a "real" lock if it detects enough
          * contention on it.  It doesn't figure this out fast enough for us
          * here, though, so this little trick will force it to turn into a real
@@ -463,6 +611,10 @@
         }
     }
 
+    Looper getBackgroundLooper() {
+        return mThread.getLooper();
+    }
+
     public class Session {
         final Callbacks mCallbacks;
         boolean mResumed;
@@ -505,6 +657,12 @@
             }
         }
 
+        ArrayList<AppEntry> getAllApps() {
+            synchronized (mEntriesMap) {
+                return new ArrayList<>(mAppEntries);
+            }
+        }
+
         // Creates a new list of app entries with the given filter and comparator.
         ArrayList<AppEntry> rebuild(AppFilter filter, Comparator<AppEntry> comparator) {
             synchronized (mRebuildSync) {
@@ -562,22 +720,21 @@
             if (filter != null) {
                 filter.init();
             }
-            
-            List<ApplicationInfo> apps;
+
+            List<AppEntry> apps;
             synchronized (mEntriesMap) {
-                apps = new ArrayList<ApplicationInfo>(mApplications);
+                apps = new ArrayList<>(mAppEntries);
             }
 
             ArrayList<AppEntry> filteredApps = new ArrayList<AppEntry>();
             if (DEBUG) Log.i(TAG, "Rebuilding...");
             for (int i=0; i<apps.size(); i++) {
-                ApplicationInfo info = apps.get(i);
-                if (filter == null || filter.filterApp(info)) {
+                AppEntry entry = apps.get(i);
+                if (filter == null || filter.filterApp(entry)) {
                     synchronized (mEntriesMap) {
                         if (DEBUG_LOCKING) Log.v(TAG, "rebuild acquired lock");
-                        AppEntry entry = getEntryLocked(info);
                         entry.ensureLabel(mContext);
-                        if (DEBUG) Log.i(TAG, "Using " + info.packageName + ": " + entry);
+                        if (DEBUG) Log.i(TAG, "Using " + entry.info.packageName + ": " + entry);
                         filteredApps.add(entry);
                         if (DEBUG_LOCKING) Log.v(TAG, "rebuild releasing lock");
                     }
@@ -630,15 +787,24 @@
             mPackageIntentReceiver = new PackageIntentReceiver();
             mPackageIntentReceiver.registerReceiver();
         }
-        mApplications = mPm.getInstalledApplications(mRetrieveFlags);
-        if (mApplications == null) {
-            mApplications = new ArrayList<ApplicationInfo>();
+        mApplications = new ArrayList<ApplicationInfo>();
+        for (UserHandle user : mUm.getUserProfiles()) {
+            try {
+                ParceledListSlice<ApplicationInfo> list =
+                        mIpm.getInstalledApplications(
+                                user.isOwner() ? mOwnerRetrieveFlags : mRetrieveFlags,
+                                user.getIdentifier());
+                mApplications.addAll(list.getList());
+            } catch (RemoteException e) {
+            }
         }
 
         if (mInterestingConfigChanges.applyNewConfig(mContext.getResources())) {
             // If an interesting part of the configuration has changed, we
             // should completely reload the app entries.
-            mEntriesMap.clear();
+            for (int i = 0; i < mEntriesMap.size(); i++) {
+                mEntriesMap.valueAt(i).clear();
+            }
             mAppEntries.clear();
         } else {
             for (int i=0; i<mAppEntries.size(); i++) {
@@ -659,7 +825,8 @@
                 }
                 mHaveDisabledApps = true;
             }
-            final AppEntry entry = mEntriesMap.get(info.packageName);
+            int userId = UserHandle.getUserId(info.uid);
+            final AppEntry entry = mEntriesMap.get(userId).get(info.packageName);
             if (entry != null) {
                 entry.info = info;
             }
@@ -683,6 +850,10 @@
                 return;
             }
         }
+        doPauseLocked();
+    }
+
+    void doPauseLocked() {
         mResumed = false;
         if (mPackageIntentReceiver != null) {
             mPackageIntentReceiver.unregisterReceiver();
@@ -690,14 +861,15 @@
         }
     }
 
-    AppEntry getEntry(String packageName) {
+    AppEntry getEntry(String packageName, int userId) {
         if (DEBUG_LOCKING) Log.v(TAG, "getEntry about to acquire lock...");
         synchronized (mEntriesMap) {
-            AppEntry entry = mEntriesMap.get(packageName);
+            AppEntry entry = mEntriesMap.get(userId).get(packageName);
             if (entry == null) {
                 for (int i=0; i<mApplications.size(); i++) {
                     ApplicationInfo info = mApplications.get(i);
-                    if (packageName.equals(info.packageName)) {
+                    if (packageName.equals(info.packageName)
+                            && userId == UserHandle.getUserId(info.uid)) {
                         entry = getEntryLocked(info);
                         break;
                     }
@@ -707,7 +879,7 @@
             return entry;
         }
     }
-    
+
     void ensureIcon(AppEntry entry) {
         if (entry.icon != null) {
             return;
@@ -716,13 +888,13 @@
             entry.ensureIconLocked(mContext, mPm);
         }
     }
-    
-    void requestSize(String packageName) {
+
+    void requestSize(String packageName, int userId) {
         if (DEBUG_LOCKING) Log.v(TAG, "requestSize about to acquire lock...");
         synchronized (mEntriesMap) {
-            AppEntry entry = mEntriesMap.get(packageName);
+            AppEntry entry = mEntriesMap.get(userId).get(packageName);
             if (entry != null) {
-                mPm.getPackageSizeInfo(packageName, mBackgroundHandler.mStatsObserver);
+                mPm.getPackageSizeInfo(packageName, userId, mBackgroundHandler.mStatsObserver);
             }
             if (DEBUG_LOCKING) Log.v(TAG, "...requestSize releasing lock");
         }
@@ -740,17 +912,19 @@
         }
         return sum;
     }
-    
-    int indexOfApplicationInfoLocked(String pkgName) {
+
+    int indexOfApplicationInfoLocked(String pkgName, int userId) {
         for (int i=mApplications.size()-1; i>=0; i--) {
-            if (mApplications.get(i).packageName.equals(pkgName)) {
+            ApplicationInfo appInfo = mApplications.get(i);
+            if (appInfo.packageName.equals(pkgName)
+                    && UserHandle.getUserId(appInfo.uid) == userId) {
                 return i;
             }
         }
         return -1;
     }
 
-    void addPackage(String pkgName) {
+    void addPackage(String pkgName, int userId) {
         try {
             synchronized (mEntriesMap) {
                 if (DEBUG_LOCKING) Log.v(TAG, "addPackage acquired lock");
@@ -762,12 +936,17 @@
                     if (DEBUG_LOCKING) Log.v(TAG, "addPackage release lock: not resumed");
                     return;
                 }
-                if (indexOfApplicationInfoLocked(pkgName) >= 0) {
+                if (indexOfApplicationInfoLocked(pkgName, userId) >= 0) {
                     if (DEBUG) Log.i(TAG, "Package already exists!");
                     if (DEBUG_LOCKING) Log.v(TAG, "addPackage release lock: already exists");
                     return;
                 }
-                ApplicationInfo info = mPm.getApplicationInfo(pkgName, mRetrieveFlags);
+                ApplicationInfo info = mIpm.getApplicationInfo(pkgName,
+                        userId == UserHandle.USER_OWNER ? mOwnerRetrieveFlags : mRetrieveFlags,
+                                userId);
+                if (info == null) {
+                    return;
+                }
                 if (!info.enabled) {
                     if (info.enabledSetting
                             != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
@@ -784,20 +963,20 @@
                 }
                 if (DEBUG_LOCKING) Log.v(TAG, "addPackage releasing lock");
             }
-        } catch (NameNotFoundException e) {
+        } catch (RemoteException e) {
         }
     }
 
-    void removePackage(String pkgName) {
+    void removePackage(String pkgName, int userId) {
         synchronized (mEntriesMap) {
             if (DEBUG_LOCKING) Log.v(TAG, "removePackage acquired lock");
-            int idx = indexOfApplicationInfoLocked(pkgName);
+            int idx = indexOfApplicationInfoLocked(pkgName, userId);
             if (DEBUG) Log.i(TAG, "removePackage: " + pkgName + " @ " + idx);
             if (idx >= 0) {
-                AppEntry entry = mEntriesMap.get(pkgName);
+                AppEntry entry = mEntriesMap.get(userId).get(pkgName);
                 if (DEBUG) Log.i(TAG, "removePackage: " + entry);
                 if (entry != null) {
-                    mEntriesMap.remove(pkgName);
+                    mEntriesMap.get(userId).remove(pkgName);
                     mAppEntries.remove(entry);
                 }
                 ApplicationInfo info = mApplications.get(idx);
@@ -819,18 +998,53 @@
         }
     }
 
-    void invalidatePackage(String pkgName) {
-        removePackage(pkgName);
-        addPackage(pkgName);
+    void invalidatePackage(String pkgName, int userId) {
+        removePackage(pkgName, userId);
+        addPackage(pkgName, userId);
     }
-    
+
+    void addUser(int userId) {
+        if (mUm.getUserProfiles().contains(new UserHandle(userId))) {
+            synchronized (mEntriesMap) {
+                mEntriesMap.put(userId, new HashMap<String, AppEntry>());
+                if (mResumed) {
+                    // If resumed, Manually pause, then cause a resume to repopulate the app list.
+                    // This is the simplest way to reload the packages so that the new user
+                    // is included.  Otherwise the list will be repopulated on next resume.
+                    doPauseLocked();
+                    doResumeIfNeededLocked();
+                }
+                if (!mMainHandler.hasMessages(MainHandler.MSG_PACKAGE_LIST_CHANGED)) {
+                    mMainHandler.sendEmptyMessage(MainHandler.MSG_PACKAGE_LIST_CHANGED);
+                }
+            }
+        }
+    }
+
+    void removeUser(int userId) {
+        synchronized (mEntriesMap) {
+            HashMap<String, AppEntry> userMap = mEntriesMap.get(userId);
+            if (userMap != null) {
+                for (AppEntry appEntry : userMap.values()) {
+                    mAppEntries.remove(appEntry);
+                    mApplications.remove(appEntry.info);
+                }
+                mEntriesMap.remove(userId);
+                if (!mMainHandler.hasMessages(MainHandler.MSG_PACKAGE_LIST_CHANGED)) {
+                    mMainHandler.sendEmptyMessage(MainHandler.MSG_PACKAGE_LIST_CHANGED);
+                }
+            }
+        }
+    }
+
     AppEntry getEntryLocked(ApplicationInfo info) {
-        AppEntry entry = mEntriesMap.get(info.packageName);
+        int userId = UserHandle.getUserId(info.uid);
+        AppEntry entry = mEntriesMap.get(userId).get(info.packageName);
         if (DEBUG) Log.i(TAG, "Looking up entry of pkg " + info.packageName + ": " + entry);
         if (entry == null) {
             if (DEBUG) Log.i(TAG, "Creating AppEntry for " + info.packageName);
             entry = new AppEntry(mContext, info, mCurId++);
-            mEntriesMap.put(info.packageName, entry);
+            mEntriesMap.get(userId).put(info.packageName, entry);
             mAppEntries.add(entry);
         } else if (entry.info != info) {
             entry.info = info;
@@ -872,6 +1086,7 @@
         static final int MSG_LOAD_ENTRIES = 2;
         static final int MSG_LOAD_ICONS = 3;
         static final int MSG_LOAD_SIZES = 4;
+        static final int MSG_LOAD_LAUNCHER = 5;
 
         boolean mRunning;
 
@@ -880,7 +1095,12 @@
                 boolean sizeChanged = false;
                 synchronized (mEntriesMap) {
                     if (DEBUG_LOCKING) Log.v(TAG, "onGetStatsCompleted acquired lock");
-                    AppEntry entry = mEntriesMap.get(stats.packageName);
+                    HashMap<String, AppEntry> userMap = mEntriesMap.get(stats.userHandle);
+                    if (userMap == null) {
+                        // The user must have been removed.
+                        return;
+                    }
+                    AppEntry entry = userMap.get(stats.packageName);
                     if (entry != null) {
                         synchronized (entry) {
                             entry.sizeStale = false;
@@ -922,7 +1142,8 @@
                         }
                     }
                     if (mCurComputingSizePkg == null
-                            || mCurComputingSizePkg.equals(stats.packageName)) {
+                            || (mCurComputingSizePkg.equals(stats.packageName)
+                                    && mCurComputingSizeUserId == stats.userHandle)) {
                         mCurComputingSizePkg = null;
                         sendEmptyMessage(MSG_LOAD_SIZES);
                     }
@@ -966,7 +1187,8 @@
                                 mMainHandler.sendMessage(m);
                             }
                             ApplicationInfo info = mApplications.get(i);
-                            if (mEntriesMap.get(info.packageName) == null) {
+                            int userId = UserHandle.getUserId(info.uid);
+                            if (mEntriesMap.get(userId).get(info.packageName) == null) {
                                 numDone++;
                                 getEntryLocked(info);
                             }
@@ -977,9 +1199,43 @@
                     if (numDone >= 6) {
                         sendEmptyMessage(MSG_LOAD_ENTRIES);
                     } else {
-                        sendEmptyMessage(MSG_LOAD_ICONS);
+                        if (!mMainHandler.hasMessages(MainHandler.MSG_LOAD_ENTRIES_COMPLETE)) {
+                            mMainHandler.sendEmptyMessage(MainHandler.MSG_LOAD_ENTRIES_COMPLETE);
+                        }
+                        sendEmptyMessage(MSG_LOAD_LAUNCHER);
                     }
                 } break;
+                case MSG_LOAD_LAUNCHER: {
+                    Intent launchIntent = new Intent(Intent.ACTION_MAIN, null)
+                            .addCategory(Intent.CATEGORY_LAUNCHER);
+
+                    for (int i = 0; i < mEntriesMap.size(); i++) {
+                        int userId = mEntriesMap.keyAt(i);
+                        List<ResolveInfo> intents = mPm.queryIntentActivitiesAsUser(launchIntent,
+                                PackageManager.GET_DISABLED_COMPONENTS, userId);
+                        synchronized (mEntriesMap) {
+                            if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_LAUNCHER acquired lock");
+                            HashMap<String, AppEntry> userEntries = mEntriesMap.valueAt(i);
+                            final int N = intents.size();
+                            for (int j = 0; j < N; j++) {
+                                String packageName = intents.get(j).activityInfo.packageName;
+                                AppEntry entry = userEntries.get(packageName);
+                                if (entry != null) {
+                                    entry.hasLauncherEntry = true;
+                                } else {
+                                    Log.w(TAG, "Cannot find pkg: " + packageName
+                                            + " on user " + userId);
+                                }
+                            }
+                            if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_LAUNCHER releasing lock");
+                        }
+                    }
+
+                    if (!mMainHandler.hasMessages(MainHandler.MSG_LAUNCHER_INFO_CHANGED)) {
+                        mMainHandler.sendEmptyMessage(MainHandler.MSG_LAUNCHER_INFO_CHANGED);
+                    }
+                    sendEmptyMessage(MSG_LOAD_ICONS);
+                } break;
                 case MSG_LOAD_ICONS: {
                     int numDone = 0;
                     synchronized (mEntriesMap) {
@@ -1035,7 +1291,9 @@
                                     }
                                     entry.sizeLoadStart = now;
                                     mCurComputingSizePkg = entry.info.packageName;
-                                    mPm.getPackageSizeInfo(mCurComputingSizePkg, mStatsObserver);
+                                    mCurComputingSizeUserId = UserHandle.getUserId(entry.info.uid);
+                                    mPm.getPackageSizeInfo(mCurComputingSizePkg,
+                                            mCurComputingSizeUserId, mStatsObserver);
                                 }
                                 if (DEBUG_LOCKING) Log.v(TAG, "MSG_LOAD_SIZES releasing: now computing");
                                 return;
diff --git a/src/com/android/settings/applications/ClearDefaultsPreference.java b/src/com/android/settings/applications/ClearDefaultsPreference.java
new file mode 100644
index 0000000..1799cad
--- /dev/null
+++ b/src/com/android/settings/applications/ClearDefaultsPreference.java
@@ -0,0 +1,172 @@
+/*
+ * 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.appwidget.AppWidgetManager;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.usb.IUsbManager;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.preference.Preference;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.style.BulletSpan;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+public class ClearDefaultsPreference extends Preference {
+
+    protected static final String TAG = ClearDefaultsPreference.class.getSimpleName();
+
+    private View mRootView;
+    private Button mActivitiesButton;
+
+    private AppWidgetManager mAppWidgetManager;
+    private IUsbManager mUsbManager;
+    private PackageManager mPm;
+    private String mPackageName;
+    protected ApplicationsState.AppEntry mAppEntry;
+
+    public ClearDefaultsPreference(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+
+        setLayoutResource(R.layout.app_preferred_settings);
+
+        mAppWidgetManager = AppWidgetManager.getInstance(context);
+        mPm = context.getPackageManager();
+        IBinder b = ServiceManager.getService(Context.USB_SERVICE);
+        mUsbManager = IUsbManager.Stub.asInterface(b);
+    }
+
+    public ClearDefaultsPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public ClearDefaultsPreference(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ClearDefaultsPreference(Context context) {
+        this(context, null);
+    }
+
+    public void setPackageName(String packageName) {
+        mPackageName = packageName;
+    }
+
+    public void setAppEntry(ApplicationsState.AppEntry entry) {
+        mAppEntry = entry;
+    }
+
+    @Override
+    protected View onCreateView(ViewGroup parent) {
+        mRootView = super.onCreateView(parent);
+
+        mActivitiesButton = (Button) mRootView.findViewById(R.id.clear_activities_button);
+        mActivitiesButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mUsbManager != null) {
+                    mPm.clearPackagePreferredActivities(mPackageName);
+                    try {
+                        mUsbManager.clearDefaults(mPackageName, UserHandle.myUserId());
+                    } catch (RemoteException e) {
+                        Log.e(TAG, "mUsbManager.clearDefaults", e);
+                    }
+                    mAppWidgetManager.setBindAppWidgetPermission(mPackageName, false);
+                    TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
+                    resetLaunchDefaultsUi(autoLaunchView);
+                }
+            }
+        });
+
+        return mRootView;
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        updateUI();
+    }
+
+    public boolean updateUI() {
+        boolean hasBindAppWidgetPermission =
+                mAppWidgetManager.hasBindAppWidgetPermission(mAppEntry.info.packageName);
+
+        TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
+        boolean autoLaunchEnabled = Utils.hasPreferredActivities(mPm, mPackageName)
+                || Utils.hasUsbDefaults(mUsbManager, mPackageName);
+        if (!autoLaunchEnabled && !hasBindAppWidgetPermission) {
+            resetLaunchDefaultsUi(autoLaunchView);
+        } else {
+            boolean useBullets = hasBindAppWidgetPermission && autoLaunchEnabled;
+
+            if (hasBindAppWidgetPermission) {
+                autoLaunchView.setText(R.string.auto_launch_label_generic);
+            } else {
+                autoLaunchView.setText(R.string.auto_launch_label);
+            }
+
+            Context context = getContext();
+            CharSequence text = null;
+            int bulletIndent = context.getResources().getDimensionPixelSize(
+                    R.dimen.installed_app_details_bullet_offset);
+            if (autoLaunchEnabled) {
+                CharSequence autoLaunchEnableText = context.getText(
+                        R.string.auto_launch_enable_text);
+                SpannableString s = new SpannableString(autoLaunchEnableText);
+                if (useBullets) {
+                    s.setSpan(new BulletSpan(bulletIndent), 0, autoLaunchEnableText.length(), 0);
+                }
+                text = (text == null) ?
+                        TextUtils.concat(s, "\n") : TextUtils.concat(text, "\n", s, "\n");
+            }
+            if (hasBindAppWidgetPermission) {
+                CharSequence alwaysAllowBindAppWidgetsText =
+                        context.getText(R.string.always_allow_bind_appwidgets_text);
+                SpannableString s = new SpannableString(alwaysAllowBindAppWidgetsText);
+                if (useBullets) {
+                    s.setSpan(new BulletSpan(bulletIndent),
+                            0, alwaysAllowBindAppWidgetsText.length(), 0);
+                }
+                text = (text == null) ?
+                        TextUtils.concat(s, "\n") : TextUtils.concat(text, "\n", s, "\n");
+            }
+            autoLaunchView.setText(text);
+            mActivitiesButton.setEnabled(true);
+        }
+        return true;
+    }
+
+    private void resetLaunchDefaultsUi(TextView autoLaunchView) {
+        autoLaunchView.setText(R.string.auto_launch_disable_text);
+        // Disable clear activities button
+        mActivitiesButton.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/applications/DefaultBrowserPreference.java b/src/com/android/settings/applications/DefaultBrowserPreference.java
new file mode 100644
index 0000000..da7f112
--- /dev/null
+++ b/src/com/android/settings/applications/DefaultBrowserPreference.java
@@ -0,0 +1,74 @@
+/*
+ * 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.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.UserHandle;
+import android.util.AttributeSet;
+
+import com.android.settings.AppListPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DefaultBrowserPreference extends AppListPreference {
+
+    final private PackageManager mPm;
+
+    public DefaultBrowserPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        mPm = context.getPackageManager();
+        loadBrowserApps();
+    }
+
+    private void loadBrowserApps() {
+        List<String> browsers = resolveBrowserApps();
+
+        setPackageNames(browsers.toArray(new String[browsers.size()]), null);
+    }
+
+    private List<String> resolveBrowserApps() {
+        List<String> result = new ArrayList<>();
+
+        // Create an Intent that will match ALL Browser Apps
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        intent.addCategory(Intent.CATEGORY_BROWSABLE);
+        intent.setData(Uri.parse("http:"));
+
+        // Resolve that intent and check that the handleAllWebDataURI boolean is set
+        List<ResolveInfo> list = mPm.queryIntentActivitiesAsUser(intent, 0, UserHandle.myUserId());
+
+        final int count = list.size();
+        for (int i=0; i<count; i++) {
+            ResolveInfo info = list.get(i);
+            if (info.activityInfo == null || result.contains(info.activityInfo.packageName)
+                    || !info.handleAllWebDataURI) {
+                continue;
+            }
+
+            result.add(info.activityInfo.packageName);
+        }
+
+        return result;
+    }
+}
diff --git a/src/com/android/settings/applications/DefaultDialerPreference.java b/src/com/android/settings/applications/DefaultDialerPreference.java
new file mode 100644
index 0000000..ce16966
--- /dev/null
+++ b/src/com/android/settings/applications/DefaultDialerPreference.java
@@ -0,0 +1,81 @@
+/*
+ * 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.content.ComponentName;
+import android.content.Context;
+import android.os.UserManager;
+import android.telecom.DefaultDialerManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+
+import com.android.settings.AppListPreference;
+
+import java.util.List;
+import java.util.Objects;
+
+public class DefaultDialerPreference extends AppListPreference {
+
+    public DefaultDialerPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        if (isAvailable(context)) {
+            loadDialerApps();
+        }
+    }
+
+    @Override
+    protected boolean persistString(String value) {
+        if (!TextUtils.isEmpty(value) && !Objects.equals(value, getDefaultPackage())) {
+            DefaultDialerManager.setDefaultPhoneApplication(getContext(), value);
+        }
+        setSummary(getEntry());
+        return true;
+    }
+
+    private void loadDialerApps() {
+        List<ComponentName> dialerComponents =
+                DefaultDialerManager.getInstalledDialerApplications(getContext());
+
+        final String[] dialers = new String[dialerComponents.size()];
+        for (int i = 0; i < dialerComponents.size(); i++) {
+            dialers[i] = dialerComponents.get(i).getPackageName();
+        }
+        setPackageNames(dialers, getDefaultPackage());
+    }
+
+    private String getDefaultPackage() {
+        ComponentName appName = DefaultDialerManager.getDefaultDialerApplication(getContext());
+        if (appName != null) {
+            return appName.getPackageName();
+        }
+        return null;
+    }
+
+    public static boolean isAvailable(Context context) {
+        final TelephonyManager tm =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        if (!tm.isVoiceCapable()) {
+            return false;
+        }
+
+        final UserManager um =
+                (UserManager) context.getSystemService(Context.USER_SERVICE);
+        return !um.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS);
+    }
+}
diff --git a/src/com/android/settings/applications/DefaultEmergencyPreference.java b/src/com/android/settings/applications/DefaultEmergencyPreference.java
new file mode 100644
index 0000000..2bda0ed
--- /dev/null
+++ b/src/com/android/settings/applications/DefaultEmergencyPreference.java
@@ -0,0 +1,150 @@
+/*
+ * 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.content.ContentResolver;
+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.os.AsyncTask;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import android.util.AttributeSet;
+
+import com.android.settings.AppListPreference;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * A preference for choosing the default emergency app
+ */
+public class DefaultEmergencyPreference extends AppListPreference {
+
+    private final ContentResolver mContentResolver;
+
+    public static final Intent QUERY_INTENT = new Intent(
+            TelephonyManager.ACTION_EMERGENCY_ASSISTANCE);
+
+    public DefaultEmergencyPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContentResolver = context.getContentResolver();
+
+        if (isAvailable(context)) {
+            load();
+        }
+    }
+
+    @Override
+    protected boolean persistString(String value) {
+        String previousValue = Settings.Secure.getString(mContentResolver,
+                Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION);
+
+        if (!TextUtils.isEmpty(value) && !Objects.equals(value, previousValue)) {
+            Settings.Secure.putString(mContentResolver,
+                    Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION,
+                    value);
+        }
+        setSummary(getEntry());
+        return true;
+    }
+
+    private void load() {
+        new AsyncTask<Void, Void, Set<String>>() {
+            @Override
+            protected Set<String> doInBackground(Void[] params) {
+                return resolveAssistPackageAndQueryApps();
+            }
+
+            @Override
+            protected void onPostExecute(Set<String> entries) {
+                String currentPkg = Settings.Secure.getString(mContentResolver,
+                        Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION);
+                setPackageNames(entries.toArray(new String[entries.size()]), currentPkg);
+            }
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }
+
+    private Set<String> resolveAssistPackageAndQueryApps() {
+        Set<String> packages = new ArraySet<>();
+
+        PackageManager packageManager = getContext().getPackageManager();
+        List<ResolveInfo> infos = packageManager.queryIntentActivities(QUERY_INTENT, 0);
+
+        PackageInfo bestMatch = null;
+        final int size = infos.size();
+        for (int i = 0; i < size; i++) {
+            ResolveInfo info = infos.get(i);
+            if (info == null || info.activityInfo == null
+                    || packages.contains(info.activityInfo.packageName)) {
+                continue;
+            }
+
+            String packageName = info.activityInfo.packageName;
+
+            packages.add(packageName);
+
+            PackageInfo packageInfo;
+            try {
+                packageInfo = packageManager.getPackageInfo(packageName, 0);
+            } catch (PackageManager.NameNotFoundException e) {
+                continue;
+            }
+
+            // Get earliest installed app, but prioritize system apps.
+            if (bestMatch == null
+                    || !isSystemApp(bestMatch) && isSystemApp(packageInfo)
+                    || isSystemApp(bestMatch) == isSystemApp(packageInfo)
+                    && bestMatch.firstInstallTime > packageInfo.firstInstallTime) {
+                bestMatch = packageInfo;
+            }
+        }
+
+        String defaultPackage = Settings.Secure.getString(mContentResolver,
+                Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION);
+        boolean defaultMissing = TextUtils.isEmpty(defaultPackage)
+                || !packages.contains(defaultPackage);
+        if (bestMatch != null && defaultMissing) {
+            Settings.Secure.putString(mContentResolver,
+                    Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION,
+                    bestMatch.packageName);
+        }
+
+        return packages;
+    }
+
+    public static boolean isAvailable(Context context) {
+        return isCapable(context)
+                && context.getPackageManager().resolveActivity(QUERY_INTENT, 0) != null;
+    }
+
+    public static boolean isCapable(Context context) {
+        return context.getResources().getBoolean(
+                com.android.internal.R.bool.config_voice_capable);
+    }
+
+    private static boolean isSystemApp(PackageInfo info) {
+        return info.applicationInfo != null
+                && (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+    }
+}
diff --git a/src/com/android/settings/applications/DefaultSmsPreference.java b/src/com/android/settings/applications/DefaultSmsPreference.java
new file mode 100644
index 0000000..bf616c3
--- /dev/null
+++ b/src/com/android/settings/applications/DefaultSmsPreference.java
@@ -0,0 +1,75 @@
+/*
+ * 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.content.ComponentName;
+import android.content.Context;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+
+import com.android.internal.telephony.SmsApplication;
+import com.android.internal.telephony.SmsApplication.SmsApplicationData;
+import com.android.settings.AppListPreference;
+
+import java.util.Collection;
+import java.util.Objects;
+
+public class DefaultSmsPreference extends AppListPreference {
+
+    public DefaultSmsPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        loadSmsApps();
+    }
+
+    private void loadSmsApps() {
+        Collection<SmsApplicationData> smsApplications =
+                SmsApplication.getApplicationCollection(getContext());
+
+        int count = smsApplications.size();
+        String[] packageNames = new String[count];
+        int i = 0;
+        for (SmsApplicationData smsApplicationData : smsApplications) {
+            packageNames[i++] = smsApplicationData.mPackageName;
+        }
+        setPackageNames(packageNames, getDefaultPackage());
+    }
+
+    private String getDefaultPackage() {
+        ComponentName appName = SmsApplication.getDefaultSmsApplication(getContext(), true);
+        if (appName != null) {
+            return appName.getPackageName();
+        }
+        return null;
+    }
+
+    @Override
+    protected boolean persistString(String value) {
+        if (!TextUtils.isEmpty(value) && !Objects.equals(value, getDefaultPackage())) {
+            SmsApplication.setDefaultApplication(value, getContext());
+        }
+        setSummary(getEntry());
+        return true;
+    }
+
+    public static boolean isAvailable(Context context) {
+        TelephonyManager tm =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        return tm.isSmsCapable();
+    }
+
+}
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 3aa948d..33a7428 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -16,74 +16,62 @@
 
 package com.android.settings.applications;
 
-import com.android.internal.telephony.ISms;
-import com.android.internal.telephony.SmsUsageMonitor;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
-import com.android.settings.applications.ApplicationsState.AppEntry;
-
 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.INotificationManager;
-import android.app.admin.DevicePolicyManager;
-import android.appwidget.AppWidgetManager;
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.ActivityNotFoundException;
 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.Loader;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageDataObserver;
-import android.content.pm.IPackageMoveObserver;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.hardware.usb.IUsbManager;
+import android.content.pm.ResolveInfo;
+import android.net.INetworkStatsService;
+import android.net.INetworkStatsSession;
+import android.net.NetworkTemplate;
+import android.net.TrafficStats;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Message;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
-import android.os.UserManager;
-import android.text.SpannableString;
-import android.text.TextUtils;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.provider.Settings;
+import android.text.format.DateUtils;
 import android.text.format.Formatter;
-import android.text.style.BulletSpan;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.DataUsageSummary;
+import com.android.settings.DataUsageSummary.AppItem;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+import com.android.settings.net.ChartData;
+import com.android.settings.net.ChartDataLoader;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.NotificationBackend.AppRow;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-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.AppSecurityPermissions;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-import android.widget.TextView;
 
 /**
  * Activity to display application information from Settings. This activity presents
@@ -94,227 +82,54 @@
  * For non-system applications, there is no option to clear data. Instead there is an option to
  * uninstall the application.
  */
-public class InstalledAppDetails extends Fragment
-        implements View.OnClickListener, CompoundButton.OnCheckedChangeListener,
-        ApplicationsState.Callbacks {
-    private static final String TAG="InstalledAppDetails";
-    private static final boolean localLOGV = false;
-    
-    public static final String ARG_PACKAGE_NAME = "package";
+public class InstalledAppDetails extends AppInfoBase
+        implements View.OnClickListener, OnPreferenceClickListener {
 
-    private PackageManager mPm;
-    private UserManager mUserManager;
-    private IUsbManager mUsbManager;
-    private AppWidgetManager mAppWidgetManager;
-    private DevicePolicyManager mDpm;
-    private ISms mSmsManager;
-    private ApplicationsState mState;
-    private ApplicationsState.Session mSession;
-    private ApplicationsState.AppEntry mAppEntry;
-    private boolean mInitialized;
-    private boolean mShowUninstalled;
-    private PackageInfo mPackageInfo;
-    private CanBeOnSdCardChecker mCanBeOnSdCardChecker;
-    private View mRootView;
-    private Button mUninstallButton;
-    private View mMoreControlButtons;
-    private Button mSpecialDisableButton;
-    private boolean mMoveInProgress = false;
-    private boolean mUpdatedSysApp = false;
-    private Button mActivitiesButton;
-    private View mScreenCompatSection;
-    private CheckBox mAskCompatibilityCB;
-    private CheckBox mEnableCompatibilityCB;
-    private boolean mCanClearData = true;
-    private boolean mAppControlRestricted = false;
-    private TextView mAppVersion;
-    private TextView mTotalSize;
-    private TextView mAppSize;
-    private TextView mDataSize;
-    private TextView mExternalCodeSize;
-    private TextView mExternalDataSize;
-    private ClearUserDataObserver mClearDataObserver;
-    // Views related to cache info
-    private TextView mCacheSize;
-    private Button mClearCacheButton;
-    private ClearCacheObserver mClearCacheObserver;
-    private Button mForceStopButton;
-    private Button mClearDataButton;
-    private Button mMoveAppButton;
-    private CompoundButton mNotificationSwitch;
-
-    private PackageMoveObserver mPackageMoveObserver;
-
-    private final HashSet<String> mHomePackages = new HashSet<String>();
-
-    private boolean mDisableAfterUninstall;
-
-    private boolean mHaveSizes = false;
-    private long mLastCodeSize = -1;
-    private long mLastDataSize = -1;
-    private long mLastExternalCodeSize = -1;
-    private long mLastExternalDataSize = -1;
-    private long mLastCacheSize = -1;
-    private long mLastTotalSize = -1;
-    
-    //internal constants used in Handler
-    private static final int OP_SUCCESSFUL = 1;
-    private static final int OP_FAILED = 2;
-    private static final int CLEAR_USER_DATA = 1;
-    private static final int CLEAR_CACHE = 3;
-    private static final int PACKAGE_MOVE = 4;
-    
-    // invalid size value used initially and also when size retrieval through PackageManager
-    // fails for whatever reason
-    private static final int SIZE_INVALID = -1;
-    
-    // Resource strings
-    private CharSequence mInvalidSizeStr;
-    private CharSequence mComputingStr;
-    
-    // Dialog identifiers used in showDialog
-    private static final int DLG_BASE = 0;
-    private static final int DLG_CLEAR_DATA = DLG_BASE + 1;
-    private static final int DLG_FACTORY_RESET = DLG_BASE + 2;
-    private static final int DLG_APP_NOT_FOUND = DLG_BASE + 3;
-    private static final int DLG_CANNOT_CLEAR_DATA = DLG_BASE + 4;
-    private static final int DLG_FORCE_STOP = DLG_BASE + 5;
-    private static final int DLG_MOVE_FAILED = DLG_BASE + 6;
-    private static final int DLG_DISABLE = DLG_BASE + 7;
-    private static final int DLG_DISABLE_NOTIFICATIONS = DLG_BASE + 8;
-    private static final int DLG_SPECIAL_DISABLE = DLG_BASE + 9;
+    private static final String LOG_TAG = "InstalledAppDetails";
 
     // 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 = 1;
-    public static final int REQUEST_MANAGE_SPACE = 2;
+    public static final int REQUEST_UNINSTALL = 0;
+    private static final int SUB_INFO_FRAGMENT = 1;
 
-    private Handler mHandler = new Handler() {
-        public void handleMessage(Message msg) {
-            // If the fragment is gone, don't process any more messages.
-            if (getView() == null) {
-                return;
-            }
-            switch (msg.what) {
-                case CLEAR_USER_DATA:
-                    processClearMsg(msg);
-                    break;
-                case CLEAR_CACHE:
-                    // Refresh size info
-                    mState.requestSize(mAppEntry.info.packageName);
-                    break;
-                case PACKAGE_MOVE:
-                    processMoveMsg(msg);
-                    break;
-                default:
-                    break;
-            }
-        }
-    };
-    
-    class ClearUserDataObserver extends IPackageDataObserver.Stub {
-       public void onRemoveCompleted(final String packageName, final boolean succeeded) {
-           final Message msg = mHandler.obtainMessage(CLEAR_USER_DATA);
-           msg.arg1 = succeeded?OP_SUCCESSFUL:OP_FAILED;
-           mHandler.sendMessage(msg);
-        }
-    }
-    
-    class ClearCacheObserver extends IPackageDataObserver.Stub {
-        public void onRemoveCompleted(final String packageName, final boolean succeeded) {
-            final Message msg = mHandler.obtainMessage(CLEAR_CACHE);
-            msg.arg1 = succeeded ? OP_SUCCESSFUL:OP_FAILED;
-            mHandler.sendMessage(msg);
-         }
-     }
+    private static final int LOADER_CHART_DATA = 2;
 
-    class PackageMoveObserver extends IPackageMoveObserver.Stub {
-        public void packageMoved(String packageName, int returnCode) throws RemoteException {
-            final Message msg = mHandler.obtainMessage(PACKAGE_MOVE);
-            msg.arg1 = returnCode;
-            mHandler.sendMessage(msg);
-        }
-    }
-    
-    private String getSizeStr(long size) {
-        if (size == SIZE_INVALID) {
-            return mInvalidSizeStr.toString();
-        }
-        return Formatter.formatFileSize(getActivity(), size);
-    }
-    
-    private void initDataButtons() {
-        // If the app doesn't have its own space management UI
-        // And it's a system app that doesn't allow clearing user data or is an active admin
-        // Then disable the Clear Data button.
-        if (mAppEntry.info.manageSpaceActivityName == null
-                && ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM
-                        | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA))
-                        == ApplicationInfo.FLAG_SYSTEM
-                        || mDpm.packageHasActiveAdmins(mPackageInfo.packageName))) {
-            mClearDataButton.setText(R.string.clear_user_data_text);
-            mClearDataButton.setEnabled(false);
-            mCanClearData = false;
-        } else {
-            if (mAppEntry.info.manageSpaceActivityName != null) {
-                mClearDataButton.setText(R.string.manage_space_text);
-            } else {
-                mClearDataButton.setText(R.string.clear_user_data_text);
-            }
-            mClearDataButton.setOnClickListener(this);
-        }
+    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 int DLG_FACTORY_RESET = DLG_BASE + 4;
 
-        if (mAppControlRestricted) {
-            mClearDataButton.setEnabled(false);
-        }
-    }
+    private static final String KEY_HEADER = "header_view";
+    private static final String KEY_NOTIFICATION = "notification_settings";
+    private static final String KEY_STORAGE = "storage_settings";
+    private static final String KEY_PERMISSION = "permission_settings";
+    private static final String KEY_DATA = "data_settings";
+    private static final String KEY_LAUNCH = "preferred_settings";
 
-    private CharSequence getMoveErrMsg(int errCode) {
-        switch (errCode) {
-            case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE:
-                return getActivity().getString(R.string.insufficient_storage);
-            case PackageManager.MOVE_FAILED_DOESNT_EXIST:
-                return getActivity().getString(R.string.does_not_exist);
-            case PackageManager.MOVE_FAILED_FORWARD_LOCKED:
-                return getActivity().getString(R.string.app_forward_locked);
-            case PackageManager.MOVE_FAILED_INVALID_LOCATION:
-                return getActivity().getString(R.string.invalid_location);
-            case PackageManager.MOVE_FAILED_SYSTEM_PACKAGE:
-                return getActivity().getString(R.string.system_package);
-            case PackageManager.MOVE_FAILED_INTERNAL_ERROR:
-                return "";
-        }
-        return "";
-    }
+    private final HashSet<String> mHomePackages = new HashSet<String>();
 
-    private void initMoveButton() {
-        if (Environment.isExternalStorageEmulated()) {
-            mMoveAppButton.setVisibility(View.INVISIBLE);
-            return;
-        }
-        boolean dataOnly = false;
-        dataOnly = (mPackageInfo == null) && (mAppEntry != null);
-        boolean moveDisable = true;
-        if (dataOnly) {
-            mMoveAppButton.setText(R.string.move_app);
-        } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
-            mMoveAppButton.setText(R.string.move_app_to_internal);
-            // Always let apps move to internal storage from sdcard.
-            moveDisable = false;
-        } else {
-            mMoveAppButton.setText(R.string.move_app_to_sdcard);
-            mCanBeOnSdCardChecker.init();
-            moveDisable = !mCanBeOnSdCardChecker.check(mAppEntry.info);
-        }
-        if (moveDisable || mAppControlRestricted) {
-            mMoveAppButton.setEnabled(false);
-        } else {
-            mMoveAppButton.setOnClickListener(this);
-            mMoveAppButton.setEnabled(true);
-        }
-    }
+    private boolean mInitialized;
+    private boolean mShowUninstalled;
+    private LayoutPreference mHeader;
+    private Button mUninstallButton;
+    private boolean mUpdatedSysApp = false;
+    private TextView mAppVersion;
+    private Button mForceStopButton;
+    private Preference mNotificationPreference;
+    private Preference mStoragePreference;
+    private Preference mPermissionsPreference;
+    private Preference mLaunchPreference;
+    private Preference mDataPreference;
+
+    private boolean mDisableAfterUninstall;
+    // Used for updating notification preference.
+    private final NotificationBackend mBackend = new NotificationBackend();
+
+    private ChartData mChartData;
+    private INetworkStatsSession mStatsSession;
 
     private boolean handleDisableable(Button button) {
         boolean disableable = false;
@@ -337,34 +152,18 @@
     }
 
     private void initUninstallButtons() {
-        mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
         final boolean isBundled = (mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
         boolean enabled = true;
-        if (mUpdatedSysApp) {
-            mUninstallButton.setText(R.string.app_factory_reset);
-            boolean showSpecialDisable = false;
-            if (isBundled) {
-                showSpecialDisable = handleDisableable(mSpecialDisableButton);
-                mSpecialDisableButton.setOnClickListener(this);
-            }
-            if (mAppControlRestricted) {
-                showSpecialDisable = false;
-            }
-            mMoreControlButtons.setVisibility(showSpecialDisable ? View.VISIBLE : View.GONE);
+        if (isBundled) {
+            enabled = handleDisableable(mUninstallButton);
         } else {
-            mMoreControlButtons.setVisibility(View.GONE);
-            if (isBundled) {
-                enabled = handleDisableable(mUninstallButton);
-            } else if ((mPackageInfo.applicationInfo.flags
-                    & ApplicationInfo.FLAG_INSTALLED) == 0
+            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.
-                mUninstallButton.setText(R.string.uninstall_text);
                 enabled = false;
-            } else {
-                mUninstallButton.setText(R.string.uninstall_text);
             }
+            mUninstallButton.setText(R.string.uninstall_text);
         }
         // 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.
@@ -407,112 +206,89 @@
         }
     }
 
-    private void initNotificationButton() {
-        INotificationManager nm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        boolean enabled = true; // default on
-        try {
-            enabled = nm.areNotificationsEnabledForPackage(mAppEntry.info.packageName,
-                    mAppEntry.info.uid);
-        } catch (android.os.RemoteException ex) {
-            // this does not bode well
-        }
-        mNotificationSwitch.setChecked(enabled);
-        if (Utils.isSystemPackage(mPm, mPackageInfo)) {
-            mNotificationSwitch.setEnabled(false);
-        } else if ((mPackageInfo.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
-            // App is not installed on the current user
-            mNotificationSwitch.setEnabled(false);
-        } else {
-            mNotificationSwitch.setEnabled(true);
-            mNotificationSwitch.setOnCheckedChangeListener(this);
-        }
-    }
-
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        mState = ApplicationsState.getInstance(getActivity().getApplication());
-        mSession = mState.newSession(this);
-        mPm = getActivity().getPackageManager();
-        mUserManager = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
-        IBinder b = ServiceManager.getService(Context.USB_SERVICE);
-        mUsbManager = IUsbManager.Stub.asInterface(b);
-        mAppWidgetManager = AppWidgetManager.getInstance(getActivity());
-        mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
-        mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms"));
-
-        mCanBeOnSdCardChecker = new CanBeOnSdCardChecker();
-
-        // Need to make sure we have loaded applications at this point.
-        mSession.resume();
-
-        retrieveAppEntry();
-
         setHasOptionsMenu(true);
+        addPreferencesFromResource(R.xml.installed_app_details);
+
+        INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(
+                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
+        try {
+            mStatsSession = statsService.openSession();
+        } catch (RemoteException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        final View view = inflater.inflate(R.layout.installed_app_details, container, false);
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_INSTALLED_APP_DETAILS;
+    }
 
-        final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);
-        Utils.forceCustomPadding(allDetails, true /* additive padding */);
+    @Override
+    public void onResume() {
+        super.onResume();
+        AppItem app = new AppItem(mAppEntry.info.uid);
+        app.addUid(mAppEntry.info.uid);
+        getLoaderManager().restartLoader(LOADER_CHART_DATA,
+                ChartDataLoader.buildArgs(NetworkTemplate.buildTemplateMobileWildcard(), app),
+                mDataCallbacks);
+    }
 
-        mRootView = view;
-        mComputingStr = getActivity().getText(R.string.computing_size);
-        
-        // Set default values on sizes
-        mTotalSize = (TextView) view.findViewById(R.id.total_size_text);
-        mAppSize = (TextView) view.findViewById(R.id.application_size_text);
-        mDataSize = (TextView) view.findViewById(R.id.data_size_text);
-        mExternalCodeSize = (TextView) view.findViewById(R.id.external_code_size_text);
-        mExternalDataSize = (TextView) view.findViewById(R.id.external_data_size_text);
+    @Override
+    public void onPause() {
+        getLoaderManager().destroyLoader(LOADER_CHART_DATA);
+        super.onPause();
+    }
 
-        if (Environment.isExternalStorageEmulated()) {
-            ((View)mExternalCodeSize.getParent()).setVisibility(View.GONE);
-            ((View)mExternalDataSize.getParent()).setVisibility(View.GONE);
+    @Override
+    public void onDestroy() {
+        TrafficStats.closeQuietly(mStatsSession);
+
+        super.onDestroy();
+    }
+
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        handleHeader();
+
+        mNotificationPreference = findPreference(KEY_NOTIFICATION);
+        mNotificationPreference.setOnPreferenceClickListener(this);
+        mStoragePreference = findPreference(KEY_STORAGE);
+        mStoragePreference.setOnPreferenceClickListener(this);
+        mPermissionsPreference = findPreference(KEY_PERMISSION);
+        mPermissionsPreference.setOnPreferenceClickListener(this);
+        mDataPreference = findPreference(KEY_DATA);
+        mDataPreference.setOnPreferenceClickListener(this);
+
+        mLaunchPreference = findPreference(KEY_LAUNCH);
+        if ((mAppEntry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
+            mLaunchPreference.setEnabled(false);
+        } else if (!mAppEntry.info.enabled) {
+            mLaunchPreference.setEnabled(false);
+        } else {
+            mLaunchPreference.setOnPreferenceClickListener(this);
         }
+    }
+
+    private void handleHeader() {
+        mHeader = (LayoutPreference) findPreference(KEY_HEADER);
 
         // Get Control button panel
-        View btnPanel = view.findViewById(R.id.control_buttons_panel);
-        mForceStopButton = (Button) btnPanel.findViewById(R.id.left_button);
+        View btnPanel = mHeader.findViewById(R.id.control_buttons_panel);
+        mForceStopButton = (Button) btnPanel.findViewById(R.id.right_button);
         mForceStopButton.setText(R.string.force_stop);
-        mUninstallButton = (Button) btnPanel.findViewById(R.id.right_button);
+        mUninstallButton = (Button) btnPanel.findViewById(R.id.left_button);
         mForceStopButton.setEnabled(false);
-        
-        // Get More Control button panel
-        mMoreControlButtons = view.findViewById(R.id.more_control_buttons_panel);
-        mMoreControlButtons.findViewById(R.id.left_button).setVisibility(View.INVISIBLE);
-        mSpecialDisableButton = (Button) mMoreControlButtons.findViewById(R.id.right_button);
-        mMoreControlButtons.setVisibility(View.GONE);
-        
-        // Initialize clear data and move install location buttons
-        View data_buttons_panel = view.findViewById(R.id.data_buttons_panel);
-        mClearDataButton = (Button) data_buttons_panel.findViewById(R.id.right_button);
-        mMoveAppButton = (Button) data_buttons_panel.findViewById(R.id.left_button);
-        
-        // Cache section
-        mCacheSize = (TextView) view.findViewById(R.id.cache_size_text);
-        mClearCacheButton = (Button) view.findViewById(R.id.clear_cache_button);
-
-        mActivitiesButton = (Button) view.findViewById(R.id.clear_activities_button);
-        
-        // Screen compatibility control
-        mScreenCompatSection = view.findViewById(R.id.screen_compatibility_section);
-        mAskCompatibilityCB = (CheckBox) view.findViewById(R.id.ask_compatibility_cb);
-        mEnableCompatibilityCB = (CheckBox) view.findViewById(R.id.enable_compatibility_cb);
-        
-        mNotificationSwitch = (CompoundButton) view.findViewById(R.id.notification_switch);
-
-        return view;
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater 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);
     }
@@ -534,14 +310,19 @@
             showIt = false;
         }
         menu.findItem(UNINSTALL_ALL_USERS_MENU).setVisible(showIt);
+        mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
+        menu.findItem(UNINSTALL_UPDATES).setVisible(mUpdatedSysApp && !mAppControlRestricted);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        int menuId = item.getItemId();
-        if (menuId == UNINSTALL_ALL_USERS_MENU) {
-            uninstallPkg(mAppEntry.info.packageName, true, false);
-            return true;
+        switch (item.getItemId()) {
+            case UNINSTALL_ALL_USERS_MENU:
+                uninstallPkg(mAppEntry.info.packageName, true, false);
+                return true;
+            case UNINSTALL_UPDATES:
+                showDialogInner(DLG_FACTORY_RESET, 0);
+                return true;
         }
         return false;
     }
@@ -572,8 +353,9 @@
 
     // Utility method to set application label and icon.
     private void setAppLabelAndIcon(PackageInfo pkgInfo) {
-        final View appSnippet = mRootView.findViewById(R.id.app_snippet);
-        appSnippet.setPaddingRelative(0, appSnippet.getPaddingTop(), 0, appSnippet.getPaddingBottom());
+        final View appSnippet = mHeader.findViewById(R.id.app_snippet);
+        appSnippet.setPaddingRelative(0, appSnippet.getPaddingTop(), 0,
+                appSnippet.getPaddingBottom());
 
         ImageView icon = (ImageView) appSnippet.findViewById(R.id.app_icon);
         mState.ensureIcon(mAppEntry);
@@ -593,86 +375,6 @@
         }
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        
-        mAppControlRestricted = mUserManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL);
-        mSession.resume();
-        if (!refreshUi()) {
-            setIntentAndFinish(true, true);
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mSession.pause();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mSession.release();
-    }
-
-    @Override
-    public void onAllSizesComputed() {
-    }
-
-    @Override
-    public void onPackageIconChanged() {
-    }
-
-    @Override
-    public void onPackageListChanged() {
-        refreshUi();
-    }
-
-    @Override
-    public void onRebuildComplete(ArrayList<AppEntry> apps) {
-    }
-
-    @Override
-    public void onPackageSizeChanged(String packageName) {
-        if (packageName.equals(mAppEntry.info.packageName)) {
-            refreshSizeInfo();
-        }
-    }
-
-    @Override
-    public void onRunningStateChanged(boolean running) {
-    }
-
-    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();
-            }
-        }
-        mAppEntry = mState.getEntry(packageName);
-        if (mAppEntry != null) {
-            // Get application info again to refresh changed properties of application
-            try {
-                mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName,
-                        PackageManager.GET_DISABLED_COMPONENTS |
-                        PackageManager.GET_UNINSTALLED_PACKAGES |
-                        PackageManager.GET_SIGNATURES);
-            } catch (NameNotFoundException e) {
-                Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e);
-            }
-        } else {
-            Log.w(TAG, "Missing AppEntry; maybe reinstalling?");
-            mPackageInfo = null;
-        }
-
-        return packageName;
-    }
-
     private boolean signaturesMatch(String pkg1, String pkg2) {
         if (pkg1 != null && pkg2 != null) {
             try {
@@ -688,12 +390,9 @@
         return false;
     }
 
-    private boolean refreshUi() {
-        if (mMoveInProgress) {
-            return true;
-        }
-        final String packageName = retrieveAppEntry();
-
+    @Override
+    protected boolean refreshUi() {
+        retrieveAppEntry();
         if (mAppEntry == null) {
             return false; // onCreate must have failed, make sure to exit
         }
@@ -721,175 +420,19 @@
             }
         }
 
-        // Get list of preferred activities
-        List<ComponentName> prefActList = new ArrayList<ComponentName>();
-        
-        // Intent list cannot be null. so pass empty list
-        List<IntentFilter> intentList = new ArrayList<IntentFilter>();
-        mPm.getPreferredActivities(intentList, prefActList, packageName);
-        if (localLOGV)
-            Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list");
-        boolean hasUsbDefaults = false;
-        try {
-            if (mUsbManager != null) {
-                hasUsbDefaults = mUsbManager.hasDefaults(packageName, UserHandle.myUserId());
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "mUsbManager.hasDefaults", e);
-        }
-        boolean hasBindAppWidgetPermission =
-                mAppWidgetManager.hasBindAppWidgetPermission(mAppEntry.info.packageName);
-
-        TextView autoLaunchTitleView = (TextView) mRootView.findViewById(R.id.auto_launch_title);
-        TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
-        boolean autoLaunchEnabled = prefActList.size() > 0 || hasUsbDefaults;
-        if (!autoLaunchEnabled && !hasBindAppWidgetPermission) {
-            resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
-        } else {
-            boolean useBullets = hasBindAppWidgetPermission && autoLaunchEnabled;
-
-            if (hasBindAppWidgetPermission) {
-                autoLaunchTitleView.setText(R.string.auto_launch_label_generic);
-            } else {
-                autoLaunchTitleView.setText(R.string.auto_launch_label);
-            }
-
-            CharSequence text = null;
-            int bulletIndent = getResources()
-                    .getDimensionPixelSize(R.dimen.installed_app_details_bullet_offset);
-            if (autoLaunchEnabled) {
-                CharSequence autoLaunchEnableText = getText(R.string.auto_launch_enable_text);
-                SpannableString s = new SpannableString(autoLaunchEnableText);
-                if (useBullets) {
-                    s.setSpan(new BulletSpan(bulletIndent), 0, autoLaunchEnableText.length(), 0);
-                }
-                text = (text == null) ?
-                        TextUtils.concat(s, "\n") : TextUtils.concat(text, "\n", s, "\n");
-            }
-            if (hasBindAppWidgetPermission) {
-                CharSequence alwaysAllowBindAppWidgetsText =
-                        getText(R.string.always_allow_bind_appwidgets_text);
-                SpannableString s = new SpannableString(alwaysAllowBindAppWidgetsText);
-                if (useBullets) {
-                    s.setSpan(new BulletSpan(bulletIndent),
-                            0, alwaysAllowBindAppWidgetsText.length(), 0);
-                }
-                text = (text == null) ?
-                        TextUtils.concat(s, "\n") : TextUtils.concat(text, "\n", s, "\n");
-            }
-            autoLaunchView.setText(text);
-            mActivitiesButton.setEnabled(true);
-            mActivitiesButton.setOnClickListener(this);
-        }
-
-        // Screen compatibility section.
-        ActivityManager am = (ActivityManager)
-                getActivity().getSystemService(Context.ACTIVITY_SERVICE);
-        int compatMode = am.getPackageScreenCompatMode(packageName);
-        // For now these are always off; this is the old UI model which we
-        // are no longer using.
-        if (false && (compatMode == ActivityManager.COMPAT_MODE_DISABLED
-                || compatMode == ActivityManager.COMPAT_MODE_ENABLED)) {
-            mScreenCompatSection.setVisibility(View.VISIBLE);
-            mAskCompatibilityCB.setChecked(am.getPackageAskScreenCompat(packageName));
-            mAskCompatibilityCB.setOnCheckedChangeListener(this);
-            mEnableCompatibilityCB.setChecked(compatMode == ActivityManager.COMPAT_MODE_ENABLED);
-            mEnableCompatibilityCB.setOnCheckedChangeListener(this);
-        } else {
-            mScreenCompatSection.setVisibility(View.GONE);
-        }
-
-        // Security permissions section
-        LinearLayout permsView = (LinearLayout) mRootView.findViewById(R.id.permissions_section);
-        AppSecurityPermissions asp = new AppSecurityPermissions(getActivity(), packageName);
-        int premiumSmsPermission = getPremiumSmsPermission(packageName);
-        // Premium SMS permission implies the app also has SEND_SMS permission, so the original
-        // application permissions list doesn't have to be shown/hidden separately. The premium
-        // SMS subsection should only be visible if the app has tried to send to a premium SMS.
-        if (asp.getPermissionCount() > 0
-                || premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
-            permsView.setVisibility(View.VISIBLE);
-        } else {
-            permsView.setVisibility(View.GONE);
-        }
-        // Premium SMS permission subsection
-        TextView securityBillingDesc = (TextView) permsView.findViewById(
-                R.id.security_settings_billing_desc);
-        LinearLayout securityBillingList = (LinearLayout) permsView.findViewById(
-                R.id.security_settings_billing_list);
-        if (premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
-            // Show the premium SMS permission selector
-            securityBillingDesc.setVisibility(View.VISIBLE);
-            securityBillingList.setVisibility(View.VISIBLE);
-            Spinner spinner = (Spinner) permsView.findViewById(
-                    R.id.security_settings_premium_sms_list);
-            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getActivity(),
-                    R.array.security_settings_premium_sms_values,
-                    android.R.layout.simple_spinner_item);
-            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-            spinner.setAdapter(adapter);
-            // List items are in the same order as SmsUsageMonitor constants, offset by 1.
-            spinner.setSelection(premiumSmsPermission - 1);
-            spinner.setOnItemSelectedListener(new PremiumSmsSelectionListener(
-                    packageName, mSmsManager));
-        } else {
-            // Hide the premium SMS permission selector
-            securityBillingDesc.setVisibility(View.GONE);
-            securityBillingList.setVisibility(View.GONE);
-        }
-        // App permissions subsection
-        if (asp.getPermissionCount() > 0) {
-            // Make the security sections header visible
-            LinearLayout securityList = (LinearLayout) permsView.findViewById(
-                    R.id.security_settings_list);
-            securityList.removeAllViews();
-            securityList.addView(asp.getPermissionsViewWithRevokeButtons());
-            // If this app is running under a shared user ID with other apps,
-            // update the description to explain this.
-            String[] packages = mPm.getPackagesForUid(mPackageInfo.applicationInfo.uid);
-            if (packages != null && packages.length > 1) {
-                ArrayList<CharSequence> pnames = new ArrayList<CharSequence>();
-                for (int i=0; i<packages.length; i++) {
-                    String pkg = packages[i];
-                    if (mPackageInfo.packageName.equals(pkg)) {
-                        continue;
-                    }
-                    try {
-                        ApplicationInfo ainfo = mPm.getApplicationInfo(pkg, 0);
-                        pnames.add(ainfo.loadLabel(mPm));
-                    } catch (PackageManager.NameNotFoundException e) {
-                    }
-                }
-                final int N = pnames.size();
-                if (N > 0) {
-                    final Resources res = getActivity().getResources();
-                    String appListStr;
-                    if (N == 1) {
-                        appListStr = pnames.get(0).toString();
-                    } else if (N == 2) {
-                        appListStr = res.getString(R.string.join_two_items, pnames.get(0),
-                                pnames.get(1));
-                    } else {
-                        appListStr = pnames.get(N-2).toString();
-                        for (int i=N-3; i>=0; i--) {
-                            appListStr = res.getString(i == 0 ? R.string.join_many_items_first
-                                    : R.string.join_many_items_middle, pnames.get(i), appListStr);
-                        }
-                        appListStr = res.getString(R.string.join_many_items_last,
-                                appListStr, pnames.get(N-1));
-                    }
-                    TextView descr = (TextView) mRootView.findViewById(
-                            R.id.security_settings_desc);
-                    descr.setText(res.getString(R.string.security_settings_desc_multi,
-                            mPackageInfo.applicationInfo.loadLabel(mPm), appListStr));
-                }
-            }
-        }
-        
         checkForceStop();
         setAppLabelAndIcon(mPackageInfo);
-        refreshButtons();
-        refreshSizeInfo();
+        initUninstallButtons();
+
+        // Update the preference summaries.
+        Activity context = getActivity();
+        mStoragePreference.setSummary(AppStorageSettings.getSummary(mAppEntry, context));
+        mPermissionsPreference.setSummary(AppPermissionSettings.getSummary(mAppEntry, context));
+        mLaunchPreference.setSummary(Utils.getLaunchByDeafaultSummary(mAppEntry, mUsbManager,
+                mPm, context));
+        mNotificationPreference.setSummary(getNotificationSummary(mAppEntry, context,
+                mBackend));
+        mDataPreference.setSummary(getDataSummary());
 
         if (!mInitialized) {
             // First time init: are we displaying an uninstalled app?
@@ -899,7 +442,7 @@
             // All other times: if the app no longer exists then we want
             // to go away.
             try {
-                ApplicationInfo ainfo = getActivity().getPackageManager().getApplicationInfo(
+                ApplicationInfo ainfo = context.getPackageManager().getApplicationInfo(
                         mAppEntry.info.packageName, PackageManager.GET_UNINSTALLED_PACKAGES
                         | PackageManager.GET_DISABLED_COMPONENTS);
                 if (!mShowUninstalled) {
@@ -916,344 +459,75 @@
         return true;
     }
 
-    private static class PremiumSmsSelectionListener implements AdapterView.OnItemSelectedListener {
-        private final String mPackageName;
-        private final ISms mSmsManager;
-
-        PremiumSmsSelectionListener(String packageName, ISms smsManager) {
-            mPackageName = packageName;
-            mSmsManager = smsManager;
+    private CharSequence getDataSummary() {
+        if (mChartData != null) {
+            long totalBytes = mChartData.detail.getTotalBytes();
+            Context context = getActivity();
+            return getString(R.string.data_summary_format,
+                    Formatter.formatFileSize(context, totalBytes),
+                    DateUtils.formatDateTime(context, mChartData.detail.getStart(),
+                            DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_ABBREV_MONTH));
         }
-
-        @Override
-        public void onItemSelected(AdapterView<?> parent, View view, int position,
-                long id) {
-            if (position >= 0 && position < 3) {
-                Log.d(TAG, "Selected premium SMS policy " + position);
-                setPremiumSmsPermission(mPackageName, (position + 1));
-            } else {
-                Log.e(TAG, "Error: unknown premium SMS policy " + position);
-            }
-        }
-
-        @Override
-        public void onNothingSelected(AdapterView<?> parent) {
-            // Ignored
-        }
-
-        private void setPremiumSmsPermission(String packageName, int permission) {
-            try {
-                if (mSmsManager != null) {
-                    mSmsManager.setPremiumSmsPermission(packageName, permission);
-                }
-            } catch (RemoteException ex) {
-                // ignored
-            }
-        }
-    }
-    
-    private void resetLaunchDefaultsUi(TextView title, TextView autoLaunchView) {
-        title.setText(R.string.auto_launch_label);
-        autoLaunchView.setText(R.string.auto_launch_disable_text);
-        // Disable clear activities button
-        mActivitiesButton.setEnabled(false);
+        return getString(R.string.computing_size);
     }
 
-    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);
-    }
-    
-    private void refreshSizeInfo() {
-        if (mAppEntry.size == ApplicationsState.SIZE_INVALID
-                || mAppEntry.size == ApplicationsState.SIZE_UNKNOWN) {
-            mLastCodeSize = mLastDataSize = mLastCacheSize = mLastTotalSize = -1;
-            if (!mHaveSizes) {
-                mAppSize.setText(mComputingStr);
-                mDataSize.setText(mComputingStr);
-                mCacheSize.setText(mComputingStr);
-                mTotalSize.setText(mComputingStr);
-            }
-            mClearDataButton.setEnabled(false);
-            mClearCacheButton.setEnabled(false);
-            
-        } else {
-            mHaveSizes = true;
-            long codeSize = mAppEntry.codeSize;
-            long dataSize = mAppEntry.dataSize;
-            if (Environment.isExternalStorageEmulated()) {
-                codeSize += mAppEntry.externalCodeSize;
-                dataSize +=  mAppEntry.externalDataSize;
-            } else {
-                if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
-                    mLastExternalCodeSize = mAppEntry.externalCodeSize;
-                    mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
-                }
-                if (mLastExternalDataSize !=  mAppEntry.externalDataSize) {
-                    mLastExternalDataSize =  mAppEntry.externalDataSize;
-                    mExternalDataSize.setText(getSizeStr( mAppEntry.externalDataSize));
-                }
-            }
-            if (mLastCodeSize != codeSize) {
-                mLastCodeSize = codeSize;
-                mAppSize.setText(getSizeStr(codeSize));
-            }
-            if (mLastDataSize != dataSize) {
-                mLastDataSize = dataSize;
-                mDataSize.setText(getSizeStr(dataSize));
-            }
-            long cacheSize = mAppEntry.cacheSize + mAppEntry.externalCacheSize;
-            if (mLastCacheSize != cacheSize) {
-                mLastCacheSize = cacheSize;
-                mCacheSize.setText(getSizeStr(cacheSize));
-            }
-            if (mLastTotalSize != mAppEntry.size) {
-                mLastTotalSize = mAppEntry.size;
-                mTotalSize.setText(getSizeStr(mAppEntry.size));
-            }
-            
-            if ((mAppEntry.dataSize+ mAppEntry.externalDataSize) <= 0 || !mCanClearData) {
-                mClearDataButton.setEnabled(false);
-            } else {
-                mClearDataButton.setEnabled(true);
-                mClearDataButton.setOnClickListener(this);
-            }
-            if (cacheSize <= 0) {
-                mClearCacheButton.setEnabled(false);
-            } else {
-                mClearCacheButton.setEnabled(true);
-                mClearCacheButton.setOnClickListener(this);
-            }
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        switch (id) {
+            case DLG_DISABLE:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.app_disable_dlg_title))
+                        .setMessage(getActivity().getText(R.string.app_disable_dlg_text))
+                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Disable the app
+                                new DisableChanger(InstalledAppDetails.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())
+                        .setTitle(getActivity().getText(R.string.app_special_disable_dlg_title))
+                        .setMessage(getActivity().getText(R.string.app_special_disable_dlg_text))
+                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Clear user data here
+                                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();
+            case DLG_FACTORY_RESET:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.app_factory_reset_dlg_title))
+                        .setMessage(getActivity().getText(R.string.app_factory_reset_dlg_text))
+                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Clear user data here
+                                uninstallPkg(mAppEntry.info.packageName,
+                                        false, false);
+                            }
+                        })
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
         }
-        if (mAppControlRestricted) {
-            mClearCacheButton.setEnabled(false);
-            mClearDataButton.setEnabled(false);
-        }
-    }
-    
-    /*
-     * Private method to handle clear message notification from observer when
-     * the async operation from PackageManager is complete
-     */
-    private void processClearMsg(Message msg) {
-        int result = msg.arg1;
-        String packageName = mAppEntry.info.packageName;
-        mClearDataButton.setText(R.string.clear_user_data_text);
-        if(result == OP_SUCCESSFUL) {
-            Log.i(TAG, "Cleared user data for package : "+packageName);
-            mState.requestSize(mAppEntry.info.packageName);
-        } else {
-            mClearDataButton.setEnabled(true);
-        }
-        checkForceStop();
-    }
-
-    private void refreshButtons() {
-        if (!mMoveInProgress) {
-            initUninstallButtons();
-            initDataButtons();
-            initMoveButton();
-            initNotificationButton();
-        } else {
-            mMoveAppButton.setText(R.string.moving);
-            mMoveAppButton.setEnabled(false);
-            mUninstallButton.setEnabled(false);
-            mSpecialDisableButton.setEnabled(false);
-        }
-    }
-
-    private void processMoveMsg(Message msg) {
-        int result = msg.arg1;
-        String packageName = mAppEntry.info.packageName;
-        // Refresh the button attributes.
-        mMoveInProgress = false;
-        if (result == PackageManager.MOVE_SUCCEEDED) {
-            Log.i(TAG, "Moved resources for " + packageName);
-            // Refresh size information again.
-            mState.requestSize(mAppEntry.info.packageName);
-        } else {
-            showDialogInner(DLG_MOVE_FAILED, result);
-        }
-        refreshUi();
-    }
-
-    /*
-     * Private method to initiate clearing user data when the user clicks the clear data 
-     * button for a system package
-     */
-    private  void initiateClearUserData() {
-        mClearDataButton.setEnabled(false);
-        // Invoke uninstall or clear user data based on sysPackage
-        String packageName = mAppEntry.info.packageName;
-        Log.i(TAG, "Clearing user data for package : " + packageName);
-        if (mClearDataObserver == null) {
-            mClearDataObserver = new ClearUserDataObserver();
-        }
-        ActivityManager am = (ActivityManager)
-                getActivity().getSystemService(Context.ACTIVITY_SERVICE);
-        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);
-            showDialogInner(DLG_CANNOT_CLEAR_DATA, 0);
-        } else {
-            mClearDataButton.setText(R.string.recompute_size);
-        }
-    }
-    
-    private void showDialogInner(int id, int moveErrorCode) {
-        DialogFragment newFragment = MyAlertDialogFragment.newInstance(id, moveErrorCode);
-        newFragment.setTargetFragment(this, 0);
-        newFragment.show(getFragmentManager(), "dialog " + id);
-    }
-    
-    public static class MyAlertDialogFragment extends DialogFragment {
-
-        public static MyAlertDialogFragment newInstance(int id, int moveErrorCode) {
-            MyAlertDialogFragment frag = new MyAlertDialogFragment();
-            Bundle args = new Bundle();
-            args.putInt("id", id);
-            args.putInt("moveError", moveErrorCode);
-            frag.setArguments(args);
-            return frag;
-        }
-
-        InstalledAppDetails getOwner() {
-            return (InstalledAppDetails)getTargetFragment();
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            int id = getArguments().getInt("id");
-            int moveErrorCode = getArguments().getInt("moveError");
-            switch (id) {
-                case DLG_CLEAR_DATA:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.clear_data_dlg_title))
-                    .setMessage(getActivity().getText(R.string.clear_data_dlg_text))
-                    .setPositiveButton(R.string.dlg_ok,
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Clear user data here
-                            getOwner().initiateClearUserData();
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel, null)
-                    .create();
-                case DLG_FACTORY_RESET:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.app_factory_reset_dlg_title))
-                    .setMessage(getActivity().getText(R.string.app_factory_reset_dlg_text))
-                    .setPositiveButton(R.string.dlg_ok,
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Clear user data here
-                            getOwner().uninstallPkg(getOwner().mAppEntry.info.packageName,
-                                    false, false);
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel, null)
-                    .create();
-                case DLG_APP_NOT_FOUND:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.app_not_found_dlg_title))
-                    .setMessage(getActivity().getText(R.string.app_not_found_dlg_title))
-                    .setNeutralButton(getActivity().getText(R.string.dlg_ok),
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            //force to recompute changed value
-                            getOwner().setIntentAndFinish(true, true);
-                        }
-                    })
-                    .create();
-                case DLG_CANNOT_CLEAR_DATA:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.clear_failed_dlg_title))
-                    .setMessage(getActivity().getText(R.string.clear_failed_dlg_text))
-                    .setNeutralButton(R.string.dlg_ok,
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            getOwner().mClearDataButton.setEnabled(false);
-                            //force to recompute changed value
-                            getOwner().setIntentAndFinish(false, false);
-                        }
-                    })
-                    .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
-                            getOwner().forceStopPackage(getOwner().mAppEntry.info.packageName);
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel, null)
-                    .create();
-                case DLG_MOVE_FAILED:
-                    CharSequence msg = getActivity().getString(R.string.move_app_failed_dlg_text,
-                            getOwner().getMoveErrMsg(moveErrorCode));
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.move_app_failed_dlg_title))
-                    .setMessage(msg)
-                    .setNeutralButton(R.string.dlg_ok, null)
-                    .create();
-                case DLG_DISABLE:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.app_disable_dlg_title))
-                    .setMessage(getActivity().getText(R.string.app_disable_dlg_text))
-                    .setPositiveButton(R.string.dlg_ok,
-                        new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Disable the app
-                            new DisableChanger(getOwner(), getOwner().mAppEntry.info,
-                                    PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)
-                            .execute((Object)null);
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel, null)
-                    .create();
-                case DLG_DISABLE_NOTIFICATIONS:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.app_disable_notifications_dlg_title))
-                    .setMessage(getActivity().getText(R.string.app_disable_notifications_dlg_text))
-                    .setPositiveButton(R.string.dlg_ok,
-                        new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Disable the package's notifications
-                            getOwner().setNotificationsEnabled(false);
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel,
-                        new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Re-enable the checkbox
-                            getOwner().mNotificationSwitch.setChecked(true);
-                        }
-                    })
-                    .create();
-                case DLG_SPECIAL_DISABLE:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.app_special_disable_dlg_title))
-                    .setMessage(getActivity().getText(R.string.app_special_disable_dlg_text))
-                    .setPositiveButton(R.string.dlg_ok,
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Clear user data here
-                            getOwner().uninstallPkg(getOwner().mAppEntry.info.packageName,
-                                    false, true);
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel, null)
-                    .create();
-            }
-            throw new IllegalArgumentException("unknown id " + id);
-        }
+        return null;
     }
 
     private void uninstallPkg(String packageName, boolean allUsers, boolean andDisable) {
@@ -1269,21 +543,15 @@
         ActivityManager am = (ActivityManager)getActivity().getSystemService(
                 Context.ACTIVITY_SERVICE);
         am.forceStopPackage(pkgName);
-        mState.invalidatePackage(pkgName);
-        ApplicationsState.AppEntry newEnt = mState.getEntry(pkgName);
+        int userId = UserHandle.getUserId(mAppEntry.info.uid);
+        mState.invalidatePackage(pkgName, userId);
+        ApplicationsState.AppEntry newEnt = mState.getEntry(pkgName, userId);
         if (newEnt != null) {
             mAppEntry = newEnt;
         }
         checkForceStop();
     }
 
-    private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            updateForceStopButton(getResultCode() != Activity.RESULT_CANCELED);
-        }
-    };
-
     private void updateForceStopButton(boolean enabled) {
         if (mAppControlRestricted) {
             mForceStopButton.setEnabled(false);
@@ -1292,7 +560,7 @@
             mForceStopButton.setOnClickListener(InstalledAppDetails.this);
         }
     }
-    
+
     private void checkForceStop() {
         if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
             // User can't force stop device admin.
@@ -1312,6 +580,112 @@
         }
     }
 
+    private void startManagePermissionsActivity() {
+        // start new activity to manage app permissions
+        Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSIONS);
+        intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mAppEntry.info.packageName);
+        try {
+            startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            Log.w(LOG_TAG, "No app can handle android.intent.action.MANAGE_APP_PERMISSIONS");
+        }
+    }
+
+    private void startAppInfoFragment(Class<? extends AppInfoBase> fragment, CharSequence title) {
+        // start new fragment to display extended information
+        Bundle args = new Bundle();
+        args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mAppEntry.info.packageName);
+
+        SettingsActivity sa = (SettingsActivity) getActivity();
+        sa.startPreferencePanel(fragment.getName(), args, -1, title, this, SUB_INFO_FRAGMENT);
+    }
+
+    private void startNotifications() {
+        // start new fragment to display extended information
+        getActivity().startActivity(new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                .putExtra(Settings.EXTRA_APP_PACKAGE, mAppEntry.info.packageName)
+                .putExtra(Settings.EXTRA_APP_UID, mAppEntry.info.uid));
+    }
+
+    /*
+     * Method implementing functionality of buttons clicked
+     * @see android.view.View.OnClickListener#onClick(android.view.View)
+     */
+    public void onClick(View v) {
+        String packageName = mAppEntry.info.packageName;
+        if(v == mUninstallButton) {
+            if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                if (mAppEntry.info.enabled) {
+                    if (mUpdatedSysApp) {
+                        showDialogInner(DLG_SPECIAL_DISABLE, 0);
+                    } else {
+                        showDialogInner(DLG_DISABLE, 0);
+                    }
+                } else {
+                    new DisableChanger(this, mAppEntry.info,
+                            PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
+                                    .execute((Object) null);
+                }
+            } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
+                uninstallPkg(packageName, true, false);
+            } else {
+                uninstallPkg(packageName, false, false);
+            }
+        } else if (v == mForceStopButton) {
+            showDialogInner(DLG_FORCE_STOP, 0);
+            //forceStopPackage(mAppInfo.packageName);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        if (preference == mStoragePreference) {
+            startAppInfoFragment(AppStorageSettings.class, mStoragePreference.getTitle());
+        } else if (preference == mNotificationPreference) {
+            startNotifications();
+        } else if (preference == mPermissionsPreference) {
+            startManagePermissionsActivity();
+        } else if (preference == mLaunchPreference) {
+            startAppInfoFragment(AppLaunchSettings.class, mLaunchPreference.getTitle());
+        } else if (preference == mDataPreference) {
+            Bundle args = new Bundle();
+            args.putString(DataUsageSummary.EXTRA_SHOW_APP_IMMEDIATE_PKG,
+                    mAppEntry.info.packageName);
+
+            SettingsActivity sa = (SettingsActivity) getActivity();
+            sa.startPreferencePanel(DataUsageSummary.class.getName(), args, -1,
+                    getString(R.string.app_data_usage), this, SUB_INFO_FRAGMENT);
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    public static CharSequence getNotificationSummary(AppEntry appEntry, Context context) {
+        return getNotificationSummary(appEntry, context, new NotificationBackend());
+    }
+
+    public static CharSequence getNotificationSummary(AppEntry appEntry, Context context,
+            NotificationBackend backend) {
+        AppRow appRow = backend.loadAppRow(context.getPackageManager(), appEntry.info);
+        return getNotificationSummary(appRow, context);
+    }
+
+    public static CharSequence getNotificationSummary(AppRow appRow, Context context) {
+        if (appRow.banned) {
+            return context.getString(R.string.notifications_disabled);
+        } else if (appRow.priority) {
+            if (appRow.sensitive) {
+                return context.getString(R.string.notifications_priority_sensitive);
+            }
+            return context.getString(R.string.notifications_priority);
+        } else if (appRow.sensitive) {
+            return context.getString(R.string.notifications_sensitive);
+        }
+        return context.getString(R.string.notifications_enabled);
+    }
+
     static class DisableChanger extends AsyncTask<Object, Object, Object> {
         final PackageManager mPm;
         final WeakReference<InstalledAppDetails> mActivity;
@@ -1332,118 +706,32 @@
         }
     }
 
-    private void setNotificationsEnabled(boolean enabled) {
-        String packageName = mAppEntry.info.packageName;
-        INotificationManager nm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        try {
-            final boolean enable = mNotificationSwitch.isChecked();
-            nm.setNotificationsEnabledForPackage(packageName, mAppEntry.info.uid, enabled);
-        } catch (android.os.RemoteException ex) {
-            mNotificationSwitch.setChecked(!enabled); // revert
-        }
-    }
+    private final LoaderCallbacks<ChartData> mDataCallbacks = new LoaderCallbacks<ChartData>() {
 
-    private int getPremiumSmsPermission(String packageName) {
-        try {
-            if (mSmsManager != null) {
-                return mSmsManager.getPremiumSmsPermission(packageName);
-            }
-        } catch (RemoteException ex) {
-            // ignored
+        @Override
+        public Loader<ChartData> onCreateLoader(int id, Bundle args) {
+            return new ChartDataLoader(getActivity(), mStatsSession, args);
         }
-        return SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
-    }
 
-    /*
-     * Method implementing functionality of buttons clicked
-     * @see android.view.View.OnClickListener#onClick(android.view.View)
-     */
-    public void onClick(View v) {
-        String packageName = mAppEntry.info.packageName;
-        if(v == mUninstallButton) {
-            if (mUpdatedSysApp) {
-                showDialogInner(DLG_FACTORY_RESET, 0);
-            } else {
-                if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                    if (mAppEntry.info.enabled) {
-                        showDialogInner(DLG_DISABLE, 0);
-                    } else {
-                        new DisableChanger(this, mAppEntry.info,
-                                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
-                        .execute((Object)null);
-                    }
-                } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
-                    uninstallPkg(packageName, true, false);
-                } else {
-                    uninstallPkg(packageName, false, false);
-                }
-            }
-        } else if(v == mSpecialDisableButton) {
-            showDialogInner(DLG_SPECIAL_DISABLE, 0);
-        } else if(v == mActivitiesButton) {
-            if (mUsbManager != null) {
-                mPm.clearPackagePreferredActivities(packageName);
-                try {
-                    mUsbManager.clearDefaults(packageName, UserHandle.myUserId());
-                } catch (RemoteException e) {
-                    Log.e(TAG, "mUsbManager.clearDefaults", e);
-                }
-                mAppWidgetManager.setBindAppWidgetPermission(packageName, false);
-                TextView autoLaunchTitleView =
-                        (TextView) mRootView.findViewById(R.id.auto_launch_title);
-                TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
-                resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
-            }
-        } else if(v == mClearDataButton) {
-            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 == mClearCacheButton) {
-            // Lazy initialization of observer
-            if (mClearCacheObserver == null) {
-                mClearCacheObserver = new ClearCacheObserver();
-            }
-            mPm.deleteApplicationCacheFiles(packageName, mClearCacheObserver);
-        } else if (v == mForceStopButton) {
-            showDialogInner(DLG_FORCE_STOP, 0);
-            //forceStopPackage(mAppInfo.packageName);
-        } else if (v == mMoveAppButton) {
-            if (mPackageMoveObserver == null) {
-                mPackageMoveObserver = new PackageMoveObserver();
-            }
-            int moveFlags = (mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0 ?
-                    PackageManager.MOVE_INTERNAL : PackageManager.MOVE_EXTERNAL_MEDIA;
-            mMoveInProgress = true;
-            refreshButtons();
-            mPm.movePackage(mAppEntry.info.packageName, mPackageMoveObserver, moveFlags);
+        @Override
+        public void onLoadFinished(Loader<ChartData> loader, ChartData data) {
+            mChartData = data;
+            mDataPreference.setSummary(getDataSummary());
         }
-    }
 
-    @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        String packageName = mAppEntry.info.packageName;
-        ActivityManager am = (ActivityManager)
-                getActivity().getSystemService(Context.ACTIVITY_SERVICE);
-        if (buttonView == mAskCompatibilityCB) {
-            am.setPackageAskScreenCompat(packageName, isChecked);
-        } else if (buttonView == mEnableCompatibilityCB) {
-            am.setPackageScreenCompatMode(packageName, isChecked ?
-                    ActivityManager.COMPAT_MODE_ENABLED : ActivityManager.COMPAT_MODE_DISABLED);
-        } else if (buttonView == mNotificationSwitch) {
-            if (!isChecked) {
-                showDialogInner(DLG_DISABLE_NOTIFICATIONS, 0);
-            } else {
-                setNotificationsEnabled(true);
-            }
+        @Override
+        public void onLoaderReset(Loader<ChartData> loader) {
+            mChartData = null;
+            mDataPreference.setSummary(getDataSummary());
         }
-    }
+    };
+
+    private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            updateForceStopButton(getResultCode() != Activity.RESULT_CANCELED);
+        }
+    };
 }
 
+
diff --git a/src/com/android/settings/applications/LayoutPreference.java b/src/com/android/settings/applications/LayoutPreference.java
new file mode 100644
index 0000000..c74ad16
--- /dev/null
+++ b/src/com/android/settings/applications/LayoutPreference.java
@@ -0,0 +1,62 @@
+/*
+ * 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.content.Context;
+import android.content.res.TypedArray;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+public class LayoutPreference extends Preference {
+
+    private View mRootView;
+
+    public LayoutPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        final TypedArray a = context.obtainStyledAttributes(
+                attrs, com.android.internal.R.styleable.Preference, 0, 0);
+        int layoutResource = a.getResourceId(com.android.internal.R.styleable.Preference_layout,
+                0);
+        if (layoutResource == 0) {
+            throw new IllegalArgumentException("LayoutPreference requires a layout to be defined");
+        }
+        // Need to create view now so that findViewById can be called immediately.
+        final View view = LayoutInflater.from(getContext())
+                .inflate(layoutResource, null, false);
+
+        final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);
+        Utils.forceCustomPadding(allDetails, true /* additive padding */);
+        mRootView = view;
+        setShouldDisableView(false);
+    }
+
+    @Override
+    protected View onCreateView(ViewGroup parent) {
+        return mRootView;
+    }
+
+    public View findViewById(int id) {
+        return mRootView.findViewById(id);
+    }
+
+}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 45431eb..58061c0 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -16,39 +16,20 @@
 
 package com.android.settings.applications;
 
-import static android.net.NetworkPolicyManager.POLICY_NONE;
-import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-
 import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.AlertDialog;
-import android.app.AppOpsManager;
-import android.app.Fragment;
-import android.app.INotificationManager;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageInfo;
+import android.content.pm.IntentFilterVerificationInfo;
 import android.content.pm.PackageManager;
-import android.net.NetworkPolicyManager;
-import android.os.AsyncTask;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.PreferenceFrameLayout;
 import android.provider.Settings;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.PagerTabStrip;
-import android.support.v4.view.ViewPager;
+import android.util.ArraySet;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -61,477 +42,618 @@
 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.ListView;
 import android.widget.Spinner;
 
-import com.android.internal.app.IMediaContainerService;
-import com.android.internal.content.PackageHelper;
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.AppHeader;
+import com.android.settings.HelpUtils;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.UserSpinnerAdapter;
-import com.android.settings.Settings.RunningServicesActivity;
+import com.android.settings.Settings.AllApplicationsActivity;
+import com.android.settings.Settings.DomainsURLsAppListActivity;
+import com.android.settings.Settings.NotificationAppListActivity;
 import com.android.settings.Settings.StorageUseActivity;
-import com.android.settings.applications.ApplicationsState.AppEntry;
-import com.android.settings.deviceinfo.StorageMeasurement;
+import com.android.settings.Settings.UsageAccessSettingsActivity;
+import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.applications.AppStateUsageBridge.UsageState;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+import com.android.settings.applications.ApplicationsState.AppFilter;
+import com.android.settings.applications.ApplicationsState.CompoundFilter;
+import com.android.settings.applications.ApplicationsState.VolumeFilter;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.NotificationBackend.AppRow;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-final class CanBeOnSdCardChecker {
-    final IPackageManager mPm;
-    int mInstallLocation;
-    
-    CanBeOnSdCardChecker() {
-        mPm = IPackageManager.Stub.asInterface(
-                ServiceManager.getService("package"));
-    }
-    
-    void init() {
-        try {
-            mInstallLocation = mPm.getInstallLocation();
-        } catch (RemoteException e) {
-            Log.e("CanBeOnSdCardChecker", "Is Package Manager running?");
-            return;
-        }
-    }
-    
-    boolean check(ApplicationInfo info) {
-        boolean canBe = false;
-        if ((info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
-            canBe = true;
-        } else {
-            if ((info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
-                if (info.installLocation == PackageInfo.INSTALL_LOCATION_PREFER_EXTERNAL ||
-                        info.installLocation == PackageInfo.INSTALL_LOCATION_AUTO) {
-                    canBe = true;
-                } else if (info.installLocation
-                        == PackageInfo.INSTALL_LOCATION_UNSPECIFIED) {
-                    if (mInstallLocation == PackageHelper.APP_INSTALL_EXTERNAL) {
-                        // For apps with no preference and the default value set
-                        // to install on sdcard.
-                        canBe = true;
-                    }
-                }
-            }
-        }
-        return canBe;
-    }
-}
-
-interface AppClickListener {
-    void onItemClick(ManageApplications.TabInfo tab, AdapterView<?> parent,
-            View view, int position, long id);
-}
-
 /**
  * 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 Fragment implements
-        AppClickListener, DialogInterface.OnClickListener,
-        DialogInterface.OnDismissListener, OnItemSelectedListener  {
+public class ManageApplications extends InstrumentedFragment
+        implements OnItemClickListener, OnItemSelectedListener {
 
     static final String TAG = "ManageApplications";
-    static final boolean DEBUG = false;
+    static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
-    private static final String EXTRA_LIST_TYPE = "currentListType";
+    // 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";
+
     private static final String EXTRA_SORT_ORDER = "sortOrder";
-    private static final String EXTRA_SHOW_BACKGROUND = "showBackground";
-    private static final String EXTRA_DEFAULT_LIST_TYPE = "defaultListType";
-    private static final String EXTRA_RESET_DIALOG = "resetDialog";
 
     // 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;
 
-    // sort order that can be changed through the menu can be sorted alphabetically
-    // or size(descending)
-    private static final int MENU_OPTIONS_BASE = 0;
     // Filter options used for displayed list of applications
-    public static final int FILTER_APPS_ALL = MENU_OPTIONS_BASE + 0;
-    public static final int FILTER_APPS_THIRD_PARTY = MENU_OPTIONS_BASE + 1;
-    public static final int FILTER_APPS_SDCARD = MENU_OPTIONS_BASE + 2;
-    public static final int FILTER_APPS_DISABLED = MENU_OPTIONS_BASE + 3;
+    // The order which they appear is the order they will show when spinner is present.
+    public static final int FILTER_APPS_DOWNLOADED_AND_LAUNCHER = 0;
+    public static final int FILTER_APPS_DL_ENABLED              = 1;
+    public static final int FILTER_APPS_DL_DISABLED             = 2;
+    public static final int FILTER_APPS_ALL                     = 3;
+    public static final int FILTER_APPS_ENABLED                 = 4;
+    public static final int FILTER_APPS_DISABLED                = 5;
+    public static final int FILTER_APPS_BLOCKED                 = 6;
+    public static final int FILTER_APPS_PRIORITY                = 7;
+    public static final int FILTER_APPS_SENSITIVE               = 8;
+    public static final int FILTER_APPS_PERSONAL                = 9;
+    public static final int FILTER_APPS_WORK                    = 10;
+    public static final int FILTER_APPS_WITH_DOMAIN_URLS        = 11;
+    public static final int FILTER_APPS_USAGE_ACCESS            = 12;
 
-    public static final int SORT_ORDER_ALPHA = MENU_OPTIONS_BASE + 4;
-    public static final int SORT_ORDER_SIZE = MENU_OPTIONS_BASE + 5;
-    public static final int SHOW_RUNNING_SERVICES = MENU_OPTIONS_BASE + 6;
-    public static final int SHOW_BACKGROUND_PROCESSES = MENU_OPTIONS_BASE + 7;
-    public static final int RESET_APP_PREFERENCES = MENU_OPTIONS_BASE + 8;
+    // This is the string labels for the filter modes above, the order must be kept in sync.
+    public static final int[] FILTER_LABELS = new int[] {
+        R.string.filter_all_apps,      // Downloaded and launcher
+        R.string.filter_enabled_apps,  // Downloaded and launcher, Enabled
+        R.string.filter_apps_disabled, // Downloaded and launcher, Disabled
+        R.string.filter_all_apps,      // All apps
+        R.string.filter_enabled_apps,  // Enabled
+        R.string.filter_apps_disabled, // Disabled
+        R.string.filter_notif_blocked_apps,   // Blocked Notifications
+        R.string.filter_notif_priority_apps,  // Priority Notifications
+        R.string.filter_notif_sensitive_apps, // Sensitive Notifications
+        R.string.filter_personal_apps, // Personal
+        R.string.filter_work_apps,     // Work
+        R.string.filter_with_domain_urls_apps,     // Domain URLs
+        R.string.filter_all_apps,      // Usage access screen, never displayed
+    };
+    // This is the actual mapping to filters from FILTER_ constants above, the order must
+    // be kept in sync.
+    public static final AppFilter[] FILTERS = new AppFilter[] {
+        ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER, // Downloaded and launcher
+        new CompoundFilter(                               // Downloaded and launcher, Enabled
+                ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
+                ApplicationsState.FILTER_ALL_ENABLED),
+        new CompoundFilter(                               // Downloaded and launcher, Disabled
+                ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
+                ApplicationsState.FILTER_DISABLED),
+        ApplicationsState.FILTER_EVERYTHING,  // All apps
+        ApplicationsState.FILTER_ALL_ENABLED, // Enabled
+        ApplicationsState.FILTER_DISABLED,    // Disabled
+        AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED,   // Blocked Notifications
+        AppStateNotificationBridge.FILTER_APP_NOTIFICATION_PRIORITY,  // Priority Notifications
+        AppStateNotificationBridge.FILTER_APP_NOTIFICATION_SENSITIVE, // Sensitive Notifications
+        ApplicationsState.FILTER_PERSONAL,    // Personal
+        ApplicationsState.FILTER_WORK,        // Work
+        ApplicationsState.FILTER_WITH_DOMAIN_URLS,   // Apps with Domain URLs
+        AppStateUsageBridge.FILTER_APP_USAGE, // Apps with Domain URLs
+    };
+
     // sort order
-    private int mSortOrder = SORT_ORDER_ALPHA;
-    
+    private int mSortOrder = R.id.sort_order_alpha;
+
+    // whether showing system apps.
+    private boolean mShowSystem;
+    private boolean mHasDisabledApps;
+
     private ApplicationsState mApplicationsState;
 
-    public static class TabInfo implements OnItemClickListener {
-        public final ManageApplications mOwner;
-        public final ApplicationsState mApplicationsState;
-        public final CharSequence mLabel;
-        public final int mListType;
-        public final int mFilter;
-        public final AppClickListener mClickListener;
-        public final CharSequence mInvalidSizeStr;
-        public final CharSequence mComputingSizeStr;
-        private final Bundle mSavedInstanceState;
+    public int mListType;
+    public int mFilter;
 
-        public ApplicationsAdapter mApplications;
-        public LayoutInflater mInflater;
-        public View mRootView;
+    public ApplicationsAdapter mApplications;
 
-        private IMediaContainerService mContainerService;
+    private View mLoadingContainer;
 
-        private View mLoadingContainer;
+    private View mListContainer;
 
-        private View mListContainer;
-
-        // ListView used to display list
-        private ListView mListView;
-        // Custom view used to display running processes
-        private RunningProcessesView mRunningProcessesView;
-        
-        //private LinearColorBar mColorBar;
-        //private TextView mStorageChartLabel;
-        //private TextView mUsedStorageText;
-        //private TextView mFreeStorageText;
-        private long mFreeStorage = 0, mAppStorage = 0, mTotalStorage = 0;
-        private long mLastUsedStorage, mLastAppStorage, mLastFreeStorage;
-
-        final Runnable mRunningProcessesAvail = new Runnable() {
-            public void run() {
-                handleRunningProcessesAvail();
-            }
-        };
-
-        public TabInfo(ManageApplications owner, ApplicationsState apps,
-                CharSequence label, int listType, AppClickListener clickListener,
-                Bundle savedInstanceState) {
-            mOwner = owner;
-            mApplicationsState = apps;
-            mLabel = label;
-            mListType = listType;
-            switch (listType) {
-                case LIST_TYPE_DOWNLOADED: mFilter = FILTER_APPS_THIRD_PARTY; break;
-                case LIST_TYPE_SDCARD: mFilter = FILTER_APPS_SDCARD; break;
-                case LIST_TYPE_DISABLED: mFilter = FILTER_APPS_DISABLED; break;
-                default: mFilter = FILTER_APPS_ALL; break;
-            }
-            mClickListener = clickListener;
-            mInvalidSizeStr = owner.getActivity().getText(R.string.invalid_size_value);
-            mComputingSizeStr = owner.getActivity().getText(R.string.computing_size);
-            mSavedInstanceState = savedInstanceState;
-        }
-
-        public void setContainerService(IMediaContainerService containerService) {
-            mContainerService = containerService;
-            updateStorageUsage();
-        }
-
-        public View build(LayoutInflater inflater, ViewGroup contentParent, View contentChild) {
-            if (mRootView != null) {
-                return mRootView;
-            }
-            mInflater = inflater;
-            mRootView = inflater.inflate(mListType == LIST_TYPE_RUNNING
-                    ? R.layout.manage_applications_running
-                    : R.layout.manage_applications_apps, null);
-            mLoadingContainer = mRootView.findViewById(R.id.loading_container);
-            mLoadingContainer.setVisibility(View.VISIBLE);
-            mListContainer = mRootView.findViewById(R.id.list_container);
-            if (mListContainer != null) {
-                // Create adapter and list view here
-                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);
-                mListView.setAdapter(mApplications);
-                mListView.setRecyclerListener(mApplications);
-                //mColorBar = (LinearColorBar)mListContainer.findViewById(R.id.storage_color_bar);
-                //mStorageChartLabel = (TextView)mListContainer.findViewById(R.id.storageChartLabel);
-                //mUsedStorageText = (TextView)mListContainer.findViewById(R.id.usedStorageText);
-                //mFreeStorageText = (TextView)mListContainer.findViewById(R.id.freeStorageText);
-                Utils.prepareCustomPreferencesList(contentParent, contentChild, mListView, false);
-                if (mFilter == FILTER_APPS_SDCARD) {
-                    //mStorageChartLabel.setText(mOwner.getActivity().getText(
-                    //        R.string.sd_card_storage));
-                } else {
-                    //mStorageChartLabel.setText(mOwner.getActivity().getText(
-                    //        R.string.internal_storage));
-                }
-                applyCurrentStorage();
-            }
-            mRunningProcessesView = (RunningProcessesView)mRootView.findViewById(
-                    R.id.running_processes);
-            if (mRunningProcessesView != null) {
-                mRunningProcessesView.doCreate(mSavedInstanceState);
-            }
-
-            return mRootView;
-        }
-
-        public void detachView() {
-            if (mRootView != null) {
-                ViewGroup group = (ViewGroup)mRootView.getParent();
-                if (group != null) {
-                    group.removeView(mRootView);
-                }
-            }
-        }
-
-        public void resume(int sortOrder) {
-            if (mApplications != null) {
-                mApplications.resume(sortOrder);
-            }
-            if (mRunningProcessesView != null) {
-                boolean haveData = mRunningProcessesView.doResume(mOwner, mRunningProcessesAvail);
-                if (haveData) {
-                    mRunningProcessesView.setVisibility(View.VISIBLE);
-                    mLoadingContainer.setVisibility(View.INVISIBLE);
-                } else {
-                    mLoadingContainer.setVisibility(View.VISIBLE);
-                }
-            }
-        }
-
-        public void pause() {
-            if (mApplications != null) {
-                mApplications.pause();
-            }
-            if (mRunningProcessesView != null) {
-                mRunningProcessesView.doPause();
-            }
-        }
-
-        public void release() {
-            if (mApplications != null) {
-                mApplications.release();
-            }
-        }
-
-        void updateStorageUsage() {
-            // Make sure a callback didn't come at an inopportune time.
-            if (mOwner.getActivity() == null) return;
-            // Doesn't make sense for stuff that is not an app list.
-            if (mApplications == null) return;
-
-            mFreeStorage = 0;
-            mAppStorage = 0;
-            mTotalStorage = 0;
-
-            if (mFilter == FILTER_APPS_SDCARD) {
-                if (mContainerService != null) {
-                    try {
-                        final long[] stats = mContainerService.getFileSystemStats(
-                                Environment.getExternalStorageDirectory().getPath());
-                        mTotalStorage = stats[0];
-                        mFreeStorage = stats[1];
-                    } catch (RemoteException e) {
-                        Log.w(TAG, "Problem in container service", e);
-                    }
-                }
-
-                if (mApplications != null) {
-                    final int N = mApplications.getCount();
-                    for (int i=0; i<N; i++) {
-                        ApplicationsState.AppEntry ae = mApplications.getAppEntry(i);
-                        mAppStorage += ae.externalCodeSize + ae.externalDataSize
-                                + ae.externalCacheSize;
-                    }
-                }
-            } else {
-                if (mContainerService != null) {
-                    try {
-                        final long[] stats = mContainerService.getFileSystemStats(
-                                Environment.getDataDirectory().getPath());
-                        mTotalStorage = stats[0];
-                        mFreeStorage = stats[1];
-                    } catch (RemoteException e) {
-                        Log.w(TAG, "Problem in container service", e);
-                    }
-                }
-
-                final boolean emulatedStorage = Environment.isExternalStorageEmulated();
-                if (mApplications != null) {
-                    final int N = mApplications.getCount();
-                    for (int i=0; i<N; i++) {
-                        ApplicationsState.AppEntry ae = mApplications.getAppEntry(i);
-                        mAppStorage += ae.codeSize + ae.dataSize;
-                        if (emulatedStorage) {
-                            mAppStorage += ae.externalCodeSize + ae.externalDataSize;
-                        }
-                    }
-                }
-                mFreeStorage += mApplicationsState.sumCacheSizes();
-            }
-
-            applyCurrentStorage();
-        }
-
-        void applyCurrentStorage() {
-            // If view hierarchy is not yet created, no views to update.
-            if (mRootView == null) {
-                return;
-            }
-            /*
-            if (mTotalStorage > 0) {
-                BidiFormatter bidiFormatter = BidiFormatter.getInstance();
-                mColorBar.setRatios((mTotalStorage-mFreeStorage-mAppStorage)/(float)mTotalStorage,
-                        mAppStorage/(float)mTotalStorage, mFreeStorage/(float)mTotalStorage);
-                long usedStorage = mTotalStorage - mFreeStorage;
-                if (mLastUsedStorage != usedStorage) {
-                    mLastUsedStorage = usedStorage;
-                    String sizeStr = bidiFormatter.unicodeWrap(
-                            Formatter.formatShortFileSize(mOwner.getActivity(), usedStorage));
-                    mUsedStorageText.setText(mOwner.getActivity().getResources().getString(
-                            R.string.service_foreground_processes, sizeStr));
-                }
-                if (mLastFreeStorage != mFreeStorage) {
-                    mLastFreeStorage = mFreeStorage;
-                    String sizeStr = bidiFormatter.unicodeWrap(
-                            Formatter.formatShortFileSize(mOwner.getActivity(), mFreeStorage));
-                    mFreeStorageText.setText(mOwner.getActivity().getResources().getString(
-                            R.string.service_background_processes, sizeStr));
-                }
-            } else {
-                mColorBar.setRatios(0, 0, 0);
-                if (mLastUsedStorage != -1) {
-                    mLastUsedStorage = -1;
-                    mUsedStorageText.setText("");
-                }
-                if (mLastFreeStorage != -1) {
-                    mLastFreeStorage = -1;
-                    mFreeStorageText.setText("");
-                }
-            }
-            */
-        }
-
-        @Override
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            mClickListener.onItemClick(this, parent, view, position, id);
-        }
-
-        void handleRunningProcessesAvail() {
-            mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(
-                    mOwner.getActivity(), android.R.anim.fade_out));
-            mRunningProcessesView.startAnimation(AnimationUtils.loadAnimation(
-                    mOwner.getActivity(), android.R.anim.fade_in));
-            mRunningProcessesView.setVisibility(View.VISIBLE);
-            mLoadingContainer.setVisibility(View.GONE);
-        }
-    }
-    private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
-    private int mNumTabs;
-    TabInfo mCurTab = null;
+    // ListView used to display list
+    private ListView mListView;
 
     // Size resource used for packages whose size computation failed for some reason
     CharSequence mInvalidSizeStr;
-    private CharSequence mComputingSizeStr;
-    
+
     // layout inflater object used to inflate views
     private LayoutInflater mInflater;
-    
+
     private String mCurrentPkgName;
-    
+    private int mCurrentUid;
+
     private Menu mOptionsMenu;
 
-    // These are for keeping track of activity and spinner switch state.
-    private boolean mActivityResumed;
+    public static final int LIST_TYPE_MAIN = 0;
+    public static final int LIST_TYPE_NOTIFICATION = 1;
+    public static final int LIST_TYPE_DOMAINS_URLS = 2;
+    public static final int LIST_TYPE_STORAGE = 3;
+    public static final int LIST_TYPE_USAGE_ACCESS = 4;
 
-    private static final int LIST_TYPE_MISSING = -1;
-    static final int LIST_TYPE_DOWNLOADED = 0;
-    static final int LIST_TYPE_RUNNING = 1;
-    static final int LIST_TYPE_SDCARD = 2;
-    static final int LIST_TYPE_ALL = 3;
-    static final int LIST_TYPE_DISABLED = 4;
-
-    private boolean mShowBackground = false;
-    
-    private int mDefaultListType = -1;
-
-    private ViewGroup mContentContainer;
     private View mRootView;
-    private ViewPager mViewPager;
-    private ViewGroup mPinnedHeader;
-    private UserSpinnerAdapter mProfileSpinnerAdapter;
-    private Spinner mSpinner;
-    private Context mContext;
 
-    AlertDialog mResetDialog;
+    private View mSpinnerHeader;
+    private Spinner mFilterSpinner;
+    private FilterSpinnerAdapter mFilterAdapter;
+    private NotificationBackend mNotifBackend;
+    private ResetAppsHelper mResetAppsHelper;
+    private String mVolumeUuid;
+    private String mVolumeName;
 
-    class MyPagerAdapter extends PagerAdapter
-            implements ViewPager.OnPageChangeListener {
-        int mCurPos = 0;
+    @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())) {
+            mListType = LIST_TYPE_NOTIFICATION;
+            mNotifBackend = new NotificationBackend();
+        } else if (className.equals(DomainsURLsAppListActivity.class.getName())) {
+            mListType = LIST_TYPE_DOMAINS_URLS;
+        } else if (className.equals(StorageUseActivity.class.getName())) {
+            if (args != null && args.containsKey(EXTRA_VOLUME_UUID)) {
+                mVolumeUuid = args.getString(EXTRA_VOLUME_UUID);
+                mVolumeName = args.getString(EXTRA_VOLUME_NAME);
+                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;
+            getActivity().getActionBar().setTitle(R.string.usage_access_title);
+        } else {
+            mListType = LIST_TYPE_MAIN;
+        }
+        mFilter = getDefaultFilter();
+
+        if (savedInstanceState != null) {
+            mSortOrder = savedInstanceState.getInt(EXTRA_SORT_ORDER, mSortOrder);
+        }
+
+        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);
+        mLoadingContainer.setVisibility(View.VISIBLE);
+        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);
+            mListView.setAdapter(mApplications);
+            mListView.setRecyclerListener(mApplications);
+
+            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;
+    }
+
+    private void createHeader() {
+        Activity activity = getActivity();
+        View content = activity.findViewById(R.id.main_content);
+        ViewGroup contentParent = (ViewGroup) content.getParent();
+        mSpinnerHeader = (ViewGroup) activity.getLayoutInflater()
+                .inflate(R.layout.apps_filter_spinner, contentParent, false);
+        mFilterSpinner = (Spinner) mSpinnerHeader.findViewById(R.id.filter_spinner);
+        mFilterAdapter = new FilterSpinnerAdapter(this);
+        mFilterSpinner.setAdapter(mFilterAdapter);
+        mFilterSpinner.setOnItemSelectedListener(this);
+        contentParent.addView(mSpinnerHeader, 0);
+
+        mFilterAdapter.enableFilter(getDefaultFilter());
+        if (mListType == LIST_TYPE_MAIN || mListType == LIST_TYPE_NOTIFICATION) {
+            if (UserManager.get(getActivity()).getUserProfiles().size() > 1) {
+                mFilterAdapter.enableFilter(FILTER_APPS_PERSONAL);
+                mFilterAdapter.enableFilter(FILTER_APPS_WORK);
+            }
+        }
+        updateMainFilters();
+        if (mListType == LIST_TYPE_NOTIFICATION) {
+            mFilterAdapter.enableFilter(FILTER_APPS_BLOCKED);
+            mFilterAdapter.enableFilter(FILTER_APPS_PRIORITY);
+            mFilterAdapter.enableFilter(FILTER_APPS_SENSITIVE);
+        }
+        if (mListType == LIST_TYPE_STORAGE) {
+            mApplications.setOverrideFilter(new VolumeFilter(mVolumeUuid));
+        }
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (mListType == LIST_TYPE_STORAGE) {
+            AppHeader.createAppHeader(getActivity(), null, mVolumeName, null);
+        }
+    }
+
+    private int getDefaultFilter() {
+        switch (mListType) {
+            case LIST_TYPE_MAIN:
+                return mShowSystem ? FILTER_APPS_ALL : FILTER_APPS_DOWNLOADED_AND_LAUNCHER;
+            case LIST_TYPE_DOMAINS_URLS:
+                return FILTER_APPS_WITH_DOMAIN_URLS;
+            case LIST_TYPE_USAGE_ACCESS:
+                return FILTER_APPS_USAGE_ACCESS;
+            default:
+                return FILTER_APPS_ALL;
+        }
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        switch (mListType) {
+            case LIST_TYPE_MAIN:
+                return MetricsLogger.MANAGE_APPLICATIONS;
+            case LIST_TYPE_NOTIFICATION:
+                return MetricsLogger.MANAGE_APPLICATIONS_NOTIFICATIONS;
+            case LIST_TYPE_DOMAINS_URLS:
+                return MetricsLogger.MANAGE_DOMAIN_URLS;
+            case LIST_TYPE_STORAGE:
+                return InstrumentedFragment.VIEW_CATEGORY_STORAGE_APPS;
+            case LIST_TYPE_USAGE_ACCESS:
+                return MetricsLogger.USAGE_ACCESS;
+            default:
+                return MetricsLogger.VIEW_UNKNOWN;
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateView();
+        updateOptionsMenu();
+        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);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mApplications != null) {
+            mApplications.pause();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        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 {
+                mApplicationsState.requestSize(mCurrentPkgName, UserHandle.getUserId(mCurrentUid));
+            }
+        }
+    }
+
+    // utility method used to start sub activity
+    private void startApplicationDetailsActivity() {
+        Activity activity = getActivity();
+        switch (mListType) {
+            case LIST_TYPE_NOTIFICATION:
+                activity.startActivity(new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                        .putExtra(Settings.EXTRA_APP_PACKAGE, mCurrentPkgName)
+                        .putExtra(Settings.EXTRA_APP_UID, mCurrentUid));
+                break;
+            case LIST_TYPE_DOMAINS_URLS:
+                startAppInfoFragment(AppLaunchSettings.class, R.string.auto_launch_label);
+                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;
+            // 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<? extends AppInfoBase> fragment, int titleRes) {
+        Bundle args = new Bundle();
+        args.putString(AppInfoBase.ARG_PACKAGE_NAME, mCurrentPkgName);
+
+        Intent intent = Utils.onBuildStartFragmentIntent(getActivity(), fragment.getName(), args,
+                null, titleRes, null, false);
+        getActivity().startActivityForResultAsUser(intent, INSTALLED_APP_DETAILS,
+                new UserHandle(UserHandle.getUserId(mCurrentUid)));
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (mListType != LIST_TYPE_MAIN) {
+            return;
+        }
+        HelpUtils.prepareHelpMenuItem(getActivity(), menu, mListType == LIST_TYPE_MAIN
+                ? R.string.help_uri_apps : R.string.help_uri_notifications);
+        mOptionsMenu = menu;
+        inflater.inflate(R.menu.manage_apps, menu);
+        updateOptionsMenu();
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        updateOptionsMenu();
+    }
+
+    @Override
+    public void onDestroyOptionsMenu() {
+        mOptionsMenu = null;
+    }
+
+    void updateOptionsMenu() {
+        if (mOptionsMenu == null) {
+            return;
+        }
+        if (mListType != LIST_TYPE_MAIN) {
+            // Allow sorting except on main apps list.
+            mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(
+                    mSortOrder != R.id.sort_order_alpha);
+            mOptionsMenu.findItem(R.id.sort_order_size).setVisible(
+                    mSortOrder != R.id.sort_order_size);
+
+            mOptionsMenu.findItem(R.id.show_system).setVisible(false);
+            mOptionsMenu.findItem(R.id.hide_system).setVisible(false);
+        } else {
+            mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(false);
+            mOptionsMenu.findItem(R.id.sort_order_size).setVisible(false);
+
+            mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem);
+            mOptionsMenu.findItem(R.id.hide_system).setVisible(mShowSystem);
+        }
+    }
+
+    @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;
+                updateMainFilters();
+                break;
+            case R.id.reset_app_preferences:
+                mResetAppsHelper.buildResetDialog();
+                return true;
+            case R.id.advanced:
+                ((SettingsActivity) getActivity()).startPreferencePanel(
+                        AdvancedAppSettings.class.getName(), null, R.string.advanced_apps,
+                        null, this, ADVANCED_SETTINGS);
+                return true;
+            default:
+                // Handle the home button
+                return false;
+        }
+        updateOptionsMenu();
+        return true;
+    }
+
+    private void updateMainFilters() {
+        if (mListType != LIST_TYPE_MAIN) {
+            return;
+        }
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_ALL, mShowSystem);
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_ENABLED, mShowSystem && mHasDisabledApps);
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, mShowSystem && mHasDisabledApps);
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_DOWNLOADED_AND_LAUNCHER, !mShowSystem);
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_DL_ENABLED, !mShowSystem && mHasDisabledApps);
+        mFilterAdapter.setFilterEnabled(FILTER_APPS_DL_DISABLED, !mShowSystem && mHasDisabledApps);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        if (mApplications != null && mApplications.getCount() > position) {
+            ApplicationsState.AppEntry entry = mApplications.getAppEntry(position);
+            mCurrentPkgName = entry.info.packageName;
+            mCurrentUid = entry.info.uid;
+            startApplicationDetailsActivity();
+        }
+    }
+
+    @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) {
+        mHasDisabledApps = hasDisabledApps;
+        mFilterAdapter.setFilterEnabled(
+                mShowSystem ? FILTER_APPS_ENABLED : FILTER_APPS_DL_ENABLED, hasDisabledApps);
+        mFilterAdapter.setFilterEnabled(
+                mShowSystem ? FILTER_APPS_DISABLED : FILTER_APPS_DL_DISABLED, hasDisabledApps);
+    }
+
+    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.getActivity(), 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 mNumTabs;
-        }
-        
-        @Override
-        public Object instantiateItem(ViewGroup container, int position) {
-            TabInfo tab = mTabs.get(position);
-            View root = tab.build(mInflater, mContentContainer, mRootView);
-            container.addView(root);
-            root.setTag(R.id.name, tab);
-            return root;
+            return mFilterOptions.size();
         }
 
         @Override
-        public void destroyItem(ViewGroup container, int position, Object object) {
-            container.removeView((View)object);
+        public CharSequence getItem(int position) {
+            return getFilterString(mFilterOptions.get(position));
         }
 
-        @Override
-        public boolean isViewFromObject(View view, Object object) {
-            return view == object;
+        private CharSequence getFilterString(int filter) {
+            return mManageApplications.getString(FILTER_LABELS[filter]);
         }
 
-        @Override
-        public int getItemPosition(Object object) {
-            return super.getItemPosition(object);
-            //return ((TabInfo)((View)object).getTag(R.id.name)).mListType;
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return mTabs.get(position).mLabel;
-        }
-
-        @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);
-            }
-        }
     }
 
     /*
@@ -544,20 +666,23 @@
      * The order of applications in the list is mirrored in mAppLocalList
      */
     static class ApplicationsAdapter extends BaseAdapter implements Filterable,
-            ApplicationsState.Callbacks, AbsListView.RecyclerListener {
+            ApplicationsState.Callbacks, AppStateBaseBridge.Callback,
+            AbsListView.RecyclerListener {
         private final ApplicationsState mState;
         private final ApplicationsState.Session mSession;
-        private final TabInfo mTab;
+        private final ManageApplications mManageApplications;
         private final Context mContext;
         private final ArrayList<View> mActive = new ArrayList<View>();
-        private final int mFilterMode;
+        private final AppStateBaseBridge mExtraInfoBridge;
+        private int mFilterMode;
         private ArrayList<ApplicationsState.AppEntry> mBaseEntries;
         private ArrayList<ApplicationsState.AppEntry> mEntries;
         private boolean mResumed;
         private int mLastSortMode=-1;
-        private boolean mWaitingForData;
         private int mWhichSize = SIZE_TOTAL;
         CharSequence mCurFilterPrefix;
+        private PackageManager mPm;
+        private AppFilter mOverrideFilter;
 
         private Filter mFilter = new Filter() {
             @Override
@@ -571,20 +696,40 @@
             }
 
             @Override
+            @SuppressWarnings("unchecked")
             protected void publishResults(CharSequence constraint, FilterResults results) {
                 mCurFilterPrefix = constraint;
-                mEntries = (ArrayList<ApplicationsState.AppEntry>)results.values;
+                mEntries = (ArrayList<ApplicationsState.AppEntry>) results.values;
                 notifyDataSetChanged();
-                mTab.updateStorageUsage();
             }
         };
 
-        public ApplicationsAdapter(ApplicationsState state, TabInfo tab, int filterMode) {
+        public ApplicationsAdapter(ApplicationsState state, ManageApplications manageApplications,
+                int filterMode) {
             mState = state;
             mSession = state.newSession(this);
-            mTab = tab;
-            mContext = tab.mOwner.getActivity();
+            mManageApplications = manageApplications;
+            mContext = manageApplications.getActivity();
+            mPm = mContext.getPackageManager();
             mFilterMode = filterMode;
+            if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
+                mExtraInfoBridge = new AppStateNotificationBridge(mContext.getPackageManager(),
+                        mState, this, manageApplications.mNotifBackend);
+            } else if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) {
+                mExtraInfoBridge = new AppStateUsageBridge(mContext, mState, this);
+            } else {
+                mExtraInfoBridge = null;
+            }
+        }
+
+        public void setOverrideFilter(AppFilter overrideFilter) {
+            mOverrideFilter = overrideFilter;
+            rebuild(true);
+        }
+
+        public void setFilter(int filter) {
+            mFilterMode = filter;
+            rebuild(true);
         }
 
         public void resume(int sort) {
@@ -593,6 +738,9 @@
                 mResumed = true;
                 mSession.resume();
                 mLastSortMode = sort;
+                if (mExtraInfoBridge != null) {
+                    mExtraInfoBridge.resume();
+                }
                 rebuild(true);
             } else {
                 rebuild(sort);
@@ -603,11 +751,17 @@
             if (mResumed) {
                 mResumed = false;
                 mSession.pause();
+                if (mExtraInfoBridge != null) {
+                    mExtraInfoBridge.pause();
+                }
             }
         }
 
         public void release() {
             mSession.release();
+            if (mExtraInfoBridge != null) {
+                mExtraInfoBridge.release();
+            }
         }
 
         public void rebuild(int sort) {
@@ -617,7 +771,7 @@
             mLastSortMode = sort;
             rebuild(true);
         }
-        
+
         public void rebuild(boolean eraseold) {
             if (DEBUG) Log.i(TAG, "Rebuilding app list...");
             ApplicationsState.AppFilter filterObj;
@@ -628,25 +782,12 @@
             } else {
                 mWhichSize = SIZE_INTERNAL;
             }
-            switch (mFilterMode) {
-                case FILTER_APPS_THIRD_PARTY:
-                    filterObj = ApplicationsState.THIRD_PARTY_FILTER;
-                    break;
-                case FILTER_APPS_SDCARD:
-                    filterObj = ApplicationsState.ON_SD_CARD_FILTER;
-                    if (!emulated) {
-                        mWhichSize = SIZE_EXTERNAL;
-                    }
-                    break;
-                case FILTER_APPS_DISABLED:
-                    filterObj = ApplicationsState.DISABLED_FILTER;
-                    break;
-                default:
-                    filterObj = ApplicationsState.ALL_ENABLED_FILTER;
-                    break;
+            filterObj = FILTERS[mFilterMode];
+            if (mOverrideFilter != null) {
+                filterObj = mOverrideFilter;
             }
             switch (mLastSortMode) {
-                case SORT_ORDER_SIZE:
+                case R.id.sort_order_size:
                     switch (mWhichSize) {
                         case SIZE_INTERNAL:
                             comparatorObj = ApplicationsState.INTERNAL_SIZE_COMPARATOR;
@@ -676,16 +817,33 @@
                 mEntries = null;
             }
             notifyDataSetChanged();
-            mTab.updateStorageUsage();
 
-            if (entries == null) {
-                mWaitingForData = true;
-                mTab.mListContainer.setVisibility(View.INVISIBLE);
-                mTab.mLoadingContainer.setVisibility(View.VISIBLE);
-            } else {
-                mTab.mListContainer.setVisibility(View.VISIBLE);
-                mTab.mLoadingContainer.setVisibility(View.GONE);
+            if (mSession.getAllApps().size() != 0
+                    && mManageApplications.mListContainer.getVisibility() != View.VISIBLE) {
+                Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
+                        mManageApplications.mListContainer, true, true);
             }
+            if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) {
+                // No enabled or disabled filters for usage access.
+                return;
+            }
+
+            mManageApplications.setHasDisabled(hasDisabledApps());
+        }
+
+        private void updateLoading() {
+            Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
+                    mManageApplications.mListContainer, mSession.getAllApps().size() != 0, false);
+        }
+
+        private boolean hasDisabledApps() {
+            ArrayList<AppEntry> allApps = mSession.getAllApps();
+            for (int i = 0; i < allApps.size(); i++) {
+                if (!allApps.get(i).info.enabled) {
+                    return true;
+                }
+            }
+            return false;
         }
 
         ArrayList<ApplicationsState.AppEntry> applyPrefixFilter(CharSequence prefix,
@@ -709,25 +867,28 @@
         }
 
         @Override
+        public void onExtraInfoUpdated() {
+            rebuild(false);
+        }
+
+        @Override
         public void onRunningStateChanged(boolean running) {
-            mTab.mOwner.getActivity().setProgressBarIndeterminateVisibility(running);
+            mManageApplications.getActivity().setProgressBarIndeterminateVisibility(running);
         }
 
         @Override
         public void onRebuildComplete(ArrayList<AppEntry> apps) {
-            if (mTab.mLoadingContainer.getVisibility() == View.VISIBLE) {
-                mTab.mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(
+            if (mManageApplications.mLoadingContainer.getVisibility() == View.VISIBLE) {
+                mManageApplications.mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(
                         mContext, android.R.anim.fade_out));
-                mTab.mListContainer.startAnimation(AnimationUtils.loadAnimation(
+                mManageApplications.mListContainer.startAnimation(AnimationUtils.loadAnimation(
                         mContext, android.R.anim.fade_in));
             }
-            mTab.mListContainer.setVisibility(View.VISIBLE);
-            mTab.mLoadingContainer.setVisibility(View.GONE);
-            mWaitingForData = false;
+            mManageApplications.mListContainer.setVisibility(View.VISIBLE);
+            mManageApplications.mLoadingContainer.setVisibility(View.GONE);
             mBaseEntries = apps;
             mEntries = applyPrefixFilter(mCurFilterPrefix, mBaseEntries);
             notifyDataSetChanged();
-            mTab.updateStorageUsage();
         }
 
         @Override
@@ -742,43 +903,53 @@
         }
 
         @Override
+        public void onLoadEntriesCompleted() {
+            // No op.
+        }
+
+        @Override
         public void onPackageSizeChanged(String packageName) {
             for (int i=0; i<mActive.size(); i++) {
                 AppViewHolder holder = (AppViewHolder)mActive.get(i).getTag();
                 if (holder.entry.info.packageName.equals(packageName)) {
                     synchronized (holder.entry) {
-                        holder.updateSizeText(mTab.mInvalidSizeStr, mWhichSize);
+                        updateSummary(holder);
                     }
-                    if (holder.entry.info.packageName.equals(mTab.mOwner.mCurrentPkgName)
-                            && mLastSortMode == SORT_ORDER_SIZE) {
+                    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);
                     }
-                    mTab.updateStorageUsage();
                     return;
                 }
             }
         }
 
         @Override
-        public void onAllSizesComputed() {
-            if (mLastSortMode == SORT_ORDER_SIZE) {
+        public void onLauncherInfoChanged() {
+            if (mFilterMode == FILTER_APPS_DOWNLOADED_AND_LAUNCHER) {
                 rebuild(false);
             }
-            mTab.updateStorageUsage();
         }
-        
+
+        @Override
+        public void onAllSizesComputed() {
+            if (mLastSortMode == R.id.sort_order_size) {
+                rebuild(false);
+            }
+        }
+
         public int getCount() {
             return mEntries != null ? mEntries.size() : 0;
         }
-        
+
         public Object getItem(int position) {
             return mEntries.get(position);
         }
-        
+
         public ApplicationsState.AppEntry getAppEntry(int position) {
             return mEntries.get(position);
         }
@@ -786,11 +957,17 @@
         public long getItemId(int position) {
             return mEntries.get(position).id;
         }
-        
+
+        @Override
+        public boolean areAllItemsEnabled() {
+            return false;
+        }
+
         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(mTab.mInflater, convertView);
+            AppViewHolder holder = AppViewHolder.createOrRecycle(mManageApplications.mInflater,
+                    convertView);
             convertView = holder.rootView;
 
             // Bind the data efficiently with the holder
@@ -804,7 +981,7 @@
                 if (entry.icon != null) {
                     holder.appIcon.setImageDrawable(entry.icon);
                 }
-                holder.updateSizeText(mTab.mInvalidSizeStr, mWhichSize);
+                updateSummary(holder);
                 if ((entry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
                     holder.disabled.setVisibility(View.VISIBLE);
                     holder.disabled.setText(R.string.not_installed);
@@ -814,19 +991,43 @@
                 } else {
                     holder.disabled.setVisibility(View.GONE);
                 }
-                if (mFilterMode == FILTER_APPS_SDCARD) {
-                    holder.checkBox.setVisibility(View.VISIBLE);
-                    holder.checkBox.setChecked((entry.info.flags
-                            & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0);
-                } else {
-                    holder.checkBox.setVisibility(View.GONE);
-                }
+                holder.checkBox.setVisibility(View.GONE);
             }
             mActive.remove(convertView);
             mActive.add(convertView);
             return convertView;
         }
 
+        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_DOMAINS_URLS:
+                    holder.summary.setText(getDomainsSummary(holder.entry.info.packageName));
+                    break;
+
+                case LIST_TYPE_USAGE_ACCESS:
+                    if (holder.entry.extraInfo != null) {
+                        holder.summary.setText(((UsageState) holder.entry.extraInfo).hasAccess() ?
+                                R.string.switch_on_text : R.string.switch_off_text);
+                    } else {
+                        holder.summary.setText(null);
+                    }
+                    break;
+
+                default:
+                    holder.updateSizeText(mManageApplications.mInvalidSizeStr, mWhichSize);
+                    break;
+            }
+        }
+
         @Override
         public Filter getFilter() {
             return mFilter;
@@ -836,487 +1037,23 @@
         public void onMovedToScrapHeap(View view) {
             mActive.remove(view);
         }
-    }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setHasOptionsMenu(true);
-
-        mContext = getActivity();
-        mApplicationsState = ApplicationsState.getInstance(getActivity().getApplication());
-        Intent intent = getActivity().getIntent();
-        String action = intent.getAction();
-        int defaultListType = LIST_TYPE_DOWNLOADED;
-        String className = getArguments() != null
-                ? getArguments().getString("classname") : null;
-        if (className == null) {
-            className = intent.getComponent().getClassName();
-        }
-        if (className.equals(RunningServicesActivity.class.getName())
-                || className.endsWith(".RunningServices")) {
-            defaultListType = LIST_TYPE_RUNNING;
-        } else if (className.equals(StorageUseActivity.class.getName())
-                || Intent.ACTION_MANAGE_PACKAGE_STORAGE.equals(action)
-                || className.endsWith(".StorageUse")) {
-            mSortOrder = SORT_ORDER_SIZE;
-            defaultListType = LIST_TYPE_ALL;
-        } else if (android.provider.Settings.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS.equals(action)) {
-            // Select the all-apps list, with the default sorting
-            defaultListType = LIST_TYPE_ALL;
-        }
-
-        if (savedInstanceState != null) {
-            mSortOrder = savedInstanceState.getInt(EXTRA_SORT_ORDER, mSortOrder);
-            int tmp = savedInstanceState.getInt(EXTRA_DEFAULT_LIST_TYPE, -1);
-            if (tmp != -1) defaultListType = tmp;
-            mShowBackground = savedInstanceState.getBoolean(EXTRA_SHOW_BACKGROUND, false);
-        }
-
-        mDefaultListType = defaultListType;
-
-        final Intent containerIntent = new Intent().setComponent(
-                StorageMeasurement.DEFAULT_CONTAINER_COMPONENT);
-        getActivity().bindService(containerIntent, mContainerConnection, Context.BIND_AUTO_CREATE);
-
-        mInvalidSizeStr = getActivity().getText(R.string.invalid_size_value);
-        mComputingSizeStr = getActivity().getText(R.string.computing_size);
-
-        TabInfo tab = new TabInfo(this, mApplicationsState,
-                getActivity().getString(R.string.filter_apps_third_party),
-                LIST_TYPE_DOWNLOADED, this, savedInstanceState);
-        mTabs.add(tab);
-
-        if (!Environment.isExternalStorageEmulated()) {
-            tab = new TabInfo(this, mApplicationsState,
-                    getActivity().getString(R.string.filter_apps_onsdcard),
-                    LIST_TYPE_SDCARD, this, savedInstanceState);
-            mTabs.add(tab);
-        }
-
-        tab = new TabInfo(this, mApplicationsState,
-                getActivity().getString(R.string.filter_apps_running),
-                LIST_TYPE_RUNNING, this, savedInstanceState);
-        mTabs.add(tab);
-
-        tab = new TabInfo(this, mApplicationsState,
-                getActivity().getString(R.string.filter_apps_all),
-                LIST_TYPE_ALL, this, savedInstanceState);
-        mTabs.add(tab);
-
-        tab = new TabInfo(this, mApplicationsState,
-                getActivity().getString(R.string.filter_apps_disabled),
-                LIST_TYPE_DISABLED, this, savedInstanceState);
-        mTabs.add(tab);
-
-        mNumTabs = mTabs.size();
-
-        final UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
-        mProfileSpinnerAdapter = Utils.createUserSpinnerAdapter(um, mContext);
-    }
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // initialize the inflater
-        mInflater = inflater;
-
-        View rootView = mInflater.inflate(R.layout.manage_applications_content,
-                container, false);
-        mContentContainer = container;
-        mRootView = rootView;
-        mPinnedHeader = (ViewGroup) mRootView.findViewById(R.id.pinned_header);
-        if (mProfileSpinnerAdapter != null) {
-            mSpinner = (Spinner) inflater.inflate(R.layout.spinner_view, null);
-            mSpinner.setAdapter(mProfileSpinnerAdapter);
-            mSpinner.setOnItemSelectedListener(this);
-            mPinnedHeader.addView(mSpinner);
-            mPinnedHeader.setVisibility(View.VISIBLE);
-        }
-        mViewPager = (ViewPager) rootView.findViewById(R.id.pager);
-        MyPagerAdapter adapter = new MyPagerAdapter();
-        mViewPager.setAdapter(adapter);
-        mViewPager.setOnPageChangeListener(adapter);
-        PagerTabStrip tabs = (PagerTabStrip) rootView.findViewById(R.id.tabs);
-        tabs.setTabIndicatorColorResource(R.color.theme_accent);
-
-        // 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;
-        }
-
-        if (savedInstanceState != null && savedInstanceState.getBoolean(EXTRA_RESET_DIALOG)) {
-            buildResetDialog();
-        }
-
-        if (savedInstanceState == null) {
-            // First time init: make sure view pager is showing the correct tab.
-            int extraCurrentListType = getActivity().getIntent().getIntExtra(EXTRA_LIST_TYPE,
-                    LIST_TYPE_MISSING);
-            int currentListType = (extraCurrentListType != LIST_TYPE_MISSING)
-                    ? extraCurrentListType : mDefaultListType;
-            for (int i = 0; i < mNumTabs; i++) {
-                TabInfo tab = mTabs.get(i);
-                if (tab.mListType == currentListType) {
-                    mViewPager.setCurrentItem(i);
-                    break;
+        private CharSequence getDomainsSummary(String packageName) {
+            ArraySet<String> result = new ArraySet<>();
+            List<IntentFilterVerificationInfo> list =
+                    mPm.getIntentFilterVerifications(packageName);
+            for (IntentFilterVerificationInfo ivi : list) {
+                for (String host : ivi.getDomains()) {
+                    result.add(host);
                 }
             }
-        }
-
-        return rootView;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mActivityResumed = true;
-        updateCurrentTab(mViewPager.getCurrentItem());
-        updateNumTabs();
-        updateOptionsMenu();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(EXTRA_SORT_ORDER, mSortOrder);
-        if (mDefaultListType != -1) {
-            outState.putInt(EXTRA_DEFAULT_LIST_TYPE, mDefaultListType);
-        }
-        outState.putBoolean(EXTRA_SHOW_BACKGROUND, mShowBackground);
-        if (mResetDialog != null) {
-            outState.putBoolean(EXTRA_RESET_DIALOG, true);
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mActivityResumed = false;
-        for (int i=0; i<mTabs.size(); i++) {
-            mTabs.get(i).pause();
-        }
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (mResetDialog != null) {
-            mResetDialog.dismiss();
-            mResetDialog = null;
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        // We are going to keep the tab data structures around, but they
-        // are no longer attached to their view hierarchy.
-        for (int i=0; i<mTabs.size(); i++) {
-            mTabs.get(i).detachView();
-            mTabs.get(i).release();
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == INSTALLED_APP_DETAILS && mCurrentPkgName != null) {
-            mApplicationsState.requestSize(mCurrentPkgName);
-        }
-    }
-
-    @Override
-    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        UserHandle selectedUser = mProfileSpinnerAdapter.getUserHandle(position);
-        if (selectedUser.getIdentifier() != UserHandle.myUserId()) {
-            Intent intent = new Intent(Settings.ACTION_APPLICATION_SETTINGS);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-            int currentTab = mViewPager.getCurrentItem();
-            intent.putExtra(EXTRA_LIST_TYPE, mTabs.get(currentTab).mListType);
-            mContext.startActivityAsUser(intent, selectedUser);
-            // Go back to default selection, which is the first one; this makes sure that pressing
-            // the back button takes you into a consistent state
-            mSpinner.setSelection(0);
-        }
-    }
-
-    @Override
-    public void onNothingSelected(AdapterView<?> parent) {
-        // Nothing to do
-    }
-
-    private void updateNumTabs() {
-        int newNum = mApplicationsState.haveDisabledApps() ? mTabs.size() : (mTabs.size()-1);
-        if (newNum != mNumTabs) {
-            mNumTabs = newNum;
-            if (mViewPager != null) {
-                mViewPager.getAdapter().notifyDataSetChanged();
+            if (result.size() == 0) {
+                return mContext.getString(R.string.domain_urls_summary_none);
+            } else if (result.size() == 1) {
+                return mContext.getString(R.string.domain_urls_summary_one, result.valueAt(0));
+            } else {
+                return mContext.getString(R.string.domain_urls_summary_some, result.valueAt(0));
             }
         }
     }
-
-    TabInfo tabForType(int type) {
-        for (int i = 0; i < mTabs.size(); i++) {
-            TabInfo tab = mTabs.get(i);
-            if (tab.mListType == type) {
-                return tab;
-            }
-        }
-        return null;
-    }
-
-    // utility method used to start sub activity
-    private void startApplicationDetailsActivity() {
-        // start new fragment to display extended information
-        Bundle args = new Bundle();
-        args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mCurrentPkgName);
-
-        SettingsActivity sa = (SettingsActivity) getActivity();
-        sa.startPreferencePanel(InstalledAppDetails.class.getName(), args,
-                R.string.application_info_label, null, this, INSTALLED_APP_DETAILS);
-    }
-    
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        mOptionsMenu = menu;
-        // note: icons removed for now because the cause the new action
-        // bar UI to be very confusing.
-        menu.add(0, SORT_ORDER_ALPHA, 1, R.string.sort_order_alpha)
-                //.setIcon(android.R.drawable.ic_menu_sort_alphabetically)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        menu.add(0, SORT_ORDER_SIZE, 2, R.string.sort_order_size)
-                //.setIcon(android.R.drawable.ic_menu_sort_by_size)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        menu.add(0, SHOW_RUNNING_SERVICES, 3, R.string.show_running_services)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        menu.add(0, SHOW_BACKGROUND_PROCESSES, 3, R.string.show_background_processes)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        menu.add(0, RESET_APP_PREFERENCES, 4, R.string.reset_app_preferences)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        updateOptionsMenu();
-    }
-    
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        updateOptionsMenu();
-    }
-    
-    @Override
-    public void onDestroyOptionsMenu() {
-        mOptionsMenu = null;
-    }
-
-    @Override
-    public void onDestroy() {
-        getActivity().unbindService(mContainerConnection);
-        super.onDestroy();
-    }
-
-    void updateOptionsMenu() {
-        if (mOptionsMenu == null) {
-            return;
-        }
-        
-        /*
-         * The running processes screen doesn't use the mApplicationsAdapter
-         * so bringing up this menu in that case doesn't make any sense.
-         */
-        if (mCurTab != null && mCurTab.mListType == LIST_TYPE_RUNNING) {
-            TabInfo tab = tabForType(LIST_TYPE_RUNNING);
-            boolean showingBackground = tab != null && tab.mRunningProcessesView != null
-                    ? tab.mRunningProcessesView.mAdapter.getShowBackground() : false;
-            mOptionsMenu.findItem(SORT_ORDER_ALPHA).setVisible(false);
-            mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(false);
-            mOptionsMenu.findItem(SHOW_RUNNING_SERVICES).setVisible(showingBackground);
-            mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
-            mOptionsMenu.findItem(RESET_APP_PREFERENCES).setVisible(false);
-            mShowBackground = showingBackground;
-        } else {
-            mOptionsMenu.findItem(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA);
-            mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE);
-            mOptionsMenu.findItem(SHOW_RUNNING_SERVICES).setVisible(false);
-            mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(false);
-            mOptionsMenu.findItem(RESET_APP_PREFERENCES).setVisible(true);
-        }
-    }
-
-    void buildResetDialog() {
-        if (mResetDialog == null) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-            builder.setTitle(R.string.reset_app_preferences_title);
-            builder.setMessage(R.string.reset_app_preferences_desc);
-            builder.setPositiveButton(R.string.reset_app_preferences_button, this);
-            builder.setNegativeButton(R.string.cancel, null);
-            mResetDialog = builder.show();
-            mResetDialog.setOnDismissListener(this);
-        }
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        if (mResetDialog == dialog) {
-            mResetDialog = null;
-        }
-    }
-
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        if (mResetDialog == dialog) {
-            final PackageManager pm = getActivity().getPackageManager();
-            final IPackageManager mIPm = IPackageManager.Stub.asInterface(
-                    ServiceManager.getService("package"));
-            final INotificationManager nm = INotificationManager.Stub.asInterface(
-                    ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-            final NetworkPolicyManager npm = NetworkPolicyManager.from(getActivity());
-            final AppOpsManager aom = (AppOpsManager)getActivity().getSystemService(
-                    Context.APP_OPS_SERVICE);
-            final Handler handler = new Handler(getActivity().getMainLooper());
-            (new AsyncTask<Void, Void, Void>() {
-                @Override protected Void doInBackground(Void... params) {
-                    List<ApplicationInfo> apps = pm.getInstalledApplications(
-                            PackageManager.GET_DISABLED_COMPONENTS);
-                    for (int i=0; i<apps.size(); i++) {
-                        ApplicationInfo app = apps.get(i);
-                        try {
-                            if (DEBUG) Log.v(TAG, "Enabling notifications: " + app.packageName);
-                            nm.setNotificationsEnabledForPackage(app.packageName, app.uid, true);
-                        } catch (android.os.RemoteException ex) {
-                        }
-                        if (!app.enabled) {
-                            if (DEBUG) Log.v(TAG, "Enabling app: " + app.packageName);
-                            if (pm.getApplicationEnabledSetting(app.packageName)
-                                    == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
-                                pm.setApplicationEnabledSetting(app.packageName,
-                                        PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
-                                        PackageManager.DONT_KILL_APP);
-                            }
-                        }
-                    }
-                    try {
-                        mIPm.resetPreferredActivities(UserHandle.myUserId());
-                    } catch (RemoteException e) {
-                    }
-                    aom.resetAllModes();
-                    final int[] restrictedUids = npm.getUidsWithPolicy(
-                            POLICY_REJECT_METERED_BACKGROUND);
-                    final int currentUserId = ActivityManager.getCurrentUser();
-                    for (int uid : restrictedUids) {
-                        // Only reset for current user
-                        if (UserHandle.getUserId(uid) == currentUserId) {
-                            if (DEBUG) Log.v(TAG, "Clearing data policy: " + uid);
-                            npm.setUidPolicy(uid, POLICY_NONE);
-                        }
-                    }
-                    handler.post(new Runnable() {
-                        @Override public void run() {
-                            if (DEBUG) Log.v(TAG, "Done clearing");
-                            if (getActivity() != null && mActivityResumed) {
-                                if (DEBUG) Log.v(TAG, "Updating UI!");
-                                for (int i=0; i<mTabs.size(); i++) {
-                                    TabInfo tab = mTabs.get(i);
-                                    if (tab.mApplications != null) {
-                                        tab.mApplications.pause();
-                                    }
-                                }
-                                if (mCurTab != null) {
-                                    mCurTab.resume(mSortOrder);
-                                }
-                            }
-                        }
-                    });
-                    return null;
-                }
-            }).execute();
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int menuId = item.getItemId();
-        if ((menuId == SORT_ORDER_ALPHA) || (menuId == SORT_ORDER_SIZE)) {
-            mSortOrder = menuId;
-            if (mCurTab != null && mCurTab.mApplications != null) {
-                mCurTab.mApplications.rebuild(mSortOrder);
-            }
-        } else if (menuId == SHOW_RUNNING_SERVICES) {
-            mShowBackground = false;
-            if (mCurTab != null && mCurTab.mRunningProcessesView != null) {
-                mCurTab.mRunningProcessesView.mAdapter.setShowBackground(false);
-            }
-        } else if (menuId == SHOW_BACKGROUND_PROCESSES) {
-            mShowBackground = true;
-            if (mCurTab != null && mCurTab.mRunningProcessesView != null) {
-                mCurTab.mRunningProcessesView.mAdapter.setShowBackground(true);
-            }
-        } else if (menuId == RESET_APP_PREFERENCES) {
-            buildResetDialog();
-        } else {
-            // Handle the home button
-            return false;
-        }
-        updateOptionsMenu();
-        return true;
-    }
-    
-    public void onItemClick(TabInfo tab, AdapterView<?> parent, View view, int position,
-            long id) {
-        if (tab.mApplications != null && tab.mApplications.getCount() > position) {
-            ApplicationsState.AppEntry entry = tab.mApplications.getAppEntry(position);
-            mCurrentPkgName = entry.info.packageName;
-            startApplicationDetailsActivity();
-        }
-    }
-
-    public void updateCurrentTab(int position) {
-        TabInfo tab = mTabs.get(position);
-        mCurTab = tab;
-
-        // Put things in the correct paused/resumed state.
-        if (mActivityResumed) {
-            mCurTab.build(mInflater, mContentContainer, mRootView);
-            mCurTab.resume(mSortOrder);
-        } else {
-            mCurTab.pause();
-        }
-        for (int i=0; i<mTabs.size(); i++) {
-            TabInfo t = mTabs.get(i);
-            if (t != mCurTab) {
-                t.pause();
-            }
-        }
-
-        mCurTab.updateStorageUsage();
-        updateOptionsMenu();
-        final Activity host = getActivity();
-        if (host != null) {
-            host.invalidateOptionsMenu();
-        }
-    }
-
-    private volatile IMediaContainerService mContainerService;
-
-    private final ServiceConnection mContainerConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mContainerService = IMediaContainerService.Stub.asInterface(service);
-            for (int i=0; i<mTabs.size(); i++) {
-                mTabs.get(i).setContainerService(mContainerService);
-            }
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            mContainerService = null;
-        }
-    };
 }
diff --git a/src/com/android/settings/applications/ManageDefaultApps.java b/src/com/android/settings/applications/ManageDefaultApps.java
new file mode 100644
index 0000000..6f58612
--- /dev/null
+++ b/src/com/android/settings/applications/ManageDefaultApps.java
@@ -0,0 +1,163 @@
+/*
+ * 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.annotation.Nullable;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.preference.Preference;
+import android.provider.SearchIndexableResource;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Index;
+import com.android.settings.search.Indexable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ManageDefaultApps extends SettingsPreferenceFragment
+        implements Preference.OnPreferenceClickListener, Indexable {
+
+    private static final String TAG = ManageDefaultApps.class.getSimpleName();
+
+    private static final String KEY_DEFAULT_BROWSER = "default_browser";
+    private static final String KEY_DEFAULT_DIALER = "default_dialer";
+    private static final String KEY_DEFAULT_EMERGENCY_APP = "default_emergency_app";
+    private static final String KEY_SMS_APPLICATION = "default_sms_app";
+
+    private DefaultBrowserPreference mDefaultBrowserPreference;
+    private PackageManager mPm;
+    private int myUserId;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        addPreferencesFromResource(R.xml.default_apps);
+
+        mPm = getPackageManager();
+        myUserId = UserHandle.myUserId();
+
+        mDefaultBrowserPreference = (DefaultBrowserPreference) findPreference(KEY_DEFAULT_BROWSER);
+        mDefaultBrowserPreference.setOnPreferenceClickListener(
+                new Preference.OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        final CharSequence packageName = mDefaultBrowserPreference.getValue();
+                        if (TextUtils.isEmpty(packageName)) {
+                            return false;
+                        }
+                        return mPm.setDefaultBrowserPackageName(packageName.toString(), myUserId);
+                    }
+        });
+        final boolean isRestrictedUser = UserManager.get(getActivity())
+                .getUserInfo(myUserId).isRestricted();
+
+        // Restricted users cannot currently read/write SMS.
+        // Remove SMS Application if the device does not support SMS
+        if (isRestrictedUser || !DefaultSmsPreference.isAvailable(getActivity())) {
+            removePreference(KEY_SMS_APPLICATION);
+        }
+
+        if (!DefaultDialerPreference.isAvailable(getActivity())) {
+            removePreference(KEY_DEFAULT_DIALER);
+        }
+
+        if (!DefaultEmergencyPreference.isAvailable(getActivity())) {
+            removePreference(KEY_DEFAULT_EMERGENCY_APP);
+        }
+
+        if (DefaultEmergencyPreference.isCapable(getActivity())) {
+            Index.getInstance(getActivity()).updateFromClassNameResource(
+                    ManageDefaultApps.class.getName(), true, true);
+        }
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        String packageName = getPackageManager().getDefaultBrowserPackageName(
+                UserHandle.myUserId());
+        if (!TextUtils.isEmpty(packageName)) {
+            // Check if the package is still there
+            Intent intent = new Intent();
+            intent.setPackage(packageName);
+            ResolveInfo info = mPm.resolveActivityAsUser(intent, 0, myUserId);
+            if (info != null) {
+                mDefaultBrowserPreference.setValue(packageName);
+            } else {
+                // Otherwise select the first one
+                mDefaultBrowserPreference.setValueIndex(0);
+            }
+        } else {
+            Log.d(TAG, "Cannot set empty default Browser value!");
+        }
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return InstrumentedFragment.VIEW_CATEGORY_DEFAULT_APPS;
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        return false;
+    }
+
+    public static final Indexable.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.default_apps;
+                return Arrays.asList(sir);
+            }
+
+            @Override
+            public List<String> getNonIndexableKeys(Context context) {
+                final ArrayList<String> result = new ArrayList<String>();
+
+                // Remove SMS Application if the device does not support SMS
+                final boolean isRestrictedUser = UserManager.get(context)
+                        .getUserInfo(UserHandle.myUserId()).isRestricted();
+                if (!DefaultSmsPreference.isAvailable(context) || isRestrictedUser) {
+                    result.add(KEY_SMS_APPLICATION);
+                }
+
+                if (!DefaultEmergencyPreference.isAvailable(context)) {
+                    result.add(KEY_DEFAULT_EMERGENCY_APP);
+                }
+
+                return result;
+            }
+    };
+}
diff --git a/src/com/android/settings/applications/ManagePermissions.java b/src/com/android/settings/applications/ManagePermissions.java
new file mode 100644
index 0000000..e8f9d0f
--- /dev/null
+++ b/src/com/android/settings/applications/ManagePermissions.java
@@ -0,0 +1,124 @@
+/*
+ * 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.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settingslib.applications.PermissionsInfo;
+import com.android.settingslib.applications.PermissionsInfo.PermissionGroup;
+
+import java.util.List;
+
+public class ManagePermissions extends SettingsPreferenceFragment
+        implements PermissionsInfo.Callback, OnPreferenceClickListener {
+
+    private static final String TAG = "ManagePermissions";
+
+    private PermissionsInfo mPermissionsInfo;
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        mPermissionsInfo = new PermissionsInfo(getActivity(), this);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        showLoadingWhenEmpty();
+    }
+
+    private void refreshUi() {
+        PreferenceScreen screen = getPreferenceScreen();
+        if (screen == null) {
+            screen = getPreferenceManager().createPreferenceScreen(getActivity());
+            setPreferenceScreen(screen);
+        } else {
+            screen.removeAll();
+        }
+        final int count = screen.getPreferenceCount();
+        if (count == 0) {
+            List<PermissionGroup> groups = mPermissionsInfo.getGroups();
+            for (PermissionGroup group : groups) {
+                if (group.possibleApps.size() == 0) continue;
+                PermissionPreference pref = new PermissionPreference(getActivity(), group);
+                pref.refreshUi();
+                screen.addPreference(pref);
+            }
+        } else {
+            for (int i = 0; i < count; i++) {
+                ((PermissionPreference) screen.getPreference(i)).refreshUi();
+            }
+        }
+    }
+
+    @Override
+    public void onPermissionLoadComplete() {
+        refreshUi();
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        return true;
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.MANAGE_PERMISSIONS;
+    }
+
+    private class PermissionPreference extends Preference implements OnPreferenceClickListener {
+        private final PermissionGroup mGroup;
+
+        public PermissionPreference(Context context, PermissionGroup group) {
+            super(context);
+            setOnPreferenceClickListener(this);
+            mGroup = group;
+        }
+
+        public void refreshUi() {
+            setTitle(mGroup.label);
+            setIcon(mGroup.icon);
+            setSummary(getContext().getString(R.string.app_permissions_group_summary,
+                    mGroup.grantedApps.size(), mGroup.possibleApps.size()));
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            Intent i = new Intent(Intent.ACTION_MANAGE_PERMISSION_APPS)
+                    .putExtra(Intent.EXTRA_PERMISSION_NAME, mGroup.name);
+            try {
+                getActivity().startActivity(i);
+            } catch (ActivityNotFoundException e) {
+                Log.w(TAG, "No app to handle " + i.getAction());
+            }
+            return true;
+        }
+    }
+
+}
diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java
index 8702478..41f7a53 100644
--- a/src/com/android/settings/applications/ProcStatsEntry.java
+++ b/src/com/android/settings/applications/ProcStatsEntry.java
@@ -17,7 +17,6 @@
 package com.android.settings.applications;
 
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -38,37 +37,49 @@
     final int mUid;
     final String mName;
     final ArrayList<String> mPackages = new ArrayList<String>();
-    final long mDuration;
-    final long mAvgPss;
-    final long mMaxPss;
-    final long mAvgUss;
-    final long mMaxUss;
-    final long mWeight;
+    final long mBgDuration;
+    final long mAvgBgMem;
+    final long mMaxBgMem;
+    final double mBgWeight;
+    final long mRunDuration;
+    final long mAvgRunMem;
+    final long mMaxRunMem;
+    final double mRunWeight;
 
     String mBestTargetPackage;
 
     ArrayMap<String, ArrayList<Service>> mServices = new ArrayMap<String, ArrayList<Service>>(1);
 
-    public ApplicationInfo mUiTargetApp;
-    public String mUiLabel;
-    public String mUiBaseLabel;
-    public String mUiPackage;
-
     public ProcStatsEntry(ProcessStats.ProcessState proc, String packageName,
-            ProcessStats.ProcessDataCollection tmpTotals, boolean useUss, boolean weightWithTime) {
-        ProcessStats.computeProcessData(proc, tmpTotals, 0);
+            ProcessStats.ProcessDataCollection tmpBgTotals,
+            ProcessStats.ProcessDataCollection tmpRunTotals, boolean useUss) {
+        ProcessStats.computeProcessData(proc, tmpBgTotals, 0);
+        ProcessStats.computeProcessData(proc, tmpRunTotals, 0);
         mPackage = proc.mPackage;
         mUid = proc.mUid;
         mName = proc.mName;
         mPackages.add(packageName);
-        mDuration = tmpTotals.totalTime;
-        mAvgPss = tmpTotals.avgPss;
-        mMaxPss = tmpTotals.maxPss;
-        mAvgUss = tmpTotals.avgUss;
-        mMaxUss = tmpTotals.maxUss;
-        mWeight = (weightWithTime ? mDuration : 1) * (useUss ? mAvgUss : mAvgPss);
-        if (DEBUG) Log.d(TAG, "New proc entry " + proc.mName + ": dur=" + mDuration
-                + " avgpss=" + mAvgPss + " weight=" + mWeight);
+        mBgDuration = tmpBgTotals.totalTime;
+        mAvgBgMem = useUss ? tmpBgTotals.avgUss : tmpBgTotals.avgPss;
+        mMaxBgMem = useUss ? tmpBgTotals.maxUss : tmpBgTotals.maxPss;
+        mBgWeight = mAvgBgMem * (double) mBgDuration;
+        mRunDuration = tmpRunTotals.totalTime;
+        mAvgRunMem = useUss ? tmpRunTotals.avgUss : tmpRunTotals.avgPss;
+        mMaxRunMem = useUss ? tmpRunTotals.maxUss : tmpRunTotals.maxPss;
+        mRunWeight = mAvgRunMem * (double) mRunDuration;
+        if (DEBUG) Log.d(TAG, "New proc entry " + proc.mName + ": dur=" + mBgDuration
+                + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight);
+    }
+
+    public ProcStatsEntry(String pkgName, int uid, String procName, long duration, long mem) {
+        mPackage = pkgName;
+        mUid = uid;
+        mName = procName;
+        mBgDuration = mRunDuration = duration;
+        mAvgBgMem = mMaxBgMem = mAvgRunMem = mMaxRunMem = mem;
+        mBgWeight = mRunWeight = ((double)duration) * mem;
+        if (DEBUG) Log.d(TAG, "New proc entry " + procName + ": dur=" + mBgDuration
+                + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight);
     }
 
     public ProcStatsEntry(Parcel in) {
@@ -76,12 +87,14 @@
         mUid = in.readInt();
         mName = in.readString();
         in.readStringList(mPackages);
-        mDuration = in.readLong();
-        mAvgPss = in.readLong();
-        mMaxPss = in.readLong();
-        mAvgUss = in.readLong();
-        mMaxUss = in.readLong();
-        mWeight = in.readLong();
+        mBgDuration = in.readLong();
+        mAvgBgMem = in.readLong();
+        mMaxBgMem = in.readLong();
+        mBgWeight = in.readDouble();
+        mRunDuration = in.readLong();
+        mAvgRunMem = in.readLong();
+        mMaxRunMem = in.readLong();
+        mRunWeight = in.readDouble();
         mBestTargetPackage = in.readString();
         final int N = in.readInt();
         if (N > 0) {
@@ -100,166 +113,139 @@
     }
 
     public void evaluateTargetPackage(PackageManager pm, ProcessStats stats,
-            ProcessStats.ProcessDataCollection totals, Comparator<ProcStatsEntry> compare,
-            boolean useUss, boolean weightWithTime) {
+            ProcessStats.ProcessDataCollection bgTotals,
+            ProcessStats.ProcessDataCollection runTotals, Comparator<ProcStatsEntry> compare,
+            boolean useUss) {
         mBestTargetPackage = null;
         if (mPackages.size() == 1) {
             if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": single pkg " + mPackages.get(0));
             mBestTargetPackage = mPackages.get(0);
-        } else {
-            // See if there is one significant package that was running here.
-            ArrayList<ProcStatsEntry> subProcs = new ArrayList<ProcStatsEntry>();
-            for (int ipkg=0; ipkg<mPackages.size(); ipkg++) {
-                SparseArray<ProcessStats.PackageState> vpkgs
-                        = stats.mPackages.get(mPackages.get(ipkg), mUid);
-                for (int ivers=0;  ivers<vpkgs.size(); ivers++) {
-                    ProcessStats.PackageState pkgState = vpkgs.valueAt(ivers);
-                    if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ", pkg "
-                            + pkgState + ":");
-                    if (pkgState == null) {
-                        Log.w(TAG, "No package state found for " + mPackages.get(ipkg) + "/"
-                                + mUid + " in process " + mName);
-                        continue;
-                    }
-                    ProcessStats.ProcessState pkgProc = pkgState.mProcesses.get(mName);
-                    if (pkgProc == null) {
-                        Log.w(TAG, "No process " + mName + " found in package state "
-                                + mPackages.get(ipkg) + "/" + mUid);
-                        continue;
-                    }
-                    subProcs.add(new ProcStatsEntry(pkgProc, pkgState.mPackageName, totals, useUss,
-                            weightWithTime));
-                }
-            }
-            if (subProcs.size() > 1) {
-                Collections.sort(subProcs, compare);
-                if (subProcs.get(0).mWeight > (subProcs.get(1).mWeight*3)) {
-                    if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": best pkg "
-                            + subProcs.get(0).mPackage + " weight " + subProcs.get(0).mWeight
-                            + " better than " + subProcs.get(1).mPackage
-                            + " weight " + subProcs.get(1).mWeight);
-                    mBestTargetPackage = subProcs.get(0).mPackage;
-                    return;
-                }
-                // Couldn't find one that is best by weight, let's decide on best another
-                // way: the one that has the longest running service, accounts for at least
-                // half of the maximum weight, and has specified an explicit app icon.
-                long maxWeight = subProcs.get(0).mWeight;
-                long bestRunTime = -1;
-                for (int i=0; i<subProcs.size(); i++) {
-                    if (subProcs.get(i).mWeight < (maxWeight/2)) {
-                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
-                                + subProcs.get(i).mPackage + " weight " + subProcs.get(i).mWeight
-                                + " too small");
-                        continue;
-                    }
-                    try {
-                        ApplicationInfo ai = pm.getApplicationInfo(subProcs.get(i).mPackage, 0);
-                        if (ai.icon == 0) {
-                            if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
-                                    + subProcs.get(i).mPackage + " has no icon");
-                            continue;
-                        }
-                    } catch (PackageManager.NameNotFoundException e) {
-                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
-                                + subProcs.get(i).mPackage + " failed finding app info");
-                        continue;
-                    }
-                    ArrayList<Service> subProcServices = null;
-                    for (int isp=0, NSP=mServices.size(); isp<NSP; isp++) {
-                        ArrayList<Service> subServices = mServices.valueAt(isp);
-                        if (subServices.get(0).mPackage.equals(subProcs.get(i).mPackage)) {
-                            subProcServices = subServices;
-                            break;
-                        }
-                    }
-                    long thisRunTime = 0;
-                    if (subProcServices != null) {
-                        for (int iss=0, NSS=subProcServices.size(); iss<NSS; iss++) {
-                            Service service = subProcServices.get(iss);
-                            if (service.mDuration > thisRunTime) {
-                                if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
-                                        + subProcs.get(i).mPackage + " service " + service.mName
-                                        + " run time is " + service.mDuration);
-                                thisRunTime = service.mDuration;
-                                break;
-                            }
-                        }
-                    }
-                    if (thisRunTime > bestRunTime) {
-                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
-                                + subProcs.get(i).mPackage + " new best run time " + thisRunTime);
-                        mBestTargetPackage = subProcs.get(i).mPackage;
-                        bestRunTime = thisRunTime;
-                    } else {
-                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
-                                + subProcs.get(i).mPackage + " run time " + thisRunTime
-                                + " not as good as last " + bestRunTime);
-                    }
-                }
-            } else if (subProcs.size() == 1) {
-                mBestTargetPackage = subProcs.get(0).mPackage;
-            }
+            return;
         }
-    }
 
-    public void retrieveUiData(PackageManager pm) {
-        mUiTargetApp = null;
-        mUiLabel = mUiBaseLabel = mName;
-        mUiPackage = mBestTargetPackage;
-        if (mUiPackage != null) {
-            // Only one app associated with this process.
-            try {
-                mUiTargetApp = pm.getApplicationInfo(mUiPackage,
-                        PackageManager.GET_DISABLED_COMPONENTS |
-                        PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
-                        PackageManager.GET_UNINSTALLED_PACKAGES);
-                String name = mUiBaseLabel = mUiTargetApp.loadLabel(pm).toString();
-                if (mName.equals(mUiPackage)) {
-                    mUiLabel = name;
-                } else {
-                    if (mName.startsWith(mUiPackage)) {
-                        int off = mUiPackage.length();
-                        if (mName.length() > off) {
-                            off++;
-                        }
-                        mUiLabel = name + " (" + mName.substring(off) + ")";
-                    } else {
-                        mUiLabel = name + " (" + mName + ")";
-                    }
-                }
-            } catch (PackageManager.NameNotFoundException e) {
+        // If one of the packages is the framework itself, that wins.
+        // See if there is one significant package that was running here.
+        for (int ipkg=0; ipkg<mPackages.size(); ipkg++) {
+            if ("android".equals(mPackages.get(ipkg))) {
+                mBestTargetPackage = mPackages.get(ipkg);
+                return;
             }
         }
-        if (mUiTargetApp == null) {
-            String[] packages = pm.getPackagesForUid(mUid);
-            if (packages != null) {
-                for (String curPkg : packages) {
-                    try {
-                        final PackageInfo pi = pm.getPackageInfo(curPkg,
-                                PackageManager.GET_DISABLED_COMPONENTS |
-                                PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
-                                PackageManager.GET_UNINSTALLED_PACKAGES);
-                        if (pi.sharedUserLabel != 0) {
-                            mUiTargetApp = pi.applicationInfo;
-                            final CharSequence nm = pm.getText(curPkg,
-                                    pi.sharedUserLabel, pi.applicationInfo);
-                            if (nm != null) {
-                                mUiBaseLabel = nm.toString();
-                                mUiLabel = mUiBaseLabel + " (" + mName + ")";
-                            } else {
-                                mUiBaseLabel = mUiTargetApp.loadLabel(pm).toString();
-                                mUiLabel = mUiBaseLabel + " (" + mName + ")";
-                            }
-                            break;
+
+        // Collect information about each package running in the process.
+        ArrayList<ProcStatsEntry> subProcs = new ArrayList<>();
+        for (int ipkg=0; ipkg<mPackages.size(); ipkg++) {
+            SparseArray<ProcessStats.PackageState> vpkgs
+                    = stats.mPackages.get(mPackages.get(ipkg), mUid);
+            for (int ivers=0;  ivers<vpkgs.size(); ivers++) {
+                ProcessStats.PackageState pkgState = vpkgs.valueAt(ivers);
+                if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ", pkg "
+                        + pkgState + ":");
+                if (pkgState == null) {
+                    Log.w(TAG, "No package state found for " + mPackages.get(ipkg) + "/"
+                            + mUid + " in process " + mName);
+                    continue;
+                }
+                ProcessStats.ProcessState pkgProc = pkgState.mProcesses.get(mName);
+                if (pkgProc == null) {
+                    Log.w(TAG, "No process " + mName + " found in package state "
+                            + mPackages.get(ipkg) + "/" + mUid);
+                    continue;
+                }
+                subProcs.add(new ProcStatsEntry(pkgProc, pkgState.mPackageName, bgTotals,
+                        runTotals, useUss));
+            }
+        }
+
+        if (subProcs.size() > 1) {
+            Collections.sort(subProcs, compare);
+            if (subProcs.get(0).mRunWeight > (subProcs.get(1).mRunWeight *3)) {
+                if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": best pkg "
+                        + subProcs.get(0).mPackage + " weight " + subProcs.get(0).mRunWeight
+                        + " better than " + subProcs.get(1).mPackage
+                        + " weight " + subProcs.get(1).mRunWeight);
+                mBestTargetPackage = subProcs.get(0).mPackage;
+                return;
+            }
+            // Couldn't find one that is best by weight, let's decide on best another
+            // way: the one that has the longest running service, accounts for at least
+            // half of the maximum weight, and has specified an explicit app icon.
+            double maxWeight = subProcs.get(0).mRunWeight;
+            long bestRunTime = -1;
+            boolean bestPersistent = false;
+            for (int i=0; i<subProcs.size(); i++) {
+                final ProcStatsEntry subProc = subProcs.get(i);
+                if (subProc.mRunWeight < (maxWeight/2)) {
+                    if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                            + subProc.mPackage + " weight " + subProc.mRunWeight
+                            + " too small");
+                    continue;
+                }
+                try {
+                    ApplicationInfo ai = pm.getApplicationInfo(subProc.mPackage, 0);
+                    if (ai.icon == 0) {
+                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                + subProc.mPackage + " has no icon");
+                        continue;
+                    }
+                    if ((ai.flags&ApplicationInfo.FLAG_PERSISTENT) != 0) {
+                        long thisRunTime = subProc.mRunDuration;
+                        if (!bestPersistent || thisRunTime > bestRunTime) {
+                            if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                    + subProc.mPackage + " new best pers run time "
+                                    + thisRunTime);
+                            bestRunTime = thisRunTime;
+                            bestPersistent = true;
+                        } else {
+                            if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                    + subProc.mPackage + " pers run time " + thisRunTime
+                                    + " not as good as last " + bestRunTime);
                         }
-                    } catch (PackageManager.NameNotFoundException e) {
+                        continue;
+                    } else if (bestPersistent) {
+                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                + subProc.mPackage + " is not persistent");
+                        continue;
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                    if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                            + subProc.mPackage + " failed finding app info");
+                    continue;
+                }
+                ArrayList<Service> subProcServices = null;
+                for (int isp=0, NSP=mServices.size(); isp<NSP; isp++) {
+                    ArrayList<Service> subServices = mServices.valueAt(isp);
+                    if (subServices.get(0).mPackage.equals(subProc.mPackage)) {
+                        subProcServices = subServices;
+                        break;
                     }
                 }
-            } else {
-                // no current packages for this uid, typically because of uninstall
-                Log.i(TAG, "No package for uid " + mUid);
+                long thisRunTime = 0;
+                if (subProcServices != null) {
+                    for (int iss=0, NSS=subProcServices.size(); iss<NSS; iss++) {
+                        Service service = subProcServices.get(iss);
+                        if (service.mDuration > thisRunTime) {
+                            if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                    + subProc.mPackage + " service " + service.mName
+                                    + " run time is " + service.mDuration);
+                            thisRunTime = service.mDuration;
+                            break;
+                        }
+                    }
+                }
+                if (thisRunTime > bestRunTime) {
+                    if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                            + subProc.mPackage + " new best run time " + thisRunTime);
+                    mBestTargetPackage = subProc.mPackage;
+                    bestRunTime = thisRunTime;
+                } else {
+                    if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                            + subProc.mPackage + " run time " + thisRunTime
+                            + " not as good as last " + bestRunTime);
+                }
             }
+        } else if (subProcs.size() == 1) {
+            mBestTargetPackage = subProcs.get(0).mPackage;
         }
     }
 
@@ -283,12 +269,14 @@
         dest.writeInt(mUid);
         dest.writeString(mName);
         dest.writeStringList(mPackages);
-        dest.writeLong(mDuration);
-        dest.writeLong(mAvgPss);
-        dest.writeLong(mMaxPss);
-        dest.writeLong(mAvgUss);
-        dest.writeLong(mMaxUss);
-        dest.writeLong(mWeight);
+        dest.writeLong(mBgDuration);
+        dest.writeLong(mAvgBgMem);
+        dest.writeLong(mMaxBgMem);
+        dest.writeDouble(mBgWeight);
+        dest.writeLong(mRunDuration);
+        dest.writeLong(mAvgRunMem);
+        dest.writeLong(mMaxRunMem);
+        dest.writeDouble(mRunWeight);
         dest.writeString(mBestTargetPackage);
         final int N = mServices.size();
         dest.writeInt(N);
diff --git a/src/com/android/settings/applications/ProcStatsPackageEntry.java b/src/com/android/settings/applications/ProcStatsPackageEntry.java
new file mode 100644
index 0000000..3925d1d
--- /dev/null
+++ b/src/com/android/settings/applications/ProcStatsPackageEntry.java
@@ -0,0 +1,145 @@
+/*
+ * 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.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
+
+public class ProcStatsPackageEntry implements Parcelable {
+    private static final String TAG = "ProcStatsEntry";
+    private static boolean DEBUG = ProcessStatsUi.DEBUG;
+
+    final String mPackage;
+    final ArrayList<ProcStatsEntry> mEntries = new ArrayList<ProcStatsEntry>();
+
+    long mBgDuration;
+    long mAvgBgMem;
+    long mMaxBgMem;
+    double mBgWeight;
+    long mRunDuration;
+    long mAvgRunMem;
+    long mMaxRunMem;
+    double mRunWeight;
+
+    public ApplicationInfo mUiTargetApp;
+    public String mUiLabel;
+
+    public ProcStatsPackageEntry(String pkg) {
+        mPackage = pkg;
+    }
+
+    public ProcStatsPackageEntry(Parcel in) {
+        mPackage = in.readString();
+        in.readTypedList(mEntries, ProcStatsEntry.CREATOR);
+        mBgDuration = in.readLong();
+        mAvgBgMem = in.readLong();
+        mMaxBgMem = in.readLong();
+        mBgWeight = in.readDouble();
+        mRunDuration = in.readLong();
+        mAvgRunMem = in.readLong();
+        mMaxRunMem = in.readLong();
+        mRunWeight = in.readDouble();
+    }
+
+    public void addEntry(ProcStatsEntry entry) {
+        mEntries.add(entry);
+    }
+
+    public void updateMetrics() {
+        mBgDuration = mAvgBgMem = mMaxBgMem = 0;
+        mBgWeight = 0;
+        mRunDuration = mAvgRunMem = mMaxRunMem = 0;
+        mRunWeight = 0;
+        final int N = mEntries.size();
+        for (int i=0; i<N; i++) {
+            ProcStatsEntry entry = mEntries.get(i);
+            mBgDuration += entry.mBgDuration;
+            mAvgBgMem += entry.mAvgBgMem;
+            if (entry.mMaxBgMem > mMaxBgMem) {
+                mMaxBgMem = entry.mMaxBgMem;
+            }
+            mBgWeight += entry.mBgWeight;
+            mRunDuration += entry.mRunDuration;
+            mAvgRunMem += entry.mAvgRunMem;
+            if (entry.mMaxRunMem > mMaxRunMem) {
+                mMaxRunMem = entry.mMaxRunMem;
+            }
+            mRunWeight += entry.mRunWeight;
+        }
+        mAvgBgMem /= N;
+        mAvgRunMem /= N;
+    }
+
+    public void retrieveUiData(Context context, PackageManager pm) {
+        mUiTargetApp = null;
+        mUiLabel = mPackage;
+        // Only one app associated with this process.
+        try {
+            if ("os".equals(mPackage)) {
+                mUiTargetApp = pm.getApplicationInfo("android",
+                        PackageManager.GET_DISABLED_COMPONENTS |
+                        PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
+                        PackageManager.GET_UNINSTALLED_PACKAGES);
+                mUiLabel = context.getString(R.string.process_stats_os_label);
+            } else {
+                mUiTargetApp = pm.getApplicationInfo(mPackage,
+                        PackageManager.GET_DISABLED_COMPONENTS |
+                        PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
+                        PackageManager.GET_UNINSTALLED_PACKAGES);
+                mUiLabel = mUiTargetApp.loadLabel(pm).toString();
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+        }
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(mPackage);
+        dest.writeTypedList(mEntries);
+        dest.writeLong(mBgDuration);
+        dest.writeLong(mAvgBgMem);
+        dest.writeLong(mMaxBgMem);
+        dest.writeDouble(mBgWeight);
+        dest.writeLong(mRunDuration);
+        dest.writeLong(mAvgRunMem);
+        dest.writeLong(mMaxRunMem);
+        dest.writeDouble(mRunWeight);
+    }
+
+    public static final Parcelable.Creator<ProcStatsPackageEntry> CREATOR
+            = new Parcelable.Creator<ProcStatsPackageEntry>() {
+        public ProcStatsPackageEntry createFromParcel(Parcel in) {
+            return new ProcStatsPackageEntry(in);
+        }
+
+        public ProcStatsPackageEntry[] newArray(int size) {
+            return new ProcStatsPackageEntry[size];
+        }
+    };
+}
diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
index 30f6b52..1e7cf09 100644
--- a/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -16,20 +16,13 @@
 
 package com.android.settings.applications;
 
-import android.app.Activity;
 import android.app.ActivityManager;
-import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Process;
-import android.os.UserHandle;
 import android.text.format.Formatter;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -38,39 +31,45 @@
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 
 import static com.android.settings.Utils.prepareCustomPreferencesList;
 
-public class ProcessStatsDetail extends Fragment implements Button.OnClickListener {
+public class ProcessStatsDetail extends InstrumentedFragment implements Button.OnClickListener {
     private static final String TAG = "ProcessStatsDetail";
 
     public static final int ACTION_FORCE_STOP = 1;
 
-    public static final String EXTRA_ENTRY = "entry";
+    public static final String EXTRA_PACKAGE_ENTRY = "package_entry";
     public static final String EXTRA_USE_USS = "use_uss";
     public static final String EXTRA_MAX_WEIGHT = "max_weight";
+    public static final String EXTRA_WEIGHT_TO_RAM = "weight_to_ram";
     public static final String EXTRA_TOTAL_TIME = "total_time";
 
     private PackageManager mPm;
     private DevicePolicyManager mDpm;
 
-    private ProcStatsEntry mEntry;
+    private ProcStatsPackageEntry mApp;
     private boolean mUseUss;
-    private long mMaxWeight;
+    private double mMaxWeight;
+    private double mWeightToRam;
     private long mTotalTime;
+    private long mOnePercentTime;
 
     private View mRootView;
     private TextView mTitleView;
     private ViewGroup mTwoButtonsPanel;
     private Button mForceStopButton;
     private Button mReportButton;
-    private ViewGroup mDetailsParent;
+    private ViewGroup mProcessesParent;
     private ViewGroup mServicesParent;
 
     @Override
@@ -79,11 +78,13 @@
         mPm = getActivity().getPackageManager();
         mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
         final Bundle args = getArguments();
-        mEntry = (ProcStatsEntry)args.getParcelable(EXTRA_ENTRY);
-        mEntry.retrieveUiData(mPm);
+        mApp = args.getParcelable(EXTRA_PACKAGE_ENTRY);
+        mApp.retrieveUiData(getActivity(), mPm);
         mUseUss = args.getBoolean(EXTRA_USE_USS);
-        mMaxWeight = args.getLong(EXTRA_MAX_WEIGHT);
+        mMaxWeight = args.getDouble(EXTRA_MAX_WEIGHT);
+        mWeightToRam = args.getDouble(EXTRA_WEIGHT_TO_RAM);
         mTotalTime = args.getLong(EXTRA_TOTAL_TIME);
+        mOnePercentTime = mTotalTime/100;
     }
 
     @Override
@@ -98,6 +99,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_PROCESS_STATS_DETAIL;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         checkForceStop();
@@ -109,24 +115,22 @@
     }
 
     private void createDetails() {
-        final double percentOfWeight = (((double)mEntry.mWeight) / mMaxWeight) * 100;
+        final double percentOfWeight = (mApp.mBgWeight / mMaxWeight) * 100;
 
         int appLevel = (int) Math.ceil(percentOfWeight);
-        String appLevelText = Utils.formatPercentage(mEntry.mDuration, mTotalTime);
+        String appLevelText = Formatter.formatShortFileSize(getActivity(),
+                (long)(mApp.mRunWeight * mWeightToRam));
 
         // Set all values in the header.
-        final TextView summary = (TextView) mRootView.findViewById(android.R.id.summary);
-        summary.setText(mEntry.mName);
-        summary.setVisibility(View.VISIBLE);
         mTitleView = (TextView) mRootView.findViewById(android.R.id.title);
-        mTitleView.setText(mEntry.mUiBaseLabel);
+        mTitleView.setText(mApp.mUiLabel);
         final TextView text1 = (TextView)mRootView.findViewById(android.R.id.text1);
         text1.setText(appLevelText);
         final ProgressBar progress = (ProgressBar) mRootView.findViewById(android.R.id.progress);
         progress.setProgress(appLevel);
         final ImageView icon = (ImageView) mRootView.findViewById(android.R.id.icon);
-        if (mEntry.mUiTargetApp != null) {
-            icon.setImageDrawable(mEntry.mUiTargetApp.loadIcon(mPm));
+        if (mApp.mUiTargetApp != null) {
+            icon.setImageDrawable(mApp.mUiTargetApp.loadIcon(mPm));
         }
 
         mTwoButtonsPanel = (ViewGroup)mRootView.findViewById(R.id.two_buttons_panel);
@@ -135,13 +139,17 @@
         mForceStopButton.setEnabled(false);
         mReportButton.setVisibility(View.INVISIBLE);
 
-        mDetailsParent = (ViewGroup)mRootView.findViewById(R.id.details);
+        mProcessesParent = (ViewGroup)mRootView.findViewById(R.id.processes);
         mServicesParent = (ViewGroup)mRootView.findViewById(R.id.services);
 
-        fillDetailsSection();
+        fillProcessesSection();
         fillServicesSection();
+        if (mServicesParent.getChildCount() <= 0) {
+            mServicesParent.setVisibility(View.GONE);
+            mRootView.findViewById(R.id.services_label).setVisibility(View.GONE);
+        }
 
-        if (mEntry.mUid >= android.os.Process.FIRST_APPLICATION_UID) {
+        if (mApp.mEntries.get(0).mUid >= android.os.Process.FIRST_APPLICATION_UID) {
             mForceStopButton.setText(R.string.force_stop);
             mForceStopButton.setTag(ACTION_FORCE_STOP);
             mForceStopButton.setOnClickListener(this);
@@ -191,15 +199,43 @@
         valueView.setText(value);
     }
 
-    private void fillDetailsSection() {
-        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_avg_ram_use),
-                Formatter.formatShortFileSize(getActivity(),
-                        (mUseUss ? mEntry.mAvgUss : mEntry.mAvgPss) * 1024));
-        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_max_ram_use),
-                Formatter.formatShortFileSize(getActivity(),
-                        (mUseUss ? mEntry.mMaxUss : mEntry.mMaxPss) * 1024));
-        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_run_time),
-                Utils.formatPercentage(mEntry.mDuration, mTotalTime));
+    final static Comparator<ProcStatsEntry> sEntryCompare = new Comparator<ProcStatsEntry>() {
+        @Override
+        public int compare(ProcStatsEntry lhs, ProcStatsEntry rhs) {
+            if (lhs.mRunWeight < rhs.mRunWeight) {
+                return 1;
+            } else if (lhs.mRunWeight > rhs.mRunWeight) {
+                return -1;
+            }
+            return 0;
+        }
+    };
+
+    private void fillProcessesSection() {
+        final ArrayList<ProcStatsEntry> entries = new ArrayList<>();
+        for (int ie=0; ie<mApp.mEntries.size(); ie++) {
+            ProcStatsEntry entry = mApp.mEntries.get(ie);
+            entries.add(entry);
+        }
+        Collections.sort(entries, sEntryCompare);
+        for (int ie=0; ie<entries.size(); ie++) {
+            ProcStatsEntry entry = entries.get(ie);
+            LayoutInflater inflater = getActivity().getLayoutInflater();
+            ViewGroup item = (ViewGroup) inflater.inflate(R.layout.process_stats_proc_details,
+                    null);
+            mProcessesParent.addView(item);
+            ((TextView)item.findViewById(R.id.processes_name)).setText(entry.mName);
+            addDetailsItem(item, getResources().getText(R.string.process_stats_ram_use),
+                    Formatter.formatShortFileSize(getActivity(),
+                            (long)(entry.mRunWeight * mWeightToRam)));
+            if (entry.mBgWeight > 0) {
+                addDetailsItem(item, getResources().getText(R.string.process_stats_bg_ram_use),
+                        Formatter.formatShortFileSize(getActivity(),
+                                (long)(entry.mBgWeight * mWeightToRam)));
+            }
+            addDetailsItem(item, getResources().getText(R.string.process_stats_run_time),
+                    Utils.formatPercentage(entry.mRunDuration, mTotalTime));
+        }
     }
 
     final static Comparator<ProcStatsEntry.Service> sServiceCompare
@@ -215,95 +251,106 @@
         }
     };
 
-    final static Comparator<ArrayList<ProcStatsEntry.Service>> sServicePkgCompare
-            = new Comparator<ArrayList<ProcStatsEntry.Service>>() {
+    final static Comparator<PkgService> sServicePkgCompare = new Comparator<PkgService>() {
         @Override
-        public int compare(ArrayList<ProcStatsEntry.Service> lhs,
-                ArrayList<ProcStatsEntry.Service> rhs) {
-            long topLhs = lhs.size() > 0 ? lhs.get(0).mDuration : 0;
-            long topRhs = rhs.size() > 0 ? rhs.get(0).mDuration : 0;
-            if (topLhs < topRhs) {
+        public int compare(PkgService lhs, PkgService rhs) {
+            if (lhs.mDuration < rhs.mDuration) {
                 return 1;
-            } else if (topLhs > topRhs) {
+            } else if (lhs.mDuration > rhs.mDuration) {
                 return -1;
             }
             return 0;
         }
     };
 
+    static class PkgService {
+        final ArrayList<ProcStatsEntry.Service> mServices = new ArrayList<>();
+        long mDuration;
+    }
+
     private void fillServicesSection() {
-        if (mEntry.mServices.size() > 0) {
-            boolean addPackageSections = false;
-            // Sort it all.
-            ArrayList<ArrayList<ProcStatsEntry.Service>> servicePkgs
-                    = new ArrayList<ArrayList<ProcStatsEntry.Service>>();
-            for (int ip=0; ip<mEntry.mServices.size(); ip++) {
-                ArrayList<ProcStatsEntry.Service> services =
-                        (ArrayList<ProcStatsEntry.Service>)mEntry.mServices.valueAt(ip).clone();
-                Collections.sort(services, sServiceCompare);
-                servicePkgs.add(services);
-            }
-            if (mEntry.mServices.size() > 1
-                    || !mEntry.mServices.valueAt(0).get(0).mPackage.equals(mEntry.mPackage)) {
-                addPackageSections = true;
-                // Sort these so that the one(s) with the longest run durations are on top.
-                Collections.sort(servicePkgs, sServicePkgCompare);
-            }
-            for (int ip=0; ip<servicePkgs.size(); ip++) {
-                ArrayList<ProcStatsEntry.Service> services = servicePkgs.get(ip);
-                if (addPackageSections) {
-                    addPackageHeaderItem(mServicesParent, services.get(0).mPackage);
-                }
-                for (int is=0; is<services.size(); is++) {
-                    ProcStatsEntry.Service service = services.get(is);
-                    String label = service.mName;
-                    int tail = label.lastIndexOf('.');
-                    if (tail >= 0 && tail < (label.length()-1)) {
-                        label = label.substring(tail+1);
+        final HashMap<String, PkgService> pkgServices = new HashMap<>();
+        final ArrayList<PkgService> pkgList = new ArrayList<>();
+        for (int ie=0; ie< mApp.mEntries.size(); ie++) {
+            ProcStatsEntry ent = mApp.mEntries.get(ie);
+            for (int ip=0; ip<ent.mServices.size(); ip++) {
+                String pkg = ent.mServices.keyAt(ip);
+                PkgService psvc = null;
+                ArrayList<ProcStatsEntry.Service> services = ent.mServices.valueAt(ip);
+                for (int is=services.size()-1; is>=0; is--) {
+                    ProcStatsEntry.Service pent = services.get(is);
+                    if (pent.mDuration >= mOnePercentTime) {
+                        if (psvc == null) {
+                            psvc = pkgServices.get(pkg);
+                            if (psvc == null) {
+                                psvc = new PkgService();
+                                pkgServices.put(pkg, psvc);
+                                pkgList.add(psvc);
+                            }
+                        }
+                        psvc.mServices.add(pent);
+                        psvc.mDuration += pent.mDuration;
                     }
-                    String percentage = Utils.formatPercentage(service.mDuration, mTotalTime);
-                    addDetailsItem(mServicesParent, label, percentage);
                 }
             }
         }
+        Collections.sort(pkgList, sServicePkgCompare);
+        for (int ip=0; ip<pkgList.size(); ip++) {
+            ArrayList<ProcStatsEntry.Service> services = pkgList.get(ip).mServices;
+            Collections.sort(services, sServiceCompare);
+            if (pkgList.size() > 1) {
+                addPackageHeaderItem(mServicesParent, services.get(0).mPackage);
+            }
+            for (int is=0; is<services.size(); is++) {
+                ProcStatsEntry.Service service = services.get(is);
+                String label = service.mName;
+                int tail = label.lastIndexOf('.');
+                if (tail >= 0 && tail < (label.length()-1)) {
+                    label = label.substring(tail+1);
+                }
+                String percentage = Utils.formatPercentage(service.mDuration, mTotalTime);
+                addDetailsItem(mServicesParent, label, percentage);
+            }
+        }
     }
 
     private void killProcesses() {
         ActivityManager am = (ActivityManager)getActivity().getSystemService(
                 Context.ACTIVITY_SERVICE);
-        am.forceStopPackage(mEntry.mUiPackage);
+        for (int i=0; i< mApp.mEntries.size(); i++) {
+            ProcStatsEntry ent = mApp.mEntries.get(i);
+            for (int j=0; j<ent.mPackages.size(); j++) {
+                am.forceStopPackage(ent.mPackages.get(j));
+            }
+        }
         checkForceStop();
     }
 
-    private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            mForceStopButton.setEnabled(getResultCode() != Activity.RESULT_CANCELED);
-        }
-    };
-
     private void checkForceStop() {
-        if (mEntry.mUiPackage == null || mEntry.mUid < Process.FIRST_APPLICATION_UID) {
+        if (mApp.mEntries.get(0).mUid < Process.FIRST_APPLICATION_UID) {
             mForceStopButton.setEnabled(false);
             return;
         }
-        if (mDpm.packageHasActiveAdmins(mEntry.mUiPackage)) {
-            mForceStopButton.setEnabled(false);
-            return;
-        }
-        try {
-            ApplicationInfo info = mPm.getApplicationInfo(mEntry.mUiPackage, 0);
-            if ((info.flags&ApplicationInfo.FLAG_STOPPED) == 0) {
-                mForceStopButton.setEnabled(true);
+        boolean isStarted = false;
+        for (int i=0; i< mApp.mEntries.size(); i++) {
+            ProcStatsEntry ent = mApp.mEntries.get(i);
+            for (int j=0; j<ent.mPackages.size(); j++) {
+                String pkg = ent.mPackages.get(j);
+                if (mDpm.packageHasActiveAdmins(pkg)) {
+                    mForceStopButton.setEnabled(false);
+                    return;
+                }
+                try {
+                    ApplicationInfo info = mPm.getApplicationInfo(pkg, 0);
+                    if ((info.flags&ApplicationInfo.FLAG_STOPPED) == 0) {
+                        isStarted = true;
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                }
             }
-        } catch (PackageManager.NameNotFoundException e) {
         }
-        Intent intent = new Intent(Intent.ACTION_QUERY_PACKAGE_RESTART,
-                Uri.fromParts("package", mEntry.mUiPackage, null));
-        intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { mEntry.mUiPackage });
-        intent.putExtra(Intent.EXTRA_UID, mEntry.mUid);
-        intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mEntry.mUid));
-        getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
-                Activity.RESULT_CANCELED, null, null);
+        if (isStarted) {
+            mForceStopButton.setEnabled(true);
+        }
     }
 }
diff --git a/src/com/android/settings/applications/ProcessStatsMemDetail.java b/src/com/android/settings/applications/ProcessStatsMemDetail.java
index ab7dbdb..7ae2824 100644
--- a/src/com/android/settings/applications/ProcessStatsMemDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsMemDetail.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.applications;
 
-import android.app.Fragment;
 import android.os.Bundle;
 import android.text.format.Formatter;
 import android.view.LayoutInflater;
@@ -25,11 +24,13 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.android.internal.app.ProcessStats;
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 
 import static com.android.settings.Utils.prepareCustomPreferencesList;
 
-public class ProcessStatsMemDetail extends Fragment {
+public class ProcessStatsMemDetail extends InstrumentedFragment {
     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";
@@ -84,6 +85,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_PROCESS_STATS_MEM_DETAIL;
+    }
+
+    @Override
     public void onPause() {
         super.onPause();
     }
diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java
index adf80e5..182cf0e 100644
--- a/src/com/android/settings/applications/ProcessStatsPreference.java
+++ b/src/com/android/settings/applications/ProcessStatsPreference.java
@@ -26,10 +26,9 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.android.settings.R;
-import com.android.settings.Utils;
 
 public class ProcessStatsPreference extends Preference {
-    private ProcStatsEntry mEntry;
+    private ProcStatsPackageEntry mEntry;
     private int mProgress;
     private CharSequence mProgressText;
 
@@ -51,18 +50,19 @@
         setLayoutResource(R.layout.preference_app_percentage);
     }
 
-    public void init(Drawable icon, ProcStatsEntry entry) {
+    public void init(Drawable icon, ProcStatsPackageEntry entry) {
         mEntry = entry;
         setIcon(icon != null ? icon : new ColorDrawable(0));
     }
 
-    public ProcStatsEntry getEntry() {
+    public ProcStatsPackageEntry getEntry() {
         return mEntry;
     }
 
-    public void setPercent(double percentOfWeight, double percentOfTime) {
+    public void setPercent(double percentOfWeight, double percentOfTime, long memory) {
         mProgress = (int) Math.ceil(percentOfWeight);
-        mProgressText = Utils.formatPercentage((int) percentOfTime);
+        //mProgressText = Utils.formatPercentage((int) percentOfTime);
+        mProgressText = Formatter.formatShortFileSize(getContext(), memory);
         notifyChanged();
     }
 
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index 30a8817..45e24dd 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -19,6 +19,7 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
@@ -40,7 +41,9 @@
 import com.android.internal.app.IProcessStats;
 import com.android.internal.app.ProcessMap;
 import com.android.internal.app.ProcessStats;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.util.MemInfoReader;
+import com.android.settings.InstrumentedPreferenceFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
@@ -50,8 +53,9 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 
-public class ProcessStatsUi extends PreferenceFragment
+public class ProcessStatsUi extends InstrumentedPreferenceFragment
         implements LinearColorBar.OnRegionTappedListener {
     static final String TAG = "ProcessStatsUi";
     static final boolean DEBUG = false;
@@ -75,13 +79,30 @@
     final static Comparator<ProcStatsEntry> sEntryCompare = new Comparator<ProcStatsEntry>() {
         @Override
         public int compare(ProcStatsEntry lhs, ProcStatsEntry rhs) {
-            if (lhs.mWeight < rhs.mWeight) {
+            if (lhs.mRunWeight < rhs.mRunWeight) {
                 return 1;
-            } else if (lhs.mWeight > rhs.mWeight) {
+            } else if (lhs.mRunWeight > rhs.mRunWeight) {
                 return -1;
-            } else if (lhs.mDuration < rhs.mDuration) {
+            } else if (lhs.mRunDuration < rhs.mRunDuration) {
                 return 1;
-            } else if (lhs.mDuration > rhs.mDuration) {
+            } else if (lhs.mRunDuration > rhs.mRunDuration) {
+                return -1;
+            }
+            return 0;
+        }
+    };
+
+    final static Comparator<ProcStatsPackageEntry> sPackageEntryCompare
+            = new Comparator<ProcStatsPackageEntry>() {
+        @Override
+        public int compare(ProcStatsPackageEntry lhs, ProcStatsPackageEntry rhs) {
+            if (lhs.mRunWeight < rhs.mRunWeight) {
+                return 1;
+            } else if (lhs.mRunWeight > rhs.mRunWeight) {
+                return -1;
+            } else if (lhs.mRunDuration < rhs.mRunDuration) {
+                return 1;
+            } else if (lhs.mRunDuration > rhs.mRunDuration) {
                 return -1;
             }
             return 0;
@@ -112,7 +133,7 @@
     private PreferenceGroup mAppListGroup;
     private Preference mMemStatusPref;
 
-    long mMaxWeight;
+    double mMaxWeight;
     long mTotalTime;
 
     long[] mMemTimes = new long[ProcessStats.ADJ_MEM_FACTOR_COUNT];
@@ -123,6 +144,7 @@
     double mMemKernelWeight;
     double mMemNativeWeight;
     double mMemTotalWeight;
+    double mWeightToRam;
 
     // The actual duration value to use for each duration option.  Note these
     // are lower than the actual duration, since our durations are computed in
@@ -164,14 +186,14 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        refreshStats();
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_PROCESS_STATS_UI;
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
+    public void onResume() {
+        super.onResume();
+        refreshStats();
     }
 
     @Override
@@ -218,9 +240,10 @@
 
         ProcessStatsPreference pgp = (ProcessStatsPreference) preference;
         Bundle args = new Bundle();
-        args.putParcelable(ProcessStatsDetail.EXTRA_ENTRY, pgp.getEntry());
+        args.putParcelable(ProcessStatsDetail.EXTRA_PACKAGE_ENTRY, pgp.getEntry());
         args.putBoolean(ProcessStatsDetail.EXTRA_USE_USS, mUseUss);
-        args.putLong(ProcessStatsDetail.EXTRA_MAX_WEIGHT, mMaxWeight);
+        args.putDouble(ProcessStatsDetail.EXTRA_MAX_WEIGHT, mMaxWeight);
+        args.putDouble(ProcessStatsDetail.EXTRA_WEIGHT_TO_RAM, mWeightToRam);
         args.putLong(ProcessStatsDetail.EXTRA_TOTAL_TIME, mTotalTime);
         ((SettingsActivity) getActivity()).startPreferencePanel(
                 ProcessStatsDetail.class.getName(), args, R.string.details_title, null, null, 0);
@@ -349,11 +372,19 @@
         mAppListGroup.addPreference(notAvailable);
     }
 
+    /**
+     * All states in which we consider a process to be actively running (rather than
+     * something that can be freely killed to reclaim RAM).  Note this also includes
+     * the HOME state, because we prioritize home over all cached processes even when
+     * it is in the background, so it is effectively always running from the perspective
+     * of the information we want to show the user here.
+     */
     public static final int[] BACKGROUND_AND_SYSTEM_PROC_STATES = new int[] {
             ProcessStats.STATE_PERSISTENT, ProcessStats.STATE_IMPORTANT_FOREGROUND,
             ProcessStats.STATE_IMPORTANT_BACKGROUND, ProcessStats.STATE_BACKUP,
             ProcessStats.STATE_HEAVY_WEIGHT, ProcessStats.STATE_SERVICE,
-            ProcessStats.STATE_SERVICE_RESTARTING, ProcessStats.STATE_RECEIVER
+            ProcessStats.STATE_SERVICE_RESTARTING, ProcessStats.STATE_RECEIVER,
+            ProcessStats.STATE_HOME
     };
 
     public static final int[] FOREGROUND_PROC_STATES = new int[] {
@@ -406,31 +437,6 @@
 
         final long elapsedTime = mStats.mTimePeriodEndRealtime-mStats.mTimePeriodStartRealtime;
 
-        mMemStatusPref.setOrder(-2);
-        mAppListGroup.addPreference(mMemStatusPref);
-        String durationString = Utils.formatElapsedTime(getActivity(), elapsedTime, false);
-        CharSequence memString;
-        CharSequence[] memStatesStr = getResources().getTextArray(R.array.ram_states);
-        if (mMemState >= 0 && mMemState < memStatesStr.length) {
-            memString = memStatesStr[mMemState];
-        } else {
-            memString = "?";
-        }
-        mMemStatusPref.setTitle(getActivity().getString(R.string.process_stats_total_duration,
-                getActivity().getString(statsLabel), durationString));
-        mMemStatusPref.setSummary(getActivity().getString(R.string.process_stats_memory_status,
-                        memString));
-        /*
-        mMemStatusPref.setTitle(DateFormat.format(DateFormat.getBestDateTimePattern(
-                getActivity().getResources().getConfiguration().locale,
-                "MMMM dd, yyyy h:mm a"), mStats.mTimePeriodStartClock));
-        */
-        /*
-        BatteryHistoryPreference hist = new BatteryHistoryPreference(getActivity(), mStats);
-        hist.setOrder(-1);
-        mAppListGroup.addPreference(hist);
-        */
-
         long now = SystemClock.uptimeMillis();
 
         final PackageManager pm = getActivity().getPackageManager();
@@ -470,9 +476,13 @@
                 memStates = ProcessStats.ALL_MEM_ADJ;
                 break;
         }
-        colors.setColoredRegions(LinearColorBar.REGION_RED);
+        final Context context = getActivity();
+        colors.setColors(context.getColor(R.color.running_processes_apps_ram),
+                context.getColor(R.color.running_processes_apps_ram),
+                context.getColor(R.color.running_processes_free_ram));
 
         // Compute memory badness for chart color.
+        /*
         int[] badColors = com.android.settings.Utils.BADNESS_COLORS;
         long timeGood = mMemTimes[ProcessStats.ADJ_MEM_FACTOR_NORMAL];
         timeGood += (mMemTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE]*2)/3;
@@ -480,6 +490,7 @@
         float memBadness = ((float)timeGood)/mTotalTime;
         int badnessColor = badColors[1 + Math.round(memBadness*(badColors.length-2))];
         colors.setColors(badnessColor, badnessColor, badnessColor);
+        */
 
         // We are now going to scale the mMemTimes to match the total elapsed time.
         // These are in uptime, so they will often be smaller than the elapsed time,
@@ -547,6 +558,8 @@
         memReader.readMemInfo();
         double realTotalRam = memReader.getTotalSize();
         double totalScale = realTotalRam / totalRam;
+        mWeightToRam = totalScale / memTotalTime * 1024;
+        mMaxWeight = totalRam / mWeightToRam;
         double realUsedRam = usedRam * totalScale;
         double realFreeRam = freeRam * totalScale;
         if (DEBUG) {
@@ -558,12 +571,15 @@
         ActivityManager.MemoryInfo memInfo = new ActivityManager.MemoryInfo();
         ((ActivityManager)getActivity().getSystemService(Context.ACTIVITY_SERVICE)).getMemoryInfo(
                 memInfo);
+        long baseCacheRam;
         if (memInfo.hiddenAppThreshold >= realFreeRam) {
             realUsedRam = realFreeRam;
             realFreeRam = 0;
+            baseCacheRam = (long)realFreeRam;
         } else {
             realUsedRam += memInfo.hiddenAppThreshold;
             realFreeRam -= memInfo.hiddenAppThreshold;
+            baseCacheRam = memInfo.hiddenAppThreshold;
         }
         if (DEBUG) {
             Log.i(TAG, "Adj Scaled Used RAM: " + Formatter.formatShortFileSize(getActivity(),
@@ -572,6 +588,22 @@
                     (long)realFreeRam));
         }
 
+        mMemStatusPref.setOrder(-2);
+        mAppListGroup.addPreference(mMemStatusPref);
+        String durationString = Utils.formatElapsedTime(getActivity(), elapsedTime, false);
+        String usedString = Formatter.formatShortFileSize(getActivity(), (long) realUsedRam);
+        String totalString = Formatter.formatShortFileSize(getActivity(), (long)realTotalRam);
+        CharSequence memString;
+        CharSequence[] memStatesStr = getResources().getTextArray(R.array.ram_states);
+        if (mMemState >= 0 && mMemState < memStatesStr.length) {
+            memString = memStatesStr[mMemState];
+        } else {
+            memString = "?";
+        }
+        mMemStatusPref.setTitle(getActivity().getString(R.string.process_stats_total_duration,
+                usedString, totalString, durationString));
+        mMemStatusPref.setSummary(getActivity().getString(R.string.process_stats_memory_status,
+                        memString)); 
         float usedRatio = (float)(realUsedRam/(realFreeRam+realUsedRam));
         colors.setRatios(usedRatio, 0, 1-usedRatio);
 
@@ -605,17 +637,20 @@
 
         mAppListGroup.addPreference(colors);
 
-        ProcessStats.ProcessDataCollection totals = new ProcessStats.ProcessDataCollection(
+        ProcessStats.ProcessDataCollection bgTotals = new ProcessStats.ProcessDataCollection(
                 ProcessStats.ALL_SCREEN_ADJ, memStates, stats);
+        ProcessStats.ProcessDataCollection runTotals = new ProcessStats.ProcessDataCollection(
+                ProcessStats.ALL_SCREEN_ADJ, memStates, ProcessStats.NON_CACHED_PROC_STATES);
 
-        ArrayList<ProcStatsEntry> entries = new ArrayList<ProcStatsEntry>();
+        final ArrayList<ProcStatsEntry> procEntries = new ArrayList<>();
+        final ArrayList<ProcStatsPackageEntry> pkgEntries = new ArrayList<>();
 
         /*
         ArrayList<ProcessStats.ProcessState> rawProcs = mStats.collectProcessesLocked(
                 ProcessStats.ALL_SCREEN_ADJ, ProcessStats.ALL_MEM_ADJ,
                 ProcessStats.BACKGROUND_PROC_STATES, now, null);
         for (int i=0, N=(rawProcs != null ? rawProcs.size() : 0); i<N; i++) {
-            procs.add(new ProcStatsEntry(rawProcs.get(i), totals));
+            procs.add(new ProcStatsEntry(rawProcs.get(i), bgTotals));
         }
         */
 
@@ -640,15 +675,15 @@
                         }
                         ProcStatsEntry ent = entriesMap.get(proc.mName, proc.mUid);
                         if (ent == null) {
-                            ent = new ProcStatsEntry(proc, st.mPackageName, totals, mUseUss,
-                                    mStatsType == MENU_TYPE_BACKGROUND);
-                            if (ent.mDuration > 0) {
+                            ent = new ProcStatsEntry(proc, st.mPackageName, bgTotals, runTotals,
+                                    mUseUss);
+                            if (ent.mRunWeight > 0) {
                                 if (DEBUG) Log.d(TAG, "Adding proc " + proc.mName + "/"
-                                        + proc.mUid + ": time=" + makeDuration(ent.mDuration) + " ("
-                                        + ((((double)ent.mDuration) / memTotalTime) * 100) + "%)"
-                                        + " pss=" + ent.mAvgPss);
+                                        + proc.mUid + ": time=" + makeDuration(ent.mRunDuration) + " ("
+                                        + ((((double)ent.mRunDuration) / memTotalTime) * 100) + "%)"
+                                        + " pss=" + ent.mAvgRunMem);
                                 entriesMap.put(proc.mName, proc.mUid, ent);
-                                entries.add(ent);
+                                procEntries.add(ent);
                             }
                         }  else {
                             ent.addPackage(st.mPackageName);
@@ -672,7 +707,8 @@
                         for (int is=0, NS=ps.mServices.size(); is<NS; is++) {
                             ProcessStats.ServiceState ss = ps.mServices.valueAt(is);
                             if (ss.mProcessName != null) {
-                                ProcStatsEntry ent = entriesMap.get(ss.mProcessName, uids.keyAt(iu));
+                                ProcStatsEntry ent = entriesMap.get(ss.mProcessName,
+                                        uids.keyAt(iu));
                                 if (ent != null) {
                                     if (DEBUG) Log.d(TAG, "Adding service " + ps.mPackageName
                                             + "/" + ss.mName + "/" + uids.keyAt(iu) + " to proc "
@@ -689,90 +725,99 @@
             }
         }
 
-        /*
-        SparseArray<ArrayMap<String, ProcStatsEntry>> processes
-                = new SparseArray<ArrayMap<String, ProcStatsEntry>>();
-        for (int ip=0, N=mStats.mProcesses.getMap().size(); ip<N; ip++) {
-            SparseArray<ProcessStats.ProcessState> uids = mStats.mProcesses.getMap().valueAt(ip);
-            for (int iu=0; iu<uids.size(); iu++) {
-                ProcessStats.ProcessState st = uids.valueAt(iu);
-                ProcStatsEntry ent = new ProcStatsEntry(st, totals, mUseUss,
-                        mStatsType == MENU_TYPE_BACKGROUND);
-                if (ent.mDuration > 0) {
-                    if (DEBUG) Log.d(TAG, "Adding proc " + st.mName + "/" + st.mUid + ": time="
-                            + makeDuration(ent.mDuration) + " ("
-                            + ((((double)ent.mDuration) / memTotalTime) * 100) + "%)");
-                    procs.add(ent);
-                    ArrayMap<String, ProcStatsEntry> uidProcs = processes.get(ent.mUid);
-                    if (uidProcs == null) {
-                        uidProcs = new ArrayMap<String, ProcStatsEntry>();
-                        processes.put(ent.mUid, uidProcs);
-                    }
-                    uidProcs.put(ent.mName, ent);
-                }
+        // Combine processes into packages.
+        HashMap<String, ProcStatsPackageEntry> pkgMap = new HashMap<>();
+        for (int i=procEntries.size()-1; i>=0; i--) {
+            ProcStatsEntry proc = procEntries.get(i);
+            proc.evaluateTargetPackage(pm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
+            ProcStatsPackageEntry pkg = pkgMap.get(proc.mBestTargetPackage);
+            if (pkg == null) {
+                pkg = new ProcStatsPackageEntry(proc.mBestTargetPackage);
+                pkgMap.put(proc.mBestTargetPackage, pkg);
+                pkgEntries.add(pkg);
             }
+            pkg.addEntry(proc);
         }
-        */
 
-        Collections.sort(entries, sEntryCompare);
+        // Add in fake entry representing the OS itself.
+        ProcStatsPackageEntry osPkg = new ProcStatsPackageEntry("os");
+        pkgMap.put("os", osPkg);
+        pkgEntries.add(osPkg);
+        ProcStatsEntry osEntry;
+        if (totalMem.sysMemNativeWeight > 0) {
+            osEntry = new ProcStatsEntry("os", 0,
+                    getString(R.string.process_stats_os_native), memTotalTime,
+                    (long)(totalMem.sysMemNativeWeight/memTotalTime));
+            osEntry.evaluateTargetPackage(pm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
+            osPkg.addEntry(osEntry);
+        }
+        if (totalMem.sysMemKernelWeight > 0) {
+            osEntry = new ProcStatsEntry("os", 0,
+                    getString(R.string.process_stats_os_kernel), memTotalTime,
+                    (long)(totalMem.sysMemKernelWeight/memTotalTime));
+            osEntry.evaluateTargetPackage(pm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
+            osPkg.addEntry(osEntry);
+        }
+        if (totalMem.sysMemZRamWeight > 0) {
+            osEntry = new ProcStatsEntry("os", 0,
+                    getString(R.string.process_stats_os_zram), memTotalTime,
+                    (long)(totalMem.sysMemZRamWeight/memTotalTime));
+            osEntry.evaluateTargetPackage(pm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
+            osPkg.addEntry(osEntry);
+        }
+        if (baseCacheRam > 0) {
+            osEntry = new ProcStatsEntry("os", 0,
+                    getString(R.string.process_stats_os_cache), memTotalTime, baseCacheRam/1024);
+            osEntry.evaluateTargetPackage(pm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
+            osPkg.addEntry(osEntry);
+        }
 
-        long maxWeight = 1;
-        for (int i=0, N=(entries != null ? entries.size() : 0); i<N; i++) {
-            ProcStatsEntry proc = entries.get(i);
-            if (maxWeight < proc.mWeight) {
-                maxWeight = proc.mWeight;
-            }
+        for (int i=0, N=pkgEntries.size(); i<N; i++) {
+            ProcStatsPackageEntry pkg = pkgEntries.get(i);
+            pkg.updateMetrics();
         }
-        if (mStatsType == MENU_TYPE_BACKGROUND) {
-            mMaxWeight = (long)(mShowSystem ? persBackgroundWeight : backgroundWeight);
-            if (mMaxWeight < maxWeight) {
-                mMaxWeight = maxWeight;
-            }
-            if (DEBUG) {
-                Log.i(TAG, "Bar max RAM: " + Formatter.formatShortFileSize(getActivity(),
-                        (mMaxWeight * 1024) / memTotalTime));
-            }
-        } else {
-            mMaxWeight = maxWeight;
-        }
+
+        Collections.sort(pkgEntries, sPackageEntryCompare);
+
+        // Now collect the per-process information into applications, so that applications
+        // running as multiple processes will have only one entry representing all of them.
 
         if (DEBUG) Log.d(TAG, "-------------------- BUILDING UI");
 
         // Find where we should stop.  Because we have two properties we are looking at,
         // we need to go from the back looking for the first place either holds.
-        int end = entries != null ? entries.size()-1 : -1;
+        int end = pkgEntries.size()-1;
         while (end >= 0) {
-            ProcStatsEntry proc = entries.get(end);
-            final double percentOfWeight = (((double)proc.mWeight) / mMaxWeight) * 100;
-            final double percentOfTime = (((double)proc.mDuration) / memTotalTime) * 100;
-            if (percentOfWeight >= 1 || percentOfTime >= 25) {
+            ProcStatsPackageEntry pkg = pkgEntries.get(end);
+            final double percentOfWeight = (pkg.mRunWeight / mMaxWeight) * 100;
+            final double percentOfTime = (((double)pkg.mRunDuration) / memTotalTime) * 100;
+            if (percentOfWeight >= .01 || percentOfTime >= 25) {
                 break;
             }
             end--;
         }
         for (int i=0; i<=end; i++) {
-            ProcStatsEntry proc = entries.get(i);
-            final double percentOfWeight = (((double)proc.mWeight) / mMaxWeight) * 100;
-            final double percentOfTime = (((double)proc.mDuration) / memTotalTime) * 100;
+            ProcStatsPackageEntry pkg = pkgEntries.get(i);
+            final double percentOfWeight = (pkg.mRunWeight / mMaxWeight) * 100;
+            final double percentOfTime = (((double)pkg.mRunDuration) / memTotalTime) * 100;
             ProcessStatsPreference pref = new ProcessStatsPreference(getActivity());
-            pref.init(null, proc);
-            proc.evaluateTargetPackage(pm, mStats, totals, sEntryCompare, mUseUss,
-                    mStatsType == MENU_TYPE_BACKGROUND);
-            proc.retrieveUiData(pm);
-            pref.setTitle(proc.mUiLabel);
-            if (proc.mUiTargetApp != null) {
-                pref.setIcon(proc.mUiTargetApp.loadIcon(pm));
+            pref.init(null, pkg);
+            pkg.retrieveUiData(getActivity(), pm);
+            pref.setTitle(pkg.mUiLabel);
+            if (pkg.mUiTargetApp != null) {
+                pref.setIcon(pkg.mUiTargetApp.loadIcon(pm));
             }
             pref.setOrder(i);
-            pref.setPercent(percentOfWeight, percentOfTime);
+            pref.setPercent(percentOfWeight, percentOfTime,
+                    (long)(pkg.mRunWeight * mWeightToRam));
             mAppListGroup.addPreference(pref);
             if (mStatsType == MENU_TYPE_BACKGROUND) {
                 if (DEBUG) {
-                    Log.i(TAG, "App " + proc.mUiLabel + ": weightedRam="
+                    Log.i(TAG, "App " + pkg.mUiLabel + ": weightedRam="
                             + Formatter.formatShortFileSize(getActivity(),
-                                    (proc.mWeight * 1024) / memTotalTime)
+                                    (long)((pkg.mRunWeight * 1024) / memTotalTime))
                             + ", avgRam=" + Formatter.formatShortFileSize(getActivity(),
-                                    (proc.mAvgPss*1024)));
+                                    (pkg.mAvgRunMem *1024)));
                 }
 
             }
diff --git a/src/com/android/settings/applications/ResetAppsHelper.java b/src/com/android/settings/applications/ResetAppsHelper.java
new file mode 100644
index 0000000..cc83157
--- /dev/null
+++ b/src/com/android/settings/applications/ResetAppsHelper.java
@@ -0,0 +1,145 @@
+/*
+ * 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 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 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));
+        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) {
+                            mPm.setApplicationEnabledSetting(app.packageName,
+                                    PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                                    PackageManager.DONT_KILL_APP);
+                        }
+                    }
+                }
+                try {
+                    mIPm.resetPreferredActivities(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);
+                    }
+                }
+            }
+        });
+    }
+}
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 13d9655..d33acd9 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -431,7 +431,7 @@
         mMyUserId = UserHandle.myUserId();
     }
     
-    public void doCreate(Bundle savedInstanceState) {
+    public void doCreate() {
         mAm = (ActivityManager)getContext().getSystemService(Context.ACTIVITY_SERVICE);
         mState = RunningState.getInstance(getContext());
         LayoutInflater inflater = (LayoutInflater)getContext().getSystemService(
@@ -449,10 +449,10 @@
         mHeader = inflater.inflate(R.layout.running_processes_header, null);
         mListView.addHeaderView(mHeader, null, false /* set as not selectable */);
         mColorBar = (LinearColorBar)mHeader.findViewById(R.id.color_bar);
-        Resources res = getResources();
-        mColorBar.setColors(res.getColor(R.color.running_processes_system_ram),
-                res.getColor(R.color.running_processes_apps_ram),
-                res.getColor(R.color.running_processes_free_ram));
+        final Context context = getContext();
+        mColorBar.setColors(context.getColor(R.color.running_processes_system_ram),
+                context.getColor(R.color.running_processes_apps_ram),
+                context.getColor(R.color.running_processes_free_ram));
         mBackgroundProcessPrefix = (TextView)mHeader.findViewById(R.id.freeSizePrefix);
         mAppsProcessPrefix = (TextView)mHeader.findViewById(R.id.appsSizePrefix);
         mForegroundProcessPrefix = (TextView)mHeader.findViewById(R.id.systemSizePrefix);
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index 45cad3d..8f074fd 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -33,6 +33,8 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -43,7 +45,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 
-public class RunningServiceDetails extends Fragment
+public class RunningServiceDetails extends InstrumentedFragment
         implements RunningState.OnRefreshUiListener {
     static final String TAG = "RunningServicesDetails";
 
@@ -533,6 +535,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.RUNNING_SERVICE_DETAILS;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         ensureData();
diff --git a/src/com/android/settings/applications/RunningServices.java b/src/com/android/settings/applications/RunningServices.java
new file mode 100644
index 0000000..1841f13
--- /dev/null
+++ b/src/com/android/settings/applications/RunningServices.java
@@ -0,0 +1,115 @@
+/*
+ * 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.Fragment;
+import android.os.Bundle;
+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 com.android.settings.R;
+import com.android.settings.Utils;
+
+public class RunningServices extends Fragment {
+
+    private static final int SHOW_RUNNING_SERVICES = 1;
+    private static final int SHOW_BACKGROUND_PROCESSES = 2;
+
+    private RunningProcessesView mRunningProcessesView;
+    private Menu mOptionsMenu;
+    private View mLoadingContainer;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.manage_applications_running, null);
+        mRunningProcessesView = (RunningProcessesView) rootView.findViewById(
+                R.id.running_processes);
+        mRunningProcessesView.doCreate();
+        mLoadingContainer = rootView.findViewById(R.id.loading_container);
+
+        return rootView;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        mOptionsMenu = menu;
+        menu.add(0, SHOW_RUNNING_SERVICES, 1, R.string.show_running_services)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menu.add(0, SHOW_BACKGROUND_PROCESSES, 2, R.string.show_background_processes)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        updateOptionsMenu();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        boolean haveData = mRunningProcessesView.doResume(this, mRunningProcessesAvail);
+        Utils.handleLoadingContainer(mLoadingContainer, mRunningProcessesView, haveData, false);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mRunningProcessesView.doPause();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case SHOW_RUNNING_SERVICES:
+                mRunningProcessesView.mAdapter.setShowBackground(false);
+                break;
+            case SHOW_BACKGROUND_PROCESSES:
+                mRunningProcessesView.mAdapter.setShowBackground(true);
+                break;
+            default:
+                return false;
+        }
+        updateOptionsMenu();
+        return true;
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        updateOptionsMenu();
+    }
+
+    private void updateOptionsMenu() {
+        boolean showingBackground = mRunningProcessesView.mAdapter.getShowBackground();
+        mOptionsMenu.findItem(SHOW_RUNNING_SERVICES).setVisible(showingBackground);
+        mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
+    }
+
+    private final Runnable mRunningProcessesAvail = new Runnable() {
+        @Override
+        public void run() {
+            Utils.handleLoadingContainer(mLoadingContainer, mRunningProcessesView, true, true);
+        }
+    };
+
+}
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 4b58729..f0c33dd 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -19,8 +19,11 @@
 import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
 import android.app.ActivityThread;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageItemInfo;
@@ -28,8 +31,6 @@
 import android.content.pm.ServiceInfo;
 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.graphics.drawable.Drawable.ConstantState;
 import android.os.Handler;
@@ -45,7 +46,6 @@
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.drawable.CircleFramedDrawable;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -124,9 +124,6 @@
     // representing all items that would be put in mUserBackgroundItems for that user.
     final SparseArray<MergedItem> mOtherUserBackgroundItems = new SparseArray<MergedItem>();
 
-    // Tracking of information about users.
-    final SparseArray<UserState> mUsers = new SparseArray<UserState>();
-
     static class AppProcessInfo {
         final ActivityManager.RunningAppProcessInfo info;
         boolean hasServices;
@@ -286,6 +283,42 @@
         }
     };
 
+    private final class UserManagerBroadcastReceiver extends BroadcastReceiver {
+        private volatile boolean usersChanged;
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            synchronized (mLock) {
+                if (mResumed) {
+                    mHaveData = false;
+                    mBackgroundHandler.removeMessages(MSG_RESET_CONTENTS);
+                    mBackgroundHandler.sendEmptyMessage(MSG_RESET_CONTENTS);
+                    mBackgroundHandler.removeMessages(MSG_UPDATE_CONTENTS);
+                    mBackgroundHandler.sendEmptyMessage(MSG_UPDATE_CONTENTS);
+                } else {
+                    usersChanged = true;
+                }
+            }
+        }
+
+        public boolean checkUsersChangedLocked() {
+            boolean oldValue = usersChanged;
+            usersChanged = false;
+            return oldValue;
+        }
+
+        void register(Context context) {
+            IntentFilter filter = new IntentFilter();
+            filter.addAction(Intent.ACTION_USER_STOPPED);
+            filter.addAction(Intent.ACTION_USER_STARTED);
+            filter.addAction(Intent.ACTION_USER_INFO_CHANGED);
+            context.registerReceiverAsUser(this, UserHandle.ALL, filter, null, null);
+        }
+    }
+
+    private final UserManagerBroadcastReceiver mUmBroadcastReceiver =
+            new UserManagerBroadcastReceiver();
+
     // ----- DATA STRUCTURES -----
 
     static interface OnRefreshUiListener {
@@ -327,7 +360,9 @@
 
         public Drawable loadIcon(Context context, RunningState state) {
             if (mPackageInfo != null) {
-                return mPackageInfo.loadIcon(state.mPm);
+                Drawable unbadgedIcon = mPackageInfo.loadUnbadgedIcon(state.mPm);
+                Drawable icon = state.mPm.getUserBadgedIcon(unbadgedIcon, new UserHandle(mUserId));
+                return icon;
             }
             return null;
         }
@@ -750,15 +785,17 @@
         mBackgroundThread = new HandlerThread("RunningState:Background");
         mBackgroundThread.start();
         mBackgroundHandler = new BackgroundHandler(mBackgroundThread.getLooper());
+        mUmBroadcastReceiver.register(mApplicationContext);
     }
 
     void resume(OnRefreshUiListener listener) {
         synchronized (mLock) {
             mResumed = true;
             mRefreshUiListener = listener;
-            // TODO: The set of users may have changed too, so we should probably recompute it
-            // each time, but that might be costly. See http://b/18696308
-            if (mInterestingConfigChanges.applyNewConfig(mApplicationContext.getResources())) {
+            boolean usersChanged = mUmBroadcastReceiver.checkUsersChangedLocked();
+            boolean configChanged =
+                    mInterestingConfigChanges.applyNewConfig(mApplicationContext.getResources());
+            if (usersChanged || configChanged) {
                 mHaveData = false;
                 mBackgroundHandler.removeMessages(MSG_RESET_CONTENTS);
                 mBackgroundHandler.removeMessages(MSG_UPDATE_CONTENTS);
@@ -824,7 +861,6 @@
         mRunningProcesses.clear();
         mProcessItems.clear();
         mAllProcessItems.clear();
-        mUsers.clear();
     }
 
     private void addOtherUserItem(Context context, ArrayList<MergedItem> newMergedItems,
@@ -832,9 +868,7 @@
         MergedItem userItem = userItems.get(newItem.mUserId);
         boolean first = userItem == null || userItem.mCurSeq != mSequence;
         if (first) {
-            UserState userState = mUsers.get(newItem.mUserId);
-            UserInfo info = userState != null
-                    ? userState.mInfo : mUm.getUserInfo(newItem.mUserId);
+            UserInfo info = mUm.getUserInfo(newItem.mUserId);
             if (info == null) {
                 // The user no longer exists, skip
                 return;
@@ -849,12 +883,10 @@
                 userItem.mChildren.clear();
             }
             userItem.mCurSeq = mSequence;
-            if (userState == null) {
-                userItem.mUser = new UserState();
-                userItem.mUser.mInfo = info;
-                userItem.mUser.mIcon = Utils.getUserIcon(context, mUm, info);
-                userItem.mUser.mLabel = Utils.getUserLabel(context, info);
-            }
+            userItem.mUser = new UserState();
+            userItem.mUser.mInfo = info;
+            userItem.mUser.mIcon = Utils.getUserIcon(context, mUm, info);
+            userItem.mUser.mLabel = Utils.getUserLabel(context, info);
             newMergedItems.add(userItem);
         }
         userItem.mChildren.add(newItem);
@@ -1403,12 +1435,6 @@
         return changed;
     }
     
-    ArrayList<BaseItem> getCurrentItems() {
-        synchronized (mLock) {
-            return mItems;
-        }
-    }
-    
     void setWatchingBackgroundItems(boolean watching) {
         synchronized (mLock) {
             mWatchingBackgroundItems = watching;
diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java
new file mode 100644
index 0000000..a11d7a7
--- /dev/null
+++ b/src/com/android/settings/applications/UsageAccessDetails.java
@@ -0,0 +1,148 @@
+/*
+ * 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.AlertDialog;
+import android.app.AppOpsManager;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.SwitchPreference;
+import android.provider.Settings;
+import android.util.Log;
+
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+import com.android.settings.applications.AppStateUsageBridge.UsageState;
+
+public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
+        OnPreferenceClickListener {
+
+    private static final String KEY_USAGE_SWITCH = "usage_switch";
+    private static final String KEY_USAGE_PREFS = "app_usage_preference";
+
+    // Use a bridge to get the usage stats but don't initialize it to connect with all state.
+    // TODO: Break out this functionality into its own class.
+    private AppStateUsageBridge mUsageBridge;
+    private AppOpsManager mAppOpsManager;
+    private SwitchPreference mSwitchPref;
+    private Preference mUsagePrefs;
+    private Intent mSettingsIntent;
+    private UsageState mUsageState;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Context context = getActivity();
+        mUsageBridge = new AppStateUsageBridge(context, mState, null);
+        mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+
+        addPreferencesFromResource(R.xml.usage_access_details);
+        mSwitchPref = (SwitchPreference) findPreference(KEY_USAGE_SWITCH);
+        mUsagePrefs = findPreference(KEY_USAGE_PREFS);
+
+        mSwitchPref.setOnPreferenceChangeListener(this);
+        mUsagePrefs.setOnPreferenceClickListener(this);
+
+        mSettingsIntent = new Intent(Intent.ACTION_MAIN)
+                .addCategory(Settings.INTENT_CATEGORY_USAGE_ACCESS_CONFIG)
+                .setPackage(mPackageName);
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        if (preference == mUsagePrefs) {
+            if (mSettingsIntent != null) {
+                try {
+                    getActivity().startActivityAsUser(mSettingsIntent, new UserHandle(mUserId));
+                } catch (ActivityNotFoundException e) {
+                    Log.w(TAG, "Unable to launch app usage access settings " + mSettingsIntent, e);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mSwitchPref) {
+            if (mUsageState != null && (Boolean) newValue != mUsageState.hasAccess()) {
+                setHasAccess(!mUsageState.hasAccess());
+                refreshUi();
+            }
+            return true;
+        }
+        return false;
+    }
+
+    private void setHasAccess(boolean newState) {
+        mAppOpsManager.setMode(AppOpsManager.OP_GET_USAGE_STATS, mPackageInfo.applicationInfo.uid,
+                mPackageName, newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        mUsageState = mUsageBridge.getUsageInfo(mPackageName,
+                mPackageInfo.applicationInfo.uid);
+
+        boolean hasAccess = mUsageState.hasAccess();
+        mSwitchPref.setChecked(hasAccess);
+        mUsagePrefs.setEnabled(hasAccess);
+
+        ResolveInfo resolveInfo = mPm.resolveActivityAsUser(mSettingsIntent,
+                PackageManager.GET_META_DATA, mUserId);
+        if (resolveInfo != null) {
+            if (findPreference(KEY_USAGE_PREFS) == null) {
+                getPreferenceScreen().addPreference(mUsagePrefs);
+            }
+            Bundle metaData = resolveInfo.activityInfo.metaData;
+            mSettingsIntent.setComponent(new ComponentName(resolveInfo.activityInfo.packageName,
+                    resolveInfo.activityInfo.name));
+            if (metaData != null
+                    && metaData.containsKey(Settings.METADATA_USAGE_ACCESS_REASON)) {
+                mSwitchPref.setSummary(
+                        metaData.getString(Settings.METADATA_USAGE_ACCESS_REASON));
+            }
+        } else {
+            if (findPreference(KEY_USAGE_PREFS) != null) {
+                getPreferenceScreen().removePreference(mUsagePrefs);
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        return null;
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return InstrumentedFragment.VIEW_CATEGORY_USAGE_ACCESS_DETAIL;
+    }
+
+}
diff --git a/src/com/android/settings/bluetooth/A2dpProfile.java b/src/com/android/settings/bluetooth/A2dpProfile.java
deleted file mode 100755
index 435a659..0000000
--- a/src/com/android/settings/bluetooth/A2dpProfile.java
+++ /dev/null
@@ -1,214 +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.bluetooth;
-
-import android.bluetooth.BluetoothA2dp;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothProfile;
-import android.bluetooth.BluetoothUuid;
-import android.content.Context;
-import android.os.ParcelUuid;
-import android.util.Log;
-
-import com.android.settings.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-final class A2dpProfile implements LocalBluetoothProfile {
-    private static final String TAG = "A2dpProfile";
-    private static boolean V = true;
-
-    private BluetoothA2dp mService;
-    private boolean mIsProfileReady;
-
-    private final LocalBluetoothAdapter mLocalAdapter;
-    private final CachedBluetoothDeviceManager mDeviceManager;
-
-    static final ParcelUuid[] SINK_UUIDS = {
-        BluetoothUuid.AudioSink,
-        BluetoothUuid.AdvAudioDist,
-    };
-
-    static final String NAME = "A2DP";
-    private final LocalBluetoothProfileManager mProfileManager;
-
-    // Order of this profile in device profiles list
-    private static final int ORDINAL = 1;
-
-    // These callbacks run on the main thread.
-    private final class A2dpServiceListener
-            implements BluetoothProfile.ServiceListener {
-
-        public void onServiceConnected(int profile, BluetoothProfile proxy) {
-            if (V) Log.d(TAG,"Bluetooth service connected");
-            mService = (BluetoothA2dp) proxy;
-            // We just bound to the service, so refresh the UI for any connected A2DP devices.
-            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-            while (!deviceList.isEmpty()) {
-                BluetoothDevice nextDevice = deviceList.remove(0);
-                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
-                // we may add a new device here, but generally this should not happen
-                if (device == null) {
-                    Log.w(TAG, "A2dpProfile found new device: " + nextDevice);
-                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
-                }
-                device.onProfileStateChanged(A2dpProfile.this, BluetoothProfile.STATE_CONNECTED);
-                device.refresh();
-            }
-            mIsProfileReady=true;
-        }
-
-        public void onServiceDisconnected(int profile) {
-            if (V) Log.d(TAG,"Bluetooth service disconnected");
-            mIsProfileReady=false;
-        }
-    }
-
-    public boolean isProfileReady() {
-        return mIsProfileReady;
-    }
-
-    A2dpProfile(Context context, LocalBluetoothAdapter adapter,
-            CachedBluetoothDeviceManager deviceManager,
-            LocalBluetoothProfileManager profileManager) {
-        mLocalAdapter = adapter;
-        mDeviceManager = deviceManager;
-        mProfileManager = profileManager;
-        mLocalAdapter.getProfileProxy(context, new A2dpServiceListener(),
-                BluetoothProfile.A2DP);
-    }
-
-    public boolean isConnectable() {
-        return true;
-    }
-
-    public boolean isAutoConnectable() {
-        return true;
-    }
-
-    public List<BluetoothDevice> getConnectedDevices() {
-        if (mService == null) return new ArrayList<BluetoothDevice>(0);
-        return mService.getDevicesMatchingConnectionStates(
-              new int[] {BluetoothProfile.STATE_CONNECTED,
-                         BluetoothProfile.STATE_CONNECTING,
-                         BluetoothProfile.STATE_DISCONNECTING});
-    }
-
-    public boolean connect(BluetoothDevice device) {
-        if (mService == null) return false;
-        List<BluetoothDevice> sinks = getConnectedDevices();
-        if (sinks != null) {
-            for (BluetoothDevice sink : sinks) {
-                mService.disconnect(sink);
-            }
-        }
-        return mService.connect(device);
-    }
-
-    public boolean disconnect(BluetoothDevice device) {
-        if (mService == null) return false;
-        // Downgrade priority as user is disconnecting the headset.
-        if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON){
-            mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
-        }
-        return mService.disconnect(device);
-    }
-
-    public int getConnectionStatus(BluetoothDevice device) {
-        if (mService == null) {
-            return BluetoothProfile.STATE_DISCONNECTED;
-        }
-        return mService.getConnectionState(device);
-    }
-
-    public boolean isPreferred(BluetoothDevice device) {
-        if (mService == null) return false;
-        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
-    }
-
-    public int getPreferred(BluetoothDevice device) {
-        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
-        return mService.getPriority(device);
-    }
-
-    public void setPreferred(BluetoothDevice device, boolean preferred) {
-        if (mService == null) return;
-        if (preferred) {
-            if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
-                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
-            }
-        } else {
-            mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
-        }
-    }
-    boolean isA2dpPlaying() {
-        if (mService == null) return false;
-        List<BluetoothDevice> sinks = mService.getConnectedDevices();
-        if (!sinks.isEmpty()) {
-            if (mService.isA2dpPlaying(sinks.get(0))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public String toString() {
-        return NAME;
-    }
-
-    public int getOrdinal() {
-        return ORDINAL;
-    }
-
-    public int getNameResource(BluetoothDevice device) {
-        return R.string.bluetooth_profile_a2dp;
-    }
-
-    public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = getConnectionStatus(device);
-        switch (state) {
-            case BluetoothProfile.STATE_DISCONNECTED:
-                return R.string.bluetooth_a2dp_profile_summary_use_for;
-
-            case BluetoothProfile.STATE_CONNECTED:
-                return R.string.bluetooth_a2dp_profile_summary_connected;
-
-            default:
-                return Utils.getConnectionStateSummary(state);
-        }
-    }
-
-    public int getDrawableResource(BluetoothClass btClass) {
-        return R.drawable.ic_bt_headphones_a2dp;
-    }
-
-    protected void finalize() {
-        if (V) Log.d(TAG, "finalize()");
-        if (mService != null) {
-            try {
-                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.A2DP,
-                                                                       mService);
-                mService = null;
-            }catch (Throwable t) {
-                Log.w(TAG, "Error cleaning up A2DP proxy", t);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/BluetoothCallback.java b/src/com/android/settings/bluetooth/BluetoothCallback.java
deleted file mode 100644
index 3ce9adf..0000000
--- a/src/com/android/settings/bluetooth/BluetoothCallback.java
+++ /dev/null
@@ -1,29 +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.bluetooth;
-
-/**
- * BluetoothCallback provides a callback interface for the settings
- * UI to receive events from {@link BluetoothEventManager}.
- */
-interface BluetoothCallback {
-    void onBluetoothStateChanged(int bluetoothState);
-    void onScanningStateChanged(boolean started);
-    void onDeviceAdded(CachedBluetoothDevice cachedDevice);
-    void onDeviceDeleted(CachedBluetoothDevice cachedDevice);
-    void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState);
-}
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceFilter.java b/src/com/android/settings/bluetooth/BluetoothDeviceFilter.java
deleted file mode 100644
index e4f11a2..0000000
--- a/src/com/android/settings/bluetooth/BluetoothDeviceFilter.java
+++ /dev/null
@@ -1,169 +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.bluetooth;
-
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothUuid;
-import android.os.ParcelUuid;
-import android.util.Log;
-
-/**
- * BluetoothDeviceFilter contains a static method that returns a
- * Filter object that returns whether or not the BluetoothDevice
- * passed to it matches the specified filter type constant from
- * {@link android.bluetooth.BluetoothDevicePicker}.
- */
-final class BluetoothDeviceFilter {
-    private static final String TAG = "BluetoothDeviceFilter";
-
-    /** The filter interface to external classes. */
-    interface Filter {
-        boolean matches(BluetoothDevice device);
-    }
-
-    /** All filter singleton (referenced directly). */
-    static final Filter ALL_FILTER = new AllFilter();
-
-    /** Bonded devices only filter (referenced directly). */
-    static final Filter BONDED_DEVICE_FILTER = new BondedDeviceFilter();
-
-    /** Unbonded devices only filter (referenced directly). */
-    static final Filter UNBONDED_DEVICE_FILTER = new UnbondedDeviceFilter();
-
-    /** Table of singleton filter objects. */
-    private static final Filter[] FILTERS = {
-            ALL_FILTER,             // FILTER_TYPE_ALL
-            new AudioFilter(),      // FILTER_TYPE_AUDIO
-            new TransferFilter(),   // FILTER_TYPE_TRANSFER
-            new PanuFilter(),       // FILTER_TYPE_PANU
-            new NapFilter()         // FILTER_TYPE_NAP
-    };
-
-    /** Private constructor. */
-    private BluetoothDeviceFilter() {
-    }
-
-    /**
-     * Returns the singleton {@link Filter} object for the specified type,
-     * or {@link #ALL_FILTER} if the type value is out of range.
-     *
-     * @param filterType a constant from BluetoothDevicePicker
-     * @return a singleton object implementing the {@link Filter} interface.
-     */
-    static Filter getFilter(int filterType) {
-        if (filterType >= 0 && filterType < FILTERS.length) {
-            return FILTERS[filterType];
-        } else {
-            Log.w(TAG, "Invalid filter type " + filterType + " for device picker");
-            return ALL_FILTER;
-        }
-    }
-
-    /** Filter that matches all devices. */
-    private static final class AllFilter implements Filter {
-        public boolean matches(BluetoothDevice device) {
-            return true;
-        }
-    }
-
-    /** Filter that matches only bonded devices. */
-    private static final class BondedDeviceFilter implements Filter {
-        public boolean matches(BluetoothDevice device) {
-            return device.getBondState() == BluetoothDevice.BOND_BONDED;
-        }
-    }
-
-    /** Filter that matches only unbonded devices. */
-    private static final class UnbondedDeviceFilter implements Filter {
-        public boolean matches(BluetoothDevice device) {
-            return device.getBondState() != BluetoothDevice.BOND_BONDED;
-        }
-    }
-
-    /** Parent class of filters based on UUID and/or Bluetooth class. */
-    private abstract static class ClassUuidFilter implements Filter {
-        abstract boolean matches(ParcelUuid[] uuids, BluetoothClass btClass);
-
-        public boolean matches(BluetoothDevice device) {
-            return matches(device.getUuids(), device.getBluetoothClass());
-        }
-    }
-
-    /** Filter that matches devices that support AUDIO profiles. */
-    private static final class AudioFilter extends ClassUuidFilter {
-        @Override
-        boolean matches(ParcelUuid[] uuids, BluetoothClass btClass) {
-            if (uuids != null) {
-                if (BluetoothUuid.containsAnyUuid(uuids, A2dpProfile.SINK_UUIDS)) {
-                    return true;
-                }
-                if (BluetoothUuid.containsAnyUuid(uuids, HeadsetProfile.UUIDS)) {
-                    return true;
-                }
-            } else if (btClass != null) {
-                if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP) ||
-                        btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-    /** Filter that matches devices that support Object Transfer. */
-    private static final class TransferFilter extends ClassUuidFilter {
-        @Override
-        boolean matches(ParcelUuid[] uuids, BluetoothClass btClass) {
-            if (uuids != null) {
-                if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.ObexObjectPush)) {
-                    return true;
-                }
-            }
-            return btClass != null
-                    && btClass.doesClassMatch(BluetoothClass.PROFILE_OPP);
-        }
-    }
-
-    /** Filter that matches devices that support PAN User (PANU) profile. */
-    private static final class PanuFilter extends ClassUuidFilter {
-        @Override
-        boolean matches(ParcelUuid[] uuids, BluetoothClass btClass) {
-            if (uuids != null) {
-                if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.PANU)) {
-                    return true;
-                }
-            }
-            return btClass != null
-                    && btClass.doesClassMatch(BluetoothClass.PROFILE_PANU);
-        }
-    }
-
-    /** Filter that matches devices that support NAP profile. */
-    private static final class NapFilter extends ClassUuidFilter {
-        @Override
-        boolean matches(ParcelUuid[] uuids, BluetoothClass btClass) {
-            if (uuids != null) {
-                if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP)) {
-                    return true;
-                }
-            }
-            return btClass != null
-                    && btClass.doesClassMatch(BluetoothClass.PROFILE_NAP);
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 5d6b17c..7bdc1a6 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -21,7 +21,6 @@
 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.os.UserManager;
@@ -37,6 +36,9 @@
 import com.android.settings.R;
 import com.android.settings.search.Index;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.HidProfile;
+import com.android.settingslib.bluetooth.LocalBluetoothProfile;
 
 import java.util.List;
 
@@ -107,7 +109,7 @@
          */
         setTitle(mCachedDevice.getName());
 
-        int summaryResId = getConnectionSummary();
+        int summaryResId = mCachedDevice.getConnectionSummary();
         if (summaryResId != 0) {
             setSummary(summaryResId);
         } else {
@@ -227,60 +229,6 @@
         }
     }
 
-    private int getConnectionSummary() {
-        final CachedBluetoothDevice cachedDevice = mCachedDevice;
-
-        boolean profileConnected = false;       // at least one profile is connected
-        boolean a2dpNotConnected = false;       // A2DP is preferred but not connected
-        boolean headsetNotConnected = false;    // Headset is preferred but not connected
-
-        for (LocalBluetoothProfile profile : cachedDevice.getProfiles()) {
-            int connectionStatus = cachedDevice.getProfileConnectionState(profile);
-
-            switch (connectionStatus) {
-                case BluetoothProfile.STATE_CONNECTING:
-                case BluetoothProfile.STATE_DISCONNECTING:
-                    return Utils.getConnectionStateSummary(connectionStatus);
-
-                case BluetoothProfile.STATE_CONNECTED:
-                    profileConnected = true;
-                    break;
-
-                case BluetoothProfile.STATE_DISCONNECTED:
-                    if (profile.isProfileReady()) {
-                        if (profile instanceof A2dpProfile) {
-                            a2dpNotConnected = true;
-                        } else if (profile instanceof HeadsetProfile) {
-                            headsetNotConnected = true;
-                        }
-                    }
-                    break;
-            }
-        }
-
-        if (profileConnected) {
-            if (a2dpNotConnected && headsetNotConnected) {
-                return R.string.bluetooth_connected_no_headset_no_a2dp;
-            } else if (a2dpNotConnected) {
-                return R.string.bluetooth_connected_no_a2dp;
-            } else if (headsetNotConnected) {
-                return R.string.bluetooth_connected_no_headset;
-            } else {
-                return R.string.bluetooth_connected;
-            }
-        }
-
-        switch (cachedDevice.getBondState()) {
-            case BluetoothDevice.BOND_BONDING:
-                return R.string.bluetooth_pairing;
-
-            case BluetoothDevice.BOND_BONDED:
-            case BluetoothDevice.BOND_NONE:
-            default:
-                return 0;
-        }
-    }
-
     private int getBtClassDrawable() {
         BluetoothClass btClass = mCachedDevice.getBtClass();
         if (btClass != null) {
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
index 17da0a7..6841b54 100755
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -25,12 +25,11 @@
 import android.os.Handler;
 import android.os.SystemProperties;
 import android.preference.Preference;
-import android.text.format.DateUtils;
+import android.util.Log;
 
 import com.android.settings.R;
-
-import android.text.format.Time;
-import android.util.Log;
+import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
 
 /**
  * BluetoothDiscoverableEnabler is a helper to manage the "Discoverable"
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.java
deleted file mode 100644
index 14f7b22..0000000
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-/* Required to handle timeout notification when phone is suspended */
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-
-public class BluetoothDiscoverableTimeoutReceiver extends BroadcastReceiver {
-    private static final String TAG = "BluetoothDiscoverableTimeoutReceiver";
-
-    private static final String INTENT_DISCOVERABLE_TIMEOUT =
-        "android.bluetooth.intent.DISCOVERABLE_TIMEOUT";
-
-    static void setDiscoverableAlarm(Context context, long alarmTime) {
-        Log.d(TAG, "setDiscoverableAlarm(): alarmTime = " + alarmTime);
-
-        Intent intent = new Intent(INTENT_DISCOVERABLE_TIMEOUT);
-        intent.setClass(context, BluetoothDiscoverableTimeoutReceiver.class);
-        PendingIntent pending = PendingIntent.getBroadcast(
-            context, 0, intent, 0);
-        AlarmManager alarmManager =
-              (AlarmManager) context.getSystemService (Context.ALARM_SERVICE);
-
-        if (pending != null) {
-            // Cancel any previous alarms that do the same thing.
-            alarmManager.cancel(pending);
-            Log.d(TAG, "setDiscoverableAlarm(): cancel prev alarm");
-        }
-        pending = PendingIntent.getBroadcast(
-            context, 0, intent, 0);
-
-        alarmManager.set(AlarmManager.RTC_WAKEUP, alarmTime, pending);
-    }
-
-    static void cancelDiscoverableAlarm(Context context) {
-        Log.d(TAG, "cancelDiscoverableAlarm(): Enter");
-
-        Intent intent = new Intent(INTENT_DISCOVERABLE_TIMEOUT);
-        intent.setClass(context, BluetoothDiscoverableTimeoutReceiver.class);
-        PendingIntent pending = PendingIntent.getBroadcast(
-            context, 0, intent, PendingIntent.FLAG_NO_CREATE);
-        if (pending != null) {
-            // Cancel any previous alarms that do the same thing.
-            AlarmManager alarmManager =
-              (AlarmManager) context.getSystemService (Context.ALARM_SERVICE);
-
-            alarmManager.cancel(pending);
-        }
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        LocalBluetoothAdapter localBluetoothAdapter = LocalBluetoothAdapter.getInstance();
-
-         if(localBluetoothAdapter != null  &&
-            localBluetoothAdapter.getState() == BluetoothAdapter.STATE_ON) {
-            Log.d(TAG, "Disable discoverable...");
-
-            localBluetoothAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
-         } else {
-            Log.e(TAG, "localBluetoothAdapter is NULL!!");
-        }
-    }
-};
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoveryReceiver.java b/src/com/android/settings/bluetooth/BluetoothDiscoveryReceiver.java
index fbb6827..1ba9f85 100644
--- a/src/com/android/settings/bluetooth/BluetoothDiscoveryReceiver.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoveryReceiver.java
@@ -22,6 +22,8 @@
 import android.content.Intent;
 import android.util.Log;
 
+import com.android.settingslib.bluetooth.BluetoothEventManager;
+
 /**
  * BluetoothDiscoveryReceiver updates a timestamp when the
  * Bluetooth adapter starts or finishes discovery mode. This
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index b006c65..1c9eeb6 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -24,14 +24,15 @@
 import android.os.Handler;
 import android.os.Message;
 import android.provider.Settings;
-import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.Toast;
 
 import com.android.settings.R;
-import com.android.settings.WirelessSettings;
 import com.android.settings.search.Index;
 import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.WirelessUtils;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**
  * BluetoothEnabler is a helper to manage the Bluetooth on/off checkbox
@@ -78,7 +79,7 @@
         mSwitch = switchBar.getSwitch();
         mValidListener = false;
 
-        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
+        LocalBluetoothManager manager = Utils.getLocalBtManager(context);
         if (manager == null) {
             // Bluetooth is not supported
             mLocalAdapter = null;
@@ -177,7 +178,7 @@
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
         // Show toast message if Bluetooth is not allowed in airplane mode
         if (isChecked &&
-                !WirelessSettings.isRadioAllowed(mContext, Settings.Global.RADIO_BLUETOOTH)) {
+                !WirelessUtils.isRadioAllowed(mContext, Settings.Global.RADIO_BLUETOOTH)) {
             Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
             // Reset switch to off
             switchView.setChecked(false);
diff --git a/src/com/android/settings/bluetooth/BluetoothEventManager.java b/src/com/android/settings/bluetooth/BluetoothEventManager.java
deleted file mode 100755
index bf7606e..0000000
--- a/src/com/android/settings/bluetooth/BluetoothEventManager.java
+++ /dev/null
@@ -1,390 +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.bluetooth;
-
-import com.android.settings.R;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothProfile;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * BluetoothEventManager receives broadcasts and callbacks from the Bluetooth
- * API and dispatches the event on the UI thread to the right class in the
- * Settings.
- */
-final class BluetoothEventManager {
-    private static final String TAG = "BluetoothEventManager";
-
-    private final LocalBluetoothAdapter mLocalAdapter;
-    private final CachedBluetoothDeviceManager mDeviceManager;
-    private LocalBluetoothProfileManager mProfileManager;
-    private final IntentFilter mAdapterIntentFilter, mProfileIntentFilter;
-    private final Map<String, Handler> mHandlerMap;
-    private Context mContext;
-
-    private final Collection<BluetoothCallback> mCallbacks =
-            new ArrayList<BluetoothCallback>();
-
-    interface Handler {
-        void onReceive(Context context, Intent intent, BluetoothDevice device);
-    }
-
-    void addHandler(String action, Handler handler) {
-        mHandlerMap.put(action, handler);
-        mAdapterIntentFilter.addAction(action);
-    }
-
-    void addProfileHandler(String action, Handler handler) {
-        mHandlerMap.put(action, handler);
-        mProfileIntentFilter.addAction(action);
-    }
-
-    // Set profile manager after construction due to circular dependency
-    void setProfileManager(LocalBluetoothProfileManager manager) {
-        mProfileManager = manager;
-    }
-
-    BluetoothEventManager(LocalBluetoothAdapter adapter,
-            CachedBluetoothDeviceManager deviceManager, Context context) {
-        mLocalAdapter = adapter;
-        mDeviceManager = deviceManager;
-        mAdapterIntentFilter = new IntentFilter();
-        mProfileIntentFilter = new IntentFilter();
-        mHandlerMap = new HashMap<String, Handler>();
-        mContext = context;
-
-        // Bluetooth on/off broadcasts
-        addHandler(BluetoothAdapter.ACTION_STATE_CHANGED, new AdapterStateChangedHandler());
-
-        // Discovery broadcasts
-        addHandler(BluetoothAdapter.ACTION_DISCOVERY_STARTED, new ScanningStateChangedHandler(true));
-        addHandler(BluetoothAdapter.ACTION_DISCOVERY_FINISHED, new ScanningStateChangedHandler(false));
-        addHandler(BluetoothDevice.ACTION_FOUND, new DeviceFoundHandler());
-        addHandler(BluetoothDevice.ACTION_DISAPPEARED, new DeviceDisappearedHandler());
-        addHandler(BluetoothDevice.ACTION_NAME_CHANGED, new NameChangedHandler());
-
-        // Pairing broadcasts
-        addHandler(BluetoothDevice.ACTION_BOND_STATE_CHANGED, new BondStateChangedHandler());
-        addHandler(BluetoothDevice.ACTION_PAIRING_CANCEL, new PairingCancelHandler());
-
-        // Fine-grained state broadcasts
-        addHandler(BluetoothDevice.ACTION_CLASS_CHANGED, new ClassChangedHandler());
-        addHandler(BluetoothDevice.ACTION_UUID, new UuidChangedHandler());
-
-        // Dock event broadcasts
-        addHandler(Intent.ACTION_DOCK_EVENT, new DockEventHandler());
-
-        mContext.registerReceiver(mBroadcastReceiver, mAdapterIntentFilter);
-    }
-
-    void registerProfileIntentReceiver() {
-        mContext.registerReceiver(mBroadcastReceiver, mProfileIntentFilter);
-    }
-
-    /** Register to start receiving callbacks for Bluetooth events. */
-    void registerCallback(BluetoothCallback callback) {
-        synchronized (mCallbacks) {
-            mCallbacks.add(callback);
-        }
-    }
-
-    /** Unregister to stop receiving callbacks for Bluetooth events. */
-    void unregisterCallback(BluetoothCallback callback) {
-        synchronized (mCallbacks) {
-            mCallbacks.remove(callback);
-        }
-    }
-
-    // This can't be called from a broadcast receiver where the filter is set in the Manifest.
-    private static String getDockedDeviceAddress(Context context) {
-        // This works only because these broadcast intents are "sticky"
-        Intent i = context.registerReceiver(null, new IntentFilter(Intent.ACTION_DOCK_EVENT));
-        if (i != null) {
-            int state = i.getIntExtra(Intent.EXTRA_DOCK_STATE, Intent.EXTRA_DOCK_STATE_UNDOCKED);
-            if (state != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
-                BluetoothDevice device = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-                if (device != null) {
-                    return device.getAddress();
-                }
-            }
-        }
-        return null;
-    }
-
-    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            BluetoothDevice device = intent
-                    .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-
-            Handler handler = mHandlerMap.get(action);
-            if (handler != null) {
-                handler.onReceive(context, intent, device);
-            }
-        }
-    };
-
-    private class AdapterStateChangedHandler implements Handler {
-        public void onReceive(Context context, Intent intent,
-                BluetoothDevice device) {
-            int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
-                                    BluetoothAdapter.ERROR);
-            // update local profiles and get paired devices
-            mLocalAdapter.setBluetoothStateInt(state);
-            // send callback to update UI and possibly start scanning
-            synchronized (mCallbacks) {
-                for (BluetoothCallback callback : mCallbacks) {
-                    callback.onBluetoothStateChanged(state);
-                }
-            }
-            // Inform CachedDeviceManager that the adapter state has changed
-            mDeviceManager.onBluetoothStateChanged(state);
-        }
-    }
-
-    private class ScanningStateChangedHandler implements Handler {
-        private final boolean mStarted;
-
-        ScanningStateChangedHandler(boolean started) {
-            mStarted = started;
-        }
-        public void onReceive(Context context, Intent intent,
-                BluetoothDevice device) {
-            synchronized (mCallbacks) {
-                for (BluetoothCallback callback : mCallbacks) {
-                    callback.onScanningStateChanged(mStarted);
-                }
-            }
-            mDeviceManager.onScanningStateChanged(mStarted);
-            LocalBluetoothPreferences.persistDiscoveringTimestamp(context);
-        }
-    }
-
-    private class DeviceFoundHandler implements Handler {
-        public void onReceive(Context context, Intent intent,
-                BluetoothDevice device) {
-            short rssi = intent.getShortExtra(BluetoothDevice.EXTRA_RSSI, Short.MIN_VALUE);
-            BluetoothClass btClass = intent.getParcelableExtra(BluetoothDevice.EXTRA_CLASS);
-            String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
-            // TODO Pick up UUID. They should be available for 2.1 devices.
-            // Skip for now, there's a bluez problem and we are not getting uuids even for 2.1.
-            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
-            if (cachedDevice == null) {
-                cachedDevice = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, device);
-                Log.d(TAG, "DeviceFoundHandler created new CachedBluetoothDevice: "
-                        + cachedDevice);
-                // callback to UI to create Preference for new device
-                dispatchDeviceAdded(cachedDevice);
-            }
-            cachedDevice.setRssi(rssi);
-            cachedDevice.setBtClass(btClass);
-            cachedDevice.setNewName(name);
-            cachedDevice.setVisible(true);
-        }
-    }
-
-    private void dispatchDeviceAdded(CachedBluetoothDevice cachedDevice) {
-        synchronized (mCallbacks) {
-            for (BluetoothCallback callback : mCallbacks) {
-                callback.onDeviceAdded(cachedDevice);
-            }
-        }
-    }
-
-    private class DeviceDisappearedHandler implements Handler {
-        public void onReceive(Context context, Intent intent,
-                BluetoothDevice device) {
-            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
-            if (cachedDevice == null) {
-                Log.w(TAG, "received ACTION_DISAPPEARED for an unknown device: " + device);
-                return;
-            }
-            if (CachedBluetoothDeviceManager.onDeviceDisappeared(cachedDevice)) {
-                synchronized (mCallbacks) {
-                    for (BluetoothCallback callback : mCallbacks) {
-                        callback.onDeviceDeleted(cachedDevice);
-                    }
-                }
-            }
-        }
-    }
-
-    private class NameChangedHandler implements Handler {
-        public void onReceive(Context context, Intent intent,
-                BluetoothDevice device) {
-            mDeviceManager.onDeviceNameUpdated(device);
-        }
-    }
-
-    private class BondStateChangedHandler implements Handler {
-        public void onReceive(Context context, Intent intent,
-                BluetoothDevice device) {
-            if (device == null) {
-                Log.e(TAG, "ACTION_BOND_STATE_CHANGED with no EXTRA_DEVICE");
-                return;
-            }
-            int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
-                                               BluetoothDevice.ERROR);
-            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
-            if (cachedDevice == null) {
-                Log.w(TAG, "CachedBluetoothDevice for device " + device +
-                        " not found, calling readPairedDevices().");
-                if (!readPairedDevices()) {
-                    Log.e(TAG, "Got bonding state changed for " + device +
-                            ", but we have no record of that device.");
-                    return;
-                }
-                cachedDevice = mDeviceManager.findDevice(device);
-                if (cachedDevice == null) {
-                    Log.e(TAG, "Got bonding state changed for " + device +
-                            ", but device not added in cache.");
-                    return;
-                }
-            }
-
-            synchronized (mCallbacks) {
-                for (BluetoothCallback callback : mCallbacks) {
-                    callback.onDeviceBondStateChanged(cachedDevice, bondState);
-                }
-            }
-            cachedDevice.onBondingStateChanged(bondState);
-
-            if (bondState == BluetoothDevice.BOND_NONE) {
-                if (device.isBluetoothDock()) {
-                    // After a dock is unpaired, we will forget the settings
-                    LocalBluetoothPreferences
-                            .removeDockAutoConnectSetting(context, device.getAddress());
-
-                    // if the device is undocked, remove it from the list as well
-                    if (!device.getAddress().equals(getDockedDeviceAddress(context))) {
-                        cachedDevice.setVisible(false);
-                    }
-                }
-                int reason = intent.getIntExtra(BluetoothDevice.EXTRA_REASON,
-                        BluetoothDevice.ERROR);
-
-                showUnbondMessage(context, cachedDevice.getName(), reason);
-            }
-        }
-
-        /**
-         * Called when we have reached the unbonded state.
-         *
-         * @param reason one of the error reasons from
-         *            BluetoothDevice.UNBOND_REASON_*
-         */
-        private void showUnbondMessage(Context context, String name, int reason) {
-            int errorMsg;
-
-            switch(reason) {
-            case BluetoothDevice.UNBOND_REASON_AUTH_FAILED:
-                errorMsg = R.string.bluetooth_pairing_pin_error_message;
-                break;
-            case BluetoothDevice.UNBOND_REASON_AUTH_REJECTED:
-                errorMsg = R.string.bluetooth_pairing_rejected_error_message;
-                break;
-            case BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN:
-                errorMsg = R.string.bluetooth_pairing_device_down_error_message;
-                break;
-            case BluetoothDevice.UNBOND_REASON_DISCOVERY_IN_PROGRESS:
-            case BluetoothDevice.UNBOND_REASON_AUTH_TIMEOUT:
-            case BluetoothDevice.UNBOND_REASON_REPEATED_ATTEMPTS:
-            case BluetoothDevice.UNBOND_REASON_REMOTE_AUTH_CANCELED:
-                errorMsg = R.string.bluetooth_pairing_error_message;
-                break;
-            default:
-                Log.w(TAG, "showUnbondMessage: Not displaying any message for reason: " + reason);
-                return;
-            }
-            Utils.showError(context, name, errorMsg);
-        }
-    }
-
-    private class ClassChangedHandler implements Handler {
-        public void onReceive(Context context, Intent intent,
-                BluetoothDevice device) {
-            mDeviceManager.onBtClassChanged(device);
-        }
-    }
-
-    private class UuidChangedHandler implements Handler {
-        public void onReceive(Context context, Intent intent,
-                BluetoothDevice device) {
-            mDeviceManager.onUuidChanged(device);
-        }
-    }
-
-    private class PairingCancelHandler implements Handler {
-        public void onReceive(Context context, Intent intent, BluetoothDevice device) {
-            if (device == null) {
-                Log.e(TAG, "ACTION_PAIRING_CANCEL with no EXTRA_DEVICE");
-                return;
-            }
-            int errorMsg = R.string.bluetooth_pairing_error_message;
-            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
-            Utils.showError(context, cachedDevice.getName(), errorMsg);
-        }
-    }
-
-    private class DockEventHandler implements Handler {
-        public void onReceive(Context context, Intent intent, BluetoothDevice device) {
-            // Remove if unpair device upon undocking
-            int anythingButUnDocked = Intent.EXTRA_DOCK_STATE_UNDOCKED + 1;
-            int state = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, anythingButUnDocked);
-            if (state == Intent.EXTRA_DOCK_STATE_UNDOCKED) {
-                if (device != null && device.getBondState() == BluetoothDevice.BOND_NONE) {
-                    CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
-                    if (cachedDevice != null) {
-                        cachedDevice.setVisible(false);
-                    }
-                }
-            }
-        }
-    }
-    boolean readPairedDevices() {
-        Set<BluetoothDevice> bondedDevices = mLocalAdapter.getBondedDevices();
-        if (bondedDevices == null) {
-            return false;
-        }
-
-        boolean deviceAdded = false;
-        for (BluetoothDevice device : bondedDevices) {
-            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
-            if (cachedDevice == null) {
-                cachedDevice = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, device);
-                dispatchDeviceAdded(cachedDevice);
-                deviceAdded = true;
-            }
-        }
-
-        return deviceAdded;
-    }
-}
diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
index ccbb655..250b326 100644
--- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -40,6 +40,8 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**
  * Dialog fragment for renaming the local Bluetooth device.
@@ -80,7 +82,7 @@
     };
 
     public BluetoothNameDialogFragment() {
-        LocalBluetoothManager localManager = LocalBluetoothManager.getInstance(getActivity());
+        LocalBluetoothManager localManager = Utils.getLocalBtManager(getActivity());
         mLocalAdapter = localManager.getBluetoothAdapter();
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 6f5c136..5785285 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -17,19 +17,16 @@
 package com.android.settings.bluetooth;
 
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothUuid;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.os.ParcelUuid;
 import android.text.Editable;
 import android.text.Html;
 import android.text.InputFilter;
 import android.text.InputType;
-import android.text.Spanned;
 import android.text.TextWatcher;
 import android.text.InputFilter.LengthFilter;
 import android.util.Log;
@@ -43,6 +40,9 @@
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
 import android.view.KeyEvent;
 
 import java.util.Locale;
@@ -103,7 +103,7 @@
             return;
         }
 
-        mBluetoothManager = LocalBluetoothManager.getInstance(this);
+        mBluetoothManager = Utils.getLocalBtManager(this);
         if (mBluetoothManager == null) {
             Log.e(TAG, "Error: BluetoothAdapter not supported by system");
             finish();
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 44198d3..5b06661 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -91,7 +91,7 @@
                         .setContentIntent(pending)
                         .setAutoCancel(true)
                         .setDefaults(Notification.DEFAULT_SOUND)
-                        .setColor(res.getColor(
+                        .setColor(context.getColor(
                                 com.android.internal.R.color.system_notification_accent_color));
 
                 NotificationManager manager = (NotificationManager)
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index 3c250f0..7a1e69d 100755
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -31,8 +31,10 @@
 
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
-
 import com.android.settings.R;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**
  * BluetoothPermissionActivity shows a dialog for accepting incoming
@@ -99,8 +101,6 @@
             showDialog(getString(R.string.bluetooth_phonebook_request), mRequestType);
         } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
             showDialog(getString(R.string.bluetooth_map_request), mRequestType);
-        } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
-            showDialog(getString(R.string.bluetooth_sap_request), mRequestType);
         }
         else {
             Log.e(TAG, "Error: bad request type: " + mRequestType);
@@ -129,9 +129,6 @@
         case BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS:
             p.mView = createMapDialogView();
             break;
-        case BluetoothDevice.REQUEST_TYPE_SIM_ACCESS:
-            p.mView = createSapDialogView();
-            break;
         }
         p.mPositiveButtonText = getString(R.string.yes);
         p.mPositiveButtonListener = this;
@@ -186,15 +183,6 @@
         return mView;
     }
 
-    private View createSapDialogView() {
-        String mRemoteName = createRemoteName();
-        mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
-        messageView = (TextView)mView.findViewById(R.id.message);
-        messageView.setText(getString(R.string.bluetooth_sap_acceptance_dialog_text,
-                mRemoteName, mRemoteName));
-        return mView;
-    }
-
     private void onPositive() {
         if (DEBUG) Log.d(TAG, "onPositive");
         sendReplyIntentToReceiver(true, true);
@@ -206,7 +194,7 @@
 
         boolean always = true;
         if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
-            LocalBluetoothManager bluetoothManager = LocalBluetoothManager.getInstance(this);
+            LocalBluetoothManager bluetoothManager = Utils.getLocalBtManager(this);
             CachedBluetoothDeviceManager cachedDeviceManager =
                     bluetoothManager.getCachedDeviceManager();
             CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index 0cf8cc8..b3a9571 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -28,6 +28,9 @@
 import android.util.Log;
 
 import com.android.settings.R;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**
  * BluetoothPermissionRequest is a receiver to receive Bluetooth connection
@@ -41,7 +44,6 @@
 
     private static final String NOTIFICATION_TAG_PBAP = "Phonebook Access" ;
     private static final String NOTIFICATION_TAG_MAP = "Message Access";
-    private static final String NOTIFICATION_TAG_SAP = "SIM Access";
 
 
     Context mContext;
@@ -155,7 +157,7 @@
                         .setContentIntent(PendingIntent.getActivity(context, 0,
                                 connectionAccessIntent, 0))
                         .setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent, 0))
-                        .setColor(context.getResources().getColor(
+                        .setColor(context.getColor(
                                 com.android.internal.R.color.system_notification_accent_color))
                         .build();
 
@@ -182,8 +184,6 @@
             return NOTIFICATION_TAG_PBAP;
         } else if(mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
             return NOTIFICATION_TAG_MAP;
-        } else if(mRequestType == BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
-            return NOTIFICATION_TAG_SAP;
         }
         return null;
     }
@@ -198,13 +198,12 @@
 
         // ignore if it is something else than phonebook/message settings it wants us to remember
         if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS
-                && mRequestType != BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS
-                && mRequestType != BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
+                && mRequestType != BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
             if (DEBUG) Log.d(TAG, "checkUserChoice(): Unknown RequestType " + mRequestType);
             return processed;
         }
 
-        LocalBluetoothManager bluetoothManager = LocalBluetoothManager.getInstance(mContext);
+        LocalBluetoothManager bluetoothManager = Utils.getLocalBtManager(mContext);
         CachedBluetoothDeviceManager cachedDeviceManager =
             bluetoothManager.getCachedDeviceManager();
         CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
@@ -243,20 +242,6 @@
             } else {
                 Log.e(TAG, "Bad messagePermission: " + messagePermission);
             }
-        } else if(mRequestType == BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
-            int simPermission = cachedDevice.getSimPermissionChoice();
-
-            if (simPermission == CachedBluetoothDevice.ACCESS_UNKNOWN) {
-                // Leave 'processed' as false.
-            } else if (simPermission == CachedBluetoothDevice.ACCESS_ALLOWED) {
-                sendReplyIntentToReceiver(true);
-                processed = true;
-            } else if (simPermission == CachedBluetoothDevice.ACCESS_REJECTED) {
-                sendReplyIntentToReceiver(false);
-                processed = true;
-            } else {
-                Log.e(TAG, "Bad simPermission: " + simPermission);
-            }
         }
         if (DEBUG) Log.d(TAG,"checkUserChoice(): returning " + processed);
         return processed;
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index dd2c9df..1d0dc7e 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -28,15 +28,15 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
-import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.text.Spannable;
+import android.text.style.TextAppearanceSpan;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -44,17 +44,21 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.LinkifyUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.location.ScanningSettings;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Index;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -125,6 +129,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.BLUETOOTH;
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         mInitialScanStarted = (savedInstanceState != null);    // don't auto start scan after rotation
@@ -132,6 +141,7 @@
 
         mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
         getListView().setEmptyView(mEmptyView);
+        mEmptyView.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
 
         final SettingsActivity activity = (SettingsActivity) getActivity();
         mSwitchBar = activity.getSwitchBar();
@@ -348,7 +358,7 @@
                 break;
 
             case BluetoothAdapter.STATE_OFF:
-                messageId = R.string.bluetooth_empty_list_bluetooth_off;
+                setOffMessage();
                 if (isUiRestricted()) {
                     messageId = R.string.bluetooth_empty_list_user_restricted;
                 }
@@ -362,12 +372,39 @@
 
         setDeviceListGroup(preferenceScreen);
         removeAllDevices();
-        mEmptyView.setText(messageId);
+        if (messageId != 0) {
+            mEmptyView.setText(messageId);
+        }
         if (!isUiRestricted()) {
             getActivity().invalidateOptionsMenu();
         }
     }
 
+    private void setOffMessage() {
+        if (mEmptyView == null) {
+            return;
+        }
+        final CharSequence briefText = getText(R.string.bluetooth_empty_list_bluetooth_off);
+        final StringBuilder contentBuilder = new StringBuilder();
+        contentBuilder.append(briefText);
+        contentBuilder.append("\n\n");
+        contentBuilder.append(getText(R.string.ble_scan_notify_text));
+        getPreferenceScreen().removeAll();
+        LinkifyUtils.linkify(mEmptyView, contentBuilder, new LinkifyUtils.OnClickListener() {
+            @Override
+            public void onClick() {
+                final SettingsActivity activity =
+                        (SettingsActivity) BluetoothSettings.this.getActivity();
+                activity.startPreferencePanel(ScanningSettings.class.getName(), null,
+                        R.string.location_scanning_screen_title, null, null, 0);
+            }
+        });
+        Spannable boldSpan = (Spannable) mEmptyView.getText();
+        boldSpan.setSpan(
+                new TextAppearanceSpan(getActivity(), android.R.style.TextAppearance_Medium), 0,
+                briefText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+    }
+
     @Override
     public void onBluetoothStateChanged(int bluetoothState) {
         super.onBluetoothStateChanged(bluetoothState);
@@ -506,7 +543,7 @@
                 result.add(data);
 
                 // Add cached paired BT devices
-                LocalBluetoothManager lbtm = LocalBluetoothManager.getInstance(context);
+                LocalBluetoothManager lbtm = Utils.getLocalBtManager(context);
                 // LocalBluetoothManager.getInstance can return null if the device does not
                 // support bluetooth (e.g. the emulator).
                 if (lbtm != null) {
diff --git a/src/com/android/settings/bluetooth/BluetoothVisibilityTimeoutFragment.java b/src/com/android/settings/bluetooth/BluetoothVisibilityTimeoutFragment.java
deleted file mode 100644
index a65c6c1..0000000
--- a/src/com/android/settings/bluetooth/BluetoothVisibilityTimeoutFragment.java
+++ /dev/null
@@ -1,68 +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.bluetooth;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.bluetooth.BluetoothAdapter;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.InputFilter;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-
-import com.android.internal.app.AlertController;
-import com.android.settings.R;
-
-/**
- * Dialog fragment for setting the discoverability timeout.
- */
-public final class BluetoothVisibilityTimeoutFragment extends DialogFragment
-        implements DialogInterface.OnClickListener {
-
-    private final BluetoothDiscoverableEnabler mDiscoverableEnabler;
-
-    public BluetoothVisibilityTimeoutFragment() {
-        mDiscoverableEnabler = LocalBluetoothManager.getInstance(getActivity())
-                .getDiscoverableEnabler();
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.bluetooth_visibility_timeout)
-                .setSingleChoiceItems(R.array.bluetooth_visibility_timeout_entries,
-                        mDiscoverableEnabler.getDiscoverableTimeoutIndex(), this)
-                .setNegativeButton(android.R.string.cancel, null)
-                .create();
-    }
-
-    public void onClick(DialogInterface dialog, int which) {
-        mDiscoverableEnabler.setDiscoverableTimeout(which);
-        dismiss();
-    }
-}
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
deleted file mode 100755
index cf289a7..0000000
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ /dev/null
@@ -1,810 +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.bluetooth;
-
-import android.bluetooth.BluetoothUuid;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothProfile;
-import android.bluetooth.BluetoothUuid;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.ParcelUuid;
-import android.os.SystemClock;
-import android.text.TextUtils;
-import android.util.Log;
-import android.bluetooth.BluetoothAdapter;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * CachedBluetoothDevice represents a remote Bluetooth device. It contains
- * attributes of the device (such as the address, name, RSSI, etc.) and
- * functionality that can be performed on the device (connect, pair, disconnect,
- * etc.).
- */
-final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
-    private static final String TAG = "CachedBluetoothDevice";
-    private static final boolean DEBUG = Utils.V;
-
-    private final Context mContext;
-    private final LocalBluetoothAdapter mLocalAdapter;
-    private final LocalBluetoothProfileManager mProfileManager;
-    private final BluetoothDevice mDevice;
-    private String mName;
-    private short mRssi;
-    private BluetoothClass mBtClass;
-    private HashMap<LocalBluetoothProfile, Integer> mProfileConnectionState;
-
-    private final List<LocalBluetoothProfile> mProfiles =
-            new ArrayList<LocalBluetoothProfile>();
-
-    // List of profiles that were previously in mProfiles, but have been removed
-    private final List<LocalBluetoothProfile> mRemovedProfiles =
-            new ArrayList<LocalBluetoothProfile>();
-
-    // Device supports PANU but not NAP: remove PanProfile after device disconnects from NAP
-    private boolean mLocalNapRoleConnected;
-
-    private boolean mVisible;
-
-    private int mMessageRejectionCount;
-
-    private final Collection<Callback> mCallbacks = new ArrayList<Callback>();
-
-    // Following constants indicate the user's choices of Phone book/message access settings
-    // User hasn't made any choice or settings app has wiped out the memory
-    public final static int ACCESS_UNKNOWN = 0;
-    // User has accepted the connection and let Settings app remember the decision
-    public final static int ACCESS_ALLOWED = 1;
-    // User has rejected the connection and let Settings app remember the decision
-    public final static int ACCESS_REJECTED = 2;
-
-    // How many times user should reject the connection to make the choice persist.
-    private final static int MESSAGE_REJECTION_COUNT_LIMIT_TO_PERSIST = 2;
-
-    private final static String MESSAGE_REJECTION_COUNT_PREFS_NAME = "bluetooth_message_reject";
-
-    /**
-     * When we connect to multiple profiles, we only want to display a single
-     * error even if they all fail. This tracks that state.
-     */
-    private boolean mIsConnectingErrorPossible;
-
-    /**
-     * Last time a bt profile auto-connect was attempted.
-     * If an ACTION_UUID intent comes in within
-     * MAX_UUID_DELAY_FOR_AUTO_CONNECT milliseconds, we will try auto-connect
-     * again with the new UUIDs
-     */
-    private long mConnectAttempted;
-
-    // See mConnectAttempted
-    private static final long MAX_UUID_DELAY_FOR_AUTO_CONNECT = 5000;
-    private static final long MAX_HOGP_DELAY_FOR_AUTO_CONNECT = 30000;
-
-    /** Auto-connect after pairing only if locally initiated. */
-    private boolean mConnectAfterPairing;
-
-    /**
-     * Describes the current device and profile for logging.
-     *
-     * @param profile Profile to describe
-     * @return Description of the device and profile
-     */
-    private String describe(LocalBluetoothProfile profile) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Address:").append(mDevice);
-        if (profile != null) {
-            sb.append(" Profile:").append(profile);
-        }
-
-        return sb.toString();
-    }
-
-    void onProfileStateChanged(LocalBluetoothProfile profile, int newProfileState) {
-        if (Utils.D) {
-            Log.d(TAG, "onProfileStateChanged: profile " + profile +
-                    " newProfileState " + newProfileState);
-        }
-        if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_TURNING_OFF)
-        {
-            if (Utils.D) Log.d(TAG, " BT Turninig Off...Profile conn state change ignored...");
-            return;
-        }
-        mProfileConnectionState.put(profile, newProfileState);
-        if (newProfileState == BluetoothProfile.STATE_CONNECTED) {
-            if (profile instanceof MapProfile) {
-                profile.setPreferred(mDevice, true);
-            } else if (!mProfiles.contains(profile)) {
-                mRemovedProfiles.remove(profile);
-                mProfiles.add(profile);
-                if (profile instanceof PanProfile &&
-                        ((PanProfile) profile).isLocalRoleNap(mDevice)) {
-                    // Device doesn't support NAP, so remove PanProfile on disconnect
-                    mLocalNapRoleConnected = true;
-                }
-            }
-        } else if (profile instanceof MapProfile &&
-                newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
-            profile.setPreferred(mDevice, false);
-        } else if (mLocalNapRoleConnected && profile instanceof PanProfile &&
-                ((PanProfile) profile).isLocalRoleNap(mDevice) &&
-                newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
-            Log.d(TAG, "Removing PanProfile from device after NAP disconnect");
-            mProfiles.remove(profile);
-            mRemovedProfiles.add(profile);
-            mLocalNapRoleConnected = false;
-        }
-    }
-
-    CachedBluetoothDevice(Context context,
-                          LocalBluetoothAdapter adapter,
-                          LocalBluetoothProfileManager profileManager,
-                          BluetoothDevice device) {
-        mContext = context;
-        mLocalAdapter = adapter;
-        mProfileManager = profileManager;
-        mDevice = device;
-        mProfileConnectionState = new HashMap<LocalBluetoothProfile, Integer>();
-        fillData();
-    }
-
-    void disconnect() {
-        for (LocalBluetoothProfile profile : mProfiles) {
-            disconnect(profile);
-        }
-        // Disconnect  PBAP server in case its connected
-        // This is to ensure all the profiles are disconnected as some CK/Hs do not
-        // disconnect  PBAP connection when HF connection is brought down
-        PbapServerProfile PbapProfile = mProfileManager.getPbapProfile();
-        if (PbapProfile.getConnectionStatus(mDevice) == BluetoothProfile.STATE_CONNECTED)
-        {
-            PbapProfile.disconnect(mDevice);
-        }
-    }
-
-    void disconnect(LocalBluetoothProfile profile) {
-        if (profile.disconnect(mDevice)) {
-            if (Utils.D) {
-                Log.d(TAG, "Command sent successfully:DISCONNECT " + describe(profile));
-            }
-        }
-    }
-
-    void connect(boolean connectAllProfiles) {
-        if (!ensurePaired()) {
-            return;
-        }
-
-        mConnectAttempted = SystemClock.elapsedRealtime();
-        connectWithoutResettingTimer(connectAllProfiles);
-    }
-
-    void onBondingDockConnect() {
-        // Attempt to connect if UUIDs are available. Otherwise,
-        // we will connect when the ACTION_UUID intent arrives.
-        connect(false);
-    }
-
-    private void connectWithoutResettingTimer(boolean connectAllProfiles) {
-        // Try to initialize the profiles if they were not.
-        if (mProfiles.isEmpty()) {
-            // if mProfiles is empty, then do not invoke updateProfiles. This causes a race
-            // condition with carkits during pairing, wherein RemoteDevice.UUIDs have been updated
-            // from bluetooth stack but ACTION.uuid is not sent yet.
-            // Eventually ACTION.uuid will be received which shall trigger the connection of the
-            // various profiles
-            // If UUIDs are not available yet, connect will be happen
-            // upon arrival of the ACTION_UUID intent.
-            Log.d(TAG, "No profiles. Maybe we will connect later");
-            return;
-        }
-
-        // Reset the only-show-one-error-dialog tracking variable
-        mIsConnectingErrorPossible = true;
-
-        int preferredProfiles = 0;
-        for (LocalBluetoothProfile profile : mProfiles) {
-            if (connectAllProfiles ? profile.isConnectable() : profile.isAutoConnectable()) {
-                if (profile.isPreferred(mDevice)) {
-                    ++preferredProfiles;
-                    connectInt(profile);
-                }
-            }
-        }
-        if (DEBUG) Log.d(TAG, "Preferred profiles = " + preferredProfiles);
-
-        if (preferredProfiles == 0) {
-            connectAutoConnectableProfiles();
-        }
-    }
-
-    private void connectAutoConnectableProfiles() {
-        if (!ensurePaired()) {
-            return;
-        }
-        // Reset the only-show-one-error-dialog tracking variable
-        mIsConnectingErrorPossible = true;
-
-        for (LocalBluetoothProfile profile : mProfiles) {
-            if (profile.isAutoConnectable()) {
-                profile.setPreferred(mDevice, true);
-                connectInt(profile);
-            }
-        }
-    }
-
-    /**
-     * Connect this device to the specified profile.
-     *
-     * @param profile the profile to use with the remote device
-     */
-    void connectProfile(LocalBluetoothProfile profile) {
-        mConnectAttempted = SystemClock.elapsedRealtime();
-        // Reset the only-show-one-error-dialog tracking variable
-        mIsConnectingErrorPossible = true;
-        connectInt(profile);
-        // Refresh the UI based on profile.connect() call
-        refresh();
-    }
-
-    synchronized void connectInt(LocalBluetoothProfile profile) {
-        if (!ensurePaired()) {
-            return;
-        }
-        if (profile.connect(mDevice)) {
-            if (Utils.D) {
-                Log.d(TAG, "Command sent successfully:CONNECT " + describe(profile));
-            }
-            return;
-        }
-        Log.i(TAG, "Failed to connect " + profile.toString() + " to " + mName);
-    }
-
-    private boolean ensurePaired() {
-        if (getBondState() == BluetoothDevice.BOND_NONE) {
-            startPairing();
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    boolean startPairing() {
-        // Pairing is unreliable while scanning, so cancel discovery
-        if (mLocalAdapter.isDiscovering()) {
-            mLocalAdapter.cancelDiscovery();
-        }
-
-        if (!mDevice.createBond()) {
-            return false;
-        }
-
-        mConnectAfterPairing = true;  // auto-connect after pairing
-        return true;
-    }
-
-    /**
-     * Return true if user initiated pairing on this device. The message text is
-     * slightly different for local vs. remote initiated pairing dialogs.
-     */
-    boolean isUserInitiatedPairing() {
-        return mConnectAfterPairing;
-    }
-
-    void unpair() {
-        int state = getBondState();
-
-        if (state == BluetoothDevice.BOND_BONDING) {
-            mDevice.cancelBondProcess();
-        }
-
-        if (state != BluetoothDevice.BOND_NONE) {
-            final BluetoothDevice dev = mDevice;
-            if (dev != null) {
-                final boolean successful = dev.removeBond();
-                if (successful) {
-                    if (Utils.D) {
-                        Log.d(TAG, "Command sent successfully:REMOVE_BOND " + describe(null));
-                    }
-                } else if (Utils.V) {
-                    Log.v(TAG, "Framework rejected command immediately:REMOVE_BOND " +
-                            describe(null));
-                }
-            }
-        }
-    }
-
-    int getProfileConnectionState(LocalBluetoothProfile profile) {
-        if (mProfileConnectionState == null ||
-                mProfileConnectionState.get(profile) == null) {
-            // If cache is empty make the binder call to get the state
-            int state = profile.getConnectionStatus(mDevice);
-            mProfileConnectionState.put(profile, state);
-        }
-        return mProfileConnectionState.get(profile);
-    }
-
-    public void clearProfileConnectionState ()
-    {
-        if (Utils.D) {
-            Log.d(TAG," Clearing all connection state for dev:" + mDevice.getName());
-        }
-        for (LocalBluetoothProfile profile :getProfiles()) {
-            mProfileConnectionState.put(profile, BluetoothProfile.STATE_DISCONNECTED);
-        }
-    }
-
-    // TODO: do any of these need to run async on a background thread?
-    private void fillData() {
-        fetchName();
-        fetchBtClass();
-        updateProfiles();
-        migratePhonebookPermissionChoice();
-        migrateMessagePermissionChoice();
-        fetchMessageRejectionCount();
-
-        mVisible = false;
-        dispatchAttributesChanged();
-    }
-
-    BluetoothDevice getDevice() {
-        return mDevice;
-    }
-
-    String getName() {
-        return mName;
-    }
-
-    /**
-     * Populate name from BluetoothDevice.ACTION_FOUND intent
-     */
-    void setNewName(String name) {
-        if (mName == null) {
-            mName = name;
-            if (mName == null || TextUtils.isEmpty(mName)) {
-                mName = mDevice.getAddress();
-            }
-            dispatchAttributesChanged();
-        }
-    }
-
-    /**
-     * user changes the device name
-     */
-    void setName(String name) {
-        if (!mName.equals(name)) {
-            mName = name;
-            mDevice.setAlias(name);
-            dispatchAttributesChanged();
-        }
-    }
-
-    void refreshName() {
-        fetchName();
-        dispatchAttributesChanged();
-    }
-
-    private void fetchName() {
-        mName = mDevice.getAliasName();
-
-        if (TextUtils.isEmpty(mName)) {
-            mName = mDevice.getAddress();
-            if (DEBUG) Log.d(TAG, "Device has no name (yet), use address: " + mName);
-        }
-    }
-
-    void refresh() {
-        dispatchAttributesChanged();
-    }
-
-    boolean isVisible() {
-        return mVisible;
-    }
-
-    void setVisible(boolean visible) {
-        if (mVisible != visible) {
-            mVisible = visible;
-            dispatchAttributesChanged();
-        }
-    }
-
-    int getBondState() {
-        return mDevice.getBondState();
-    }
-
-    void setRssi(short rssi) {
-        if (mRssi != rssi) {
-            mRssi = rssi;
-            dispatchAttributesChanged();
-        }
-    }
-
-    /**
-     * Checks whether we are connected to this device (any profile counts).
-     *
-     * @return Whether it is connected.
-     */
-    boolean isConnected() {
-        for (LocalBluetoothProfile profile : mProfiles) {
-            int status = getProfileConnectionState(profile);
-            if (status == BluetoothProfile.STATE_CONNECTED) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    boolean isConnectedProfile(LocalBluetoothProfile profile) {
-        int status = getProfileConnectionState(profile);
-        return status == BluetoothProfile.STATE_CONNECTED;
-
-    }
-
-    boolean isBusy() {
-        for (LocalBluetoothProfile profile : mProfiles) {
-            int status = getProfileConnectionState(profile);
-            if (status == BluetoothProfile.STATE_CONNECTING
-                    || status == BluetoothProfile.STATE_DISCONNECTING) {
-                return true;
-            }
-        }
-        return getBondState() == BluetoothDevice.BOND_BONDING;
-    }
-
-    /**
-     * Fetches a new value for the cached BT class.
-     */
-    private void fetchBtClass() {
-        mBtClass = mDevice.getBluetoothClass();
-    }
-
-    private boolean updateProfiles() {
-        ParcelUuid[] uuids = mDevice.getUuids();
-        if (uuids == null) return false;
-
-        ParcelUuid[] localUuids = mLocalAdapter.getUuids();
-        if (localUuids == null) return false;
-
-        /**
-         * Now we know if the device supports PBAP, update permissions...
-         */
-        processPhonebookAccess();
-
-        mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles,
-                                       mLocalNapRoleConnected, mDevice);
-
-        if (DEBUG) {
-            Log.e(TAG, "updating profiles for " + mDevice.getAliasName());
-            BluetoothClass bluetoothClass = mDevice.getBluetoothClass();
-
-            if (bluetoothClass != null) Log.v(TAG, "Class: " + bluetoothClass.toString());
-            Log.v(TAG, "UUID:");
-            for (ParcelUuid uuid : uuids) {
-                Log.v(TAG, "  " + uuid);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Refreshes the UI for the BT class, including fetching the latest value
-     * for the class.
-     */
-    void refreshBtClass() {
-        fetchBtClass();
-        dispatchAttributesChanged();
-    }
-
-    /**
-     * Refreshes the UI when framework alerts us of a UUID change.
-     */
-    void onUuidChanged() {
-        updateProfiles();
-        ParcelUuid[] uuids = mDevice.getUuids();
-        long timeout = MAX_UUID_DELAY_FOR_AUTO_CONNECT;
-
-        if (DEBUG) {
-            Log.d(TAG, "onUuidChanged: Time since last connect"
-                    + (SystemClock.elapsedRealtime() - mConnectAttempted));
-        }
-
-        /*
-         * If a connect was attempted earlier without any UUID, we will do the
-         * connect now.
-         */
-        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hogp)) {
-            timeout = MAX_HOGP_DELAY_FOR_AUTO_CONNECT;
-        }
-        if (!mProfiles.isEmpty()
-                && (mConnectAttempted + timeout) > SystemClock.elapsedRealtime()) {
-            connectWithoutResettingTimer(false);
-        }
-        dispatchAttributesChanged();
-    }
-
-    void onBondingStateChanged(int bondState) {
-        if (bondState == BluetoothDevice.BOND_NONE) {
-            mProfiles.clear();
-            mConnectAfterPairing = false;  // cancel auto-connect
-            setPhonebookPermissionChoice(ACCESS_UNKNOWN);
-            setMessagePermissionChoice(ACCESS_UNKNOWN);
-            setSimPermissionChoice(ACCESS_UNKNOWN);
-            mMessageRejectionCount = 0;
-            saveMessageRejectionCount();
-        }
-
-        refresh();
-
-        if (bondState == BluetoothDevice.BOND_BONDED) {
-            if (mDevice.isBluetoothDock()) {
-                onBondingDockConnect();
-            } else if (mConnectAfterPairing) {
-                connect(false);
-            }
-            mConnectAfterPairing = false;
-        }
-    }
-
-    void setBtClass(BluetoothClass btClass) {
-        if (btClass != null && mBtClass != btClass) {
-            mBtClass = btClass;
-            dispatchAttributesChanged();
-        }
-    }
-
-    BluetoothClass getBtClass() {
-        return mBtClass;
-    }
-
-    List<LocalBluetoothProfile> getProfiles() {
-        return Collections.unmodifiableList(mProfiles);
-    }
-
-    List<LocalBluetoothProfile> getConnectableProfiles() {
-        List<LocalBluetoothProfile> connectableProfiles =
-                new ArrayList<LocalBluetoothProfile>();
-        for (LocalBluetoothProfile profile : mProfiles) {
-            if (profile.isConnectable()) {
-                connectableProfiles.add(profile);
-            }
-        }
-        return connectableProfiles;
-    }
-
-    List<LocalBluetoothProfile> getRemovedProfiles() {
-        return mRemovedProfiles;
-    }
-
-    void registerCallback(Callback callback) {
-        synchronized (mCallbacks) {
-            mCallbacks.add(callback);
-        }
-    }
-
-    void unregisterCallback(Callback callback) {
-        synchronized (mCallbacks) {
-            mCallbacks.remove(callback);
-        }
-    }
-
-    private void dispatchAttributesChanged() {
-        synchronized (mCallbacks) {
-            for (Callback callback : mCallbacks) {
-                callback.onDeviceAttributesChanged();
-            }
-        }
-    }
-
-    @Override
-    public String toString() {
-        return mDevice.toString();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if ((o == null) || !(o instanceof CachedBluetoothDevice)) {
-            return false;
-        }
-        return mDevice.equals(((CachedBluetoothDevice) o).mDevice);
-    }
-
-    @Override
-    public int hashCode() {
-        return mDevice.getAddress().hashCode();
-    }
-
-    // This comparison uses non-final fields so the sort order may change
-    // when device attributes change (such as bonding state). Settings
-    // will completely refresh the device list when this happens.
-    public int compareTo(CachedBluetoothDevice another) {
-        // Connected above not connected
-        int comparison = (another.isConnected() ? 1 : 0) - (isConnected() ? 1 : 0);
-        if (comparison != 0) return comparison;
-
-        // Paired above not paired
-        comparison = (another.getBondState() == BluetoothDevice.BOND_BONDED ? 1 : 0) -
-            (getBondState() == BluetoothDevice.BOND_BONDED ? 1 : 0);
-        if (comparison != 0) return comparison;
-
-        // Visible above not visible
-        comparison = (another.mVisible ? 1 : 0) - (mVisible ? 1 : 0);
-        if (comparison != 0) return comparison;
-
-        // Stronger signal above weaker signal
-        comparison = another.mRssi - mRssi;
-        if (comparison != 0) return comparison;
-
-        // Fallback on name
-        return mName.compareTo(another.mName);
-    }
-
-    public interface Callback {
-        void onDeviceAttributesChanged();
-    }
-
-    int getPhonebookPermissionChoice() {
-        int permission = mDevice.getPhonebookAccessPermission();
-        if (permission == BluetoothDevice.ACCESS_ALLOWED) {
-            return ACCESS_ALLOWED;
-        } else if (permission == BluetoothDevice.ACCESS_REJECTED) {
-            return ACCESS_REJECTED;
-        }
-        return ACCESS_UNKNOWN;
-    }
-
-    void setPhonebookPermissionChoice(int permissionChoice) {
-        int permission = BluetoothDevice.ACCESS_UNKNOWN;
-        if (permissionChoice == ACCESS_ALLOWED) {
-            permission = BluetoothDevice.ACCESS_ALLOWED;
-        } else if (permissionChoice == ACCESS_REJECTED) {
-            permission = BluetoothDevice.ACCESS_REJECTED;
-        }
-        mDevice.setPhonebookAccessPermission(permission);
-    }
-
-    // Migrates data from old data store (in Settings app's shared preferences) to new (in Bluetooth
-    // app's shared preferences).
-    private void migratePhonebookPermissionChoice() {
-        SharedPreferences preferences = mContext.getSharedPreferences(
-                "bluetooth_phonebook_permission", Context.MODE_PRIVATE);
-        if (!preferences.contains(mDevice.getAddress())) {
-            return;
-        }
-
-        if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_UNKNOWN) {
-            int oldPermission = preferences.getInt(mDevice.getAddress(), ACCESS_UNKNOWN);
-            if (oldPermission == ACCESS_ALLOWED) {
-                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
-            } else if (oldPermission == ACCESS_REJECTED) {
-                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
-            }
-        }
-
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.remove(mDevice.getAddress());
-        editor.commit();
-    }
-
-    int getSimPermissionChoice() {
-        int permission = mDevice.getSimAccessPermission();
-        if (permission == BluetoothDevice.ACCESS_ALLOWED) {
-            return ACCESS_ALLOWED;
-        } else if (permission == BluetoothDevice.ACCESS_REJECTED) {
-            return ACCESS_REJECTED;
-        }
-        return ACCESS_UNKNOWN;
-    }
-
-    void setSimPermissionChoice(int permissionChoice) {
-        int permission = BluetoothDevice.ACCESS_UNKNOWN;
-        if (permissionChoice == ACCESS_ALLOWED) {
-            permission = BluetoothDevice.ACCESS_ALLOWED;
-        } else if (permissionChoice == ACCESS_REJECTED) {
-            permission = BluetoothDevice.ACCESS_REJECTED;
-        }
-        mDevice.setSimAccessPermission(permission);
-    }
-
-    int getMessagePermissionChoice() {
-        int permission = mDevice.getMessageAccessPermission();
-        if (permission == BluetoothDevice.ACCESS_ALLOWED) {
-            return ACCESS_ALLOWED;
-        } else if (permission == BluetoothDevice.ACCESS_REJECTED) {
-            return ACCESS_REJECTED;
-        }
-        return ACCESS_UNKNOWN;
-    }
-
-    void setMessagePermissionChoice(int permissionChoice) {
-        int permission = BluetoothDevice.ACCESS_UNKNOWN;
-        if (permissionChoice == ACCESS_ALLOWED) {
-            permission = BluetoothDevice.ACCESS_ALLOWED;
-        } else if (permissionChoice == ACCESS_REJECTED) {
-            permission = BluetoothDevice.ACCESS_REJECTED;
-        }
-        mDevice.setMessageAccessPermission(permission);
-    }
-
-    // Migrates data from old data store (in Settings app's shared preferences) to new (in Bluetooth
-    // app's shared preferences).
-    private void migrateMessagePermissionChoice() {
-        SharedPreferences preferences = mContext.getSharedPreferences(
-                "bluetooth_message_permission", Context.MODE_PRIVATE);
-        if (!preferences.contains(mDevice.getAddress())) {
-            return;
-        }
-
-        if (mDevice.getMessageAccessPermission() == BluetoothDevice.ACCESS_UNKNOWN) {
-            int oldPermission = preferences.getInt(mDevice.getAddress(), ACCESS_UNKNOWN);
-            if (oldPermission == ACCESS_ALLOWED) {
-                mDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
-            } else if (oldPermission == ACCESS_REJECTED) {
-                mDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_REJECTED);
-            }
-        }
-
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.remove(mDevice.getAddress());
-        editor.commit();
-    }
-
-    /**
-     * @return Whether this rejection should persist.
-     */
-    boolean checkAndIncreaseMessageRejectionCount() {
-        if (mMessageRejectionCount < MESSAGE_REJECTION_COUNT_LIMIT_TO_PERSIST) {
-            mMessageRejectionCount++;
-            saveMessageRejectionCount();
-        }
-        return mMessageRejectionCount >= MESSAGE_REJECTION_COUNT_LIMIT_TO_PERSIST;
-    }
-
-    private void fetchMessageRejectionCount() {
-        SharedPreferences preference = mContext.getSharedPreferences(
-                MESSAGE_REJECTION_COUNT_PREFS_NAME, Context.MODE_PRIVATE);
-        mMessageRejectionCount = preference.getInt(mDevice.getAddress(), 0);
-    }
-
-    private void saveMessageRejectionCount() {
-        SharedPreferences.Editor editor = mContext.getSharedPreferences(
-                MESSAGE_REJECTION_COUNT_PREFS_NAME, Context.MODE_PRIVATE).edit();
-        if (mMessageRejectionCount == 0) {
-            editor.remove(mDevice.getAddress());
-        } else {
-            editor.putInt(mDevice.getAddress(), mMessageRejectionCount);
-        }
-        editor.commit();
-    }
-
-    private void processPhonebookAccess() {
-        if (mDevice.getBondState() != BluetoothDevice.BOND_BONDED) return;
-
-        ParcelUuid[] uuids = mDevice.getUuids();
-        if (BluetoothUuid.containsAnyUuid(uuids, PbapServerProfile.PBAB_CLIENT_UUIDS)) {
-            // The pairing dialog now warns of phone-book access for paired devices.
-            // No separate prompt is displayed after pairing.
-            setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
deleted file mode 100755
index 2b0e7f1..0000000
--- a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
+++ /dev/null
@@ -1,172 +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.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.content.Context;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * CachedBluetoothDeviceManager manages the set of remote Bluetooth devices.
- */
-final class CachedBluetoothDeviceManager {
-    private static final String TAG = "CachedBluetoothDeviceManager";
-    private static final boolean DEBUG = Utils.D;
-
-    private Context mContext;
-    private final List<CachedBluetoothDevice> mCachedDevices =
-            new ArrayList<CachedBluetoothDevice>();
-
-    CachedBluetoothDeviceManager(Context context) {
-        mContext = context;
-    }
-
-    public synchronized Collection<CachedBluetoothDevice> getCachedDevicesCopy() {
-        return new ArrayList<CachedBluetoothDevice>(mCachedDevices);
-    }
-
-    public static boolean onDeviceDisappeared(CachedBluetoothDevice cachedDevice) {
-        cachedDevice.setVisible(false);
-        return cachedDevice.getBondState() == BluetoothDevice.BOND_NONE;
-    }
-
-    public void onDeviceNameUpdated(BluetoothDevice device) {
-        CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice != null) {
-            cachedDevice.refreshName();
-        }
-    }
-
-    /**
-     * Search for existing {@link CachedBluetoothDevice} or return null
-     * if this device isn't in the cache. Use {@link #addDevice}
-     * to create and return a new {@link CachedBluetoothDevice} for
-     * a newly discovered {@link BluetoothDevice}.
-     *
-     * @param device the address of the Bluetooth device
-     * @return the cached device object for this device, or null if it has
-     *   not been previously seen
-     */
-    CachedBluetoothDevice findDevice(BluetoothDevice device) {
-        for (CachedBluetoothDevice cachedDevice : mCachedDevices) {
-            if (cachedDevice.getDevice().equals(device)) {
-                return cachedDevice;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Create and return a new {@link CachedBluetoothDevice}. This assumes
-     * that {@link #findDevice} has already been called and returned null.
-     * @param device the address of the new Bluetooth device
-     * @return the newly created CachedBluetoothDevice object
-     */
-    CachedBluetoothDevice addDevice(LocalBluetoothAdapter adapter,
-            LocalBluetoothProfileManager profileManager,
-            BluetoothDevice device) {
-        CachedBluetoothDevice newDevice = new CachedBluetoothDevice(mContext, adapter,
-            profileManager, device);
-        synchronized (mCachedDevices) {
-            mCachedDevices.add(newDevice);
-        }
-        return newDevice;
-    }
-
-    /**
-     * Attempts to get the name of a remote device, otherwise returns the address.
-     *
-     * @param device The remote device.
-     * @return The name, or if unavailable, the address.
-     */
-    public String getName(BluetoothDevice device) {
-        CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice != null) {
-            return cachedDevice.getName();
-        }
-
-        String name = device.getAliasName();
-        if (name != null) {
-            return name;
-        }
-
-        return device.getAddress();
-    }
-
-    public synchronized void clearNonBondedDevices() {
-        for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
-            CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
-            if (cachedDevice.getBondState() != BluetoothDevice.BOND_BONDED) {
-                mCachedDevices.remove(i);
-            }
-        }
-    }
-
-    public synchronized void onScanningStateChanged(boolean started) {
-        if (!started) return;
-
-        // If starting a new scan, clear old visibility
-        // Iterate in reverse order since devices may be removed.
-        for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
-            CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
-            cachedDevice.setVisible(false);
-        }
-    }
-
-    public synchronized void onBtClassChanged(BluetoothDevice device) {
-        CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice != null) {
-            cachedDevice.refreshBtClass();
-        }
-    }
-
-    public synchronized void onUuidChanged(BluetoothDevice device) {
-        CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice != null) {
-            cachedDevice.onUuidChanged();
-        }
-    }
-
-    public synchronized void onBluetoothStateChanged(int bluetoothState) {
-        // When Bluetooth is turning off, we need to clear the non-bonded devices
-        // Otherwise, they end up showing up on the next BT enable
-        if (bluetoothState == BluetoothAdapter.STATE_TURNING_OFF) {
-            for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
-                CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
-                if (cachedDevice.getBondState() != BluetoothDevice.BOND_BONDED) {
-                    cachedDevice.setVisible(false);
-                    mCachedDevices.remove(i);
-                } else {
-                    // For bonded devices, we need to clear the connection status so that
-                    // when BT is enabled next time, device connection status shall be retrieved
-                    // by making a binder call.
-                    cachedDevice.clearProfileConnectionState();
-                }
-            }
-        }
-    }
-    private void log(String msg) {
-        if (DEBUG) {
-            Log.d(TAG, msg);
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index e7208b5..cc98c7b 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -26,6 +26,11 @@
 import android.util.Log;
 
 import com.android.settings.RestrictedSettingsFragment;
+import com.android.settingslib.bluetooth.BluetoothCallback;
+import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 import java.util.Collection;
 import java.util.WeakHashMap;
@@ -74,7 +79,7 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mLocalManager = LocalBluetoothManager.getInstance(getActivity());
+        mLocalManager = Utils.getLocalBtManager(getActivity());
         if (mLocalManager == null) {
             Log.e(TAG, "Bluetooth is not supported on this device");
             return;
@@ -164,7 +169,7 @@
         if (mFilter.matches(cachedDevice.getDevice())) {
             createDevicePreference(cachedDevice);
         }
-     }
+    }
 
     void createDevicePreference(CachedBluetoothDevice cachedDevice) {
         if (mDeviceListGroup == null) {
@@ -211,4 +216,6 @@
             updateProgressUi(false);
         }
     }
+
+    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }
 }
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 354d03c..9441626 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -17,6 +17,7 @@
 package com.android.settings.bluetooth;
 
 import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
+
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothDevicePicker;
@@ -28,7 +29,9 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 
 /**
  * BluetoothSettings is the Settings screen for Bluetooth configuration and
@@ -82,6 +85,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.BLUETOOTH_DEVICE_PICKER;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getActivity().setTitle(getString(R.string.device_picker));
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index 0109e35..1df6275 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -17,7 +17,6 @@
 package com.android.settings.bluetooth;
 
 import android.app.AlertDialog;
-import android.app.Fragment;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
@@ -27,21 +26,20 @@
 import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
 import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
 import android.widget.EditText;
-import android.text.TextWatcher;
-import android.app.Dialog;
-import android.widget.Button;
-import android.text.Editable;
-
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.search.Index;
-import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfile;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.bluetooth.MapProfile;
+import com.android.settingslib.bluetooth.PbapServerProfile;
 
 import java.util.HashMap;
 
@@ -72,6 +70,11 @@
     private boolean mProfileGroupIsRemoved;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.BLUETOOTH_DEVICE_PROFILES;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
@@ -80,7 +83,7 @@
         mProfileContainer = (PreferenceGroup) findPreference(KEY_PROFILE_CONTAINER);
         mProfileContainer.setLayoutResource(R.layout.bluetooth_preference_category);
 
-        mManager = LocalBluetoothManager.getInstance(getActivity());
+        mManager = Utils.getLocalBtManager(getActivity());
         CachedBluetoothDeviceManager deviceManager =
                 mManager.getCachedDeviceManager();
         mProfileManager = mManager.getProfileManager();
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java
index c9a18a3..020ca0c 100644
--- a/src/com/android/settings/bluetooth/DockService.java
+++ b/src/com/android/settings/bluetooth/DockService.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.bluetooth;
 
-import com.android.settings.R;
-import com.android.settings.bluetooth.LocalBluetoothProfileManager.ServiceListener;
-
 import android.app.AlertDialog;
 import android.app.Notification;
 import android.app.Service;
@@ -27,6 +24,7 @@
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
 import android.bluetooth.BluetoothProfile;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -44,6 +42,16 @@
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.BluetoothCallback;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfile;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager.ServiceListener;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -126,7 +134,7 @@
     public void onCreate() {
         if (DEBUG) Log.d(TAG, "onCreate");
 
-        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(this);
+        LocalBluetoothManager manager = Utils.getLocalBtManager(this);
         if (manager == null) {
             Log.e(TAG, "Can't get LocalBluetoothManager: exiting");
             return;
@@ -918,4 +926,57 @@
     public void onServiceDisconnected() {
         // FIXME: shouldn't I do something on service disconnected too?
     }
+
+    public static class DockBluetoothCallback implements BluetoothCallback {
+        private final Context mContext;
+
+        public DockBluetoothCallback(Context context) {
+            mContext = context;
+        }
+
+        public void onBluetoothStateChanged(int bluetoothState) { }
+        public void onDeviceAdded(CachedBluetoothDevice cachedDevice) { }
+        public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) { }
+        public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }
+
+        @Override
+        public void onScanningStateChanged(boolean started) {
+            // TODO: Find a more unified place for a persistent BluetoothCallback to live
+            // as this is not exactly dock related.
+            LocalBluetoothPreferences.persistDiscoveringTimestamp(mContext);
+        }
+
+        @Override
+        public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
+            BluetoothDevice device = cachedDevice.getDevice();
+            if (bondState == BluetoothDevice.BOND_NONE) {
+                if (device.isBluetoothDock()) {
+                    // After a dock is unpaired, we will forget the settings
+                    LocalBluetoothPreferences
+                            .removeDockAutoConnectSetting(mContext, device.getAddress());
+
+                    // if the device is undocked, remove it from the list as well
+                    if (!device.getAddress().equals(getDockedDeviceAddress(mContext))) {
+                        cachedDevice.setVisible(false);
+                    }
+                }
+            }
+        }
+
+        // This can't be called from a broadcast receiver where the filter is set in the Manifest.
+        private static String getDockedDeviceAddress(Context context) {
+            // This works only because these broadcast intents are "sticky"
+            Intent i = context.registerReceiver(null, new IntentFilter(Intent.ACTION_DOCK_EVENT));
+            if (i != null) {
+                int state = i.getIntExtra(Intent.EXTRA_DOCK_STATE, Intent.EXTRA_DOCK_STATE_UNDOCKED);
+                if (state != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
+                    BluetoothDevice device = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                    if (device != null) {
+                        return device.getAddress();
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/HeadsetProfile.java b/src/com/android/settings/bluetooth/HeadsetProfile.java
deleted file mode 100755
index 45b81ab..0000000
--- a/src/com/android/settings/bluetooth/HeadsetProfile.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothHeadset;
-import android.bluetooth.BluetoothProfile;
-import android.bluetooth.BluetoothUuid;
-import android.content.Context;
-import android.os.ParcelUuid;
-import android.util.Log;
-
-import com.android.settings.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * HeadsetProfile handles Bluetooth HFP and Headset profiles.
- */
-final class HeadsetProfile implements LocalBluetoothProfile {
-    private static final String TAG = "HeadsetProfile";
-    private static boolean V = true;
-
-    private BluetoothHeadset mService;
-    private boolean mIsProfileReady;
-
-    private final LocalBluetoothAdapter mLocalAdapter;
-    private final CachedBluetoothDeviceManager mDeviceManager;
-    private final LocalBluetoothProfileManager mProfileManager;
-
-    static final ParcelUuid[] UUIDS = {
-        BluetoothUuid.HSP,
-        BluetoothUuid.Handsfree,
-    };
-
-    static final String NAME = "HEADSET";
-
-    // Order of this profile in device profiles list
-    private static final int ORDINAL = 0;
-
-    // These callbacks run on the main thread.
-    private final class HeadsetServiceListener
-            implements BluetoothProfile.ServiceListener {
-
-        public void onServiceConnected(int profile, BluetoothProfile proxy) {
-            if (V) Log.d(TAG,"Bluetooth service connected");
-            mService = (BluetoothHeadset) proxy;
-            // We just bound to the service, so refresh the UI for any connected HFP devices.
-            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-            while (!deviceList.isEmpty()) {
-                BluetoothDevice nextDevice = deviceList.remove(0);
-                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
-                // we may add a new device here, but generally this should not happen
-                if (device == null) {
-                    Log.w(TAG, "HeadsetProfile found new device: " + nextDevice);
-                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
-                }
-                device.onProfileStateChanged(HeadsetProfile.this,
-                        BluetoothProfile.STATE_CONNECTED);
-                device.refresh();
-            }
-
-            mProfileManager.callServiceConnectedListeners();
-            mIsProfileReady=true;
-        }
-
-        public void onServiceDisconnected(int profile) {
-            if (V) Log.d(TAG,"Bluetooth service disconnected");
-            mProfileManager.callServiceDisconnectedListeners();
-            mIsProfileReady=false;
-        }
-    }
-
-    public boolean isProfileReady() {
-        return mIsProfileReady;
-    }
-
-    HeadsetProfile(Context context, LocalBluetoothAdapter adapter,
-            CachedBluetoothDeviceManager deviceManager,
-            LocalBluetoothProfileManager profileManager) {
-        mLocalAdapter = adapter;
-        mDeviceManager = deviceManager;
-        mProfileManager = profileManager;
-        mLocalAdapter.getProfileProxy(context, new HeadsetServiceListener(),
-                BluetoothProfile.HEADSET);
-    }
-
-    public boolean isConnectable() {
-        return true;
-    }
-
-    public boolean isAutoConnectable() {
-        return true;
-    }
-
-    public boolean connect(BluetoothDevice device) {
-        if (mService == null) return false;
-        List<BluetoothDevice> sinks = mService.getConnectedDevices();
-        if (sinks != null) {
-            for (BluetoothDevice sink : sinks) {
-                Log.d(TAG,"Not disconnecting device = " + sink);
-            }
-        }
-        return mService.connect(device);
-    }
-
-    public boolean disconnect(BluetoothDevice device) {
-        if (mService == null) return false;
-        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-        if (!deviceList.isEmpty()) {
-            for (BluetoothDevice dev : deviceList) {
-                if (dev.equals(device)) {
-                    if (V) Log.d(TAG,"Downgrade priority as user" +
-                                        "is disconnecting the headset");
-                    // Downgrade priority as user is disconnecting the headset.
-                    if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
-                        mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
-                    }
-                    return mService.disconnect(device);
-                }
-            }
-        }
-        return false;
-    }
-
-    public int getConnectionStatus(BluetoothDevice device) {
-        if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
-        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-        if (!deviceList.isEmpty()){
-            for (BluetoothDevice dev : deviceList) {
-                if (dev.equals(device)) {
-                    return mService.getConnectionState(device);
-                }
-            }
-        }
-        return BluetoothProfile.STATE_DISCONNECTED;
-    }
-
-    public boolean isPreferred(BluetoothDevice device) {
-        if (mService == null) return false;
-        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
-    }
-
-    public int getPreferred(BluetoothDevice device) {
-        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
-        return mService.getPriority(device);
-    }
-
-    public void setPreferred(BluetoothDevice device, boolean preferred) {
-        if (mService == null) return;
-        if (preferred) {
-            if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
-                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
-            }
-        } else {
-            mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
-        }
-    }
-
-    public List<BluetoothDevice> getConnectedDevices() {
-        if (mService == null) return new ArrayList<BluetoothDevice>(0);
-        return mService.getDevicesMatchingConnectionStates(
-              new int[] {BluetoothProfile.STATE_CONNECTED,
-                         BluetoothProfile.STATE_CONNECTING,
-                         BluetoothProfile.STATE_DISCONNECTING});
-    }
-
-    public String toString() {
-        return NAME;
-    }
-
-    public int getOrdinal() {
-        return ORDINAL;
-    }
-
-    public int getNameResource(BluetoothDevice device) {
-        return R.string.bluetooth_profile_headset;
-    }
-
-    public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = getConnectionStatus(device);
-        switch (state) {
-            case BluetoothProfile.STATE_DISCONNECTED:
-                return R.string.bluetooth_headset_profile_summary_use_for;
-
-            case BluetoothProfile.STATE_CONNECTED:
-                return R.string.bluetooth_headset_profile_summary_connected;
-
-            default:
-                return Utils.getConnectionStateSummary(state);
-        }
-    }
-
-    public int getDrawableResource(BluetoothClass btClass) {
-        return R.drawable.ic_bt_headset_hfp;
-    }
-
-    protected void finalize() {
-        if (V) Log.d(TAG, "finalize()");
-        if (mService != null) {
-            try {
-                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.HEADSET,
-                                                                       mService);
-                mService = null;
-            }catch (Throwable t) {
-                Log.w(TAG, "Error cleaning up HID proxy", t);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/HidProfile.java b/src/com/android/settings/bluetooth/HidProfile.java
deleted file mode 100755
index 91e715d..0000000
--- a/src/com/android/settings/bluetooth/HidProfile.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothInputDevice;
-import android.bluetooth.BluetoothProfile;
-import android.content.Context;
-import android.util.Log;
-
-import com.android.settings.R;
-
-import java.util.List;
-
-/**
- * HidProfile handles Bluetooth HID profile.
- */
-final class HidProfile implements LocalBluetoothProfile {
-    private static final String TAG = "HidProfile";
-    private static boolean V = true;
-
-    private BluetoothInputDevice mService;
-    private boolean mIsProfileReady;
-
-    private final LocalBluetoothAdapter mLocalAdapter;
-    private final CachedBluetoothDeviceManager mDeviceManager;
-    private final LocalBluetoothProfileManager mProfileManager;
-
-    static final String NAME = "HID";
-
-    // Order of this profile in device profiles list
-    private static final int ORDINAL = 3;
-
-    // These callbacks run on the main thread.
-    private final class InputDeviceServiceListener
-            implements BluetoothProfile.ServiceListener {
-
-        public void onServiceConnected(int profile, BluetoothProfile proxy) {
-            if (V) Log.d(TAG,"Bluetooth service connected");
-            mService = (BluetoothInputDevice) proxy;
-            // We just bound to the service, so refresh the UI for any connected HID devices.
-            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-            while (!deviceList.isEmpty()) {
-                BluetoothDevice nextDevice = deviceList.remove(0);
-                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
-                // we may add a new device here, but generally this should not happen
-                if (device == null) {
-                    Log.w(TAG, "HidProfile found new device: " + nextDevice);
-                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
-                }
-                device.onProfileStateChanged(HidProfile.this, BluetoothProfile.STATE_CONNECTED);
-                device.refresh();
-            }
-            mIsProfileReady=true;
-        }
-
-        public void onServiceDisconnected(int profile) {
-            if (V) Log.d(TAG,"Bluetooth service disconnected");
-            mIsProfileReady=false;
-        }
-    }
-
-    public boolean isProfileReady() {
-        return mIsProfileReady;
-    }
-
-    HidProfile(Context context, LocalBluetoothAdapter adapter,
-        CachedBluetoothDeviceManager deviceManager,
-        LocalBluetoothProfileManager profileManager) {
-        mLocalAdapter = adapter;
-        mDeviceManager = deviceManager;
-        mProfileManager = profileManager;
-        adapter.getProfileProxy(context, new InputDeviceServiceListener(),
-                BluetoothProfile.INPUT_DEVICE);
-    }
-
-    public boolean isConnectable() {
-        return true;
-    }
-
-    public boolean isAutoConnectable() {
-        return true;
-    }
-
-    public boolean connect(BluetoothDevice device) {
-        if (mService == null) return false;
-        return mService.connect(device);
-    }
-
-    public boolean disconnect(BluetoothDevice device) {
-        if (mService == null) return false;
-        return mService.disconnect(device);
-    }
-
-    public int getConnectionStatus(BluetoothDevice device) {
-        if (mService == null) {
-            return BluetoothProfile.STATE_DISCONNECTED;
-        }
-        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-
-        return !deviceList.isEmpty() && deviceList.get(0).equals(device)
-                ? mService.getConnectionState(device)
-                : BluetoothProfile.STATE_DISCONNECTED;
-    }
-
-    public boolean isPreferred(BluetoothDevice device) {
-        if (mService == null) return false;
-        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
-    }
-
-    public int getPreferred(BluetoothDevice device) {
-        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
-        return mService.getPriority(device);
-    }
-
-    public void setPreferred(BluetoothDevice device, boolean preferred) {
-        if (mService == null) return;
-        if (preferred) {
-            if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
-                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
-            }
-        } else {
-            mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
-        }
-    }
-
-    public String toString() {
-        return NAME;
-    }
-
-    public int getOrdinal() {
-        return ORDINAL;
-    }
-
-    public int getNameResource(BluetoothDevice device) {
-        // TODO: distinguish between keyboard and mouse?
-        return R.string.bluetooth_profile_hid;
-    }
-
-    public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = getConnectionStatus(device);
-        switch (state) {
-            case BluetoothProfile.STATE_DISCONNECTED:
-                return R.string.bluetooth_hid_profile_summary_use_for;
-
-            case BluetoothProfile.STATE_CONNECTED:
-                return R.string.bluetooth_hid_profile_summary_connected;
-
-            default:
-                return Utils.getConnectionStateSummary(state);
-        }
-    }
-
-    public int getDrawableResource(BluetoothClass btClass) {
-        if (btClass == null) {
-            return R.drawable.ic_lockscreen_ime;
-        }
-        return getHidClassDrawable(btClass);
-    }
-
-    static int getHidClassDrawable(BluetoothClass btClass) {
-        switch (btClass.getDeviceClass()) {
-            case BluetoothClass.Device.PERIPHERAL_KEYBOARD:
-            case BluetoothClass.Device.PERIPHERAL_KEYBOARD_POINTING:
-                return R.drawable.ic_lockscreen_ime;
-            case BluetoothClass.Device.PERIPHERAL_POINTING:
-                return R.drawable.ic_bt_pointing_hid;
-            default:
-                return R.drawable.ic_bt_misc_hid;
-        }
-    }
-
-    protected void finalize() {
-        if (V) Log.d(TAG, "finalize()");
-        if (mService != null) {
-            try {
-                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.INPUT_DEVICE,
-                                                                       mService);
-                mService = null;
-            }catch (Throwable t) {
-                Log.w(TAG, "Error cleaning up HID proxy", t);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothAdapter.java b/src/com/android/settings/bluetooth/LocalBluetoothAdapter.java
deleted file mode 100644
index 013171c..0000000
--- a/src/com/android/settings/bluetooth/LocalBluetoothAdapter.java
+++ /dev/null
@@ -1,216 +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.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothProfile;
-import android.content.Context;
-import android.os.ParcelUuid;
-import android.util.Log;
-
-import java.util.Set;
-
-/**
- * LocalBluetoothAdapter provides an interface between the Settings app
- * and the functionality of the local {@link BluetoothAdapter}, specifically
- * those related to state transitions of the adapter itself.
- *
- * <p>Connection and bonding state changes affecting specific devices
- * are handled by {@link CachedBluetoothDeviceManager},
- * {@link BluetoothEventManager}, and {@link LocalBluetoothProfileManager}.
- */
-public final class LocalBluetoothAdapter {
-    private static final String TAG = "LocalBluetoothAdapter";
-
-    /** This class does not allow direct access to the BluetoothAdapter. */
-    private final BluetoothAdapter mAdapter;
-
-    private LocalBluetoothProfileManager mProfileManager;
-
-    private static LocalBluetoothAdapter sInstance;
-
-    private int mState = BluetoothAdapter.ERROR;
-
-    private static final int SCAN_EXPIRATION_MS = 5 * 60 * 1000; // 5 mins
-
-    private long mLastScan;
-
-    private LocalBluetoothAdapter(BluetoothAdapter adapter) {
-        mAdapter = adapter;
-    }
-
-    void setProfileManager(LocalBluetoothProfileManager manager) {
-        mProfileManager = manager;
-    }
-
-    /**
-     * Get the singleton instance of the LocalBluetoothAdapter. If this device
-     * doesn't support Bluetooth, then null will be returned. Callers must be
-     * prepared to handle a null return value.
-     * @return the LocalBluetoothAdapter object, or null if not supported
-     */
-    static synchronized LocalBluetoothAdapter getInstance() {
-        if (sInstance == null) {
-            BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-            if (adapter != null) {
-                sInstance = new LocalBluetoothAdapter(adapter);
-            }
-        }
-
-        return sInstance;
-    }
-
-    // Pass-through BluetoothAdapter methods that we can intercept if necessary
-
-    void cancelDiscovery() {
-        mAdapter.cancelDiscovery();
-    }
-
-    boolean enable() {
-        return mAdapter.enable();
-    }
-
-    boolean disable() {
-        return mAdapter.disable();
-    }
-
-    void getProfileProxy(Context context,
-            BluetoothProfile.ServiceListener listener, int profile) {
-        mAdapter.getProfileProxy(context, listener, profile);
-    }
-
-    Set<BluetoothDevice> getBondedDevices() {
-        return mAdapter.getBondedDevices();
-    }
-
-    String getName() {
-        return mAdapter.getName();
-    }
-
-    int getScanMode() {
-        return mAdapter.getScanMode();
-    }
-
-    int getState() {
-        return mAdapter.getState();
-    }
-
-    ParcelUuid[] getUuids() {
-        return mAdapter.getUuids();
-    }
-
-    boolean isDiscovering() {
-        return mAdapter.isDiscovering();
-    }
-
-    boolean isEnabled() {
-        return mAdapter.isEnabled();
-    }
-
-    void setDiscoverableTimeout(int timeout) {
-        mAdapter.setDiscoverableTimeout(timeout);
-    }
-
-    void setName(String name) {
-        mAdapter.setName(name);
-    }
-
-    void setScanMode(int mode) {
-        mAdapter.setScanMode(mode);
-    }
-
-    boolean setScanMode(int mode, int duration) {
-        return mAdapter.setScanMode(mode, duration);
-    }
-
-    void startScanning(boolean force) {
-        // Only start if we're not already scanning
-        if (!mAdapter.isDiscovering()) {
-            if (!force) {
-                // Don't scan more than frequently than SCAN_EXPIRATION_MS,
-                // unless forced
-                if (mLastScan + SCAN_EXPIRATION_MS > System.currentTimeMillis()) {
-                    return;
-                }
-
-                // If we are playing music, don't scan unless forced.
-                A2dpProfile a2dp = mProfileManager.getA2dpProfile();
-                if (a2dp != null && a2dp.isA2dpPlaying()) {
-                    return;
-                }
-            }
-
-            if (mAdapter.startDiscovery()) {
-                mLastScan = System.currentTimeMillis();
-            }
-        }
-    }
-
-    void stopScanning() {
-        if (mAdapter.isDiscovering()) {
-            mAdapter.cancelDiscovery();
-        }
-    }
-
-    public synchronized int getBluetoothState() {
-        // Always sync state, in case it changed while paused
-        syncBluetoothState();
-        return mState;
-    }
-
-    synchronized void setBluetoothStateInt(int state) {
-        mState = state;
-
-        if (state == BluetoothAdapter.STATE_ON) {
-            // if mProfileManager hasn't been constructed yet, it will
-            // get the adapter UUIDs in its constructor when it is.
-            if (mProfileManager != null) {
-                mProfileManager.setBluetoothStateOn();
-            }
-        }
-    }
-
-    // Returns true if the state changed; false otherwise.
-    boolean syncBluetoothState() {
-        int currentState = mAdapter.getState();
-        if (currentState != mState) {
-            setBluetoothStateInt(mAdapter.getState());
-            return true;
-        }
-        return false;
-    }
-
-    public void setBluetoothEnabled(boolean enabled) {
-        boolean success = enabled
-                ? mAdapter.enable()
-                : mAdapter.disable();
-
-        if (success) {
-            setBluetoothStateInt(enabled
-                ? BluetoothAdapter.STATE_TURNING_ON
-                : BluetoothAdapter.STATE_TURNING_OFF);
-        } else {
-            if (Utils.V) {
-                Log.v(TAG, "setBluetoothEnabled call, manager didn't return " +
-                        "success for enabled: " + enabled);
-            }
-
-            syncBluetoothState();
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothManager.java b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
deleted file mode 100644
index ae8dec2..0000000
--- a/src/com/android/settings/bluetooth/LocalBluetoothManager.java
+++ /dev/null
@@ -1,123 +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.bluetooth;
-
-import android.content.Context;
-import android.util.Log;
-
-/**
- * LocalBluetoothManager provides a simplified interface on top of a subset of
- * the Bluetooth API. Note that {@link #getInstance} will return null
- * if there is no Bluetooth adapter on this device, and callers must be
- * prepared to handle this case.
- */
-public final class LocalBluetoothManager {
-    private static final String TAG = "LocalBluetoothManager";
-
-    /** Singleton instance. */
-    private static LocalBluetoothManager sInstance;
-
-    private final Context mContext;
-
-    /** If a BT-related activity is in the foreground, this will be it. */
-    private Context mForegroundActivity;
-
-    private BluetoothDiscoverableEnabler mDiscoverableEnabler;
-
-    private final LocalBluetoothAdapter mLocalAdapter;
-
-    private final CachedBluetoothDeviceManager mCachedDeviceManager;
-
-    /** The Bluetooth profile manager. */
-    private final LocalBluetoothProfileManager mProfileManager;
-
-    /** The broadcast receiver event manager. */
-    private final BluetoothEventManager mEventManager;
-
-    public static synchronized LocalBluetoothManager getInstance(Context context) {
-        if (sInstance == null) {
-            LocalBluetoothAdapter adapter = LocalBluetoothAdapter.getInstance();
-            if (adapter == null) {
-                return null;
-            }
-            // This will be around as long as this process is
-            Context appContext = context.getApplicationContext();
-            sInstance = new LocalBluetoothManager(adapter, appContext);
-        }
-
-        return sInstance;
-    }
-
-    public void setDiscoverableEnabler(BluetoothDiscoverableEnabler discoverableEnabler) {
-        mDiscoverableEnabler = discoverableEnabler;
-    }
-
-    public BluetoothDiscoverableEnabler getDiscoverableEnabler() {
-        return mDiscoverableEnabler;
-    }
-
-    private LocalBluetoothManager(LocalBluetoothAdapter adapter, Context context) {
-        mContext = context;
-        mLocalAdapter = adapter;
-
-        mCachedDeviceManager = new CachedBluetoothDeviceManager(context);
-        mEventManager = new BluetoothEventManager(mLocalAdapter,
-                mCachedDeviceManager, context);
-        mProfileManager = new LocalBluetoothProfileManager(context,
-                mLocalAdapter, mCachedDeviceManager, mEventManager);
-    }
-
-    public LocalBluetoothAdapter getBluetoothAdapter() {
-        return mLocalAdapter;
-    }
-
-    public Context getContext() {
-        return mContext;
-    }
-
-    public Context getForegroundActivity() {
-        return mForegroundActivity;
-    }
-
-    boolean isForegroundActivity() {
-        return mForegroundActivity != null;
-    }
-
-    synchronized void setForegroundActivity(Context context) {
-        if (context != null) {
-            Log.d(TAG, "setting foreground activity to non-null context");
-            mForegroundActivity = context;
-        } else {
-            if (mForegroundActivity != null) {
-                Log.d(TAG, "setting foreground activity to null");
-                mForegroundActivity = null;
-            }
-        }
-    }
-
-    CachedBluetoothDeviceManager getCachedDeviceManager() {
-        return mCachedDeviceManager;
-    }
-
-    BluetoothEventManager getEventManager() {
-        return mEventManager;
-    }
-
-    LocalBluetoothProfileManager getProfileManager() {
-        return mProfileManager;
-    }
-}
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
index f00b801..9f2553f 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -22,6 +22,9 @@
 import android.content.res.Configuration;
 import android.util.Log;
 
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
 /**
  * LocalBluetoothPreferences provides an interface to the preferences
  * related to Bluetooth.
@@ -60,7 +63,7 @@
 
     static boolean shouldShowDialogInForeground(Context context,
             String deviceAddress) {
-        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
+        LocalBluetoothManager manager = Utils.getLocalBtManager(context);
         if (manager == null) {
             if(DEBUG) Log.v(TAG, "manager == null - do not show dialog.");
             return false;
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfile.java b/src/com/android/settings/bluetooth/LocalBluetoothProfile.java
deleted file mode 100755
index 8c0de95..0000000
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfile.java
+++ /dev/null
@@ -1,71 +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.bluetooth;
-
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-
-/**
- * LocalBluetoothProfile is an interface defining the basic
- * functionality related to a Bluetooth profile.
- */
-interface LocalBluetoothProfile {
-
-    /**
-     * Returns true if the user can initiate a connection, false otherwise.
-     */
-    boolean isConnectable();
-
-    /**
-     * Returns true if the user can enable auto connection for this profile.
-     */
-    boolean isAutoConnectable();
-
-    boolean connect(BluetoothDevice device);
-
-    boolean disconnect(BluetoothDevice device);
-
-    int getConnectionStatus(BluetoothDevice device);
-
-    boolean isPreferred(BluetoothDevice device);
-
-    int getPreferred(BluetoothDevice device);
-
-    void setPreferred(BluetoothDevice device, boolean preferred);
-
-    boolean isProfileReady();
-
-    /** Display order for device profile settings. */
-    int getOrdinal();
-
-    /**
-     * Returns the string resource ID for the localized name for this profile.
-     * @param device the Bluetooth device (to distinguish between PAN roles)
-     */
-    int getNameResource(BluetoothDevice device);
-
-    /**
-     * Returns the string resource ID for the summary text for this profile
-     * for the specified device, e.g. "Use for media audio" or
-     * "Connected to media audio".
-     * @param device the device to query for profile connection status
-     * @return a string resource ID for the profile summary text
-     */
-    int getSummaryResourceForDevice(BluetoothDevice device);
-
-    int getDrawableResource(BluetoothClass btClass);
-}
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
deleted file mode 100644
index 2a6a759..0000000
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ /dev/null
@@ -1,383 +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.bluetooth;
-
-import android.bluetooth.BluetoothA2dp;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothHeadset;
-import android.bluetooth.BluetoothMap;
-import android.bluetooth.BluetoothInputDevice;
-import android.bluetooth.BluetoothPan;
-import android.bluetooth.BluetoothPbap;
-import android.bluetooth.BluetoothProfile;
-import android.bluetooth.BluetoothUuid;
-import android.content.Context;
-import android.content.Intent;
-import android.os.ParcelUuid;
-import android.util.Log;
-import android.os.Handler;
-import android.os.Message;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.List;
-
-/**
- * LocalBluetoothProfileManager provides access to the LocalBluetoothProfile
- * objects for the available Bluetooth profiles.
- */
-final class LocalBluetoothProfileManager {
-    private static final String TAG = "LocalBluetoothProfileManager";
-    private static final boolean DEBUG = Utils.D;
-    /** Singleton instance. */
-    private static LocalBluetoothProfileManager sInstance;
-
-    /**
-     * An interface for notifying BluetoothHeadset IPC clients when they have
-     * been connected to the BluetoothHeadset service.
-     * Only used by {@link DockService}.
-     */
-    public interface ServiceListener {
-        /**
-         * Called to notify the client when this proxy object has been
-         * connected to the BluetoothHeadset service. Clients must wait for
-         * this callback before making IPC calls on the BluetoothHeadset
-         * service.
-         */
-        void onServiceConnected();
-
-        /**
-         * Called to notify the client that this proxy object has been
-         * disconnected from the BluetoothHeadset service. Clients must not
-         * make IPC calls on the BluetoothHeadset service after this callback.
-         * This callback will currently only occur if the application hosting
-         * the BluetoothHeadset service, but may be called more often in future.
-         */
-        void onServiceDisconnected();
-    }
-
-    private final Context mContext;
-    private final LocalBluetoothAdapter mLocalAdapter;
-    private final CachedBluetoothDeviceManager mDeviceManager;
-    private final BluetoothEventManager mEventManager;
-
-    private A2dpProfile mA2dpProfile;
-    private HeadsetProfile mHeadsetProfile;
-    private MapProfile mMapProfile;
-    private final HidProfile mHidProfile;
-    private OppProfile mOppProfile;
-    private final PanProfile mPanProfile;
-    private final PbapServerProfile mPbapProfile;
-
-    /**
-     * Mapping from profile name, e.g. "HEADSET" to profile object.
-     */
-    private final Map<String, LocalBluetoothProfile>
-            mProfileNameMap = new HashMap<String, LocalBluetoothProfile>();
-
-    LocalBluetoothProfileManager(Context context,
-            LocalBluetoothAdapter adapter,
-            CachedBluetoothDeviceManager deviceManager,
-            BluetoothEventManager eventManager) {
-        mContext = context;
-
-        mLocalAdapter = adapter;
-        mDeviceManager = deviceManager;
-        mEventManager = eventManager;
-        // pass this reference to adapter and event manager (circular dependency)
-        mLocalAdapter.setProfileManager(this);
-        mEventManager.setProfileManager(this);
-
-        ParcelUuid[] uuids = adapter.getUuids();
-
-        // uuids may be null if Bluetooth is turned off
-        if (uuids != null) {
-            updateLocalProfiles(uuids);
-        }
-
-        // Always add HID and PAN profiles
-        mHidProfile = new HidProfile(context, mLocalAdapter, mDeviceManager, this);
-        addProfile(mHidProfile, HidProfile.NAME,
-                BluetoothInputDevice.ACTION_CONNECTION_STATE_CHANGED);
-
-        mPanProfile = new PanProfile(context);
-        addPanProfile(mPanProfile, PanProfile.NAME,
-                BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
-
-        if(DEBUG) Log.d(TAG, "Adding local MAP profile");
-        mMapProfile = new MapProfile(mContext, mLocalAdapter,
-                mDeviceManager, this);
-        addProfile(mMapProfile, MapProfile.NAME,
-                BluetoothMap.ACTION_CONNECTION_STATE_CHANGED);
-
-       //Create PBAP server profile, but do not add it to list of profiles
-       // as we do not need to monitor the profile as part of profile list
-        mPbapProfile = new PbapServerProfile(context);
-
-        if (DEBUG) Log.d(TAG, "LocalBluetoothProfileManager construction complete");
-    }
-
-    /**
-     * Initialize or update the local profile objects. If a UUID was previously
-     * present but has been removed, we print a warning but don't remove the
-     * profile object as it might be referenced elsewhere, or the UUID might
-     * come back and we don't want multiple copies of the profile objects.
-     * @param uuids
-     */
-    void updateLocalProfiles(ParcelUuid[] uuids) {
-        // A2DP
-        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AudioSource)) {
-            if (mA2dpProfile == null) {
-                if(DEBUG) Log.d(TAG, "Adding local A2DP profile");
-                mA2dpProfile = new A2dpProfile(mContext, mLocalAdapter, mDeviceManager, this);
-                addProfile(mA2dpProfile, A2dpProfile.NAME,
-                        BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
-            }
-        } else if (mA2dpProfile != null) {
-            Log.w(TAG, "Warning: A2DP profile was previously added but the UUID is now missing.");
-        }
-
-        // Headset / Handsfree
-        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Handsfree_AG) ||
-            BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.HSP_AG)) {
-            if (mHeadsetProfile == null) {
-                if (DEBUG) Log.d(TAG, "Adding local HEADSET profile");
-                mHeadsetProfile = new HeadsetProfile(mContext, mLocalAdapter,
-                        mDeviceManager, this);
-                addProfile(mHeadsetProfile, HeadsetProfile.NAME,
-                        BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);
-            }
-        } else if (mHeadsetProfile != null) {
-            Log.w(TAG, "Warning: HEADSET profile was previously added but the UUID is now missing.");
-        }
-
-        // OPP
-        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.ObexObjectPush)) {
-            if (mOppProfile == null) {
-                if(DEBUG) Log.d(TAG, "Adding local OPP profile");
-                mOppProfile = new OppProfile();
-                // Note: no event handler for OPP, only name map.
-                mProfileNameMap.put(OppProfile.NAME, mOppProfile);
-            }
-        } else if (mOppProfile != null) {
-            Log.w(TAG, "Warning: OPP profile was previously added but the UUID is now missing.");
-        }
-        mEventManager.registerProfileIntentReceiver();
-
-        // There is no local SDP record for HID and Settings app doesn't control PBAP
-    }
-
-    private final Collection<ServiceListener> mServiceListeners =
-            new ArrayList<ServiceListener>();
-
-    private void addProfile(LocalBluetoothProfile profile,
-            String profileName, String stateChangedAction) {
-        mEventManager.addProfileHandler(stateChangedAction, new StateChangedHandler(profile));
-        mProfileNameMap.put(profileName, profile);
-    }
-
-    private void addPanProfile(LocalBluetoothProfile profile,
-            String profileName, String stateChangedAction) {
-        mEventManager.addProfileHandler(stateChangedAction,
-                new PanStateChangedHandler(profile));
-        mProfileNameMap.put(profileName, profile);
-    }
-
-    LocalBluetoothProfile getProfileByName(String name) {
-        return mProfileNameMap.get(name);
-    }
-
-    // Called from LocalBluetoothAdapter when state changes to ON
-    void setBluetoothStateOn() {
-        ParcelUuid[] uuids = mLocalAdapter.getUuids();
-        if (uuids != null) {
-            updateLocalProfiles(uuids);
-        }
-        mEventManager.readPairedDevices();
-    }
-
-    /**
-     * Generic handler for connection state change events for the specified profile.
-     */
-    private class StateChangedHandler implements BluetoothEventManager.Handler {
-        final LocalBluetoothProfile mProfile;
-
-        StateChangedHandler(LocalBluetoothProfile profile) {
-            mProfile = profile;
-        }
-
-        public void onReceive(Context context, Intent intent, BluetoothDevice device) {
-            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
-            if (cachedDevice == null) {
-                Log.w(TAG, "StateChangedHandler found new device: " + device);
-                cachedDevice = mDeviceManager.addDevice(mLocalAdapter,
-                        LocalBluetoothProfileManager.this, device);
-            }
-            int newState = intent.getIntExtra(BluetoothProfile.EXTRA_STATE, 0);
-            int oldState = intent.getIntExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, 0);
-            if (newState == BluetoothProfile.STATE_DISCONNECTED &&
-                    oldState == BluetoothProfile.STATE_CONNECTING) {
-                Log.i(TAG, "Failed to connect " + mProfile + " device");
-            }
-
-            cachedDevice.onProfileStateChanged(mProfile, newState);
-            cachedDevice.refresh();
-        }
-    }
-
-    /** State change handler for NAP and PANU profiles. */
-    private class PanStateChangedHandler extends StateChangedHandler {
-
-        PanStateChangedHandler(LocalBluetoothProfile profile) {
-            super(profile);
-        }
-
-        @Override
-        public void onReceive(Context context, Intent intent, BluetoothDevice device) {
-            PanProfile panProfile = (PanProfile) mProfile;
-            int role = intent.getIntExtra(BluetoothPan.EXTRA_LOCAL_ROLE, 0);
-            panProfile.setLocalRole(device, role);
-            super.onReceive(context, intent, device);
-        }
-    }
-
-    // called from DockService
-    void addServiceListener(ServiceListener l) {
-        mServiceListeners.add(l);
-    }
-
-    // called from DockService
-    void removeServiceListener(ServiceListener l) {
-        mServiceListeners.remove(l);
-    }
-
-    // not synchronized: use only from UI thread! (TODO: verify)
-    void callServiceConnectedListeners() {
-        for (ServiceListener l : mServiceListeners) {
-            l.onServiceConnected();
-        }
-    }
-
-    // not synchronized: use only from UI thread! (TODO: verify)
-    void callServiceDisconnectedListeners() {
-        for (ServiceListener listener : mServiceListeners) {
-            listener.onServiceDisconnected();
-        }
-    }
-
-    // This is called by DockService, so check Headset and A2DP.
-    public synchronized boolean isManagerReady() {
-        // Getting just the headset profile is fine for now. Will need to deal with A2DP
-        // and others if they aren't always in a ready state.
-        LocalBluetoothProfile profile = mHeadsetProfile;
-        if (profile != null) {
-            return profile.isProfileReady();
-        }
-        profile = mA2dpProfile;
-        if (profile != null) {
-            return profile.isProfileReady();
-        }
-        return false;
-    }
-
-    A2dpProfile getA2dpProfile() {
-        return mA2dpProfile;
-    }
-
-    HeadsetProfile getHeadsetProfile() {
-        return mHeadsetProfile;
-    }
-
-    PbapServerProfile getPbapProfile(){
-        return mPbapProfile;
-    }
-
-    MapProfile getMapProfile(){
-        return mMapProfile;
-    }
-
-    /**
-     * Fill in a list of LocalBluetoothProfile objects that are supported by
-     * the local device and the remote device.
-     *
-     * @param uuids of the remote device
-     * @param localUuids UUIDs of the local device
-     * @param profiles The list of profiles to fill
-     * @param removedProfiles list of profiles that were removed
-     */
-    synchronized void updateProfiles(ParcelUuid[] uuids, ParcelUuid[] localUuids,
-            Collection<LocalBluetoothProfile> profiles,
-            Collection<LocalBluetoothProfile> removedProfiles,
-            boolean isPanNapConnected, BluetoothDevice device) {
-        // Copy previous profile list into removedProfiles
-        removedProfiles.clear();
-        removedProfiles.addAll(profiles);
-        profiles.clear();
-
-        if (uuids == null) {
-            return;
-        }
-
-        if (mHeadsetProfile != null) {
-            if ((BluetoothUuid.isUuidPresent(localUuids, BluetoothUuid.HSP_AG) &&
-                    BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.HSP)) ||
-                    (BluetoothUuid.isUuidPresent(localUuids, BluetoothUuid.Handsfree_AG) &&
-                            BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Handsfree))) {
-                profiles.add(mHeadsetProfile);
-                removedProfiles.remove(mHeadsetProfile);
-            }
-        }
-
-        if (BluetoothUuid.containsAnyUuid(uuids, A2dpProfile.SINK_UUIDS) &&
-            mA2dpProfile != null) {
-            profiles.add(mA2dpProfile);
-            removedProfiles.remove(mA2dpProfile);
-        }
-
-        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.ObexObjectPush) &&
-            mOppProfile != null) {
-            profiles.add(mOppProfile);
-            removedProfiles.remove(mOppProfile);
-        }
-
-        if ((BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hid) ||
-             BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hogp)) &&
-            mHidProfile != null) {
-            profiles.add(mHidProfile);
-            removedProfiles.remove(mHidProfile);
-        }
-
-        if(isPanNapConnected)
-            if(DEBUG) Log.d(TAG, "Valid PAN-NAP connection exists.");
-        if ((BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP) &&
-            mPanProfile != null) || isPanNapConnected) {
-            profiles.add(mPanProfile);
-            removedProfiles.remove(mPanProfile);
-        }
-
-        if ((mMapProfile != null) &&
-            (mMapProfile.getConnectionStatus(device) == BluetoothProfile.STATE_CONNECTED)) {
-            profiles.add(mMapProfile);
-            removedProfiles.remove(mMapProfile);
-            mMapProfile.setPreferred(device, true);
-        }
-    }
-
-}
diff --git a/src/com/android/settings/bluetooth/MapProfile.java b/src/com/android/settings/bluetooth/MapProfile.java
deleted file mode 100644
index f47e24f..0000000
--- a/src/com/android/settings/bluetooth/MapProfile.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothMap;
-import android.bluetooth.BluetoothProfile;
-import android.bluetooth.BluetoothUuid;
-import android.content.Context;
-import android.os.ParcelUuid;
-import android.util.Log;
-
-import com.android.settings.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * MapProfile handles Bluetooth MAP profile.
- */
-final class MapProfile implements LocalBluetoothProfile {
-    private static final String TAG = "MapProfile";
-    private static boolean V = true;
-
-    private BluetoothMap mService;
-    private boolean mIsProfileReady;
-
-    private final LocalBluetoothAdapter mLocalAdapter;
-    private final CachedBluetoothDeviceManager mDeviceManager;
-    private final LocalBluetoothProfileManager mProfileManager;
-
-    static final ParcelUuid[] UUIDS = {
-        BluetoothUuid.MAP,
-        BluetoothUuid.MNS,
-        BluetoothUuid.MAS,
-    };
-
-    static final String NAME = "MAP";
-
-    // Order of this profile in device profiles list
-
-    // These callbacks run on the main thread.
-    private final class MapServiceListener
-            implements BluetoothProfile.ServiceListener {
-
-        public void onServiceConnected(int profile, BluetoothProfile proxy) {
-            if (V) Log.d(TAG,"Bluetooth service connected");
-            mService = (BluetoothMap) proxy;
-            // We just bound to the service, so refresh the UI for any connected MAP devices.
-            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-            while (!deviceList.isEmpty()) {
-                BluetoothDevice nextDevice = deviceList.remove(0);
-                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
-                // we may add a new device here, but generally this should not happen
-                if (device == null) {
-                    Log.w(TAG, "MapProfile found new device: " + nextDevice);
-                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
-                }
-                device.onProfileStateChanged(MapProfile.this,
-                        BluetoothProfile.STATE_CONNECTED);
-                device.refresh();
-            }
-
-            mProfileManager.callServiceConnectedListeners();
-            mIsProfileReady=true;
-        }
-
-        public void onServiceDisconnected(int profile) {
-            if (V) Log.d(TAG,"Bluetooth service disconnected");
-            mProfileManager.callServiceDisconnectedListeners();
-            mIsProfileReady=false;
-        }
-    }
-
-    public boolean isProfileReady() {
-        if(V) Log.d(TAG,"isProfileReady(): "+ mIsProfileReady);
-        return mIsProfileReady;
-    }
-
-    MapProfile(Context context, LocalBluetoothAdapter adapter,
-            CachedBluetoothDeviceManager deviceManager,
-            LocalBluetoothProfileManager profileManager) {
-        mLocalAdapter = adapter;
-        mDeviceManager = deviceManager;
-        mProfileManager = profileManager;
-        mLocalAdapter.getProfileProxy(context, new MapServiceListener(),
-                BluetoothProfile.MAP);
-    }
-
-    public boolean isConnectable() {
-        return true;
-    }
-
-    public boolean isAutoConnectable() {
-        return true;
-    }
-
-    public boolean connect(BluetoothDevice device) {
-        if(V)Log.d(TAG,"connect() - should not get called");
-        return false; // MAP never connects out
-    }
-
-    public boolean disconnect(BluetoothDevice device) {
-        if (mService == null) return false;
-        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-        if (!deviceList.isEmpty() && deviceList.get(0).equals(device)) {
-            if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
-                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
-            }
-            return mService.disconnect(device);
-        } else {
-            return false;
-        }
-    }
-
-    public int getConnectionStatus(BluetoothDevice device) {
-        if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
-        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-        if(V) Log.d(TAG,"getConnectionStatus: status is: "+ mService.getConnectionState(device));
-
-        return !deviceList.isEmpty() && deviceList.get(0).equals(device)
-                ? mService.getConnectionState(device)
-                : BluetoothProfile.STATE_DISCONNECTED;
-    }
-
-    public boolean isPreferred(BluetoothDevice device) {
-        if (mService == null) return false;
-        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
-    }
-
-    public int getPreferred(BluetoothDevice device) {
-        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
-        return mService.getPriority(device);
-    }
-
-    public void setPreferred(BluetoothDevice device, boolean preferred) {
-        if (mService == null) return;
-        if (preferred) {
-            if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
-                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
-            }
-        } else {
-            mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
-        }
-    }
-
-    public List<BluetoothDevice> getConnectedDevices() {
-        if (mService == null) return new ArrayList<BluetoothDevice>(0);
-        return mService.getDevicesMatchingConnectionStates(
-              new int[] {BluetoothProfile.STATE_CONNECTED,
-                         BluetoothProfile.STATE_CONNECTING,
-                         BluetoothProfile.STATE_DISCONNECTING});
-    }
-
-    public String toString() {
-        return NAME;
-    }
-
-    public int getOrdinal() {
-        return BluetoothProfile.MAP;
-    }
-
-    public int getNameResource(BluetoothDevice device) {
-        return R.string.bluetooth_profile_map;
-    }
-
-    public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = getConnectionStatus(device);
-        switch (state) {
-            case BluetoothProfile.STATE_DISCONNECTED:
-                return R.string.bluetooth_map_profile_summary_use_for;
-
-            case BluetoothProfile.STATE_CONNECTED:
-                return R.string.bluetooth_map_profile_summary_connected;
-
-            default:
-                return Utils.getConnectionStateSummary(state);
-        }
-    }
-
-    public int getDrawableResource(BluetoothClass btClass) {
-        return R.drawable.ic_bt_cellphone;
-    }
-
-    protected void finalize() {
-        if (V) Log.d(TAG, "finalize()");
-        if (mService != null) {
-            try {
-                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.MAP,
-                                                                       mService);
-                mService = null;
-            }catch (Throwable t) {
-                Log.w(TAG, "Error cleaning up MAP proxy", t);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/OppProfile.java b/src/com/android/settings/bluetooth/OppProfile.java
deleted file mode 100755
index 7ee2ad1..0000000
--- a/src/com/android/settings/bluetooth/OppProfile.java
+++ /dev/null
@@ -1,89 +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.bluetooth;
-
-import com.android.settings.R;
-
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothProfile;
-
-/**
- * OppProfile handles Bluetooth OPP.
- */
-final class OppProfile implements LocalBluetoothProfile {
-
-    static final String NAME = "OPP";
-
-    // Order of this profile in device profiles list
-    private static final int ORDINAL = 2;
-
-    public boolean isConnectable() {
-        return false;
-    }
-
-    public boolean isAutoConnectable() {
-        return false;
-    }
-
-    public boolean connect(BluetoothDevice device) {
-        return false;
-    }
-
-    public boolean disconnect(BluetoothDevice device) {
-        return false;
-    }
-
-    public int getConnectionStatus(BluetoothDevice device) {
-        return BluetoothProfile.STATE_DISCONNECTED; // Settings app doesn't handle OPP
-    }
-
-    public boolean isPreferred(BluetoothDevice device) {
-        return false;
-    }
-
-    public int getPreferred(BluetoothDevice device) {
-        return BluetoothProfile.PRIORITY_OFF; // Settings app doesn't handle OPP
-    }
-
-    public void setPreferred(BluetoothDevice device, boolean preferred) {
-    }
-
-    public boolean isProfileReady() {
-        return true;
-    }
-
-    public String toString() {
-        return NAME;
-    }
-
-    public int getOrdinal() {
-        return ORDINAL;
-    }
-
-    public int getNameResource(BluetoothDevice device) {
-        return R.string.bluetooth_profile_opp;
-    }
-
-    public int getSummaryResourceForDevice(BluetoothDevice device) {
-        return 0;   // OPP profile not displayed in UI
-    }
-
-    public int getDrawableResource(BluetoothClass btClass) {
-        return 0;   // no icon for OPP
-    }
-}
diff --git a/src/com/android/settings/bluetooth/PanProfile.java b/src/com/android/settings/bluetooth/PanProfile.java
deleted file mode 100755
index f6e0691..0000000
--- a/src/com/android/settings/bluetooth/PanProfile.java
+++ /dev/null
@@ -1,183 +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.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothPan;
-import android.bluetooth.BluetoothProfile;
-import android.content.Context;
-import android.util.Log;
-
-import com.android.settings.R;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * PanProfile handles Bluetooth PAN profile (NAP and PANU).
- */
-final class PanProfile implements LocalBluetoothProfile {
-    private static final String TAG = "PanProfile";
-    private static boolean V = true;
-
-    private BluetoothPan mService;
-    private boolean mIsProfileReady;
-
-    // Tethering direction for each device
-    private final HashMap<BluetoothDevice, Integer> mDeviceRoleMap =
-            new HashMap<BluetoothDevice, Integer>();
-
-    static final String NAME = "PAN";
-
-    // Order of this profile in device profiles list
-    private static final int ORDINAL = 4;
-
-    // These callbacks run on the main thread.
-    private final class PanServiceListener
-            implements BluetoothProfile.ServiceListener {
-
-        public void onServiceConnected(int profile, BluetoothProfile proxy) {
-            if (V) Log.d(TAG,"Bluetooth service connected");
-            mService = (BluetoothPan) proxy;
-            mIsProfileReady=true;
-        }
-
-        public void onServiceDisconnected(int profile) {
-            if (V) Log.d(TAG,"Bluetooth service disconnected");
-            mIsProfileReady=false;
-        }
-    }
-
-    public boolean isProfileReady() {
-        return mIsProfileReady;
-    }
-
-    PanProfile(Context context) {
-        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        adapter.getProfileProxy(context, new PanServiceListener(),
-                BluetoothProfile.PAN);
-    }
-
-    public boolean isConnectable() {
-        return true;
-    }
-
-    public boolean isAutoConnectable() {
-        return false;
-    }
-
-    public boolean connect(BluetoothDevice device) {
-        if (mService == null) return false;
-        List<BluetoothDevice> sinks = mService.getConnectedDevices();
-        if (sinks != null) {
-            for (BluetoothDevice sink : sinks) {
-                mService.disconnect(sink);
-            }
-        }
-        return mService.connect(device);
-    }
-
-    public boolean disconnect(BluetoothDevice device) {
-        if (mService == null) return false;
-        return mService.disconnect(device);
-    }
-
-    public int getConnectionStatus(BluetoothDevice device) {
-        if (mService == null) {
-            return BluetoothProfile.STATE_DISCONNECTED;
-        }
-        return mService.getConnectionState(device);
-    }
-
-    public boolean isPreferred(BluetoothDevice device) {
-        // return current connection status so profile checkbox is set correctly
-        return getConnectionStatus(device) == BluetoothProfile.STATE_CONNECTED;
-    }
-
-    public int getPreferred(BluetoothDevice device) {
-        return -1;
-    }
-
-    public void setPreferred(BluetoothDevice device, boolean preferred) {
-        // ignore: isPreferred is always true for PAN
-    }
-
-    public String toString() {
-        return NAME;
-    }
-
-    public int getOrdinal() {
-        return ORDINAL;
-    }
-
-    public int getNameResource(BluetoothDevice device) {
-        if (isLocalRoleNap(device)) {
-            return R.string.bluetooth_profile_pan_nap;
-        } else {
-            return R.string.bluetooth_profile_pan;
-        }
-    }
-
-    public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = getConnectionStatus(device);
-        switch (state) {
-            case BluetoothProfile.STATE_DISCONNECTED:
-                return R.string.bluetooth_pan_profile_summary_use_for;
-
-            case BluetoothProfile.STATE_CONNECTED:
-                if (isLocalRoleNap(device)) {
-                    return R.string.bluetooth_pan_nap_profile_summary_connected;
-                } else {
-                    return R.string.bluetooth_pan_user_profile_summary_connected;
-                }
-
-            default:
-                return Utils.getConnectionStateSummary(state);
-        }
-    }
-
-    public int getDrawableResource(BluetoothClass btClass) {
-        return R.drawable.ic_bt_network_pan;
-    }
-
-    // Tethering direction determines UI strings.
-    void setLocalRole(BluetoothDevice device, int role) {
-        mDeviceRoleMap.put(device, role);
-    }
-
-    boolean isLocalRoleNap(BluetoothDevice device) {
-        if (mDeviceRoleMap.containsKey(device)) {
-            return mDeviceRoleMap.get(device) == BluetoothPan.LOCAL_NAP_ROLE;
-        } else {
-            return false;
-        }
-    }
-
-    protected void finalize() {
-        if (V) Log.d(TAG, "finalize()");
-        if (mService != null) {
-            try {
-                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.PAN, mService);
-                mService = null;
-            }catch (Throwable t) {
-                Log.w(TAG, "Error cleaning up PAN proxy", t);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/PbapServerProfile.java b/src/com/android/settings/bluetooth/PbapServerProfile.java
deleted file mode 100755
index 6e48b12..0000000
--- a/src/com/android/settings/bluetooth/PbapServerProfile.java
+++ /dev/null
@@ -1,152 +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.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothPbap;
-import android.bluetooth.BluetoothProfile;
-import android.bluetooth.BluetoothUuid;
-import android.content.Context;
-import android.os.ParcelUuid;
-import android.util.Log;
-
-import com.android.settings.R;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * PBAPServer Profile
- */
-final class PbapServerProfile implements LocalBluetoothProfile {
-    private static final String TAG = "PbapServerProfile";
-    private static boolean V = true;
-
-    private BluetoothPbap mService;
-    private boolean mIsProfileReady;
-
-    static final String NAME = "PBAP Server";
-
-    // Order of this profile in device profiles list
-    private static final int ORDINAL = 6;
-
-    // The UUIDs indicate that remote device might access pbap server
-    static final ParcelUuid[] PBAB_CLIENT_UUIDS = {
-        BluetoothUuid.HSP,
-        BluetoothUuid.Handsfree,
-        BluetoothUuid.PBAP_PCE
-    };
-
-    // These callbacks run on the main thread.
-    private final class PbapServiceListener
-            implements BluetoothPbap.ServiceListener {
-
-        public void onServiceConnected(BluetoothPbap proxy) {
-            if (V) Log.d(TAG,"Bluetooth service connected");
-            mService = (BluetoothPbap) proxy;
-            mIsProfileReady=true;
-        }
-
-        public void onServiceDisconnected() {
-            if (V) Log.d(TAG,"Bluetooth service disconnected");
-            mIsProfileReady=false;
-        }
-    }
-
-    public boolean isProfileReady() {
-        return mIsProfileReady;
-    }
-
-    PbapServerProfile(Context context) {
-        BluetoothPbap pbap = new BluetoothPbap(context, new PbapServiceListener());
-    }
-
-    public boolean isConnectable() {
-        return true;
-    }
-
-    public boolean isAutoConnectable() {
-        return false;
-    }
-
-    public boolean connect(BluetoothDevice device) {
-        /*Can't connect from server */
-        return false;
-
-    }
-
-    public boolean disconnect(BluetoothDevice device) {
-        if (mService == null) return false;
-        return mService.disconnect();
-    }
-
-    public int getConnectionStatus(BluetoothDevice device) {
-        if (mService == null) {
-            return BluetoothProfile.STATE_DISCONNECTED;
-        }
-        if (mService.isConnected(device))
-            return BluetoothProfile.STATE_CONNECTED;
-        else
-            return BluetoothProfile.STATE_DISCONNECTED;
-    }
-
-    public boolean isPreferred(BluetoothDevice device) {
-        return false;
-    }
-
-    public int getPreferred(BluetoothDevice device) {
-        return -1;
-    }
-
-    public void setPreferred(BluetoothDevice device, boolean preferred) {
-        // ignore: isPreferred is always true for PBAP
-    }
-
-    public String toString() {
-        return NAME;
-    }
-
-    public int getOrdinal() {
-        return ORDINAL;
-    }
-
-    public int getNameResource(BluetoothDevice device) {
-        return R.string.bluetooth_profile_pbap;
-    }
-
-    public int getSummaryResourceForDevice(BluetoothDevice device) {
-        return R.string.bluetooth_profile_pbap_summary;
-    }
-
-    public int getDrawableResource(BluetoothClass btClass) {
-        return R.drawable.ic_bt_cellphone;
-    }
-
-    protected void finalize() {
-        if (V) Log.d(TAG, "finalize()");
-        if (mService != null) {
-            try {
-                mService.close();
-                mService = null;
-            }catch (Throwable t) {
-                Log.w(TAG, "Error cleaning up PBAP proxy", t);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index 9f266a5..9ce332d 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.bluetooth;
 
-import com.android.settings.R;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.bluetooth.BluetoothAdapter;
@@ -30,6 +28,11 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
 /**
  * RequestPermissionActivity asks the user whether to enable discovery. This is
  * usually started by an application wanted to start bluetooth and or discovery
@@ -275,7 +278,7 @@
             return true;
         }
 
-        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(this);
+        LocalBluetoothManager manager = Utils.getLocalBtManager(this);
         if (manager == null) {
             Log.e(TAG, "Error: there's a problem starting Bluetooth");
             setResult(RESULT_CANCELED);
diff --git a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
index f108513..c30113e 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
@@ -19,15 +19,14 @@
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
-import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
 
 /**
  * RequestPermissionHelperActivity asks the user whether to enable discovery.
@@ -146,7 +145,7 @@
             return true;
         }
 
-        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(this);
+        LocalBluetoothManager manager = Utils.getLocalBtManager(this);
         if (manager == null) {
             Log.e(TAG, "Error: there's a problem starting Bluetooth");
             setResult(RESULT_CANCELED);
diff --git a/src/com/android/settings/bluetooth/SapProfile.java b/src/com/android/settings/bluetooth/SapProfile.java
deleted file mode 100644
index 95dfd1f..0000000
--- a/src/com/android/settings/bluetooth/SapProfile.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.bluetooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothSap;
-import android.bluetooth.BluetoothProfile;
-import android.bluetooth.BluetoothUuid;
-import android.content.Context;
-import android.os.ParcelUuid;
-import android.util.Log;
-
-import com.android.settings.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * SapProfile handles Bluetooth SAP profile.
- */
-final class SapProfile implements LocalBluetoothProfile {
-    private static final String TAG = "SapProfile";
-    private static boolean V = true;
-
-    private BluetoothSap mService;
-    private boolean mIsProfileReady;
-
-    private final LocalBluetoothAdapter mLocalAdapter;
-    private final CachedBluetoothDeviceManager mDeviceManager;
-    private final LocalBluetoothProfileManager mProfileManager;
-
-    static final ParcelUuid[] UUIDS = {
-        BluetoothUuid.SAP,
-    };
-
-    static final String NAME = "SAP";
-
-    // Order of this profile in device profiles list
-    private static final int ORDINAL = 10;
-
-    // These callbacks run on the main thread.
-    private final class SapServiceListener
-            implements BluetoothProfile.ServiceListener {
-
-        public void onServiceConnected(int profile, BluetoothProfile proxy) {
-            if (V) Log.d(TAG,"Bluetooth service connected");
-            mService = (BluetoothSap) proxy;
-            // We just bound to the service, so refresh the UI for any connected SAP devices.
-            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-            while (!deviceList.isEmpty()) {
-                BluetoothDevice nextDevice = deviceList.remove(0);
-                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
-                // we may add a new device here, but generally this should not happen
-                if (device == null) {
-                    Log.w(TAG, "SapProfile found new device: " + nextDevice);
-                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
-                }
-                device.onProfileStateChanged(SapProfile.this,
-                        BluetoothProfile.STATE_CONNECTED);
-                device.refresh();
-            }
-
-            mProfileManager.callServiceConnectedListeners();
-            mIsProfileReady=true;
-        }
-
-        public void onServiceDisconnected(int profile) {
-            if (V) Log.d(TAG,"Bluetooth service disconnected");
-            mProfileManager.callServiceDisconnectedListeners();
-            mIsProfileReady=false;
-        }
-    }
-
-    public boolean isProfileReady() {
-        return mIsProfileReady;
-    }
-
-    SapProfile(Context context, LocalBluetoothAdapter adapter,
-            CachedBluetoothDeviceManager deviceManager,
-            LocalBluetoothProfileManager profileManager) {
-        mLocalAdapter = adapter;
-        mDeviceManager = deviceManager;
-        mProfileManager = profileManager;
-        mLocalAdapter.getProfileProxy(context, new SapServiceListener(),
-                BluetoothProfile.SAP);
-    }
-
-    public boolean isConnectable() {
-        return true;
-    }
-
-    public boolean isAutoConnectable() {
-        return true;
-    }
-
-    public boolean connect(BluetoothDevice device) {
-        if (mService == null) return false;
-        List<BluetoothDevice> sinks = mService.getConnectedDevices();
-        if (sinks != null) {
-            for (BluetoothDevice sink : sinks) {
-                mService.disconnect(sink);
-            }
-        }
-        return mService.connect(device);
-    }
-
-    public boolean disconnect(BluetoothDevice device) {
-        if (mService == null) return false;
-        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-        if (!deviceList.isEmpty() && deviceList.get(0).equals(device)) {
-            if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
-                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
-            }
-            return mService.disconnect(device);
-        } else {
-            return false;
-        }
-    }
-
-    public int getConnectionStatus(BluetoothDevice device) {
-        if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
-        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-
-        return !deviceList.isEmpty() && deviceList.get(0).equals(device)
-                ? mService.getConnectionState(device)
-                : BluetoothProfile.STATE_DISCONNECTED;
-    }
-
-    public boolean isPreferred(BluetoothDevice device) {
-        if (mService == null) return false;
-        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
-    }
-
-    public int getPreferred(BluetoothDevice device) {
-        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
-        return mService.getPriority(device);
-    }
-
-    public void setPreferred(BluetoothDevice device, boolean preferred) {
-        if (mService == null) return;
-        if (preferred) {
-            if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
-                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
-            }
-        } else {
-            mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
-        }
-    }
-
-    public List<BluetoothDevice> getConnectedDevices() {
-        if (mService == null) return new ArrayList<BluetoothDevice>(0);
-        return mService.getDevicesMatchingConnectionStates(
-              new int[] {BluetoothProfile.STATE_CONNECTED,
-                         BluetoothProfile.STATE_CONNECTING,
-                         BluetoothProfile.STATE_DISCONNECTING});
-    }
-
-    public String toString() {
-        return NAME;
-    }
-
-    public int getOrdinal() {
-        return ORDINAL;
-    }
-
-    public int getNameResource(BluetoothDevice device) {
-        return R.string.bluetooth_profile_sap;
-    }
-
-    public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = getConnectionStatus(device);
-        switch (state) {
-            case BluetoothProfile.STATE_DISCONNECTED:
-                return R.string.bluetooth_sap_profile_summary_use_for;
-
-            case BluetoothProfile.STATE_CONNECTED:
-                return R.string.bluetooth_sap_profile_summary_connected;
-
-            default:
-                return Utils.getConnectionStateSummary(state);
-        }
-    }
-
-    public int getDrawableResource(BluetoothClass btClass) {
-        return R.drawable.ic_bt_cellphone;
-    }
-
-    protected void finalize() {
-        if (V) Log.d(TAG, "finalize()");
-        if (mService != null) {
-            try {
-                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.SAP,
-                                                                       mService);
-                mService = null;
-            }catch (Throwable t) {
-                Log.w(TAG, "Error cleaning up SAP proxy", t);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java
index e9230de..2cbe473 100755
--- a/src/com/android/settings/bluetooth/Utils.java
+++ b/src/com/android/settings/bluetooth/Utils.java
@@ -17,24 +17,27 @@
 package com.android.settings.bluetooth;
 
 import android.app.AlertDialog;
-import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.widget.Toast;
 
 import com.android.settings.R;
+import com.android.settings.bluetooth.DockService.DockBluetoothCallback;
 import com.android.settings.search.Index;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothManager.BluetoothManagerCallback;
+import com.android.settingslib.bluetooth.Utils.ErrorListener;
 
 /**
  * Utils is a helper class that contains constants for various
  * Android resource IDs, debug logging flags, and static methods
  * for creating dialogs.
  */
-final class Utils {
-    static final boolean V = false; // verbose logging
-    static final boolean D = true;  // regular logging
+public final class Utils {
+    static final boolean V = com.android.settingslib.bluetooth.Utils.V; // verbose logging
+    static final boolean D =  com.android.settingslib.bluetooth.Utils.D;  // regular logging
 
     private Utils() {
     }
@@ -91,7 +94,7 @@
 
     static void showError(Context context, String name, int messageResId) {
         String message = context.getString(messageResId, name);
-        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
+        LocalBluetoothManager manager = getLocalBtManager(context);
         Context activity = manager.getForegroundActivity();
         if(manager.isForegroundActivity()) {
             new AlertDialog.Builder(activity)
@@ -118,4 +121,25 @@
 
         Index.getInstance(context).updateFromSearchIndexableData(data);
     }
+
+    public static LocalBluetoothManager getLocalBtManager(Context context) {
+        return LocalBluetoothManager.getInstance(context, mOnInitCallback);
+    }
+
+    private static final ErrorListener mErrorListener = new ErrorListener() {
+        @Override
+        public void onShowError(Context context, String name, int messageResId) {
+            showError(context, name, messageResId);
+        }
+    };
+
+    private static final BluetoothManagerCallback mOnInitCallback = new BluetoothManagerCallback() {
+        @Override
+        public void onBluetoothManagerInitialized(Context appContext,
+                LocalBluetoothManager bluetoothManager) {
+            bluetoothManager.getEventManager().registerCallback(
+                    new DockBluetoothCallback(appContext));
+            com.android.settingslib.bluetooth.Utils.setErrorListener(mErrorListener);
+        }
+    };
 }
diff --git a/src/com/android/settings/dashboard/DashboardCategory.java b/src/com/android/settings/dashboard/DashboardCategory.java
index 164d988..69d0316 100644
--- a/src/com/android/settings/dashboard/DashboardCategory.java
+++ b/src/com/android/settings/dashboard/DashboardCategory.java
@@ -19,7 +19,6 @@
 import android.content.res.Resources;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.os.Parcelable.Creator;
 import android.text.TextUtils;
 
 import java.util.ArrayList;
@@ -53,6 +52,16 @@
     public CharSequence title;
 
     /**
+     * Key used for placing external tiles.
+     */
+    public String key;
+
+    /**
+     * Optional index of where to place tiles specified by system apps.
+     */
+    public int externalIndex = -1;
+
+    /**
      * List of the category's children
      */
     public List<DashboardTile> tiles = new ArrayList<DashboardTile>();
@@ -106,7 +115,9 @@
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(titleRes);
+        dest.writeInt(externalIndex);
         TextUtils.writeToParcel(title, dest, flags);
+        dest.writeString(key);
 
         final int count = tiles.size();
         dest.writeInt(count);
@@ -119,7 +130,9 @@
 
     public void readFromParcel(Parcel in) {
         titleRes = in.readInt();
+        externalIndex = in.readInt();
         title = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
+        key = in.readString();
 
         final int count = in.readInt();
 
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index cf398d7..31aa0df 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -16,28 +16,36 @@
 
 package com.android.settings.dashboard;
 
-import android.app.Fragment;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.HelpUtils;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 
 import java.util.List;
 
-public class DashboardSummary extends Fragment {
+public class DashboardSummary extends InstrumentedFragment {
     private static final String LOG_TAG = "DashboardSummary";
 
     private LayoutInflater mLayoutInflater;
@@ -65,6 +73,24 @@
     private HomePackageReceiver mHomePackageReceiver = new HomePackageReceiver();
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DASHBOARD_SUMMARY;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_uri_dashboard);
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
 
@@ -148,7 +174,23 @@
     private void updateTileView(Context context, Resources res, DashboardTile tile,
             ImageView tileIcon, TextView tileTextView, TextView statusTextView) {
 
-        if (tile.iconRes > 0) {
+        if (!TextUtils.isEmpty(tile.iconPkg)) {
+            try {
+                Drawable drawable = context.getPackageManager()
+                        .getResourcesForApplication(tile.iconPkg).getDrawable(tile.iconRes, null);
+                if (!tile.iconPkg.equals(context.getPackageName()) && drawable != null) {
+                    // If this drawable is coming from outside Settings, tint it to match the color.
+                    TypedValue tintColor = new TypedValue();
+                    context.getTheme().resolveAttribute(com.android.internal.R.attr.colorAccent,
+                            tintColor, true);
+                    drawable.setTint(tintColor.data);
+                }
+                tileIcon.setImageDrawable(drawable);
+            } catch (NameNotFoundException | Resources.NotFoundException e) {
+                tileIcon.setImageDrawable(null);
+                tileIcon.setBackground(null);
+            }
+        } else if (tile.iconRes > 0) {
             tileIcon.setImageResource(tile.iconRes);
         } else {
             tileIcon.setImageDrawable(null);
diff --git a/src/com/android/settings/dashboard/DashboardTile.java b/src/com/android/settings/dashboard/DashboardTile.java
index 1f1d9c2..5e7e49a 100644
--- a/src/com/android/settings/dashboard/DashboardTile.java
+++ b/src/com/android/settings/dashboard/DashboardTile.java
@@ -21,8 +21,11 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.os.UserHandle;
 import android.text.TextUtils;
 
+import java.util.ArrayList;
+
 /**
  * Description of a single dashboard tile that the user can select.
  */
@@ -73,6 +76,11 @@
     public int iconRes;
 
     /**
+     * Optional package to pull the icon resource from.
+     */
+    public String iconPkg;
+
+    /**
      * Full class name of the fragment to display when this tile is
      * selected.
      * @attr ref android.R.styleable#PreferenceHeader_fragment
@@ -91,6 +99,11 @@
     public Intent intent;
 
     /**
+     * Optional list of user handles which the intent should be launched on.
+     */
+    public ArrayList<UserHandle> userHandle = new ArrayList<>();
+
+    /**
      * Optional additional data for use by subclasses of the activity
      */
     public Bundle extras;
@@ -136,6 +149,7 @@
         dest.writeInt(summaryRes);
         TextUtils.writeToParcel(summary, dest, flags);
         dest.writeInt(iconRes);
+        dest.writeString(iconPkg);
         dest.writeString(fragment);
         dest.writeBundle(fragmentArguments);
         if (intent != null) {
@@ -144,6 +158,11 @@
         } else {
             dest.writeInt(0);
         }
+        final int N = userHandle.size();
+        dest.writeInt(N);
+        for (int i = 0; i < N; i++) {
+            userHandle.get(i).writeToParcel(dest, flags);
+        }
         dest.writeBundle(extras);
     }
 
@@ -154,11 +173,16 @@
         summaryRes = in.readInt();
         summary = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
         iconRes = in.readInt();
+        iconPkg = in.readString();
         fragment = in.readString();
         fragmentArguments = in.readBundle();
         if (in.readInt() != 0) {
             intent = Intent.CREATOR.createFromParcel(in);
         }
+        final int N = in.readInt();
+        for (int i = 0; i < N; i++) {
+            userHandle.add(UserHandle.CREATOR.createFromParcel(in));
+        }
         extras = in.readBundle();
     }
 
diff --git a/src/com/android/settings/dashboard/DashboardTileView.java b/src/com/android/settings/dashboard/DashboardTileView.java
index a54217b..0896b82 100644
--- a/src/com/android/settings/dashboard/DashboardTileView.java
+++ b/src/com/android/settings/dashboard/DashboardTileView.java
@@ -16,14 +16,16 @@
 
 package com.android.settings.dashboard;
 
+import android.app.Activity;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
-
 import android.widget.ImageView;
 import android.widget.TextView;
+
+import com.android.settings.ProfileSelectDialog;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -93,7 +95,14 @@
             Utils.startWithFragment(getContext(), mTile.fragment, mTile.fragmentArguments, null, 0,
                     mTile.titleRes, mTile.getTitle(getResources()));
         } else if (mTile.intent != null) {
-            getContext().startActivity(mTile.intent);
+            int numUserHandles = mTile.userHandle.size();
+            if (numUserHandles > 1) {
+                ProfileSelectDialog.show(((Activity) getContext()).getFragmentManager(), mTile);
+            } else if (numUserHandles == 1) {
+                getContext().startActivityAsUser(mTile.intent, mTile.userHandle.get(0));
+            } else {
+                getContext().startActivity(mTile.intent);
+            }
         }
     }
 }
diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index 0a43ce9..af7cf4a 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/src/com/android/settings/dashboard/SearchResultsSummary.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.dashboard;
 
-import android.app.Fragment;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -37,6 +36,8 @@
 import android.widget.ListView;
 import android.widget.SearchView;
 import android.widget.TextView;
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
@@ -44,7 +45,7 @@
 
 import java.util.HashMap;
 
-public class SearchResultsSummary extends Fragment {
+public class SearchResultsSummary extends InstrumentedFragment {
 
     private static final String LOG_TAG = "SearchResultsSummary";
 
@@ -245,6 +246,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DASHBOARD_SEARCH_RESULTS;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
 
diff --git a/src/com/android/settings/deviceinfo/FileItemInfoLayout.java b/src/com/android/settings/deviceinfo/FileItemInfoLayout.java
deleted file mode 100644
index 542d7c9..0000000
--- a/src/com/android/settings/deviceinfo/FileItemInfoLayout.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2011 Google Inc. All Rights Reserved.
-
-package com.android.settings.deviceinfo;
-
-import android.content.Context;
-import android.os.Environment.UserEnvironment;
-import android.os.UserHandle;
-import android.util.AttributeSet;
-import android.view.ViewDebug;
-import android.widget.CheckBox;
-import android.widget.Checkable;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-/**
- * Handles display of a single row entry on Settings --> Storage --> Misc Files screen
- */
-public class FileItemInfoLayout extends RelativeLayout implements Checkable {
-    private TextView mFileNameView;
-    private TextView mFileSizeView;
-    private CheckBox mCheckbox;
-
-    private static final int sLengthExternalStorageDirPrefix = new UserEnvironment(
-            UserHandle.myUserId()).getExternalStorageDirectory().getAbsolutePath().length() + 1;
-
-    public FileItemInfoLayout(Context context) {
-        this(context, null);
-    }
-
-    public FileItemInfoLayout(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public FileItemInfoLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public void toggle() {
-        setChecked(!mCheckbox.isChecked());
-    }
-
-    /* (non-Javadoc)
-     * @see android.view.View#onFinishInflate()
-     */
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mFileNameView = (TextView) findViewById(R.id.misc_filename);
-        mFileSizeView = (TextView) findViewById(R.id.misc_filesize);
-        mCheckbox = (CheckBox) findViewById(R.id.misc_checkbox);
-    }
-
-    public void setFileName(String fileName) {
-        mFileNameView.setText(fileName.substring(sLengthExternalStorageDirPrefix));
-    }
-
-    public void setFileSize(String filesize) {
-        mFileSizeView.setText(filesize);
-    }
-
-    @ViewDebug.ExportedProperty
-    public boolean isChecked() {
-        return mCheckbox.isChecked();
-    }
-
-    public CheckBox getCheckBox() {
-        return mCheckbox;
-    }
-
-    /**
-     * <p>Changes the checked state of this text view.</p>
-     *
-     * @param checked true to check the text, false to uncheck it
-     */
-    public void setChecked(boolean checked) {
-        mCheckbox.setChecked(checked);
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
index 253e22a..d82e6c9 100644
--- a/src/com/android/settings/deviceinfo/ImeiInformation.java
+++ b/src/com/android/settings/deviceinfo/ImeiInformation.java
@@ -15,6 +15,7 @@
  */
 package com.android.settings.deviceinfo;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.PhoneFactory;
@@ -24,16 +25,13 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
-import android.util.Log;
-
+import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
-import java.util.List;
 
-public class ImeiInformation extends PreferenceActivity {
+public class ImeiInformation extends InstrumentedPreferenceActivity {
 
     private static final String KEY_PRL_VERSION = "prl_version";
     private static final String KEY_MIN_NUMBER = "min_number";
@@ -91,10 +89,8 @@
                     removePreferenceFromScreen(KEY_ICC_ID);
                 }
             } else {
-                setSummaryText(KEY_IMEI, phone.getDeviceId());
-                setSummaryText(KEY_IMEI_SV,
-                        ((TelephonyManager) getSystemService(TELEPHONY_SERVICE))
-                        .getDeviceSoftwareVersion(phoneId));
+                setSummaryText(KEY_IMEI, phone.getImei());
+                setSummaryText(KEY_IMEI_SV, phone.getDeviceSvn());
                 // device is not CDMA, do not display CDMA features
                 // check Null in case no specified preference in overlay xml
                 removePreferenceFromScreen(KEY_PRL_VERSION);
@@ -155,4 +151,8 @@
         }
     }
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_IMEI_INFORMATION;
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
deleted file mode 100644
index 1958f38..0000000
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ /dev/null
@@ -1,503 +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.deviceinfo;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.content.ActivityNotFoundException;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.IPackageDataObserver;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.hardware.usb.UsbManager;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserManager;
-import android.os.storage.IMountService;
-import android.os.storage.StorageEventListener;
-import android.os.storage.StorageManager;
-import android.os.storage.StorageVolume;
-import android.preference.Preference;
-import android.preference.PreferenceScreen;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
-import com.google.android.collect.Lists;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Panel showing storage usage on disk for known {@link StorageVolume} returned
- * by {@link StorageManager}. Calculates and displays usage of data types.
- */
-public class Memory extends SettingsPreferenceFragment implements Indexable {
-    private static final String TAG = "MemorySettings";
-
-    private static final String TAG_CONFIRM_CLEAR_CACHE = "confirmClearCache";
-
-    private static final int DLG_CONFIRM_UNMOUNT = 1;
-    private static final int DLG_ERROR_UNMOUNT = 2;
-
-    // The mountToggle Preference that has last been clicked.
-    // Assumes no two successive unmount event on 2 different volumes are performed before the first
-    // one's preference is disabled
-    private static Preference sLastClickedMountToggle;
-    private static String sClickedMountPoint;
-
-    // Access using getMountService()
-    private IMountService mMountService;
-    private StorageManager mStorageManager;
-    private UsbManager mUsbManager;
-
-    private ArrayList<StorageVolumePreferenceCategory> mCategories = Lists.newArrayList();
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        final Context context = getActivity();
-
-        mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
-
-        mStorageManager = StorageManager.from(context);
-        mStorageManager.registerListener(mStorageListener);
-
-        addPreferencesFromResource(R.xml.device_info_memory);
-
-        addCategory(StorageVolumePreferenceCategory.buildForInternal(context));
-
-        final StorageVolume[] storageVolumes = mStorageManager.getVolumeList();
-        for (StorageVolume volume : storageVolumes) {
-            if (!volume.isEmulated()) {
-                addCategory(StorageVolumePreferenceCategory.buildForPhysical(context, volume));
-            }
-        }
-
-        setHasOptionsMenu(true);
-    }
-
-    private void addCategory(StorageVolumePreferenceCategory category) {
-        mCategories.add(category);
-        getPreferenceScreen().addPreference(category);
-        category.init();
-    }
-
-    private boolean isMassStorageEnabled() {
-        // Mass storage is enabled if primary volume supports it
-        final StorageVolume[] volumes = mStorageManager.getVolumeList();
-        final StorageVolume primary = StorageManager.getPrimaryVolume(volumes);
-        return primary != null && primary.allowMassStorage();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        IntentFilter intentFilter = new IntentFilter(Intent.ACTION_MEDIA_SCANNER_STARTED);
-        intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);
-        intentFilter.addDataScheme("file");
-        getActivity().registerReceiver(mMediaScannerReceiver, intentFilter);
-
-        intentFilter = new IntentFilter();
-        intentFilter.addAction(UsbManager.ACTION_USB_STATE);
-        getActivity().registerReceiver(mMediaScannerReceiver, intentFilter);
-
-        for (StorageVolumePreferenceCategory category : mCategories) {
-            category.onResume();
-        }
-    }
-
-    StorageEventListener mStorageListener = new StorageEventListener() {
-        @Override
-        public void onStorageStateChanged(String path, String oldState, String newState) {
-            Log.i(TAG, "Received storage state changed notification that " + path +
-                    " changed state from " + oldState + " to " + newState);
-            for (StorageVolumePreferenceCategory category : mCategories) {
-                final StorageVolume volume = category.getStorageVolume();
-                if (volume != null && path.equals(volume.getPath())) {
-                    category.onStorageStateChanged();
-                    break;
-                }
-            }
-        }
-    };
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        getActivity().unregisterReceiver(mMediaScannerReceiver);
-        for (StorageVolumePreferenceCategory category : mCategories) {
-            category.onPause();
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        if (mStorageManager != null && mStorageListener != null) {
-            mStorageManager.unregisterListener(mStorageListener);
-        }
-        super.onDestroy();
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.storage, menu);
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        final MenuItem usb = menu.findItem(R.id.storage_usb);
-        UserManager um = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
-        boolean usbItemVisible = !isMassStorageEnabled()
-                && !um.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
-        usb.setVisible(usbItemVisible);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.storage_usb:
-                if (getActivity() instanceof SettingsActivity) {
-                    ((SettingsActivity) getActivity()).startPreferencePanel(
-                            UsbSettings.class.getCanonicalName(),
-                            null, R.string.storage_title_usb, null, this, 0);
-                } else {
-                    startFragment(this, UsbSettings.class.getCanonicalName(),
-                            R.string.storage_title_usb, -1, null);
-                }
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private synchronized IMountService getMountService() {
-       if (mMountService == null) {
-           IBinder service = ServiceManager.getService("mount");
-           if (service != null) {
-               mMountService = IMountService.Stub.asInterface(service);
-           } else {
-               Log.e(TAG, "Can't get mount service");
-           }
-       }
-       return mMountService;
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (StorageVolumePreferenceCategory.KEY_CACHE.equals(preference.getKey())) {
-            ConfirmClearCacheFragment.show(this);
-            return true;
-        }
-
-        for (StorageVolumePreferenceCategory category : mCategories) {
-            Intent intent = category.intentForClick(preference);
-            if (intent != null) {
-                // Don't go across app boundary if monkey is running
-                if (!Utils.isMonkeyRunning()) {
-                    try {
-                        startActivity(intent);
-                    } catch (ActivityNotFoundException anfe) {
-                        Log.w(TAG, "No activity found for intent " + intent);
-                    }
-                }
-                return true;
-            }
-
-            final StorageVolume volume = category.getStorageVolume();
-            if (volume != null && category.mountToggleClicked(preference)) {
-                sLastClickedMountToggle = preference;
-                sClickedMountPoint = volume.getPath();
-                String state = mStorageManager.getVolumeState(volume.getPath());
-                if (Environment.MEDIA_MOUNTED.equals(state) ||
-                        Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-                    unmount();
-                } else {
-                    mount();
-                }
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private final BroadcastReceiver mMediaScannerReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals(UsbManager.ACTION_USB_STATE)) {
-               boolean isUsbConnected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);
-               String usbFunction = mUsbManager.getDefaultFunction();
-               for (StorageVolumePreferenceCategory category : mCategories) {
-                   category.onUsbStateChanged(isUsbConnected, usbFunction);
-               }
-            } else if (action.equals(Intent.ACTION_MEDIA_SCANNER_FINISHED)) {
-                for (StorageVolumePreferenceCategory category : mCategories) {
-                    category.onMediaScannerFinished();
-                }
-            }
-        }
-    };
-
-    @Override
-    public Dialog onCreateDialog(int id) {
-        switch (id) {
-        case DLG_CONFIRM_UNMOUNT:
-                return new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.dlg_confirm_unmount_title)
-                    .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            doUnmount();
-                        }})
-                    .setNegativeButton(R.string.cancel, null)
-                    .setMessage(R.string.dlg_confirm_unmount_text)
-                    .create();
-        case DLG_ERROR_UNMOUNT:
-                return new AlertDialog.Builder(getActivity())
-            .setTitle(R.string.dlg_error_unmount_title)
-            .setNeutralButton(R.string.dlg_ok, null)
-            .setMessage(R.string.dlg_error_unmount_text)
-            .create();
-        }
-        return null;
-    }
-
-    private void doUnmount() {
-        // Present a toast here
-        Toast.makeText(getActivity(), R.string.unmount_inform_text, Toast.LENGTH_SHORT).show();
-        IMountService mountService = getMountService();
-        try {
-            sLastClickedMountToggle.setEnabled(false);
-            sLastClickedMountToggle.setTitle(getString(R.string.sd_ejecting_title));
-            sLastClickedMountToggle.setSummary(getString(R.string.sd_ejecting_summary));
-            mountService.unmountVolume(sClickedMountPoint, true, false);
-        } catch (RemoteException e) {
-            // Informative dialog to user that unmount failed.
-            showDialogInner(DLG_ERROR_UNMOUNT);
-        }
-    }
-
-    private void showDialogInner(int id) {
-        removeDialog(id);
-        showDialog(id);
-    }
-
-    private boolean hasAppsAccessingStorage() throws RemoteException {
-        IMountService mountService = getMountService();
-        int stUsers[] = mountService.getStorageUsers(sClickedMountPoint);
-        if (stUsers != null && stUsers.length > 0) {
-            return true;
-        }
-        // TODO FIXME Parameterize with mountPoint and uncomment.
-        // On HC-MR2, no apps can be installed on sd and the emulated internal storage is not
-        // removable: application cannot interfere with unmount
-        /*
-        ActivityManager am = (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE);
-        List<ApplicationInfo> list = am.getRunningExternalApplications();
-        if (list != null && list.size() > 0) {
-            return true;
-        }
-        */
-        // Better safe than sorry. Assume the storage is used to ask for confirmation.
-        return true;
-    }
-
-    private void unmount() {
-        // Check if external media is in use.
-        try {
-           if (hasAppsAccessingStorage()) {
-               // Present dialog to user
-               showDialogInner(DLG_CONFIRM_UNMOUNT);
-           } else {
-               doUnmount();
-           }
-        } catch (RemoteException e) {
-            // Very unlikely. But present an error dialog anyway
-            Log.e(TAG, "Is MountService running?");
-            showDialogInner(DLG_ERROR_UNMOUNT);
-        }
-    }
-
-    private void mount() {
-        IMountService mountService = getMountService();
-        try {
-            if (mountService != null) {
-                mountService.mountVolume(sClickedMountPoint);
-            } else {
-                Log.e(TAG, "Mount service is null, can't mount");
-            }
-        } catch (RemoteException ex) {
-            // Not much can be done
-        }
-    }
-
-    private void onCacheCleared() {
-        for (StorageVolumePreferenceCategory category : mCategories) {
-            category.onCacheCleared();
-        }
-    }
-
-    private static class ClearCacheObserver extends IPackageDataObserver.Stub {
-        private final Memory mTarget;
-        private int mRemaining;
-
-        public ClearCacheObserver(Memory target, int remaining) {
-            mTarget = target;
-            mRemaining = remaining;
-        }
-
-        @Override
-        public void onRemoveCompleted(final String packageName, final boolean succeeded) {
-            synchronized (this) {
-                if (--mRemaining == 0) {
-                    mTarget.onCacheCleared();
-                }
-            }
-        }
-    }
-
-    /**
-     * Dialog to request user confirmation before clearing all cache data.
-     */
-    public static class ConfirmClearCacheFragment extends DialogFragment {
-        public static void show(Memory parent) {
-            if (!parent.isAdded()) return;
-
-            final ConfirmClearCacheFragment dialog = new ConfirmClearCacheFragment();
-            dialog.setTargetFragment(parent, 0);
-            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_CLEAR_CACHE);
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final Context context = getActivity();
-
-            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setTitle(R.string.memory_clear_cache_title);
-            builder.setMessage(getString(R.string.memory_clear_cache_message));
-
-            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    final Memory target = (Memory) getTargetFragment();
-                    final PackageManager pm = context.getPackageManager();
-                    final List<PackageInfo> infos = pm.getInstalledPackages(0);
-                    final ClearCacheObserver observer = new ClearCacheObserver(
-                            target, infos.size());
-                    for (PackageInfo info : infos) {
-                        pm.deleteApplicationCacheFiles(info.packageName, observer);
-                    }
-                }
-            });
-            builder.setNegativeButton(android.R.string.cancel, null);
-
-            return builder.create();
-        }
-    }
-
-    /**
-     * Enable indexing of searchable data
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-        new BaseSearchIndexProvider() {
-            @Override
-            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
-
-                SearchIndexableRaw data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.storage_settings);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.internal_storage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                final StorageVolume[] storageVolumes = StorageManager.from(context).getVolumeList();
-                for (StorageVolume volume : storageVolumes) {
-                    if (!volume.isEmulated()) {
-                        data.title = volume.getDescription(context);
-                        data.screenTitle = context.getString(R.string.storage_settings);
-                        result.add(data);
-                    }
-                }
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_size);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_available);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_apps_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_dcim_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_music_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_downloads_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_media_cache_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_media_misc_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                return result;
-            }
-        };
-
-}
diff --git a/src/com/android/settings/deviceinfo/MiscFilesHandler.java b/src/com/android/settings/deviceinfo/MiscFilesHandler.java
deleted file mode 100644
index 93e352b..0000000
--- a/src/com/android/settings/deviceinfo/MiscFilesHandler.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import android.app.Activity;
-import android.app.ListActivity;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.storage.StorageVolume;
-import android.text.format.Formatter;
-import android.util.Log;
-import android.util.SparseBooleanArray;
-import android.view.ActionMode;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.ListView;
-
-import com.android.settings.R;
-import com.android.settings.deviceinfo.StorageMeasurement.FileInfo;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This class handles the selection and removal of Misc files.
- */
-public class MiscFilesHandler extends ListActivity {
-    private static final String TAG = "MemorySettings";
-    private String mNumSelectedFormat;
-    private String mNumBytesSelectedFormat;
-    private MemoryMearurementAdapter mAdapter;
-    private LayoutInflater mInflater;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setFinishOnTouchOutside(true);
-        setTitle(R.string.misc_files);
-        mNumSelectedFormat = getString(R.string.misc_files_selected_count);
-        mNumBytesSelectedFormat = getString(R.string.misc_files_selected_count_bytes);
-        mAdapter = new MemoryMearurementAdapter(this);
-        mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        setContentView(R.layout.settings_storage_miscfiles_list);
-        ListView lv = getListView();
-        lv.setItemsCanFocus(true);
-        lv.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
-        lv.setMultiChoiceModeListener(new ModeCallback(this));
-        setListAdapter(mAdapter);
-    } 
-
-    private class ModeCallback implements ListView.MultiChoiceModeListener {
-        private int mDataCount;
-        private final Context mContext;
-
-        public ModeCallback(Context context) {
-            mContext = context;
-            mDataCount = mAdapter.getCount();
-        }
-
-        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-            final MenuInflater inflater = getMenuInflater();
-            inflater.inflate(R.menu.misc_files_menu, menu);
-            return true;
-        }
-
-        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-            return true;
-        }
-
-        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-            ListView lv = getListView();
-            switch (item.getItemId()) {
-            case R.id.action_delete:
-                // delete the files selected
-                SparseBooleanArray checkedItems = lv.getCheckedItemPositions();
-                int checkedCount = getListView().getCheckedItemCount();
-                if (checkedCount > mDataCount) {
-                    throw new IllegalStateException("checked item counts do not match. " +
-                            "checkedCount: " + checkedCount + ", dataSize: " + mDataCount);
-                }
-                if (mDataCount > 0) {
-                    ArrayList<Object> toRemove = new ArrayList<Object>();
-                    for (int i = 0; i < mDataCount; i++) {
-                        if (!checkedItems.get(i)) {
-                            //item not selected
-                            continue;
-                        }
-                        if (StorageMeasurement.LOGV) {
-                            Log.i(TAG, "deleting: " + mAdapter.getItem(i));
-                        }
-                        // delete the file
-                        File file = new File(mAdapter.getItem(i).mFileName);
-                        if (file.isDirectory()) {
-                            deleteDir(file);
-                        } else {
-                            file.delete();                            
-                        }
-                        toRemove.add(mAdapter.getItem(i));
-                    }
-                    mAdapter.removeAll(toRemove);
-                    mAdapter.notifyDataSetChanged();
-                    mDataCount = mAdapter.getCount();
-                }
-                mode.finish();
-                break;
-
-            case R.id.action_select_all:
-                // check ALL items
-                for (int i = 0; i < mDataCount; i++) {
-                    lv.setItemChecked(i, true);
-                }
-                // update the title and subtitle with number selected and numberBytes selected
-                onItemCheckedStateChanged(mode, 1, 0, true);
-                break;
-            }
-            return true;
-        }
-
-        // Deletes all files and subdirectories under given dir.
-        // Returns true if all deletions were successful.
-        // If a deletion fails, the method stops attempting to delete and returns false.
-        private boolean deleteDir(File dir) {
-            String[] children = dir.list();
-            if (children != null) {
-                for (int i=0; i < children.length; i++) {
-                    boolean success = deleteDir(new File(dir, children[i]));
-                    if (!success) {
-                        return false;
-                    }
-                }
-            }
-            // The directory is now empty so delete it
-            return dir.delete();
-        }
-
-        public void onDestroyActionMode(ActionMode mode) {
-            // This block intentionally left blank
-        }
-
-        public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
-                boolean checked) {
-            ListView lv = getListView();
-            int numChecked = lv.getCheckedItemCount();
-            mode.setTitle(String.format(mNumSelectedFormat, numChecked, mAdapter.getCount()));
-
-            // total the sizes of all items selected so far
-            SparseBooleanArray checkedItems = lv.getCheckedItemPositions();
-            long selectedDataSize = 0;
-            if (numChecked > 0) {
-                for (int i = 0; i < mDataCount; i++) {
-                    if (checkedItems.get(i)) {
-                        // item is checked
-                        selectedDataSize += mAdapter.getItem(i).mSize;
-                    }
-                }
-            }
-            mode.setSubtitle(String.format(mNumBytesSelectedFormat,
-                    Formatter.formatFileSize(mContext, selectedDataSize),
-                    Formatter.formatFileSize(mContext, mAdapter.getDataSize())));
-        }
-    }
-
-    class MemoryMearurementAdapter extends BaseAdapter {
-        private ArrayList<StorageMeasurement.FileInfo> mData = null;
-        private long mDataSize = 0;
-        private Context mContext;
-
-        public MemoryMearurementAdapter(Activity activity) {
-            mContext = activity;
-            final StorageVolume storageVolume = activity.getIntent().getParcelableExtra(
-                    StorageVolume.EXTRA_STORAGE_VOLUME);
-            StorageMeasurement mMeasurement = StorageMeasurement.getInstance(
-                    activity, storageVolume);
-            if (mMeasurement == null) return;
-            mData = (ArrayList<StorageMeasurement.FileInfo>) mMeasurement.mFileInfoForMisc;
-            if (mData != null) {
-                for (StorageMeasurement.FileInfo info : mData) {
-                    mDataSize += info.mSize;
-                }
-            }
-        }
-
-        @Override
-        public int getCount() {
-            return (mData == null) ? 0 : mData.size();
-        }
-
-        @Override
-        public StorageMeasurement.FileInfo getItem(int position) {
-            if (mData == null || mData.size() <= position) {
-                return null;
-            }
-            return mData.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            if (mData == null || mData.size() <= position) {
-                return 0;
-            }
-            return mData.get(position).mId;
-        }
-
-        public void removeAll(List<Object> objs) {
-            if (mData == null) {
-                return;
-            }
-            for (Object o : objs) {
-                mData.remove(o);
-                mDataSize -= ((StorageMeasurement.FileInfo) o).mSize;
-            }
-        }
-
-        public long getDataSize() {
-            return mDataSize;
-        }
-
-        @Override
-        public void notifyDataSetChanged() {
-            super.notifyDataSetChanged();
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            final FileItemInfoLayout view = (convertView == null) ?
-                    (FileItemInfoLayout) mInflater.inflate(R.layout.settings_storage_miscfiles,
-                            parent, false) : (FileItemInfoLayout) convertView;
-            FileInfo item = getItem(position);
-            view.setFileName(item.mFileName);
-            view.setFileSize(Formatter.formatFileSize(mContext, item.mSize));
-            final ListView listView = (ListView) parent;
-            final int listPosition = position;
-            view.getCheckBox().setOnCheckedChangeListener(new OnCheckedChangeListener() {
-                
-                @Override
-                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                    listView.setItemChecked(listPosition, isChecked);
-                }
-                
-            });
-            view.setOnLongClickListener(new OnLongClickListener() {
-                @Override
-                public boolean onLongClick(View v) {
-                    if (listView.getCheckedItemCount() > 0) {
-                        return false;
-                    }
-                    listView.setItemChecked(listPosition, !view.isChecked());
-                    return true;
-                }
-            });
-            view.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (listView.getCheckedItemCount() > 0) {
-                        listView.setItemChecked(listPosition, !view.isChecked());
-                    }
-                }
-            });
-            return view;
-        }
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeFormatConfirm.java b/src/com/android/settings/deviceinfo/PrivateVolumeFormatConfirm.java
new file mode 100644
index 0000000..666a918
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeFormatConfirm.java
@@ -0,0 +1,74 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+
+public class PrivateVolumeFormatConfirm extends InstrumentedFragment {
+    private VolumeInfo mVolume;
+    private DiskInfo mDisk;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STORAGE;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final StorageManager storage = getActivity().getSystemService(StorageManager.class);
+        final String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
+        mVolume = storage.findVolumeById(volumeId);
+        mDisk = storage.findDiskById(mVolume.getDiskId());
+
+        final View view = inflater.inflate(R.layout.storage_internal_format, container, false);
+        final TextView body = (TextView) view.findViewById(R.id.body);
+        final Button confirm = (Button) view.findViewById(R.id.confirm);
+
+        body.setText(TextUtils.expandTemplate(getText(R.string.storage_internal_format_details),
+                mDisk.getDescription()));
+        confirm.setOnClickListener(mConfirmListener);
+
+        return view;
+    }
+
+    private final OnClickListener mConfirmListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            final Intent intent = new Intent(getActivity(), StorageWizardFormatProgress.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            intent.putExtra(StorageWizardFormatProgress.EXTRA_FORMAT_PUBLIC, true);
+            startActivity(intent);
+            getActivity().finish();
+        }
+    };
+}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
new file mode 100644
index 0000000..492051d
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -0,0 +1,577 @@
+/*
+ * 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.deviceinfo;
+
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.DownloadManager;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.IPackageDataObserver;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.os.storage.StorageEventListener;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.provider.MediaStore;
+import android.text.TextUtils;
+import android.text.format.Formatter;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+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.deviceinfo.StorageSettings.MountTask;
+import com.android.settingslib.deviceinfo.StorageMeasurement;
+import com.android.settingslib.deviceinfo.StorageMeasurement.MeasurementDetails;
+import com.android.settingslib.deviceinfo.StorageMeasurement.MeasurementReceiver;
+import com.google.android.collect.Lists;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Panel showing summary and actions for a {@link VolumeInfo#TYPE_PRIVATE}
+ * storage volume.
+ */
+public class PrivateVolumeSettings extends SettingsPreferenceFragment {
+    // TODO: disable unmount when providing over MTP/PTP
+    // TODO: warn when mounted read-only
+
+    private static final String TAG_RENAME = "rename";
+    private static final String TAG_CONFIRM_CLEAR_CACHE = "confirmClearCache";
+
+    private StorageManager mStorageManager;
+    private UserManager mUserManager;
+
+    private String mVolumeId;
+    private VolumeInfo mVolume;
+    private VolumeInfo mSharedVolume;
+
+    private StorageMeasurement mMeasure;
+
+    private UserInfo mCurrentUser;
+
+    private int mNextOrder = 0;
+
+    private UsageBarPreference mGraph;
+    private StorageItemPreference mTotal;
+    private StorageItemPreference mAvailable;
+    private StorageItemPreference mApps;
+    private StorageItemPreference mDcim;
+    private StorageItemPreference mMusic;
+    private StorageItemPreference mDownloads;
+    private StorageItemPreference mCache;
+    private StorageItemPreference mMisc;
+    private List<StorageItemPreference> mUsers = Lists.newArrayList();
+
+    private long mTotalSize;
+    private long mAvailSize;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STORAGE;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        final Context context = getActivity();
+
+        mUserManager = context.getSystemService(UserManager.class);
+        mStorageManager = context.getSystemService(StorageManager.class);
+
+        mVolumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
+        mVolume = mStorageManager.findVolumeById(mVolumeId);
+
+        Preconditions.checkNotNull(mVolume);
+        Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
+
+        addPreferencesFromResource(R.xml.device_info_storage_volume);
+
+        // Find the emulated shared storage layered above this private volume
+        mSharedVolume = mStorageManager.findEmulatedForPrivate(mVolume);
+
+        mMeasure = new StorageMeasurement(context, mVolume, mSharedVolume);
+        mMeasure.setReceiver(mReceiver);
+
+        mGraph = buildGraph();
+        mTotal = buildItem(R.string.memory_size, 0);
+        mAvailable = buildItem(R.string.memory_available, R.color.memory_avail);
+
+        mApps = buildItem(R.string.memory_apps_usage, R.color.memory_apps_usage);
+        mDcim = buildItem(R.string.memory_dcim_usage, R.color.memory_dcim);
+        mMusic = buildItem(R.string.memory_music_usage, R.color.memory_music);
+        mDownloads = buildItem(R.string.memory_downloads_usage, R.color.memory_downloads);
+        mCache = buildItem(R.string.memory_media_cache_usage, R.color.memory_cache);
+        mMisc = buildItem(R.string.memory_media_misc_usage, R.color.memory_misc);
+
+        mCurrentUser = mUserManager.getUserInfo(UserHandle.myUserId());
+        final List<UserInfo> otherUsers = getUsersExcluding(mCurrentUser);
+        for (int i = 0; i < otherUsers.size(); i++) {
+            final UserInfo user = otherUsers.get(i);
+            final int colorRes = i % 2 == 0 ? R.color.memory_user_light
+                    : R.color.memory_user_dark;
+            final StorageItemPreference userPref = new StorageItemPreference(
+                    context, user.name, colorRes, user.id);
+            mUsers.add(userPref);
+        }
+
+        setHasOptionsMenu(true);
+    }
+
+    public void refresh() {
+        getActivity().setTitle(mStorageManager.getBestVolumeDescription(mVolume));
+
+        // Valid options may have changed
+        getFragmentManager().invalidateOptionsMenu();
+
+        final Context context = getActivity();
+        final PreferenceScreen screen = getPreferenceScreen();
+
+        screen.removeAll();
+
+        if (!mVolume.isMountedReadable()) {
+            return;
+        }
+
+        screen.addPreference(mGraph);
+        screen.addPreference(mTotal);
+        screen.addPreference(mAvailable);
+
+        final boolean showUsers = !mUsers.isEmpty();
+        if (showUsers) {
+            screen.addPreference(new PreferenceHeader(context, mCurrentUser.name));
+        }
+
+        screen.addPreference(mApps);
+        screen.addPreference(mDcim);
+        screen.addPreference(mMusic);
+        screen.addPreference(mDownloads);
+        screen.addPreference(mCache);
+        screen.addPreference(mMisc);
+
+        if (showUsers) {
+            screen.addPreference(new PreferenceHeader(context, R.string.storage_other_users));
+            for (Preference pref : mUsers) {
+                screen.addPreference(pref);
+            }
+        }
+
+        for (int i = 0; i < screen.getPreferenceCount(); i++) {
+            final Preference pref = screen.getPreference(i);
+            if (pref instanceof StorageItemPreference) {
+                ((StorageItemPreference) pref).setLoading();
+            }
+        }
+
+        final File file = mVolume.getPath();
+        mTotalSize = file.getTotalSpace();
+        mAvailSize = file.getFreeSpace();
+
+        mTotal.setSummary(Formatter.formatFileSize(context, mTotalSize));
+        mAvailable.setSummary(Formatter.formatFileSize(context, mAvailSize));
+
+        mGraph.clear();
+        mGraph.addEntry(0, (mTotalSize - mAvailSize) / (float) mTotalSize,
+                android.graphics.Color.GRAY);
+        mGraph.commit();
+
+        mMeasure.forceMeasure();
+    }
+
+    private UsageBarPreference buildGraph() {
+        final UsageBarPreference pref = new UsageBarPreference(getActivity());
+        pref.setOrder(mNextOrder++);
+        return pref;
+    }
+
+    private StorageItemPreference buildItem(int titleRes, int colorRes) {
+        final StorageItemPreference pref = new StorageItemPreference(getActivity(), titleRes,
+                colorRes);
+        pref.setOrder(mNextOrder++);
+        return pref;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Refresh to verify that we haven't been formatted away
+        mVolume = mStorageManager.findVolumeById(mVolumeId);
+        if (mVolume == null) {
+            getActivity().finish();
+            return;
+        }
+
+        mStorageManager.registerListener(mStorageListener);
+        refresh();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mStorageManager.unregisterListener(mStorageListener);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mMeasure.onDestroy();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.storage_volume, menu);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        final MenuItem rename = menu.findItem(R.id.storage_rename);
+        final MenuItem mount = menu.findItem(R.id.storage_mount);
+        final MenuItem unmount = menu.findItem(R.id.storage_unmount);
+        final MenuItem format = menu.findItem(R.id.storage_format);
+        final MenuItem usb = menu.findItem(R.id.storage_usb);
+
+        // Actions live in menu for non-internal private volumes; they're shown
+        // as preference items for public volumes.
+        if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(mVolume.getId())) {
+            rename.setVisible(false);
+            mount.setVisible(false);
+            unmount.setVisible(false);
+            format.setVisible(false);
+        } else {
+            rename.setVisible(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
+            mount.setVisible(mVolume.getState() == VolumeInfo.STATE_UNMOUNTED);
+            unmount.setVisible(mVolume.isMountedReadable());
+            format.setVisible(true);
+        }
+
+        // TODO: show usb if we jumped past first screen
+        usb.setVisible(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final Context context = getActivity();
+        final Bundle args = new Bundle();
+        switch (item.getItemId()) {
+            case R.id.storage_rename:
+                RenameFragment.show(this);
+                return true;
+            case R.id.storage_mount:
+                new MountTask(context, mVolume).execute();
+                return true;
+            case R.id.storage_unmount:
+                args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
+                startFragment(this, PrivateVolumeUnmountConfirm.class.getCanonicalName(),
+                        R.string.storage_menu_unmount, 0, args);
+                return true;
+            case R.id.storage_format:
+                args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
+                startFragment(this, PrivateVolumeFormatConfirm.class.getCanonicalName(),
+                        R.string.storage_menu_format, 0, args);
+                return true;
+            case R.id.storage_usb:
+                startFragment(this, UsbSettings.class.getCanonicalName(),
+                        R.string.storage_title_usb, 0, null);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference pref) {
+        // TODO: launch better intents for specific volume
+
+        Intent intent = null;
+        if (pref == mApps) {
+            Bundle args = new Bundle();
+            args.putString(ManageApplications.EXTRA_CLASSNAME, StorageUseActivity.class.getName());
+            args.putString(ManageApplications.EXTRA_VOLUME_UUID, mVolume.getFsUuid());
+            args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription());
+            intent = Utils.onBuildStartFragmentIntent(getActivity(),
+                    ManageApplications.class.getName(), args, null, R.string.apps_storage, null,
+                    false);
+        } else if (pref == mDownloads) {
+            intent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).putExtra(
+                    DownloadManager.INTENT_EXTRAS_SORT_BY_SIZE, true);
+
+        } else if (pref == mMusic) {
+            intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.setType("audio/mp3");
+
+        } else if (pref == mDcim) {
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
+            intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+
+        } else if (pref == mCache) {
+            ConfirmClearCacheFragment.show(this);
+            return true;
+
+        } else if (pref == mMisc) {
+            intent = mSharedVolume.buildBrowseIntent();
+        }
+
+        if (intent != null) {
+            try {
+                startActivity(intent);
+            } catch (ActivityNotFoundException e) {
+                Log.w(TAG, "No activity found for " + intent);
+            }
+            return true;
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, pref);
+    }
+
+    private final MeasurementReceiver mReceiver = new MeasurementReceiver() {
+        @Override
+        public void onDetailsChanged(MeasurementDetails details) {
+            updateDetails(details);
+        }
+    };
+
+    private void updateDetails(MeasurementDetails details) {
+        mGraph.clear();
+
+        updatePreference(mApps, details.appsSize);
+
+        final long dcimSize = totalValues(details.mediaSize, Environment.DIRECTORY_DCIM,
+                Environment.DIRECTORY_MOVIES, Environment.DIRECTORY_PICTURES);
+        updatePreference(mDcim, dcimSize);
+
+        final long musicSize = totalValues(details.mediaSize, Environment.DIRECTORY_MUSIC,
+                Environment.DIRECTORY_ALARMS, Environment.DIRECTORY_NOTIFICATIONS,
+                Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS);
+        updatePreference(mMusic, musicSize);
+
+        final long downloadsSize = totalValues(details.mediaSize, Environment.DIRECTORY_DOWNLOADS);
+        updatePreference(mDownloads, downloadsSize);
+
+        updatePreference(mCache, details.cacheSize);
+        updatePreference(mMisc, details.miscSize);
+
+        for (StorageItemPreference userPref : mUsers) {
+            final long userSize = details.usersSize.get(userPref.userHandle);
+            updatePreference(userPref, userSize);
+        }
+
+        mGraph.commit();
+    }
+
+    private void updatePreference(StorageItemPreference pref, long size) {
+        pref.setSummary(Formatter.formatFileSize(getActivity(), size));
+        if (size > 0) {
+            final int order = pref.getOrder();
+            mGraph.addEntry(order, size / (float) mTotalSize, pref.color);
+        }
+    }
+
+    /**
+     * Return list of other users, excluding the current user.
+     */
+    private List<UserInfo> getUsersExcluding(UserInfo excluding) {
+        final List<UserInfo> users = mUserManager.getUsers();
+        final Iterator<UserInfo> i = users.iterator();
+        while (i.hasNext()) {
+            if (i.next().id == excluding.id) {
+                i.remove();
+            }
+        }
+        return users;
+    }
+
+    private static long totalValues(HashMap<String, Long> map, String... keys) {
+        long total = 0;
+        for (String key : keys) {
+            if (map.containsKey(key)) {
+                total += map.get(key);
+            }
+        }
+        return total;
+    }
+
+    private final StorageEventListener mStorageListener = new StorageEventListener() {
+        @Override
+        public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) {
+            if (Objects.equals(mVolume.getId(), vol.getId())) {
+                mVolume = vol;
+                refresh();
+            }
+        }
+
+        @Override
+        public void onVolumeMetadataChanged(VolumeInfo vol) {
+            if (Objects.equals(mVolume.getId(), vol.getId())) {
+                mVolume = vol;
+                refresh();
+            }
+        }
+    };
+
+    /**
+     * Dialog that allows editing of volume nickname.
+     */
+    public static class RenameFragment extends DialogFragment {
+        public static void show(PrivateVolumeSettings parent) {
+            if (!parent.isAdded()) return;
+
+            final RenameFragment dialog = new RenameFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.setArguments(parent.getArguments());
+            dialog.show(parent.getFragmentManager(), TAG_RENAME);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+            final StorageManager storageManager = context.getSystemService(StorageManager.class);
+
+            final String volId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
+            final VolumeInfo vol = storageManager.findVolumeById(volId);
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
+
+            final View view = dialogInflater.inflate(R.layout.dialog_edittext, null, false);
+            final EditText nickname = (EditText) view.findViewById(R.id.edittext);
+
+            if (!TextUtils.isEmpty(vol.getNickname())) {
+                nickname.setText(vol.getNickname());
+            } else {
+                nickname.setText(storageManager.getBestVolumeDescription(vol));
+            }
+
+            builder.setTitle(R.string.storage_rename_title);
+            builder.setView(view);
+
+            builder.setPositiveButton(R.string.save,
+                    new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            // TODO: move to background thread
+                            storageManager.setVolumeNickname(volId, nickname.getText().toString());
+                        }
+                    });
+            builder.setNegativeButton(R.string.cancel, null);
+
+            return builder.create();
+        }
+    }
+
+    /**
+     * Dialog to request user confirmation before clearing all cache data.
+     */
+    public static class ConfirmClearCacheFragment extends DialogFragment {
+        public static void show(PrivateVolumeSettings parent) {
+            if (!parent.isAdded()) return;
+
+            final ConfirmClearCacheFragment dialog = new ConfirmClearCacheFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_CLEAR_CACHE);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.memory_clear_cache_title);
+            builder.setMessage(getString(R.string.memory_clear_cache_message));
+
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    final PrivateVolumeSettings target = (PrivateVolumeSettings) getTargetFragment();
+                    final PackageManager pm = context.getPackageManager();
+                    final List<PackageInfo> infos = pm.getInstalledPackages(0);
+                    final ClearCacheObserver observer = new ClearCacheObserver(
+                            target, infos.size());
+                    for (PackageInfo info : infos) {
+                        pm.deleteApplicationCacheFiles(info.packageName, observer);
+                    }
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+
+            return builder.create();
+        }
+    }
+
+    private static class ClearCacheObserver extends IPackageDataObserver.Stub {
+        private final PrivateVolumeSettings mTarget;
+        private int mRemaining;
+
+        public ClearCacheObserver(PrivateVolumeSettings target, int remaining) {
+            mTarget = target;
+            mRemaining = remaining;
+        }
+
+        @Override
+        public void onRemoveCompleted(final String packageName, final boolean succeeded) {
+            synchronized (this) {
+                if (--mRemaining == 0) {
+                    mTarget.refresh();
+                }
+            }
+        }
+    }
+
+    public static class PreferenceHeader extends Preference {
+        public PreferenceHeader(Context context, int titleRes) {
+            super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
+            setTitle(titleRes);
+        }
+
+        public PreferenceHeader(Context context, CharSequence title) {
+            super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
+            setTitle(title);
+        }
+
+        @Override
+        public boolean isEnabled() {
+            return false;
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeUnmountConfirm.java b/src/com/android/settings/deviceinfo/PrivateVolumeUnmountConfirm.java
new file mode 100644
index 0000000..614b737
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeUnmountConfirm.java
@@ -0,0 +1,71 @@
+/*
+ * 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.deviceinfo;
+
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
+
+public class PrivateVolumeUnmountConfirm extends InstrumentedFragment {
+    private VolumeInfo mVolume;
+    private DiskInfo mDisk;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STORAGE;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final StorageManager storage = getActivity().getSystemService(StorageManager.class);
+        final String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
+        mVolume = storage.findVolumeById(volumeId);
+        mDisk = storage.findDiskById(mVolume.getDiskId());
+
+        final View view = inflater.inflate(R.layout.storage_internal_unmount, container, false);
+        final TextView body = (TextView) view.findViewById(R.id.body);
+        final Button confirm = (Button) view.findViewById(R.id.confirm);
+
+        body.setText(TextUtils.expandTemplate(getText(R.string.storage_internal_unmount_details),
+                mDisk.getDescription()));
+        confirm.setOnClickListener(mConfirmListener);
+
+        return view;
+    }
+
+    private final OnClickListener mConfirmListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            new UnmountTask(getActivity(), mVolume).execute();
+            getActivity().finish();
+        }
+    };
+}
diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
new file mode 100644
index 0000000..e0b6843
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
@@ -0,0 +1,227 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.os.storage.StorageEventListener;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.provider.DocumentsContract;
+import android.text.format.Formatter;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.deviceinfo.StorageSettings.FormatTask;
+import com.android.settings.deviceinfo.StorageSettings.MountTask;
+import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
+
+import java.io.File;
+import java.util.Objects;
+
+/**
+ * Panel showing summary and actions for a {@link VolumeInfo#TYPE_PUBLIC}
+ * storage volume.
+ */
+public class PublicVolumeSettings extends SettingsPreferenceFragment {
+    // TODO: disable unmount when providing over MTP/PTP
+
+    private StorageManager mStorageManager;
+
+    private String mVolumeId;
+    private VolumeInfo mVolume;
+    private DiskInfo mDisk;
+
+    private int mNextOrder = 0;
+
+    private UsageBarPreference mGraph;
+    private StorageItemPreference mTotal;
+    private StorageItemPreference mAvailable;
+
+    private Preference mMount;
+    private Preference mUnmount;
+    private Preference mFormat;
+    private Preference mFormatInternal;
+
+    private long mTotalSize;
+    private long mAvailSize;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STORAGE;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        final Context context = getActivity();
+
+        mStorageManager = context.getSystemService(StorageManager.class);
+
+        if (DocumentsContract.ACTION_DOCUMENT_ROOT_SETTINGS.equals(
+                getActivity().getIntent().getAction())) {
+            final Uri rootUri = getActivity().getIntent().getData();
+            final String fsUuid = DocumentsContract.getRootId(rootUri);
+            mVolume = mStorageManager.findVolumeByUuid(fsUuid);
+        } else {
+            final String volId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
+            mVolume = mStorageManager.findVolumeById(volId);
+        }
+
+        Preconditions.checkNotNull(mVolume);
+        Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PUBLIC);
+
+        mDisk = mStorageManager.findDiskById(mVolume.getDiskId());
+        Preconditions.checkNotNull(mDisk);
+
+        mVolumeId = mVolume.getId();
+
+        addPreferencesFromResource(R.xml.device_info_storage_volume);
+
+        mGraph = buildGraph();
+        mTotal = buildItem(R.string.memory_size, 0);
+        mAvailable = buildItem(R.string.memory_available, R.color.memory_avail);
+
+        mMount = buildAction(R.string.storage_menu_mount);
+        mUnmount = buildAction(R.string.storage_menu_unmount);
+        mFormat = buildAction(R.string.storage_menu_format);
+        mFormatInternal = buildAction(R.string.storage_menu_format_internal);
+    }
+
+    public void refresh() {
+        getActivity().setTitle(mStorageManager.getBestVolumeDescription(mVolume));
+
+        final Context context = getActivity();
+        final PreferenceScreen screen = getPreferenceScreen();
+
+        screen.removeAll();
+
+        if (mVolume.isMountedReadable()) {
+            screen.addPreference(mGraph);
+            screen.addPreference(mTotal);
+            screen.addPreference(mAvailable);
+
+            final File file = mVolume.getPath();
+            mTotalSize = file.getTotalSpace();
+            mAvailSize = file.getFreeSpace();
+
+            mTotal.setSummary(Formatter.formatFileSize(context, mTotalSize));
+            mAvailable.setSummary(Formatter.formatFileSize(context, mAvailSize));
+
+            mGraph.clear();
+            mGraph.addEntry(0, (mTotalSize - mAvailSize) / (float) mTotalSize,
+                    android.graphics.Color.GRAY);
+            mGraph.commit();
+        }
+
+        if (mVolume.getState() == VolumeInfo.STATE_UNMOUNTED) {
+            screen.addPreference(mMount);
+        }
+        if (mVolume.isMountedReadable()) {
+            screen.addPreference(mUnmount);
+        }
+        screen.addPreference(mFormat);
+        if (mDisk.isAdoptable()) {
+            screen.addPreference(mFormatInternal);
+        }
+    }
+
+    private UsageBarPreference buildGraph() {
+        final UsageBarPreference pref = new UsageBarPreference(getActivity());
+        pref.setOrder(mNextOrder++);
+        return pref;
+    }
+
+    private StorageItemPreference buildItem(int titleRes, int colorRes) {
+        final StorageItemPreference pref = new StorageItemPreference(getActivity(), titleRes,
+                colorRes);
+        pref.setOrder(mNextOrder++);
+        return pref;
+    }
+
+    private Preference buildAction(int titleRes) {
+        final Preference pref = new Preference(getActivity());
+        pref.setTitle(titleRes);
+        pref.setOrder(mNextOrder++);
+        return pref;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Refresh to verify that we haven't been formatted away
+        mVolume = mStorageManager.findVolumeById(mVolumeId);
+        if (mVolume == null) {
+            getActivity().finish();
+            return;
+        }
+
+        mStorageManager.registerListener(mStorageListener);
+        refresh();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mStorageManager.unregisterListener(mStorageListener);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference pref) {
+        final Context context = getActivity();
+        if (pref == mMount) {
+            new MountTask(context, mVolume).execute();
+        } else if (pref == mUnmount) {
+            new UnmountTask(context, mVolume).execute();
+        } else if (pref == mFormat) {
+            new FormatTask(context, mVolume).execute();
+        } else if (pref == mFormatInternal) {
+            final Intent intent = new Intent(context, StorageWizardFormatConfirm.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            startActivity(intent);
+        }
+
+        return super.onPreferenceTreeClick(preferenceScreen, pref);
+    }
+
+    private final StorageEventListener mStorageListener = new StorageEventListener() {
+        @Override
+        public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) {
+            if (Objects.equals(mVolume.getId(), vol.getId())) {
+                mVolume = vol;
+                refresh();
+            }
+        }
+
+        @Override
+        public void onVolumeMetadataChanged(VolumeInfo vol) {
+            if (Objects.equals(mVolume.getId(), vol.getId())) {
+                mVolume = vol;
+                refresh();
+            }
+        }
+    };
+}
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index db3a491..4fa5673 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -22,9 +22,6 @@
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.os.ServiceManager;
-import android.os.RemoteException;
-import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
@@ -36,14 +33,14 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-import android.provider.Telephony;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.internal.telephony.ITelephony;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.DefaultPhoneNotifier;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
+import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -70,7 +67,7 @@
  * # Signal Strength
  *
  */
-public class SimStatus extends PreferenceActivity {
+public class SimStatus extends InstrumentedPreferenceActivity {
     private static final String TAG = "SimStatus";
 
     private static final String KEY_DATA_STATE = "data_state";
@@ -135,9 +132,9 @@
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        mTelephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
 
-        mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
-        mTelephonyManager = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
+        mSelectableSubInfos = SubscriptionManager.from(this).getActiveSubscriptionInfoList();
 
         addPreferencesFromResource(R.xml.device_info_sim_status);
 
@@ -146,13 +143,6 @@
         // Note - missing in zaku build, be careful later...
         mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
 
-        for (int i = 0; i < mTelephonyManager.getSimCount(); i++) {
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(this, i);
-            if (sir != null) {
-                mSelectableSubInfos.add(sir);
-            }
-        }
-
         mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
         if (mSelectableSubInfos.size() > 1) {
             setContentView(R.layout.sim_information);
@@ -175,6 +165,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_SIM_STATUS;
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
         if (mPhone != null) {
@@ -349,10 +344,8 @@
         }
         // If formattedNumber is null or empty, it'll display as "Unknown".
         setSummaryText(KEY_PHONE_NUMBER, formattedNumber);
-        final String imei = mPhone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
-                ? mPhone.getImei() : mPhone.getDeviceId();
-        setSummaryText(KEY_IMEI, imei);
-        setSummaryText(KEY_IMEI_SV, mTelephonyManager.getDeviceSoftwareVersion(/*slotId*/));
+        setSummaryText(KEY_IMEI, mPhone.getImei());
+        setSummaryText(KEY_IMEI_SV, mPhone.getDeviceSvn());
 
         if (!mShowLatestAreaInfo) {
             removePreferenceFromScreen(KEY_LATEST_AREA_INFO);
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index dcac1cb..b86f9c6 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -24,7 +24,6 @@
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
@@ -42,7 +41,9 @@
 import android.widget.ListAdapter;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.util.ArrayUtils;
+import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -56,7 +57,7 @@
  * # XMPP/buzz/tickle status : TODO
  *
  */
-public class Status extends PreferenceActivity {
+public class Status extends InstrumentedPreferenceActivity {
 
     private static final String KEY_BATTERY_STATUS = "battery_status";
     private static final String KEY_BATTERY_LEVEL = "battery_level";
@@ -233,6 +234,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STATUS;
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
         registerReceiver(mConnectivityReceiver, mConnectivityIntentFilter,
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index e4f3ff9..8d48cf0 100644
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -39,7 +39,7 @@
         super(context);
 
         if (colorRes != 0) {
-            this.color = context.getResources().getColor(colorRes);
+            this.color = context.getColor(colorRes);
 
             final Resources res = context.getResources();
             final int width = res.getDimensionPixelSize(R.dimen.device_memory_usage_button_width);
@@ -62,4 +62,8 @@
         shape.getPaint().setColor(color);
         return shape;
     }
+
+    public void setLoading() {
+        setSummary(R.string.memory_calculating_size);
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/StorageMeasurement.java b/src/com/android/settings/deviceinfo/StorageMeasurement.java
deleted file mode 100644
index 34ef62b..0000000
--- a/src/com/android/settings/deviceinfo/StorageMeasurement.java
+++ /dev/null
@@ -1,535 +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.deviceinfo;
-
-import android.app.ActivityManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageStatsObserver;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageStats;
-import android.content.pm.UserInfo;
-import android.os.Environment;
-import android.os.Environment.UserEnvironment;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.IBinder;
-import android.os.Looper;
-import android.os.Message;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.os.storage.StorageVolume;
-import android.util.Log;
-import android.util.SparseLongArray;
-
-import com.android.internal.app.IMediaContainerService;
-import com.google.android.collect.Maps;
-import com.google.android.collect.Sets;
-
-import java.io.File;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.concurrent.GuardedBy;
-
-/**
- * Utility for measuring the disk usage of internal storage or a physical
- * {@link StorageVolume}. Connects with a remote {@link IMediaContainerService}
- * and delivers results to {@link MeasurementReceiver}.
- */
-public class StorageMeasurement {
-    private static final String TAG = "StorageMeasurement";
-
-    private static final boolean LOCAL_LOGV = true;
-    static final boolean LOGV = LOCAL_LOGV && Log.isLoggable(TAG, Log.VERBOSE);
-
-    private static final String DEFAULT_CONTAINER_PACKAGE = "com.android.defcontainer";
-
-    public static final ComponentName DEFAULT_CONTAINER_COMPONENT = new ComponentName(
-            DEFAULT_CONTAINER_PACKAGE, "com.android.defcontainer.DefaultContainerService");
-
-    /** Media types to measure on external storage. */
-    private static final Set<String> sMeasureMediaTypes = Sets.newHashSet(
-            Environment.DIRECTORY_DCIM, Environment.DIRECTORY_MOVIES,
-            Environment.DIRECTORY_PICTURES, Environment.DIRECTORY_MUSIC,
-            Environment.DIRECTORY_ALARMS, Environment.DIRECTORY_NOTIFICATIONS,
-            Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS,
-            Environment.DIRECTORY_DOWNLOADS, Environment.DIRECTORY_ANDROID);
-
-    @GuardedBy("sInstances")
-    private static HashMap<StorageVolume, StorageMeasurement> sInstances = Maps.newHashMap();
-
-    /**
-     * Obtain shared instance of {@link StorageMeasurement} for given physical
-     * {@link StorageVolume}, or internal storage if {@code null}.
-     */
-    public static StorageMeasurement getInstance(Context context, StorageVolume volume) {
-        synchronized (sInstances) {
-            StorageMeasurement value = sInstances.get(volume);
-            if (value == null) {
-                value = new StorageMeasurement(context.getApplicationContext(), volume);
-                sInstances.put(volume, value);
-            }
-            return value;
-        }
-    }
-
-    public static class MeasurementDetails {
-        public long totalSize;
-        public long availSize;
-
-        /**
-         * Total apps disk usage.
-         * <p>
-         * When measuring internal storage, this value includes the code size of
-         * all apps (regardless of install status for current user), and
-         * internal disk used by the current user's apps. When the device
-         * emulates external storage, this value also includes emulated storage
-         * used by the current user's apps.
-         * <p>
-         * When measuring a physical {@link StorageVolume}, this value includes
-         * usage by all apps on that volume.
-         */
-        public long appsSize;
-
-        /**
-         * Total cache disk usage by apps.
-         */
-        public long cacheSize;
-
-        /**
-         * Total media disk usage, categorized by types such as
-         * {@link Environment#DIRECTORY_MUSIC}.
-         * <p>
-         * When measuring internal storage, this reflects media on emulated
-         * storage for the current user.
-         * <p>
-         * When measuring a physical {@link StorageVolume}, this reflects media
-         * on that volume.
-         */
-        public HashMap<String, Long> mediaSize = Maps.newHashMap();
-
-        /**
-         * Misc external disk usage for the current user, unaccounted in
-         * {@link #mediaSize}.
-         */
-        public long miscSize;
-
-        /**
-         * Total disk usage for users, which is only meaningful for emulated
-         * internal storage. Key is {@link UserHandle}.
-         */
-        public SparseLongArray usersSize = new SparseLongArray();
-    }
-
-    public interface MeasurementReceiver {
-        public void updateApproximate(StorageMeasurement meas, long totalSize, long availSize);
-        public void updateDetails(StorageMeasurement meas, MeasurementDetails details);
-    }
-
-    private volatile WeakReference<MeasurementReceiver> mReceiver;
-
-    /** Physical volume being measured, or {@code null} for internal. */
-    private final StorageVolume mVolume;
-
-    private final boolean mIsInternal;
-    private final boolean mIsPrimary;
-
-    private final MeasurementHandler mHandler;
-
-    private long mTotalSize;
-    private long mAvailSize;
-
-    List<FileInfo> mFileInfoForMisc;
-
-    private StorageMeasurement(Context context, StorageVolume volume) {
-        mVolume = volume;
-        mIsInternal = volume == null;
-        mIsPrimary = volume != null ? volume.isPrimary() : false;
-
-        // Start the thread that will measure the disk usage.
-        final HandlerThread handlerThread = new HandlerThread("MemoryMeasurement");
-        handlerThread.start();
-        mHandler = new MeasurementHandler(context, handlerThread.getLooper());
-    }
-
-    public void setReceiver(MeasurementReceiver receiver) {
-        if (mReceiver == null || mReceiver.get() == null) {
-            mReceiver = new WeakReference<MeasurementReceiver>(receiver);
-        }
-    }
-
-    public void measure() {
-        if (!mHandler.hasMessages(MeasurementHandler.MSG_MEASURE)) {
-            mHandler.sendEmptyMessage(MeasurementHandler.MSG_MEASURE);
-        }
-    }
-
-    public void cleanUp() {
-        mReceiver = null;
-        mHandler.removeMessages(MeasurementHandler.MSG_MEASURE);
-        mHandler.sendEmptyMessage(MeasurementHandler.MSG_DISCONNECT);
-    }
-
-    public void invalidate() {
-        mHandler.sendEmptyMessage(MeasurementHandler.MSG_INVALIDATE);
-    }
-
-    private void sendInternalApproximateUpdate() {
-        MeasurementReceiver receiver = (mReceiver != null) ? mReceiver.get() : null;
-        if (receiver == null) {
-            return;
-        }
-        receiver.updateApproximate(this, mTotalSize, mAvailSize);
-    }
-
-    private void sendExactUpdate(MeasurementDetails details) {
-        MeasurementReceiver receiver = (mReceiver != null) ? mReceiver.get() : null;
-        if (receiver == null) {
-            if (LOGV) {
-                Log.i(TAG, "measurements dropped because receiver is null! wasted effort");
-            }
-            return;
-        }
-        receiver.updateDetails(this, details);
-    }
-
-    private static class StatsObserver extends IPackageStatsObserver.Stub {
-        private final boolean mIsInternal;
-        private final MeasurementDetails mDetails;
-        private final int mCurrentUser;
-        private final Message mFinished;
-
-        private int mRemaining;
-
-        public StatsObserver(boolean isInternal, MeasurementDetails details, int currentUser,
-                Message finished, int remaining) {
-            mIsInternal = isInternal;
-            mDetails = details;
-            mCurrentUser = currentUser;
-            mFinished = finished;
-            mRemaining = remaining;
-        }
-
-        @Override
-        public void onGetStatsCompleted(PackageStats stats, boolean succeeded) {
-            synchronized (mDetails) {
-                if (succeeded) {
-                    addStatsLocked(stats);
-                }
-                if (--mRemaining == 0) {
-                    mFinished.sendToTarget();
-                }
-            }
-        }
-
-        private void addStatsLocked(PackageStats stats) {
-            if (mIsInternal) {
-                long codeSize = stats.codeSize;
-                long dataSize = stats.dataSize;
-                long cacheSize = stats.cacheSize;
-                if (Environment.isExternalStorageEmulated()) {
-                    // Include emulated storage when measuring internal. OBB is
-                    // shared on emulated storage, so treat as code.
-                    codeSize += stats.externalCodeSize + stats.externalObbSize;
-                    dataSize += stats.externalDataSize + stats.externalMediaSize;
-                    cacheSize += stats.externalCacheSize;
-                }
-
-                // Count code and data for current user
-                if (stats.userHandle == mCurrentUser) {
-                    mDetails.appsSize += codeSize;
-                    mDetails.appsSize += dataSize;
-                }
-
-                // User summary only includes data (code is only counted once
-                // for the current user)
-                addValue(mDetails.usersSize, stats.userHandle, dataSize);
-
-                // Include cache for all users
-                mDetails.cacheSize += cacheSize;
-
-            } else {
-                // Physical storage; only count external sizes
-                mDetails.appsSize += stats.externalCodeSize + stats.externalDataSize
-                        + stats.externalMediaSize + stats.externalObbSize;
-                mDetails.cacheSize += stats.externalCacheSize;
-            }
-        }
-    }
-
-    private class MeasurementHandler extends Handler {
-        public static final int MSG_MEASURE = 1;
-        public static final int MSG_CONNECTED = 2;
-        public static final int MSG_DISCONNECT = 3;
-        public static final int MSG_COMPLETED = 4;
-        public static final int MSG_INVALIDATE = 5;
-
-        private Object mLock = new Object();
-
-        private IMediaContainerService mDefaultContainer;
-
-        private volatile boolean mBound = false;
-
-        private MeasurementDetails mCached;
-
-        private final WeakReference<Context> mContext;
-
-        private final ServiceConnection mDefContainerConn = new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName name, IBinder service) {
-                final IMediaContainerService imcs = IMediaContainerService.Stub.asInterface(
-                        service);
-                mDefaultContainer = imcs;
-                mBound = true;
-                sendMessage(obtainMessage(MSG_CONNECTED, imcs));
-            }
-
-            @Override
-            public void onServiceDisconnected(ComponentName name) {
-                mBound = false;
-                removeMessages(MSG_CONNECTED);
-            }
-        };
-
-        public MeasurementHandler(Context context, Looper looper) {
-            super(looper);
-            mContext = new WeakReference<Context>(context);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_MEASURE: {
-                    if (mCached != null) {
-                        sendExactUpdate(mCached);
-                        break;
-                    }
-
-                    final Context context = (mContext != null) ? mContext.get() : null;
-                    if (context == null) {
-                        return;
-                    }
-
-                    synchronized (mLock) {
-                        if (mBound) {
-                            removeMessages(MSG_DISCONNECT);
-                            sendMessage(obtainMessage(MSG_CONNECTED, mDefaultContainer));
-                        } else {
-                            Intent service = new Intent().setComponent(DEFAULT_CONTAINER_COMPONENT);
-                            context.bindServiceAsUser(service, mDefContainerConn, Context.BIND_AUTO_CREATE,
-                                    UserHandle.OWNER);
-                        }
-                    }
-                    break;
-                }
-                case MSG_CONNECTED: {
-                    IMediaContainerService imcs = (IMediaContainerService) msg.obj;
-                    measureApproximateStorage(imcs);
-                    measureExactStorage(imcs);
-                    break;
-                }
-                case MSG_DISCONNECT: {
-                    synchronized (mLock) {
-                        if (mBound) {
-                            final Context context = (mContext != null) ? mContext.get() : null;
-                            if (context == null) {
-                                return;
-                            }
-
-                            mBound = false;
-                            context.unbindService(mDefContainerConn);
-                        }
-                    }
-                    break;
-                }
-                case MSG_COMPLETED: {
-                    mCached = (MeasurementDetails) msg.obj;
-                    sendExactUpdate(mCached);
-                    break;
-                }
-                case MSG_INVALIDATE: {
-                    mCached = null;
-                    break;
-                }
-            }
-        }
-
-        private void measureApproximateStorage(IMediaContainerService imcs) {
-            final String path = mVolume != null ? mVolume.getPath()
-                    : Environment.getDataDirectory().getPath();
-            try {
-                final long[] stats = imcs.getFileSystemStats(path);
-                mTotalSize = stats[0];
-                mAvailSize = stats[1];
-            } catch (Exception e) {
-                Log.w(TAG, "Problem in container service", e);
-            }
-
-            sendInternalApproximateUpdate();
-        }
-
-        private void measureExactStorage(IMediaContainerService imcs) {
-            final Context context = mContext != null ? mContext.get() : null;
-            if (context == null) {
-                return;
-            }
-
-            final MeasurementDetails details = new MeasurementDetails();
-            final Message finished = obtainMessage(MSG_COMPLETED, details);
-
-            details.totalSize = mTotalSize;
-            details.availSize = mAvailSize;
-
-            final UserManager userManager = (UserManager) context.getSystemService(
-                    Context.USER_SERVICE);
-            final List<UserInfo> users = userManager.getUsers();
-
-            final int currentUser = ActivityManager.getCurrentUser();
-            final UserEnvironment currentEnv = new UserEnvironment(currentUser);
-
-            // Measure media types for emulated storage, or for primary physical
-            // external volume
-            final boolean measureMedia = (mIsInternal && Environment.isExternalStorageEmulated())
-                    || mIsPrimary;
-            if (measureMedia) {
-                for (String type : sMeasureMediaTypes) {
-                    final File path = currentEnv.getExternalStoragePublicDirectory(type);
-                    final long size = getDirectorySize(imcs, path);
-                    details.mediaSize.put(type, size);
-                }
-            }
-
-            // Measure misc files not counted under media
-            if (measureMedia) {
-                final File path = mIsInternal ? currentEnv.getExternalStorageDirectory()
-                        : mVolume.getPathFile();
-                details.miscSize = measureMisc(imcs, path);
-            }
-
-            // Measure total emulated storage of all users; internal apps data
-            // will be spliced in later
-            for (UserInfo user : users) {
-                final UserEnvironment userEnv = new UserEnvironment(user.id);
-                final long size = getDirectorySize(imcs, userEnv.getExternalStorageDirectory());
-                addValue(details.usersSize, user.id, size);
-            }
-
-            // Measure all apps for all users
-            final PackageManager pm = context.getPackageManager();
-            if (mIsInternal || mIsPrimary) {
-                final List<ApplicationInfo> apps = pm.getInstalledApplications(
-                        PackageManager.GET_UNINSTALLED_PACKAGES
-                        | PackageManager.GET_DISABLED_COMPONENTS);
-
-                final int count = users.size() * apps.size();
-                final StatsObserver observer = new StatsObserver(
-                        mIsInternal, details, currentUser, finished, count);
-
-                for (UserInfo user : users) {
-                    for (ApplicationInfo app : apps) {
-                        pm.getPackageSizeInfo(app.packageName, user.id, observer);
-                    }
-                }
-
-            } else {
-                finished.sendToTarget();
-            }
-        }
-    }
-
-    private static long getDirectorySize(IMediaContainerService imcs, File path) {
-        try {
-            final long size = imcs.calculateDirectorySize(path.toString());
-            Log.d(TAG, "getDirectorySize(" + path + ") returned " + size);
-            return size;
-        } catch (Exception e) {
-            Log.w(TAG, "Could not read memory from default container service for " + path, e);
-            return 0;
-        }
-    }
-
-    private long measureMisc(IMediaContainerService imcs, File dir) {
-        mFileInfoForMisc = new ArrayList<FileInfo>();
-
-        final File[] files = dir.listFiles();
-        if (files == null) return 0;
-
-        // Get sizes of all top level nodes except the ones already computed
-        long counter = 0;
-        long miscSize = 0;
-
-        for (File file : files) {
-            final String path = file.getAbsolutePath();
-            final String name = file.getName();
-            if (sMeasureMediaTypes.contains(name)) {
-                continue;
-            }
-
-            if (file.isFile()) {
-                final long fileSize = file.length();
-                mFileInfoForMisc.add(new FileInfo(path, fileSize, counter++));
-                miscSize += fileSize;
-            } else if (file.isDirectory()) {
-                final long dirSize = getDirectorySize(imcs, file);
-                mFileInfoForMisc.add(new FileInfo(path, dirSize, counter++));
-                miscSize += dirSize;
-            } else {
-                // Non directory, non file: not listed
-            }
-        }
-
-        // sort the list of FileInfo objects collected above in descending order of their sizes
-        Collections.sort(mFileInfoForMisc);
-
-        return miscSize;
-    }
-
-    static class FileInfo implements Comparable<FileInfo> {
-        final String mFileName;
-        final long mSize;
-        final long mId;
-
-        FileInfo(String fileName, long size, long id) {
-            mFileName = fileName;
-            mSize = size;
-            mId = id;
-        }
-
-        @Override
-        public int compareTo(FileInfo that) {
-            if (this == that || mSize == that.mSize) return 0;
-            else return (mSize < that.mSize) ? 1 : -1; // for descending sort
-        }
-
-        @Override
-        public String toString() {
-            return mFileName  + " : " + mSize + ", id:" + mId;
-        }
-    }
-
-    private static void addValue(SparseLongArray array, int key, long value) {
-        array.put(key, array.get(key) + value);
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
new file mode 100644
index 0000000..7a7d90d
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -0,0 +1,386 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.os.storage.StorageEventListener;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import com.android.internal.logging.MetricsLogger;
+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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Panel showing both internal storage (both built-in storage and private
+ * volumes) and removable storage (public volumes).
+ */
+public class StorageSettings extends SettingsPreferenceFragment implements Indexable {
+    static final String TAG = "StorageSettings";
+
+    // TODO: badging to indicate devices running low on storage
+    // TODO: show currently ejected private volumes
+
+    private UserManager mUserManager;
+    private StorageManager mStorageManager;
+
+    private PreferenceCategory mInternalCategory;
+    private PreferenceCategory mExternalCategory;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STORAGE;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_storage;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        final Context context = getActivity();
+
+        mUserManager = context.getSystemService(UserManager.class);
+
+        mStorageManager = context.getSystemService(StorageManager.class);
+        mStorageManager.registerListener(mStorageListener);
+
+        addPreferencesFromResource(R.xml.device_info_storage);
+
+        mInternalCategory = (PreferenceCategory) findPreference("storage_internal");
+        mExternalCategory = (PreferenceCategory) findPreference("storage_external");
+
+        // TODO: if only one volume visible, shortcut into it
+
+        setHasOptionsMenu(true);
+    }
+
+    private final StorageEventListener mStorageListener = new StorageEventListener() {
+        @Override
+        public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) {
+            if (isInteresting(vol)) {
+                refresh();
+            }
+        }
+    };
+
+    private static boolean isInteresting(VolumeInfo vol) {
+        switch(vol.getType()) {
+            case VolumeInfo.TYPE_PRIVATE:
+            case VolumeInfo.TYPE_PUBLIC:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private void refresh() {
+        final Context context = getActivity();
+
+        getPreferenceScreen().removeAll();
+        mInternalCategory.removeAll();
+        mExternalCategory.removeAll();
+
+        final List<VolumeInfo> volumes = mStorageManager.getVolumes();
+        Collections.sort(volumes, VolumeInfo.getDescriptionComparator());
+
+        for (VolumeInfo vol : volumes) {
+            if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
+                mInternalCategory.addPreference(new StorageVolumePreference(context, vol));
+            } else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
+                mExternalCategory.addPreference(new StorageVolumePreference(context, vol));
+            }
+        }
+
+        if (mInternalCategory.getPreferenceCount() > 0) {
+            getPreferenceScreen().addPreference(mInternalCategory);
+        }
+        if (mExternalCategory.getPreferenceCount() > 0) {
+            getPreferenceScreen().addPreference(mExternalCategory);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mStorageManager.registerListener(mStorageListener);
+        refresh();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mStorageManager.unregisterListener(mStorageListener);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.storage, menu);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        final MenuItem usb = menu.findItem(R.id.storage_usb);
+
+        usb.setVisible(!mUserManager.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.storage_usb:
+                startFragment(this, UsbSettings.class.getCanonicalName(),
+                        R.string.storage_title_usb, 0, null);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference pref) {
+        final String volId = pref.getKey();
+        final VolumeInfo vol = mStorageManager.findVolumeById(volId);
+        if (vol == null) {
+            return false;
+
+        } else if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
+            final Bundle args = new Bundle();
+            args.putString(VolumeInfo.EXTRA_VOLUME_ID, volId);
+            startFragment(this, PrivateVolumeSettings.class.getCanonicalName(),
+                    -1, 0, args);
+            return true;
+
+        } else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
+            if (vol.isMountedReadable()) {
+                startActivity(vol.buildBrowseIntent());
+                return true;
+            } else {
+                final Bundle args = new Bundle();
+                args.putString(VolumeInfo.EXTRA_VOLUME_ID, volId);
+                startFragment(this, PublicVolumeSettings.class.getCanonicalName(),
+                        -1, 0, args);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static class MountTask extends AsyncTask<Void, Void, Exception> {
+        private final Context mContext;
+        private final StorageManager mStorageManager;
+        private final String mVolumeId;
+        private final String mDescription;
+
+        public MountTask(Context context, VolumeInfo volume) {
+            mContext = context.getApplicationContext();
+            mStorageManager = mContext.getSystemService(StorageManager.class);
+            mVolumeId = volume.getId();
+            mDescription = mStorageManager.getBestVolumeDescription(volume);
+        }
+
+        @Override
+        protected Exception doInBackground(Void... params) {
+            try {
+                mStorageManager.mount(mVolumeId);
+                return null;
+            } catch (Exception e) {
+                return e;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Exception e) {
+            if (e == null) {
+                Toast.makeText(mContext, mContext.getString(R.string.storage_mount_success,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            } else {
+                Log.e(TAG, "Failed to mount " + mVolumeId, e);
+                Toast.makeText(mContext, mContext.getString(R.string.storage_mount_failure,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    public static class UnmountTask extends AsyncTask<Void, Void, Exception> {
+        private final Context mContext;
+        private final StorageManager mStorageManager;
+        private final String mVolumeId;
+        private final String mDescription;
+
+        public UnmountTask(Context context, VolumeInfo volume) {
+            mContext = context.getApplicationContext();
+            mStorageManager = mContext.getSystemService(StorageManager.class);
+            mVolumeId = volume.getId();
+            mDescription = mStorageManager.getBestVolumeDescription(volume);
+        }
+
+        @Override
+        protected Exception doInBackground(Void... params) {
+            try {
+                mStorageManager.unmount(mVolumeId);
+                return null;
+            } catch (Exception e) {
+                return e;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Exception e) {
+            if (e == null) {
+                Toast.makeText(mContext, mContext.getString(R.string.storage_unmount_success,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            } else {
+                Log.e(TAG, "Failed to unmount " + mVolumeId, e);
+                Toast.makeText(mContext, mContext.getString(R.string.storage_unmount_failure,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    public static class FormatTask extends AsyncTask<Void, Void, Exception> {
+        private final Context mContext;
+        private final StorageManager mStorageManager;
+        private final String mVolumeId;
+        private final String mDescription;
+
+        public FormatTask(Context context, VolumeInfo volume) {
+            mContext = context.getApplicationContext();
+            mStorageManager = mContext.getSystemService(StorageManager.class);
+            mVolumeId = volume.getId();
+            mDescription = mStorageManager.getBestVolumeDescription(volume);
+        }
+
+        @Override
+        protected Exception doInBackground(Void... params) {
+            try {
+                mStorageManager.format(mVolumeId);
+                mStorageManager.mount(mVolumeId);
+                return null;
+            } catch (Exception e) {
+                return e;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Exception e) {
+            if (e == null) {
+                Toast.makeText(mContext, mContext.getString(R.string.storage_format_success,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            } else {
+                Log.e(TAG, "Failed to format " + mVolumeId, e);
+                Toast.makeText(mContext, mContext.getString(R.string.storage_format_failure,
+                        mDescription), Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    /**
+     * Enable indexing of searchable data
+     */
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+        new BaseSearchIndexProvider() {
+            @Override
+            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
+                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
+
+                SearchIndexableRaw data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.storage_settings);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.internal_storage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                final StorageManager storage = context.getSystemService(StorageManager.class);
+                final List<VolumeInfo> vols = storage.getVolumes();
+                for (VolumeInfo vol : vols) {
+                    if (isInteresting(vol)) {
+                        data.title = storage.getBestVolumeDescription(vol);
+                        data.screenTitle = context.getString(R.string.storage_settings);
+                        result.add(data);
+                    }
+                }
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_size);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_available);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_apps_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_dcim_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_music_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_downloads_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_media_cache_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                data = new SearchIndexableRaw(context);
+                data.title = context.getString(R.string.memory_media_misc_usage);
+                data.screenTitle = context.getString(R.string.storage_settings);
+                result.add(data);
+
+                return result;
+            }
+        };
+}
diff --git a/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java b/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java
new file mode 100644
index 0000000..81ac97b
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java
@@ -0,0 +1,43 @@
+/*
+ * 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.deviceinfo;
+
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.util.Log;
+
+import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
+
+public class StorageUnmountReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final StorageManager storage = context.getSystemService(StorageManager.class);
+
+        final String volId = intent.getStringExtra(VolumeInfo.EXTRA_VOLUME_ID);
+        final VolumeInfo vol = storage.findVolumeById(volId);
+        if (vol != null) {
+            new UnmountTask(context, vol).execute();
+        } else {
+            Log.w(TAG, "Missing volume " + volId);
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
new file mode 100644
index 0000000..852aa39
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -0,0 +1,88 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.Context;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.preference.Preference;
+import android.text.format.Formatter;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
+
+import java.io.File;
+
+/**
+ * Preference line representing a single {@link VolumeInfo}, possibly including
+ * quick actions like unmounting.
+ */
+public class StorageVolumePreference extends Preference {
+    private final StorageManager mStorageManager;
+    private final VolumeInfo mVolume;
+
+    public StorageVolumePreference(Context context, VolumeInfo volume) {
+        super(context);
+
+        mStorageManager = context.getSystemService(StorageManager.class);
+        mVolume = volume;
+
+        setKey(volume.getId());
+        setTitle(mStorageManager.getBestVolumeDescription(volume));
+
+        if (volume.isMountedReadable()) {
+            // TODO: move statfs() to background thread
+            final File path = volume.getPath();
+            final String free = Formatter.formatFileSize(context, path.getFreeSpace());
+            final String total = Formatter.formatFileSize(context, path.getTotalSpace());
+            setSummary(context.getString(R.string.storage_volume_summary, free, total));
+        }
+
+        // TODO: better icons
+        if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(volume.getId())) {
+            setIcon(context.getDrawable(R.drawable.ic_settings_storage));
+        } else {
+            setIcon(context.getDrawable(R.drawable.ic_sim_sd));
+        }
+
+        if (volume.getType() == VolumeInfo.TYPE_PUBLIC
+                && volume.isMountedReadable()) {
+            setWidgetLayoutResource(R.layout.preference_storage_action);
+        }
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        final TextView unmount = (TextView) view.findViewById(R.id.unmount);
+        if (unmount != null) {
+            unmount.setText("\u23CF");
+            unmount.setOnClickListener(mUnmountListener);
+        }
+
+        super.onBindView(view);
+    }
+
+    private final View.OnClickListener mUnmountListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            new UnmountTask(getContext(), mVolume).execute();
+        }
+    };
+}
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
deleted file mode 100644
index a98f8d9..0000000
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ /dev/null
@@ -1,483 +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.deviceinfo;
-
-import android.app.ActivityManagerNative;
-import android.app.ActivityThread;
-import android.app.DownloadManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.IPackageManager;
-import android.content.pm.UserInfo;
-import android.content.res.Resources;
-import android.hardware.usb.UsbManager;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.os.RemoteException;
-import android.os.UserManager;
-import android.os.storage.StorageManager;
-import android.os.storage.StorageVolume;
-import android.preference.Preference;
-import android.preference.PreferenceCategory;
-import android.provider.MediaStore;
-import android.text.format.Formatter;
-
-import com.android.settings.R;
-import com.android.settings.Settings;
-import com.android.settings.deviceinfo.StorageMeasurement.MeasurementDetails;
-import com.android.settings.deviceinfo.StorageMeasurement.MeasurementReceiver;
-import com.google.android.collect.Lists;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-public class StorageVolumePreferenceCategory extends PreferenceCategory {
-    public static final String KEY_CACHE = "cache";
-
-    private static final int ORDER_USAGE_BAR = -2;
-    private static final int ORDER_STORAGE_LOW = -1;
-
-    /** Physical volume being measured, or {@code null} for internal. */
-    private final StorageVolume mVolume;
-    private final StorageMeasurement mMeasure;
-
-    private final Resources mResources;
-    private final StorageManager mStorageManager;
-    private final UserManager mUserManager;
-
-    private UsageBarPreference mUsageBarPreference;
-    private Preference mMountTogglePreference;
-    private Preference mFormatPreference;
-    private Preference mStorageLow;
-
-    private StorageItemPreference mItemTotal;
-    private StorageItemPreference mItemAvailable;
-    private StorageItemPreference mItemApps;
-    private StorageItemPreference mItemDcim;
-    private StorageItemPreference mItemMusic;
-    private StorageItemPreference mItemDownloads;
-    private StorageItemPreference mItemCache;
-    private StorageItemPreference mItemMisc;
-    private List<StorageItemPreference> mItemUsers = Lists.newArrayList();
-
-    private boolean mUsbConnected;
-    private String mUsbFunction;
-
-    private long mTotalSize;
-
-    private static final int MSG_UI_UPDATE_APPROXIMATE = 1;
-    private static final int MSG_UI_UPDATE_DETAILS = 2;
-
-    private Handler mUpdateHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_UI_UPDATE_APPROXIMATE: {
-                    final long[] size = (long[]) msg.obj;
-                    updateApproximate(size[0], size[1]);
-                    break;
-                }
-                case MSG_UI_UPDATE_DETAILS: {
-                    final MeasurementDetails details = (MeasurementDetails) msg.obj;
-                    updateDetails(details);
-                    break;
-                }
-            }
-        }
-    };
-
-    /**
-     * Build category to summarize internal storage, including any emulated
-     * {@link StorageVolume}.
-     */
-    public static StorageVolumePreferenceCategory buildForInternal(Context context) {
-        return new StorageVolumePreferenceCategory(context, null);
-    }
-
-    /**
-     * Build category to summarize specific physical {@link StorageVolume}.
-     */
-    public static StorageVolumePreferenceCategory buildForPhysical(
-            Context context, StorageVolume volume) {
-        return new StorageVolumePreferenceCategory(context, volume);
-    }
-
-    private StorageVolumePreferenceCategory(Context context, StorageVolume volume) {
-        super(context);
-
-        mVolume = volume;
-        mMeasure = StorageMeasurement.getInstance(context, volume);
-
-        mResources = context.getResources();
-        mStorageManager = StorageManager.from(context);
-        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-
-        setTitle(volume != null ? volume.getDescription(context)
-                : context.getText(R.string.internal_storage));
-    }
-
-    private StorageItemPreference buildItem(int titleRes, int colorRes) {
-        return new StorageItemPreference(getContext(), titleRes, colorRes);
-    }
-
-    public void init() {
-        final Context context = getContext();
-
-        removeAll();
-
-        final UserInfo currentUser;
-        try {
-            currentUser = ActivityManagerNative.getDefault().getCurrentUser();
-        } catch (RemoteException e) {
-            throw new RuntimeException("Failed to get current user");
-        }
-
-        final List<UserInfo> otherUsers = getUsersExcluding(currentUser);
-        final boolean showUsers = mVolume == null && otherUsers.size() > 0;
-
-        mUsageBarPreference = new UsageBarPreference(context);
-        mUsageBarPreference.setOrder(ORDER_USAGE_BAR);
-        addPreference(mUsageBarPreference);
-
-        mItemTotal = buildItem(R.string.memory_size, 0);
-        mItemAvailable = buildItem(R.string.memory_available, R.color.memory_avail);
-        addPreference(mItemTotal);
-        addPreference(mItemAvailable);
-
-        mItemApps = buildItem(R.string.memory_apps_usage, R.color.memory_apps_usage);
-        mItemDcim = buildItem(R.string.memory_dcim_usage, R.color.memory_dcim);
-        mItemMusic = buildItem(R.string.memory_music_usage, R.color.memory_music);
-        mItemDownloads = buildItem(R.string.memory_downloads_usage, R.color.memory_downloads);
-        mItemCache = buildItem(R.string.memory_media_cache_usage, R.color.memory_cache);
-        mItemMisc = buildItem(R.string.memory_media_misc_usage, R.color.memory_misc);
-
-        mItemCache.setKey(KEY_CACHE);
-
-        final boolean showDetails = mVolume == null || mVolume.isPrimary();
-        if (showDetails) {
-            if (showUsers) {
-                addPreference(new PreferenceHeader(context, currentUser.name));
-            }
-
-            addPreference(mItemApps);
-            addPreference(mItemDcim);
-            addPreference(mItemMusic);
-            addPreference(mItemDownloads);
-            addPreference(mItemCache);
-            addPreference(mItemMisc);
-
-            if (showUsers) {
-                addPreference(new PreferenceHeader(context, R.string.storage_other_users));
-
-                int count = 0;
-                for (UserInfo info : otherUsers) {
-                    final int colorRes = count++ % 2 == 0 ? R.color.memory_user_light
-                            : R.color.memory_user_dark;
-                    final StorageItemPreference userPref = new StorageItemPreference(
-                            getContext(), info.name, colorRes, info.id);
-                    mItemUsers.add(userPref);
-                    addPreference(userPref);
-                }
-            }
-        }
-
-        final boolean isRemovable = mVolume != null ? mVolume.isRemovable() : false;
-        // Always create the preference since many code rely on it existing
-        mMountTogglePreference = new Preference(context);
-        if (isRemovable) {
-            mMountTogglePreference.setTitle(R.string.sd_eject);
-            mMountTogglePreference.setSummary(R.string.sd_eject_summary);
-            addPreference(mMountTogglePreference);
-        }
-
-        final boolean allowFormat = mVolume != null;
-        if (allowFormat) {
-            mFormatPreference = new Preference(context);
-            mFormatPreference.setTitle(R.string.sd_format);
-            mFormatPreference.setSummary(R.string.sd_format_summary);
-            addPreference(mFormatPreference);
-        }
-
-        final IPackageManager pm = ActivityThread.getPackageManager();
-        try {
-            if (pm.isStorageLow()) {
-                mStorageLow = new Preference(context);
-                mStorageLow.setOrder(ORDER_STORAGE_LOW);
-                mStorageLow.setTitle(R.string.storage_low_title);
-                mStorageLow.setSummary(R.string.storage_low_summary);
-                addPreference(mStorageLow);
-            } else if (mStorageLow != null) {
-                removePreference(mStorageLow);
-                mStorageLow = null;
-            }
-        } catch (RemoteException e) {
-        }
-    }
-
-    public StorageVolume getStorageVolume() {
-        return mVolume;
-    }
-
-    private void updatePreferencesFromState() {
-        // Only update for physical volumes
-        if (mVolume == null) return;
-
-        mMountTogglePreference.setEnabled(true);
-
-        final String state = mStorageManager.getVolumeState(mVolume.getPath());
-
-        if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-            mItemAvailable.setTitle(R.string.memory_available_read_only);
-        } else {
-            mItemAvailable.setTitle(R.string.memory_available);
-        }
-
-        if (Environment.MEDIA_MOUNTED.equals(state)
-                || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-            mMountTogglePreference.setEnabled(true);
-            mMountTogglePreference.setTitle(mResources.getString(R.string.sd_eject));
-            mMountTogglePreference.setSummary(mResources.getString(R.string.sd_eject_summary));
-            addPreference(mUsageBarPreference);
-            addPreference(mItemTotal);
-            addPreference(mItemAvailable);
-        } else {
-            if (Environment.MEDIA_UNMOUNTED.equals(state) || Environment.MEDIA_NOFS.equals(state)
-                    || Environment.MEDIA_UNMOUNTABLE.equals(state)) {
-                mMountTogglePreference.setEnabled(true);
-                mMountTogglePreference.setTitle(mResources.getString(R.string.sd_mount));
-                mMountTogglePreference.setSummary(mResources.getString(R.string.sd_mount_summary));
-            } else {
-                mMountTogglePreference.setEnabled(false);
-                mMountTogglePreference.setTitle(mResources.getString(R.string.sd_mount));
-                mMountTogglePreference.setSummary(mResources.getString(R.string.sd_insert_summary));
-            }
-
-            removePreference(mUsageBarPreference);
-            removePreference(mItemTotal);
-            removePreference(mItemAvailable);
-        }
-
-        if (mUsbConnected && (UsbManager.USB_FUNCTION_MTP.equals(mUsbFunction) ||
-                UsbManager.USB_FUNCTION_PTP.equals(mUsbFunction))) {
-            mMountTogglePreference.setEnabled(false);
-            if (Environment.MEDIA_MOUNTED.equals(state)
-                    || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-                mMountTogglePreference.setSummary(
-                        mResources.getString(R.string.mtp_ptp_mode_summary));
-            }
-
-            if (mFormatPreference != null) {
-                mFormatPreference.setEnabled(false);
-                mFormatPreference.setSummary(mResources.getString(R.string.mtp_ptp_mode_summary));
-            }
-        } else if (mFormatPreference != null) {
-            mFormatPreference.setEnabled(mMountTogglePreference.isEnabled());
-            mFormatPreference.setSummary(mResources.getString(R.string.sd_format_summary));
-        }
-    }
-
-    public void updateApproximate(long totalSize, long availSize) {
-        mItemTotal.setSummary(formatSize(totalSize));
-        mItemAvailable.setSummary(formatSize(availSize));
-
-        mTotalSize = totalSize;
-
-        final long usedSize = totalSize - availSize;
-
-        mUsageBarPreference.clear();
-        mUsageBarPreference.addEntry(0, usedSize / (float) totalSize, android.graphics.Color.GRAY);
-        mUsageBarPreference.commit();
-
-        updatePreferencesFromState();
-    }
-
-    private static long totalValues(HashMap<String, Long> map, String... keys) {
-        long total = 0;
-        for (String key : keys) {
-            if (map.containsKey(key)) {
-                total += map.get(key);
-            }
-        }
-        return total;
-    }
-
-    public void updateDetails(MeasurementDetails details) {
-        final boolean showDetails = mVolume == null || mVolume.isPrimary();
-        if (!showDetails) return;
-
-        // Count caches as available space, since system manages them
-        mItemTotal.setSummary(formatSize(details.totalSize));
-        mItemAvailable.setSummary(formatSize(details.availSize));
-
-        mUsageBarPreference.clear();
-
-        updatePreference(mItemApps, details.appsSize);
-
-        final long dcimSize = totalValues(details.mediaSize, Environment.DIRECTORY_DCIM,
-                Environment.DIRECTORY_MOVIES, Environment.DIRECTORY_PICTURES);
-        updatePreference(mItemDcim, dcimSize);
-
-        final long musicSize = totalValues(details.mediaSize, Environment.DIRECTORY_MUSIC,
-                Environment.DIRECTORY_ALARMS, Environment.DIRECTORY_NOTIFICATIONS,
-                Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS);
-        updatePreference(mItemMusic, musicSize);
-
-        final long downloadsSize = totalValues(details.mediaSize, Environment.DIRECTORY_DOWNLOADS);
-        updatePreference(mItemDownloads, downloadsSize);
-
-        updatePreference(mItemCache, details.cacheSize);
-        updatePreference(mItemMisc, details.miscSize);
-
-        for (StorageItemPreference userPref : mItemUsers) {
-            final long userSize = details.usersSize.get(userPref.userHandle);
-            updatePreference(userPref, userSize);
-        }
-
-        mUsageBarPreference.commit();
-    }
-
-    private void updatePreference(StorageItemPreference pref, long size) {
-        if (size > 0) {
-            pref.setSummary(formatSize(size));
-            final int order = pref.getOrder();
-            mUsageBarPreference.addEntry(order, size / (float) mTotalSize, pref.color);
-        } else {
-            removePreference(pref);
-        }
-    }
-
-    private void measure() {
-        mMeasure.invalidate();
-        mMeasure.measure();
-    }
-
-    public void onResume() {
-        mMeasure.setReceiver(mReceiver);
-        measure();
-    }
-
-    public void onStorageStateChanged() {
-        init();
-        measure();
-    }
-
-    public void onUsbStateChanged(boolean isUsbConnected, String usbFunction) {
-        mUsbConnected = isUsbConnected;
-        mUsbFunction = usbFunction;
-        measure();
-    }
-
-    public void onMediaScannerFinished() {
-        measure();
-    }
-
-    public void onCacheCleared() {
-        measure();
-    }
-
-    public void onPause() {
-        mMeasure.cleanUp();
-    }
-
-    private String formatSize(long size) {
-        return Formatter.formatFileSize(getContext(), size);
-    }
-
-    private MeasurementReceiver mReceiver = new MeasurementReceiver() {
-        @Override
-        public void updateApproximate(StorageMeasurement meas, long totalSize, long availSize) {
-            mUpdateHandler.obtainMessage(MSG_UI_UPDATE_APPROXIMATE, new long[] {
-                    totalSize, availSize }).sendToTarget();
-        }
-
-        @Override
-        public void updateDetails(StorageMeasurement meas, MeasurementDetails details) {
-            mUpdateHandler.obtainMessage(MSG_UI_UPDATE_DETAILS, details).sendToTarget();
-        }
-    };
-
-    public boolean mountToggleClicked(Preference preference) {
-        return preference == mMountTogglePreference;
-    }
-
-    public Intent intentForClick(Preference pref) {
-        Intent intent = null;
-
-        // TODO The current "delete" story is not fully handled by the respective applications.
-        // When it is done, make sure the intent types below are correct.
-        // If that cannot be done, remove these intents.
-        final String key = pref.getKey();
-        if (pref == mFormatPreference) {
-            intent = new Intent(Intent.ACTION_VIEW);
-            intent.setClass(getContext(), com.android.settings.MediaFormat.class);
-            intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mVolume);
-        } else if (pref == mItemApps) {
-            intent = new Intent(Intent.ACTION_MANAGE_PACKAGE_STORAGE);
-            intent.setClass(getContext(), Settings.ManageApplicationsActivity.class);
-        } else if (pref == mItemDownloads) {
-            intent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).putExtra(
-                    DownloadManager.INTENT_EXTRAS_SORT_BY_SIZE, true);
-        } else if (pref == mItemMusic) {
-            intent = new Intent(Intent.ACTION_GET_CONTENT);
-            intent.setType("audio/mp3");
-        } else if (pref == mItemDcim) {
-            intent = new Intent(Intent.ACTION_VIEW);
-            intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
-            // TODO Create a Videos category, MediaStore.Video.Media.EXTERNAL_CONTENT_URI
-            intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-        } else if (pref == mItemMisc) {
-            Context context = getContext().getApplicationContext();
-            intent = new Intent(context, MiscFilesHandler.class);
-            intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mVolume);
-        }
-
-        return intent;
-    }
-
-    public static class PreferenceHeader extends Preference {
-        public PreferenceHeader(Context context, int titleRes) {
-            super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
-            setTitle(titleRes);
-        }
-
-        public PreferenceHeader(Context context, CharSequence title) {
-            super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
-            setTitle(title);
-        }
-
-        @Override
-        public boolean isEnabled() {
-            return false;
-        }
-    }
-
-    /**
-     * Return list of other users, excluding the current user.
-     */
-    private List<UserInfo> getUsersExcluding(UserInfo excluding) {
-        final List<UserInfo> users = mUserManager.getUsers();
-        final Iterator<UserInfo> i = users.iterator();
-        while (i.hasNext()) {
-            if (i.next().id == excluding.id) {
-                i.remove();
-            }
-        }
-        return users;
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
new file mode 100644
index 0000000..42c74a5
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -0,0 +1,133 @@
+/*
+ * 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.deviceinfo;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.os.storage.StorageManager;
+import android.os.storage.VolumeInfo;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.setupwizardlib.SetupWizardLayout;
+import com.android.setupwizardlib.view.NavigationBar;
+import com.android.setupwizardlib.view.NavigationBar.NavigationBarListener;
+
+import java.text.NumberFormat;
+
+public abstract class StorageWizardBase extends Activity implements NavigationBarListener {
+    protected StorageManager mStorage;
+
+    protected VolumeInfo mVolume;
+    protected DiskInfo mDisk;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mStorage = getSystemService(StorageManager.class);
+
+        final String volumeId = getIntent().getStringExtra(VolumeInfo.EXTRA_VOLUME_ID);
+        if (!TextUtils.isEmpty(volumeId)) {
+            mVolume = mStorage.findVolumeById(volumeId);
+        }
+
+        final String diskId = getIntent().getStringExtra(DiskInfo.EXTRA_DISK_ID);
+        if (!TextUtils.isEmpty(diskId)) {
+            mDisk = mStorage.findDiskById(diskId);
+        } else {
+            mDisk = mVolume.getDisk();
+        }
+
+        setTheme(R.style.SuwThemeMaterial_Light);
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
+                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN |
+                WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
+
+        getNavigationBar().setSystemUiVisibility(
+                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+
+        getWindow().setStatusBarColor(Color.TRANSPARENT);
+
+        getNavigationBar().setNavigationBarListener(this);
+        getBackButton().setVisibility(View.GONE);
+    }
+
+    protected NavigationBar getNavigationBar() {
+        return (NavigationBar) findViewById(R.id.suw_layout_navigation_bar);
+    }
+
+    protected Button getBackButton() {
+        return getNavigationBar().getBackButton();
+    }
+
+    protected Button getNextButton() {
+        return getNavigationBar().getNextButton();
+    }
+
+    protected SetupWizardLayout getSetupWizardLayout() {
+        return (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);
+    }
+
+    protected ProgressBar getProgressBar() {
+        return (ProgressBar) findViewById(R.id.storage_wizard_progress);
+    }
+
+    protected void setCurrentProgress(int progress) {
+        getProgressBar().setProgress(progress);
+        ((TextView) findViewById(R.id.storage_wizard_progress_summary)).setText(
+                NumberFormat.getPercentInstance().format((double) progress / 100));
+    }
+
+    protected void setHeaderText(int resId, String... args) {
+        getSetupWizardLayout().setHeaderText(TextUtils.expandTemplate(getText(resId), args));
+    }
+
+    protected void setBodyText(int resId, String... args) {
+        ((TextView) findViewById(R.id.storage_wizard_body)).setText(
+                TextUtils.expandTemplate(getText(resId), args));
+    }
+
+    protected void setSecondaryBodyText(int resId, String... args) {
+        final TextView secondBody = ((TextView) findViewById(R.id.storage_wizard_second_body));
+        secondBody.setText(TextUtils.expandTemplate(getText(resId), args));
+        secondBody.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void onNavigateNext() {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
new file mode 100644
index 0000000..f4f475f
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.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.deviceinfo;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardFormatConfirm extends StorageWizardBase {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_generic);
+
+        Preconditions.checkNotNull(mDisk);
+
+        setHeaderText(R.string.storage_wizard_format_confirm_title);
+        setBodyText(R.string.storage_wizard_format_confirm_body,
+                mDisk.getDescription());
+
+        // TODO: make this a big red scary button
+        getNextButton().setText(R.string.storage_wizard_format_confirm_next);
+    }
+
+    @Override
+    public void onNavigateNext() {
+        final Intent intent = new Intent(this, StorageWizardFormatProgress.class);
+        intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+        startActivity(intent);
+        finishAffinity();
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
new file mode 100644
index 0000000..2996d45
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
@@ -0,0 +1,94 @@
+/*
+ * 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.deviceinfo;
+
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardFormatProgress extends StorageWizardBase {
+    public static final String EXTRA_FORMAT_PUBLIC = "format_private";
+
+    private boolean mFormatPublic;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_progress);
+
+        Preconditions.checkNotNull(mDisk);
+
+        mFormatPublic = getIntent().getBooleanExtra(EXTRA_FORMAT_PUBLIC, false);
+
+        setHeaderText(R.string.storage_wizard_format_progress_title, mDisk.getDescription());
+        setBodyText(R.string.storage_wizard_format_progress_body, mDisk.getDescription());
+
+        setCurrentProgress(20);
+
+        getNextButton().setVisibility(View.GONE);
+
+        new PartitionTask().execute();
+    }
+
+    public class PartitionTask extends AsyncTask<Void, Void, Exception> {
+        @Override
+        protected Exception doInBackground(Void... params) {
+            try {
+                if (mFormatPublic) {
+                    mStorage.partitionPublic(mDisk.getId());
+                } else {
+                    mStorage.partitionPrivate(mDisk.getId());
+                }
+                return null;
+            } catch (Exception e) {
+                return e;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Exception e) {
+            final Context context = StorageWizardFormatProgress.this;
+            if (e == null) {
+                if (!mFormatPublic) {
+                    // TODO: bring back migration once implemented
+//                    final Intent intent = new Intent(context, StorageWizardMigrate.class);
+//                    intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+//                    startActivity(intent);
+                    final Intent intent = new Intent(context, StorageWizardReady.class);
+                    intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+                    startActivity(intent);
+                }
+                finishAffinity();
+
+            } else {
+                Log.e(TAG, "Failed to partition", e);
+                Toast.makeText(context, e.getMessage(), Toast.LENGTH_LONG).show();
+                finishAffinity();
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardInit.java b/src/com/android/settings/deviceinfo/StorageWizardInit.java
new file mode 100644
index 0000000..9d59231
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardInit.java
@@ -0,0 +1,87 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.RadioButton;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardInit extends StorageWizardBase {
+    private RadioButton mRadioExternal;
+    private RadioButton mRadioInternal;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_init);
+
+        Preconditions.checkNotNull(mDisk);
+
+        setHeaderText(R.string.storage_wizard_init_title, mDisk.getDescription());
+
+        mRadioExternal = (RadioButton) findViewById(R.id.storage_wizard_init_external_title);
+        mRadioInternal = (RadioButton) findViewById(R.id.storage_wizard_init_internal_title);
+
+        mRadioExternal.setOnCheckedChangeListener(mRadioListener);
+        mRadioInternal.setOnCheckedChangeListener(mRadioListener);
+
+        findViewById(R.id.storage_wizard_init_external_summary).setPadding(
+                mRadioExternal.getCompoundPaddingLeft(), 0,
+                mRadioExternal.getCompoundPaddingRight(), 0);
+        findViewById(R.id.storage_wizard_init_internal_summary).setPadding(
+                mRadioExternal.getCompoundPaddingLeft(), 0,
+                mRadioExternal.getCompoundPaddingRight(), 0);
+
+        getNextButton().setEnabled(false);
+    }
+
+    private final OnCheckedChangeListener mRadioListener = new OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            if (isChecked) {
+                if (buttonView == mRadioExternal) {
+                    mRadioInternal.setChecked(false);
+                } else if (buttonView == mRadioInternal) {
+                    mRadioExternal.setChecked(false);
+                }
+                getNextButton().setEnabled(true);
+            }
+        }
+    };
+
+    @Override
+    public void onNavigateNext() {
+        if (mRadioExternal.isChecked()) {
+            // Remember that user made decision
+            mStorage.setVolumeInited(mVolume.getId(), true);
+
+            final Intent intent = new Intent(this, StorageWizardReady.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            startActivity(intent);
+        } else if (mRadioInternal.isChecked()) {
+            final Intent intent = new Intent(this, StorageWizardFormatConfirm.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            startActivity(intent);
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrate.java b/src/com/android/settings/deviceinfo/StorageWizardMigrate.java
new file mode 100644
index 0000000..4d42613
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrate.java
@@ -0,0 +1,82 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.RadioButton;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardMigrate extends StorageWizardBase {
+    private RadioButton mRadioNow;
+    private RadioButton mRadioLater;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_migrate);
+
+        Preconditions.checkNotNull(mDisk);
+
+        final String time = DateUtils.formatDuration(0).toString();
+        final String size = Formatter.formatFileSize(this, 0);
+
+        setHeaderText(R.string.storage_wizard_migrate_title, mDisk.getDescription());
+        setBodyText(R.string.storage_wizard_migrate_body, mDisk.getDescription(), time, size);
+
+        mRadioNow = (RadioButton) findViewById(R.id.storage_wizard_migrate_now);
+        mRadioLater = (RadioButton) findViewById(R.id.storage_wizard_migrate_later);
+
+        mRadioNow.setOnCheckedChangeListener(mRadioListener);
+        mRadioLater.setOnCheckedChangeListener(mRadioListener);
+
+        mRadioNow.setChecked(true);
+    }
+
+    private final OnCheckedChangeListener mRadioListener = new OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            if (isChecked) {
+                if (buttonView == mRadioNow) {
+                    mRadioLater.setChecked(false);
+                } else if (buttonView == mRadioLater) {
+                    mRadioNow.setChecked(false);
+                }
+            }
+        }
+    };
+
+    @Override
+    public void onNavigateNext() {
+        if (mRadioNow.isChecked()) {
+            final Intent intent = new Intent(this, StorageWizardMigrateConfirm.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            startActivity(intent);
+        } else if (mRadioLater.isChecked()) {
+            final Intent intent = new Intent(this, StorageWizardReady.class);
+            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+            startActivity(intent);
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
new file mode 100644
index 0000000..9aa1441
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -0,0 +1,53 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.DiskInfo;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardMigrateConfirm extends StorageWizardBase {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_generic);
+
+        Preconditions.checkNotNull(mDisk);
+
+        final String time = DateUtils.formatDuration(0).toString();
+        final String size = Formatter.formatFileSize(this, 0);
+
+        setHeaderText(R.string.storage_wizard_migrate_confirm_title, mDisk.getDescription());
+        setBodyText(R.string.storage_wizard_migrate_confirm_body, time, size);
+        setSecondaryBodyText(R.string.storage_wizard_migrate_details, mDisk.getDescription());
+
+        getNextButton().setText(R.string.storage_wizard_migrate_confirm_next);
+    }
+
+    @Override
+    public void onNavigateNext() {
+        final Intent intent = new Intent(this, StorageWizardMigrateProgress.class);
+        intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+        startActivity(intent);
+        finishAffinity();
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
new file mode 100644
index 0000000..b53b250
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
@@ -0,0 +1,76 @@
+/*
+ * 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.deviceinfo;
+
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.os.storage.DiskInfo;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardMigrateProgress extends StorageWizardBase {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_progress);
+
+        Preconditions.checkNotNull(mDisk);
+
+        setHeaderText(R.string.storage_wizard_migrate_progress_title, mDisk.getDescription());
+        setBodyText(R.string.storage_wizard_migrate_details, mDisk.getDescription());
+
+        setCurrentProgress(20);
+
+        getNextButton().setVisibility(View.GONE);
+
+        new MigrateTask().execute();
+    }
+
+    public class MigrateTask extends AsyncTask<Void, Void, Exception> {
+        @Override
+        protected Exception doInBackground(Void... params) {
+            // TODO: wire up migration
+            SystemClock.sleep(2000);
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Exception e) {
+            final Context context = StorageWizardMigrateProgress.this;
+            if (e == null) {
+                final Intent intent = new Intent(context, StorageWizardReady.class);
+                intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+                startActivity(intent);
+                finishAffinity();
+
+            } else {
+                Log.e(TAG, "Failed to migrate", e);
+                Toast.makeText(context, e.getMessage(), Toast.LENGTH_LONG).show();
+                finishAffinity();
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
new file mode 100644
index 0000000..3a802a3
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
@@ -0,0 +1,77 @@
+/*
+ * 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.deviceinfo;
+
+import static android.content.Intent.EXTRA_PACKAGE_NAME;
+import static android.content.Intent.EXTRA_TITLE;
+import static android.content.pm.PackageManager.EXTRA_MOVE_ID;
+import static android.os.storage.VolumeInfo.EXTRA_VOLUME_ID;
+
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Bundle;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+public class StorageWizardMoveConfirm extends StorageWizardBase {
+    private String mPackageName;
+    private ApplicationInfo mApp;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_generic);
+
+        try {
+            mPackageName = getIntent().getStringExtra(EXTRA_PACKAGE_NAME);
+            mApp = getPackageManager().getApplicationInfo(mPackageName, 0);
+        } catch (NameNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+
+        Preconditions.checkNotNull(mVolume);
+        Preconditions.checkNotNull(mApp);
+
+        // Sanity check that target volume is candidate
+        Preconditions.checkState(
+                getPackageManager().getPackageCandidateVolumes(mApp).contains(mVolume));
+
+        final String appName = getPackageManager().getApplicationLabel(mApp).toString();
+        final String volumeName = mStorage.getBestVolumeDescription(mVolume);
+
+        setHeaderText(R.string.storage_wizard_move_confirm_title, appName);
+        setBodyText(R.string.storage_wizard_move_confirm_body, appName, volumeName);
+
+        getNextButton().setText(R.string.move_app);
+    }
+
+    @Override
+    public void onNavigateNext() {
+        // Kick off move before we transition
+        final String appName = getPackageManager().getApplicationLabel(mApp).toString();
+        final int moveId = getPackageManager().movePackage(mPackageName, mVolume);
+
+        final Intent intent = new Intent(this, StorageWizardMoveProgress.class);
+        intent.putExtra(EXTRA_MOVE_ID, moveId);
+        intent.putExtra(EXTRA_TITLE, appName);
+        intent.putExtra(EXTRA_VOLUME_ID, mVolume.getId());
+        startActivity(intent);
+        finishAffinity();
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
new file mode 100644
index 0000000..b0946c5
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
@@ -0,0 +1,102 @@
+/*
+ * 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.deviceinfo;
+
+import static android.content.Intent.EXTRA_TITLE;
+import static android.content.pm.PackageManager.EXTRA_MOVE_ID;
+import static com.android.settings.deviceinfo.StorageSettings.TAG;
+
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.MoveCallback;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.settings.R;
+
+public class StorageWizardMoveProgress extends StorageWizardBase {
+    private int mMoveId;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_progress);
+
+        mMoveId = getIntent().getIntExtra(EXTRA_MOVE_ID, -1);
+        final String appName = getIntent().getStringExtra(EXTRA_TITLE);
+        final String volumeName = mStorage.getBestVolumeDescription(mVolume);
+
+        setHeaderText(R.string.storage_wizard_move_progress_title, appName);
+        setBodyText(R.string.storage_wizard_move_progress_body, volumeName, appName);
+
+        getNextButton().setVisibility(View.GONE);
+
+        // Register for updates and push through current status
+        getPackageManager().registerMoveCallback(mCallback, new Handler());
+        mCallback.onStatusChanged(mMoveId, getPackageManager().getMoveStatus(mMoveId), -1);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getPackageManager().unregisterMoveCallback(mCallback);
+    }
+
+    private final MoveCallback mCallback = new MoveCallback() {
+        @Override
+        public void onStarted(int moveId, String title) {
+            // Ignored
+        }
+
+        @Override
+        public void onStatusChanged(int moveId, int status, long estMillis) {
+            if (mMoveId != moveId) return;
+
+            if (PackageManager.isMoveStatusFinished(status)) {
+                Log.d(TAG, "Finished with status " + status);
+                if (status != PackageManager.MOVE_SUCCEEDED) {
+                    Toast.makeText(StorageWizardMoveProgress.this, moveStatusToMessage(status),
+                            Toast.LENGTH_LONG).show();
+                }
+                finishAffinity();
+
+            } else {
+                setCurrentProgress(status);
+            }
+        }
+    };
+
+    private CharSequence moveStatusToMessage(int returnCode) {
+        switch (returnCode) {
+            case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE:
+                return getString(R.string.insufficient_storage);
+            case PackageManager.MOVE_FAILED_DOESNT_EXIST:
+                return getString(R.string.does_not_exist);
+            case PackageManager.MOVE_FAILED_FORWARD_LOCKED:
+                return getString(R.string.app_forward_locked);
+            case PackageManager.MOVE_FAILED_INVALID_LOCATION:
+                return getString(R.string.invalid_location);
+            case PackageManager.MOVE_FAILED_SYSTEM_PACKAGE:
+                return getString(R.string.system_package);
+            case PackageManager.MOVE_FAILED_INTERNAL_ERROR:
+            default:
+                return getString(R.string.insufficient_storage);
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardReady.java b/src/com/android/settings/deviceinfo/StorageWizardReady.java
new file mode 100644
index 0000000..26038ce
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageWizardReady.java
@@ -0,0 +1,62 @@
+/*
+ * 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.deviceinfo;
+
+import android.os.Bundle;
+import android.os.storage.VolumeInfo;
+
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
+
+import java.util.List;
+import java.util.Objects;
+
+public class StorageWizardReady extends StorageWizardBase {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.storage_wizard_generic);
+
+        Preconditions.checkNotNull(mDisk);
+
+        setHeaderText(R.string.storage_wizard_ready_title, mDisk.getDescription());
+
+        // TODO: handle mixed partition cases instead of just guessing based on
+        // first volume type we encounter
+        final List<VolumeInfo> vols = mStorage.getVolumes();
+        for (VolumeInfo vol : vols) {
+            if (!Objects.equals(mDisk.getId(), vol.getDiskId())) continue;
+
+            if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
+                setBodyText(R.string.storage_wizard_ready_external_body,
+                        mDisk.getDescription());
+                break;
+            } else if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
+                setBodyText(R.string.storage_wizard_ready_internal_body,
+                        mDisk.getDescription());
+                break;
+            }
+        }
+
+        getNextButton().setText(R.string.done);
+    }
+
+    @Override
+    public void onNavigateNext() {
+        finishAffinity();
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/UsbSettings.java b/src/com/android/settings/deviceinfo/UsbSettings.java
index 42de2fd..d8a675c 100644
--- a/src/com/android/settings/deviceinfo/UsbSettings.java
+++ b/src/com/android/settings/deviceinfo/UsbSettings.java
@@ -28,6 +28,7 @@
 import android.preference.PreferenceScreen;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -41,10 +42,12 @@
 
     private static final String KEY_MTP = "usb_mtp";
     private static final String KEY_PTP = "usb_ptp";
+    private static final String KEY_MIDI = "usb_midi";
 
     private UsbManager mUsbManager;
     private CheckBoxPreference mMtp;
     private CheckBoxPreference mPtp;
+    private CheckBoxPreference mMidi;
     private boolean mUsbAccessoryMode;
 
     private final BroadcastReceiver mStateReceiver = new BroadcastReceiver() {
@@ -68,6 +71,7 @@
 
         mMtp = (CheckBoxPreference)root.findPreference(KEY_MTP);
         mPtp = (CheckBoxPreference)root.findPreference(KEY_PTP);
+        mMidi = (CheckBoxPreference)root.findPreference(KEY_MIDI);
 
         UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         if (um.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER)) {
@@ -79,6 +83,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_USB;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         mUsbManager = (UsbManager)getSystemService(Context.USB_SERVICE);
@@ -107,27 +116,37 @@
         if (UsbManager.USB_FUNCTION_MTP.equals(function)) {
             mMtp.setChecked(true);
             mPtp.setChecked(false);
+            mMidi.setChecked(false);
         } else if (UsbManager.USB_FUNCTION_PTP.equals(function)) {
             mMtp.setChecked(false);
             mPtp.setChecked(true);
+            mMidi.setChecked(false);
+        } else if (UsbManager.USB_FUNCTION_MIDI.equals(function)) {
+            mMtp.setChecked(false);
+            mPtp.setChecked(false);
+            mMidi.setChecked(true);
         } else  {
             mMtp.setChecked(false);
             mPtp.setChecked(false);
+            mMidi.setChecked(false);
         }
         UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         if (um.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER)) {
             Log.e(TAG, "USB is locked down");
             mMtp.setEnabled(false);
             mPtp.setEnabled(false);
+            mMidi.setEnabled(true);
         } else if (!mUsbAccessoryMode) {
             //Enable MTP and PTP switch while USB is not in Accessory Mode, otherwise disable it
             Log.e(TAG, "USB Normal Mode");
             mMtp.setEnabled(true);
             mPtp.setEnabled(true);
+            mMidi.setEnabled(true);
         } else {
             Log.e(TAG, "USB Accessory Mode");
             mMtp.setEnabled(false);
             mPtp.setEnabled(false);
+            mMidi.setEnabled(false);
         }
     }
 
@@ -151,6 +170,8 @@
             function = UsbManager.USB_FUNCTION_MTP;
         } else if (preference == mPtp && mPtp.isChecked()) {
             function = UsbManager.USB_FUNCTION_PTP;
+        } else if (preference == mMidi && mMidi.isChecked()) {
+            function = UsbManager.USB_FUNCTION_MIDI;
         }
 
         mUsbManager.setCurrentFunction(function, true);
diff --git a/src/com/android/settings/drawable/CircleFramedDrawable.java b/src/com/android/settings/drawable/CircleFramedDrawable.java
index 97c96a0..31b8922 100644
--- a/src/com/android/settings/drawable/CircleFramedDrawable.java
+++ b/src/com/android/settings/drawable/CircleFramedDrawable.java
@@ -42,45 +42,22 @@
     private final Bitmap mBitmap;
     private final int mSize;
     private final Paint mPaint;
-    private final float mShadowRadius;
-    private final float mStrokeWidth;
-    private final int mFrameColor;
-    private final int mHighlightColor;
-    private final int mFrameShadowColor;
 
     private float mScale;
-    private Path mFramePath;
     private Rect mSrcRect;
     private RectF mDstRect;
-    private RectF mFrameRect;
-    private boolean mPressed;
 
     public static CircleFramedDrawable getInstance(Context context, Bitmap icon) {
         Resources res = context.getResources();
         float iconSize = res.getDimension(R.dimen.circle_avatar_size);
-        float strokeWidth = res.getDimension(R.dimen.circle_avatar_frame_stroke_width);
-        float shadowRadius = res.getDimension(R.dimen.circle_avatar_frame_shadow_radius);
-        int frameColor = res.getColor(R.color.circle_avatar_frame_color);
-        int frameShadowColor = res.getColor(R.color.circle_avatar_frame_shadow_color);
-        int highlightColor = res.getColor(R.color.circle_avatar_frame_pressed_color);
 
-        CircleFramedDrawable instance = new CircleFramedDrawable(icon,
-                (int) iconSize, frameColor, strokeWidth, frameShadowColor, shadowRadius,
-                highlightColor);
+        CircleFramedDrawable instance = new CircleFramedDrawable(icon, (int) iconSize);
         return instance;
     }
 
-    public CircleFramedDrawable(Bitmap icon, int size,
-            int frameColor, float strokeWidth,
-            int frameShadowColor, float shadowRadius,
-            int highlightColor) {
+    public CircleFramedDrawable(Bitmap icon, int size) {
         super();
         mSize = size;
-        mShadowRadius = shadowRadius;
-        mFrameColor = frameColor;
-        mFrameShadowColor = frameShadowColor;
-        mStrokeWidth = strokeWidth;
-        mHighlightColor = highlightColor;
 
         mBitmap = Bitmap.createBitmap(mSize, mSize, Bitmap.Config.ARGB_8888);
         final Canvas canvas = new Canvas(mBitmap);
@@ -91,8 +68,6 @@
 
         final Rect cropRect = new Rect((width - square) / 2, (height - square) / 2, square, square);
         final RectF circleRect = new RectF(0f, 0f, mSize, mSize);
-        circleRect.inset(mStrokeWidth / 2f, mStrokeWidth / 2f);
-        circleRect.inset(mShadowRadius, mShadowRadius);
 
         final Path fillPath = new Path();
         fillPath.addArc(circleRect, 0f, 360f);
@@ -117,8 +92,6 @@
 
         mSrcRect = new Rect(0, 0, mSize, mSize);
         mDstRect = new RectF(0, 0, mSize, mSize);
-        mFrameRect = new RectF(mDstRect);
-        mFramePath = new Path();
     }
 
     @Override
@@ -128,28 +101,6 @@
 
         mDstRect.set(pad, pad, mSize - pad, mSize - pad);
         canvas.drawBitmap(mBitmap, mSrcRect, mDstRect, null);
-
-        mFrameRect.set(mDstRect);
-        mFrameRect.inset(mStrokeWidth / 2f, mStrokeWidth / 2f);
-        mFrameRect.inset(mShadowRadius, mShadowRadius);
-
-        mFramePath.reset();
-        mFramePath.addArc(mFrameRect, 0f, 360f);
-
-        // white frame
-        if (mPressed) {
-            mPaint.setStyle(Paint.Style.FILL);
-            mPaint.setColor(Color.argb((int) (0.33f * 255),
-                            Color.red(mHighlightColor),
-                            Color.green(mHighlightColor),
-                            Color.blue(mHighlightColor)));
-            canvas.drawPath(mFramePath, mPaint);
-        }
-        mPaint.setStrokeWidth(mStrokeWidth);
-        mPaint.setStyle(Paint.Style.STROKE);
-        mPaint.setColor(mPressed ? mHighlightColor : mFrameColor);
-        mPaint.setShadowLayer(mShadowRadius, 0f, 0f, mFrameShadowColor);
-        canvas.drawPath(mFramePath, mPaint);
     }
 
     public void setScale(float scale) {
@@ -160,10 +111,6 @@
         return mScale;
     }
 
-    public void setPressed(boolean pressed) {
-        mPressed = pressed;
-    }
-
     @Override
     public int getOpacity() {
         return PixelFormat.TRANSLUCENT;
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 3312162..9ec0565 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -20,7 +20,6 @@
 import android.graphics.Bitmap;
 import android.graphics.DashPathEffect;
 import android.os.BatteryManager;
-import android.provider.Settings;
 import android.text.format.DateFormat;
 import android.text.format.Formatter;
 import android.util.Log;
@@ -667,8 +666,8 @@
     }
 
     private boolean isDayFirst() {
-        LocaleData d = LocaleData.get(mContext.getResources().getConfiguration().locale);
-        String value = d.shortDateFormat4;
+        final String value = LocaleData.get(getResources().getConfiguration().locale)
+                .getDateFormat(java.text.DateFormat.SHORT);
         return value.indexOf('M') > value.indexOf('d');
     }
 
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
index 63e4e13..c977063 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.fuelgauge;
 
-import android.app.Fragment;
 import android.content.Intent;
 import android.os.BatteryStats;
 import android.os.Bundle;
@@ -24,10 +23,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 
-public class BatteryHistoryDetail extends Fragment {
+public class BatteryHistoryDetail extends InstrumentedFragment {
     public static final String EXTRA_STATS = "stats";
     public static final String EXTRA_BROADCAST = "broadcast";
 
@@ -50,4 +51,9 @@
         chart.setStats(mStats, mBatteryBroadcast);
         return view;
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FUELGAUGE_BATTERY_HISTORY_DETAIL;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
index e7326b1..b615ffd 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
@@ -18,14 +18,10 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.os.BatteryStats;
 import android.preference.Preference;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
 import com.android.settings.R;
 
 /**
diff --git a/src/com/android/settings/fuelgauge/BatterySaverModeVoiceActivity.java b/src/com/android/settings/fuelgauge/BatterySaverModeVoiceActivity.java
new file mode 100644
index 0000000..3fa0e02
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatterySaverModeVoiceActivity.java
@@ -0,0 +1,51 @@
+/*
+ * 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.fuelgauge;
+
+import static android.provider.Settings.EXTRA_BATTERY_SAVER_MODE_ENABLED;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.PowerManager;
+import android.util.Log;
+
+import com.android.settings.utils.VoiceSettingsActivity;
+
+/**
+ * Activity for modifying the {@link android.os.PowerManager} power save mode
+ * setting using the Voice Interaction API.
+ */
+public class BatterySaverModeVoiceActivity extends VoiceSettingsActivity {
+    private static final String TAG = "BatterySaverModeVoiceActivity";
+
+    @Override
+    protected boolean onVoiceSettingInteraction(Intent intent) {
+        if (intent.hasExtra(EXTRA_BATTERY_SAVER_MODE_ENABLED)) {
+            PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            if (powerManager.setPowerSaveMode(
+                    intent.getBooleanExtra(EXTRA_BATTERY_SAVER_MODE_ENABLED, false))) {
+                notifySuccess(null);
+            } else {
+                Log.v(TAG, "Unable to set power mode");
+                notifyFailure(null);
+            }
+        } else {
+            Log.v(TAG, "Missing battery saver mode extra");
+        }
+        return true;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index e6b90a7..d8a9ca0 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -34,6 +34,7 @@
 import android.util.Log;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -61,6 +62,11 @@
     private PowerManager mPowerManager;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FUELGAUGE_BATTERY_SAVER;
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         if (mCreated) {
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index e3c8dab..1f13e8e 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -21,7 +21,6 @@
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ApplicationErrorReport;
-import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -47,10 +46,12 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.util.FastPrintWriter;
 import com.android.settings.DisplaySettings;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
@@ -64,7 +65,7 @@
 import java.io.StringWriter;
 import java.io.Writer;
 
-public class PowerUsageDetail extends Fragment implements Button.OnClickListener {
+public class PowerUsageDetail extends InstrumentedFragment implements Button.OnClickListener {
 
     // Note: Must match the sequence of the DrainType
     private static int[] sDrainTypeDesciptions = new int[] {
@@ -91,9 +92,9 @@
         Bundle args = new Bundle();
         args.putString(PowerUsageDetail.EXTRA_TITLE, entry.name);
         args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)
-                ((entry.sipper.value * dischargeAmount / helper.getTotalPower()) + .5));
+                ((entry.sipper.totalPowerMah * dischargeAmount / helper.getTotalPower()) + .5));
         args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)
-                Math.ceil(entry.sipper.value * 100 / helper.getMaxPower()));
+                Math.ceil(entry.sipper.totalPowerMah * 100 / helper.getMaxPower()));
         args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, helper.getStatsPeriod());
         args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, entry.defaultPackageName);
         args.putInt(PowerUsageDetail.EXTRA_ICON_ID, entry.iconId);
@@ -127,11 +128,11 @@
                     R.string.usage_type_video,
                 };
                 values = new double[] {
-                    entry.sipper.cpuTime,
-                    entry.sipper.cpuFgTime,
-                    entry.sipper.wakeLockTime,
-                    entry.sipper.gpsTime,
-                    entry.sipper.wifiRunningTime,
+                    entry.sipper.cpuTimeMs,
+                    entry.sipper.cpuFgTimeMs,
+                    entry.sipper.wakeLockTimeMs,
+                    entry.sipper.gpsTimeMs,
+                    entry.sipper.wifiRunningTimeMs,
                     entry.sipper.mobileRxPackets,
                     entry.sipper.mobileTxPackets,
                     entry.sipper.mobileActive,
@@ -168,7 +169,7 @@
                     R.string.usage_type_radio_active,
                 };
                 values = new double[] {
-                    entry.sipper.usageTime,
+                    entry.sipper.usageTimeMs,
                     entry.sipper.noCoveragePercent,
                     entry.sipper.mobileActive
                 };
@@ -187,10 +188,10 @@
                     R.string.usage_type_data_wifi_send,
                 };
                 values = new double[] {
-                    entry.sipper.usageTime,
-                    entry.sipper.cpuTime,
-                    entry.sipper.cpuFgTime,
-                    entry.sipper.wakeLockTime,
+                    entry.sipper.usageTimeMs,
+                    entry.sipper.cpuTimeMs,
+                    entry.sipper.cpuFgTimeMs,
+                    entry.sipper.wakeLockTimeMs,
                     entry.sipper.mobileRxPackets,
                     entry.sipper.mobileTxPackets,
                     entry.sipper.wifiRxPackets,
@@ -210,10 +211,10 @@
                     R.string.usage_type_data_wifi_send,
                 };
                 values = new double[] {
-                    entry.sipper.usageTime,
-                    entry.sipper.cpuTime,
-                    entry.sipper.cpuFgTime,
-                    entry.sipper.wakeLockTime,
+                    entry.sipper.usageTimeMs,
+                    entry.sipper.cpuTimeMs,
+                    entry.sipper.cpuFgTimeMs,
+                    entry.sipper.wakeLockTimeMs,
                     entry.sipper.mobileRxPackets,
                     entry.sipper.mobileTxPackets,
                     entry.sipper.wifiRxPackets,
@@ -252,21 +253,15 @@
                     R.string.usage_type_on_time
                 };
                 values = new double[] {
-                    entry.sipper.usageTime
+                    entry.sipper.usageTimeMs
                 };
             }
         }
         args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
         args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
 
-        // This is a workaround, see b/17523189
-        if (userId == UserHandle.myUserId()) {
-            caller.startPreferencePanel(PowerUsageDetail.class.getName(), args,
-                    R.string.details_title, null, null, 0);
-        } else {
-            caller.startPreferencePanelAsUser(PowerUsageDetail.class.getName(), args,
-                    R.string.details_title, null, new UserHandle(userId));
-        }
+        caller.startPreferencePanelAsUser(PowerUsageDetail.class.getName(), args,
+                R.string.details_title, null, new UserHandle(userId));
     }
 
     public static final int ACTION_DISPLAY_SETTINGS = 1;
@@ -345,6 +340,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FUELGAUGE_POWER_USAGE_DETAIL;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         mStartTime = android.os.Process.getElapsedCpuTime();
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 5ee4fa0..297fe1a 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -30,7 +30,6 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
-import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.text.TextUtils;
@@ -38,10 +37,12 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.os.PowerProfile;
 import com.android.settings.HelpUtils;
+import com.android.settings.InstrumentedPreferenceFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 
@@ -51,7 +52,7 @@
  * Displays a list of apps and subsystems that consume power, ordered by how much power was
  * consumed since the last time it was unplugged.
  */
-public class PowerUsageSummary extends PreferenceFragment {
+public class PowerUsageSummary extends InstrumentedPreferenceFragment {
 
     private static final boolean DEBUG = false;
 
@@ -120,6 +121,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FUELGAUGE_POWER_USAGE_SUMMARY;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         BatteryStatsHelper.dropFile(getActivity(), BATTERY_HISTORY_FILE);
@@ -271,18 +277,18 @@
             final int numSippers = usageList.size();
             for (int i = 0; i < numSippers; i++) {
                 final BatterySipper sipper = usageList.get(i);
-                if ((sipper.value * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP) {
+                if ((sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP) {
                     continue;
                 }
                 final double percentOfTotal =
-                        ((sipper.value / mStatsHelper.getTotalPower()) * dischargeAmount);
+                        ((sipper.totalPowerMah / mStatsHelper.getTotalPower()) * dischargeAmount);
                 if (((int) (percentOfTotal + .5)) < 1) {
                     continue;
                 }
                 if (sipper.drainType == BatterySipper.DrainType.OVERCOUNTED) {
                     // Don't show over-counted unless it is at least 2/3 the size of
                     // the largest real entry, and its percent of total is more significant
-                    if (sipper.value < ((mStatsHelper.getMaxRealPower()*2)/3)) {
+                    if (sipper.totalPowerMah < ((mStatsHelper.getMaxRealPower()*2)/3)) {
                         continue;
                     }
                     if (percentOfTotal < 10) {
@@ -295,7 +301,7 @@
                 if (sipper.drainType == BatterySipper.DrainType.UNACCOUNTED) {
                     // Don't show over-counted unless it is at least 1/2 the size of
                     // the largest real entry, and its percent of total is more significant
-                    if (sipper.value < (mStatsHelper.getMaxRealPower()/2)) {
+                    if (sipper.totalPowerMah < (mStatsHelper.getMaxRealPower()/2)) {
                         continue;
                     }
                     if (percentOfTotal < 5) {
@@ -314,7 +320,7 @@
                 final PowerGaugePreference pref = new PowerGaugePreference(getActivity(),
                         badgedIcon, contentDescription, entry);
 
-                final double percentOfMax = (sipper.value * 100) / mStatsHelper.getMaxPower();
+                final double percentOfMax = (sipper.totalPowerMah * 100) / mStatsHelper.getMaxPower();
                 sipper.percent = percentOfTotal;
                 pref.setTitle(entry.getLabel());
                 pref.setOrder(i + 1);
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 20a273f..1b2f567 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -51,6 +51,7 @@
 import android.view.textservice.TextServicesManager;
 
 import com.android.internal.app.LocalePicker;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.Settings.KeyboardLayoutPickerActivity;
 import com.android.settings.SettingsActivity;
@@ -104,6 +105,11 @@
     private DevicePolicyManager mDpm;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_LANGUAGE;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index 146f512..c73ccef 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -31,6 +31,7 @@
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -53,6 +54,11 @@
     private Collator mCollator;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_SUBTYPE_ENABLER;
+    }
+
+    @Override
     public void onCreate(final Bundle icicle) {
         super.onCreate(icicle);
         mImm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
diff --git a/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
index ada476e..8f10bdf 100644
--- a/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
+++ b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
@@ -186,13 +186,16 @@
         if (imi.isAuxiliaryIme()) {
             return false;
         }
-        if (InputMethodUtils.isValidSystemDefaultIme(true /* isSystemReady */, imi, context)) {
+        final Locale systemLocale = context.getResources().getConfiguration().locale;
+        if (InputMethodUtils.isSystemImeThatHasSubtypeOf(imi, context,
+                    true /* checkDefaultAttribute */, systemLocale, false /* checkCountry */,
+                    InputMethodUtils.SUBTYPE_MODE_ANY)) {
             return true;
         }
         if (mAsciiCapableEnabledImis.isEmpty()) {
             Log.w(TAG, "ascii capable subtype enabled imi not found. Fall back to English"
                     + " Keyboard subtype.");
-            return InputMethodUtils.containsSubtypeOf(imi, Locale.ENGLISH.getLanguage(),
+            return InputMethodUtils.containsSubtypeOf(imi, Locale.ENGLISH, false /* checkCountry */,
                     InputMethodUtils.SUBTYPE_MODE_KEYBOARD);
         }
         return mAsciiCapableEnabledImis.contains(imi);
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
index 645695e..69586b9 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.inputmethod;
 
-import com.android.settings.R;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.SettingsPreferenceFragment;
 
 import android.content.Context;
@@ -50,6 +50,11 @@
     public static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier";
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_KEYBOARD;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
index 5a8ccea..729fdc6 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -30,6 +30,7 @@
 import android.view.textservice.TextServicesManager;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -54,6 +55,11 @@
     private TextServicesManager mTsm;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_SPELL_CHECKERS;
+    }
+
+    @Override
     public void onCreate(final Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
index 4f231cb..3eb5dc6 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.inputmethod;
 
-import android.app.Fragment;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -27,6 +26,8 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.inputmethod.UserDictionaryAddWordContents.LocaleRenderer;
@@ -40,7 +41,7 @@
  * As opposed to the UserDictionaryActivity, this is only invoked within Settings
  * from the UserDictionarySettings.
  */
-public class UserDictionaryAddWordFragment extends Fragment
+public class UserDictionaryAddWordFragment extends InstrumentedFragment
         implements AdapterView.OnItemSelectedListener,
         com.android.internal.app.LocalePicker.LocaleSelectionListener {
 
@@ -109,6 +110,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_USER_DICTIONARY_ADD_WORD;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         // We are being shown: display the word
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index 7439001..ab23614 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.inputmethod;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -43,6 +44,11 @@
     private String mLocale;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_USER_DICTIONARY;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getActivity()));
diff --git a/src/com/android/settings/inputmethod/UserDictionaryLocalePicker.java b/src/com/android/settings/inputmethod/UserDictionaryLocalePicker.java
index b9ccdfd..c3c4237 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryLocalePicker.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryLocalePicker.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.inputmethod;
 
-import java.util.Locale;
-
 public class UserDictionaryLocalePicker extends com.android.internal.app.LocalePicker {
     public UserDictionaryLocalePicker(final UserDictionaryAddWordFragment parent) {
         super();
diff --git a/src/com/android/settings/location/LocationMode.java b/src/com/android/settings/location/LocationMode.java
index 7e95cac..d203bc4 100644
--- a/src/com/android/settings/location/LocationMode.java
+++ b/src/com/android/settings/location/LocationMode.java
@@ -19,6 +19,7 @@
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 
 /**
@@ -42,6 +43,11 @@
     private RadioButtonPreference mSensorsOnly;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.LOCATION_MODE;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         createPreferenceHierarchy();
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index ba5cd92..d0dde32 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -21,7 +21,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.location.SettingInjectorService;
-import android.os.Binder;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -29,11 +28,13 @@
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
-import android.provider.Settings;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
@@ -69,6 +70,8 @@
     /** Key for preference category "Location services" */
     private static final String KEY_LOCATION_SERVICES = "location_services";
 
+    private static final int MENU_SCANNING = Menu.FIRST;
+
     private SwitchBar mSwitchBar;
     private Switch mSwitch;
     private boolean mValidListener = false;
@@ -82,6 +85,11 @@
     private UserManager mUm;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.LOCATION;
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
@@ -253,6 +261,28 @@
     }
 
     @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        menu.add(0, MENU_SCANNING, 0, R.string.location_menu_scanning);
+        // The super class adds "Help & Feedback" menu item.
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final SettingsActivity activity = (SettingsActivity) getActivity();
+        switch (item.getItemId()) {
+            case MENU_SCANNING:
+                activity.startPreferencePanel(
+                        ScanningSettings.class.getName(), null,
+                        R.string.location_scanning_screen_title, null, LocationSettings.this,
+                        0);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
     public int getHelpResource() {
         return R.string.help_url_location_access;
     }
diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java
index c134889..d7b62e7 100644
--- a/src/com/android/settings/location/RecentLocationApps.java
+++ b/src/com/android/settings/location/RecentLocationApps.java
@@ -31,9 +31,6 @@
 import android.os.UserManager;
 import android.preference.Preference;
 import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
-
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.applications.InstalledAppDetails;
diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java
new file mode 100644
index 0000000..5eb424d
--- /dev/null
+++ b/src/com/android/settings/location/ScanningSettings.java
@@ -0,0 +1,84 @@
+/*
+ * 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.location;
+
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.provider.Settings.Global;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+/**
+ * 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";
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.LOCATION_SCANNING;
+    }
+
+    @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);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen screen, 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(screen, preference);
+        }
+        return true;
+    }
+}
diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java
index f0a0ff3..ef6117b 100644
--- a/src/com/android/settings/location/SettingsInjector.java
+++ b/src/com/android/settings/location/SettingsInjector.java
@@ -39,8 +39,6 @@
 import android.util.Log;
 import android.util.Xml;
 
-import com.android.settings.R;
-
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java
index d567c7e..ec1dd38 100644
--- a/src/com/android/settings/net/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/net/DataUsageMeteredSettings.java
@@ -34,6 +34,7 @@
 import android.preference.SwitchPreference;
 import android.telephony.TelephonyManager;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -60,6 +61,11 @@
     private Preference mWifiDisabled;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NET_DATA_USAGE_METERED;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         final Context context = getActivity();
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index 20201f4..a907ea1 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -17,21 +17,25 @@
 package com.android.settings.nfc;
 
 import android.app.ActionBar;
-import android.app.Fragment;
 import android.content.Context;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.os.UserManager;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.HelpUtils;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.widget.SwitchBar;
 
-public class AndroidBeam extends Fragment
+public class AndroidBeam extends InstrumentedFragment
         implements SwitchBar.OnSwitchChangeListener {
     private View mView;
     private NfcAdapter mNfcAdapter;
@@ -51,6 +55,13 @@
         mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
         mBeamDisallowed = ((UserManager) getActivity().getSystemService(Context.USER_SERVICE))
                 .hasUserRestriction(UserManager.DISALLOW_OUTGOING_BEAM);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_uri_beam);
     }
 
     @Override
@@ -98,4 +109,9 @@
         }
         mSwitchBar.setEnabled(true);
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NFC_BEAM;
+    }
 }
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index 02254dd..4f04d73 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -42,6 +42,7 @@
 import android.widget.TextView;
 
 import com.android.internal.content.PackageMonitor;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.HelpUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -58,6 +59,11 @@
 
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NFC_PAYMENT;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 0eeefa9..129c359 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -16,11 +16,15 @@
 
 package com.android.settings.notification;
 
+import android.app.Notification;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
+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.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
@@ -29,19 +33,17 @@
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
-import com.android.settings.notification.NotificationAppList.AppRow;
-import com.android.settings.notification.NotificationAppList.Backend;
+import com.android.settings.notification.NotificationBackend.AppRow;
+
+import java.util.List;
 
 /** These settings are per app, so should not be returned in global search results. */
 public class AppNotificationSettings extends SettingsPreferenceFragment {
@@ -50,19 +52,26 @@
 
     private static final String KEY_BLOCK = "block";
     private static final String KEY_PRIORITY = "priority";
+    private static final String KEY_PEEKABLE = "peekable";
     private static final String KEY_SENSITIVE = "sensitive";
 
     static final String EXTRA_HAS_SETTINGS_INTENT = "has_settings_intent";
     static final String EXTRA_SETTINGS_INTENT = "settings_intent";
 
-    private final Backend mBackend = new Backend();
+    private static final Intent APP_NOTIFICATION_PREFS_CATEGORY_INTENT
+            = new Intent(Intent.ACTION_MAIN)
+                .addCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES);
+
+    private final NotificationBackend mBackend = new NotificationBackend();
 
     private Context mContext;
     private SwitchPreference mBlock;
     private SwitchPreference mPriority;
+    private SwitchPreference mPeekable;
     private SwitchPreference mSensitive;
     private AppRow mAppRow;
     private boolean mCreated;
+    private boolean mIsSystemPackage;
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -74,30 +83,13 @@
         }
         mCreated = true;
         if (mAppRow == null) return;
-        final View content = getActivity().findViewById(R.id.main_content);
-        final ViewGroup contentParent = (ViewGroup) content.getParent();
-        final View bar = getActivity().getLayoutInflater().inflate(R.layout.app_notification_header,
-                contentParent, false);
+        AppHeader.createAppHeader(getActivity(), mAppRow.icon, mAppRow.label,
+                mAppRow.settingsIntent);
+    }
 
-        final ImageView appIcon = (ImageView) bar.findViewById(R.id.app_icon);
-        appIcon.setImageDrawable(mAppRow.icon);
-
-        final TextView appName = (TextView) bar.findViewById(R.id.app_name);
-        appName.setText(mAppRow.label);
-
-        final View appSettings = bar.findViewById(R.id.app_settings);
-        if (mAppRow.settingsIntent == null) {
-            appSettings.setVisibility(View.GONE);
-        } else {
-            appSettings.setClickable(true);
-            appSettings.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mContext.startActivity(mAppRow.settingsIntent);
-                }
-            });
-        }
-        contentParent.addView(bar, 0);
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_APP_NOTIFICATION;
     }
 
     @Override
@@ -130,20 +122,16 @@
             toastAndFinish();
             return;
         }
+        mIsSystemPackage = Utils.isSystemPackage(pm, info);
 
         addPreferencesFromResource(R.xml.app_notification_settings);
         mBlock = (SwitchPreference) findPreference(KEY_BLOCK);
         mPriority = (SwitchPreference) findPreference(KEY_PRIORITY);
+        mPeekable = (SwitchPreference) findPreference(KEY_PEEKABLE);
         mSensitive = (SwitchPreference) findPreference(KEY_SENSITIVE);
 
-        final boolean secure = new LockPatternUtils(getActivity()).isSecure();
-        final boolean enabled = getLockscreenNotificationsEnabled();
-        final boolean allowPrivate = getLockscreenAllowPrivateNotifications();
-        if (!secure || !enabled || !allowPrivate) {
-            getPreferenceScreen().removePreference(mSensitive);
-        }
+        mAppRow = mBackend.loadAppRow(pm, info.applicationInfo);
 
-        mAppRow = NotificationAppList.loadAppRow(pm, info.applicationInfo, mBackend);
         if (intent.hasExtra(EXTRA_HAS_SETTINGS_INTENT)) {
             // use settings intent from extra
             if (intent.getBooleanExtra(EXTRA_HAS_SETTINGS_INTENT, false)) {
@@ -153,20 +141,27 @@
             // load settings intent
             ArrayMap<String, AppRow> rows = new ArrayMap<String, AppRow>();
             rows.put(mAppRow.pkg, mAppRow);
-            NotificationAppList.collectConfigActivities(getPackageManager(), rows);
+            collectConfigActivities(getPackageManager(), rows);
         }
 
         mBlock.setChecked(mAppRow.banned);
+        updateDependents(mAppRow.banned);
         mPriority.setChecked(mAppRow.priority);
-        if (mSensitive != null) {
-            mSensitive.setChecked(mAppRow.sensitive);
-        }
+        mPeekable.setChecked(mAppRow.peekable);
+        mSensitive.setChecked(mAppRow.sensitive);
 
         mBlock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final boolean block = (Boolean) newValue;
-                return mBackend.setNotificationsBanned(pkg, uid, block);
+                final boolean banned = (Boolean) newValue;
+                if (banned) {
+                    MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BAN_APP_NOTES, pkg);
+                }
+                final boolean success =  mBackend.setNotificationsBanned(pkg, uid, banned);
+                if (success) {
+                    updateDependents(banned);
+                }
+                return success;
             }
         });
 
@@ -178,20 +173,42 @@
             }
         });
 
-        if (mSensitive != null) {
-            mSensitive.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    final boolean sensitive = (Boolean) newValue;
-                    return mBackend.setSensitive(pkg, uid, sensitive);
-                }
-            });
-        }
+        mPeekable.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                final boolean peekable = (Boolean) newValue;
+                return mBackend.setPeekable(pkg, uid, peekable);
+            }
+        });
 
-        // Users cannot block notifications from system/signature packages
-        if (Utils.isSystemPackage(pm, info)) {
-            getPreferenceScreen().removePreference(mBlock);
-            mPriority.setDependency(null); // don't have it depend on a preference that's gone
+        mSensitive.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                final boolean sensitive = (Boolean) newValue;
+                return mBackend.setSensitive(pkg, uid, sensitive);
+            }
+        });
+    }
+
+    private void updateDependents(boolean banned) {
+        final boolean lockscreenSecure = new LockPatternUtils(getActivity()).isSecure();
+        final boolean lockscreenNotificationsEnabled = getLockscreenNotificationsEnabled();
+        final boolean allowPrivate = getLockscreenAllowPrivateNotifications();
+
+        setVisible(mBlock, !mIsSystemPackage);
+        setVisible(mPriority, mIsSystemPackage || !banned);
+        setVisible(mPeekable, mIsSystemPackage || !banned);
+        setVisible(mSensitive, mIsSystemPackage || !banned && lockscreenSecure
+                && lockscreenNotificationsEnabled && allowPrivate);
+    }
+
+    private void setVisible(Preference p, boolean visible) {
+        final boolean isVisible = getPreferenceScreen().findPreference(p.getKey()) != null;
+        if (isVisible == visible) return;
+        if (visible) {
+            getPreferenceScreen().addPreference(p);
+        } else {
+            getPreferenceScreen().removePreference(p);
         }
     }
 
@@ -227,4 +244,44 @@
         }
         return null;
     }
+
+    public static List<ResolveInfo> queryNotificationConfigActivities(PackageManager pm) {
+        if (DEBUG) Log.d(TAG, "APP_NOTIFICATION_PREFS_CATEGORY_INTENT is "
+                + APP_NOTIFICATION_PREFS_CATEGORY_INTENT);
+        final List<ResolveInfo> resolveInfos = pm.queryIntentActivities(
+                APP_NOTIFICATION_PREFS_CATEGORY_INTENT,
+                0 //PackageManager.MATCH_DEFAULT_ONLY
+        );
+        return resolveInfos;
+    }
+
+    public static void collectConfigActivities(PackageManager pm, ArrayMap<String, AppRow> rows) {
+        final List<ResolveInfo> resolveInfos = queryNotificationConfigActivities(pm);
+        applyConfigActivities(pm, rows, resolveInfos);
+    }
+
+    public static void applyConfigActivities(PackageManager pm, ArrayMap<String, AppRow> rows,
+            List<ResolveInfo> resolveInfos) {
+        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 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);
+                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)
+                    .setClassName(activityInfo.packageName, activityInfo.name);
+        }
+    }
 }
diff --git a/src/com/android/settings/notification/ConditionProviderSettings.java b/src/com/android/settings/notification/ConditionProviderSettings.java
deleted file mode 100644
index 259e53c..0000000
--- a/src/com/android/settings/notification/ConditionProviderSettings.java
+++ /dev/null
@@ -1,55 +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.notification;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.provider.Settings;
-import android.service.notification.ConditionProviderService;
-
-import com.android.settings.R;
-
-public class ConditionProviderSettings extends ManagedServiceSettings {
-    private static final String TAG = ConditionProviderSettings.class.getSimpleName();
-    private static final Config CONFIG = getConditionProviderConfig();
-
-    private static Config getConditionProviderConfig() {
-        final Config c = new Config();
-        c.tag = TAG;
-        c.setting = Settings.Secure.ENABLED_CONDITION_PROVIDERS;
-        c.intentAction = ConditionProviderService.SERVICE_INTERFACE;
-        c.permission = android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE;
-        c.noun = "condition provider";
-        c.warningDialogTitle = R.string.condition_provider_security_warning_title;
-        c.warningDialogSummary = R.string.condition_provider_security_warning_summary;
-        c.emptyText = R.string.no_condition_providers;
-        return c;
-    }
-
-    @Override
-    protected Config getConfig() {
-        return CONFIG;
-    }
-
-    public static int getProviderCount(PackageManager pm) {
-        return getServicesCount(CONFIG, pm);
-    }
-
-    public static int getEnabledProviderCount(Context context) {
-        return getEnabledServicesCount(CONFIG, context);
-    }
-}
diff --git a/src/com/android/settings/notification/ManagedServiceSettings.java b/src/com/android/settings/notification/ManagedServiceSettings.java
index 7be644e..cc9e734 100644
--- a/src/com/android/settings/notification/ManagedServiceSettings.java
+++ b/src/com/android/settings/notification/ManagedServiceSettings.java
@@ -16,28 +16,17 @@
 
 package com.android.settings.notification;
 
-import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.app.ListFragment;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
-import android.database.ContentObserver;
-import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.provider.Settings;
-import android.util.Slog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -49,17 +38,15 @@
 
 import com.android.settings.R;
 
-import java.util.HashSet;
 import java.util.List;
 
 public abstract class ManagedServiceSettings extends ListFragment {
     private static final boolean SHOW_PACKAGE_NAME = false;
 
     private final Config mConfig;
-    private PackageManager mPM;
-    private ContentResolver mCR;
 
-    private final HashSet<ComponentName> mEnabledServices = new HashSet<ComponentName>();
+    private PackageManager mPM;
+    private ServiceListing mServiceListing;
     private ServiceListAdapter mListAdapter;
 
     abstract protected Config getConfig();
@@ -68,19 +55,65 @@
         mConfig = getConfig();
     }
 
-    private final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            updateList();
-        }
-    };
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
 
-    private final BroadcastReceiver mPackageReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            updateList();
+        mPM = getActivity().getPackageManager();
+        mServiceListing = new ServiceListing(getActivity(), mConfig);
+        mServiceListing.addCallback(new ServiceListing.Callback() {
+            @Override
+            public void onServicesReloaded(List<ServiceInfo> services) {
+                updateList(services);
+            }
+        });
+        mListAdapter = new ServiceListAdapter(getActivity());
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        View v =  inflater.inflate(R.layout.managed_service_settings, container, false);
+        TextView empty = (TextView) v.findViewById(android.R.id.empty);
+        empty.setText(mConfig.emptyText);
+        return v;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mServiceListing.reload();
+        mServiceListing.setListening(true);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mServiceListing.setListening(false);
+    }
+
+    private void updateList(List<ServiceInfo> services) {
+        mListAdapter.clear();
+        mListAdapter.addAll(services);
+        mListAdapter.sort(new PackageItemInfo.DisplayNameComparator(mPM));
+
+        getListView().setAdapter(mListAdapter);
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        ServiceInfo info = mListAdapter.getItem(position);
+        final ComponentName cn = new ComponentName(info.packageName, info.name);
+        if (mServiceListing.isEnabled(cn)) {
+            // the simple version: disabling
+            mServiceListing.setEnabled(cn, false);
+        } else {
+            // show a scary dialog
+            new ScaryWarningDialogFragment()
+                .setServiceInfo(cn, info.loadLabel(mPM).toString())
+                .show(getFragmentManager(), "dialog");
         }
-    };
+    }
 
     public class ScaryWarningDialogFragment extends DialogFragment {
         static final String KEY_COMPONENT = "c";
@@ -99,7 +132,8 @@
             super.onCreate(savedInstanceState);
             final Bundle args = getArguments();
             final String label = args.getString(KEY_LABEL);
-            final ComponentName cn = ComponentName.unflattenFromString(args.getString(KEY_COMPONENT));
+            final ComponentName cn = ComponentName.unflattenFromString(args
+                    .getString(KEY_COMPONENT));
 
             final String title = getResources().getString(mConfig.warningDialogTitle, label);
             final String summary = getResources().getString(mConfig.warningDialogSummary, label);
@@ -110,8 +144,7 @@
                     .setPositiveButton(android.R.string.ok,
                             new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int id) {
-                                    mEnabledServices.add(cn);
-                                    saveEnabledServices();
+                                    mServiceListing.setEnabled(cn, true);
                                 }
                             })
                     .setNegativeButton(android.R.string.cancel,
@@ -124,151 +157,6 @@
         }
     }
 
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mPM = getActivity().getPackageManager();
-        mCR = getActivity().getContentResolver();
-        mListAdapter = new ServiceListAdapter(getActivity());
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        View v =  inflater.inflate(R.layout.managed_service_settings, container, false);
-        TextView empty = (TextView) v.findViewById(android.R.id.empty);
-        empty.setText(mConfig.emptyText);
-        return v;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updateList();
-
-        // listen for package changes
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
-        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
-        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
-        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-        filter.addDataScheme("package");
-        getActivity().registerReceiver(mPackageReceiver, filter);
-
-        mCR.registerContentObserver(Settings.Secure.getUriFor(mConfig.setting),
-                false, mSettingsObserver);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-
-        getActivity().unregisterReceiver(mPackageReceiver);
-        mCR.unregisterContentObserver(mSettingsObserver);
-    }
-
-    private void loadEnabledServices() {
-        mEnabledServices.clear();
-        final String flat = Settings.Secure.getString(mCR, mConfig.setting);
-        if (flat != null && !"".equals(flat)) {
-            final String[] names = flat.split(":");
-            for (int i = 0; i < names.length; i++) {
-                final ComponentName cn = ComponentName.unflattenFromString(names[i]);
-                if (cn != null) {
-                    mEnabledServices.add(cn);
-                }
-            }
-        }
-    }
-
-    private void saveEnabledServices() {
-        StringBuilder sb = null;
-        for (ComponentName cn : mEnabledServices) {
-            if (sb == null) {
-                sb = new StringBuilder();
-            } else {
-                sb.append(':');
-            }
-            sb.append(cn.flattenToString());
-        }
-        Settings.Secure.putString(mCR,
-                mConfig.setting,
-                sb != null ? sb.toString() : "");
-    }
-
-    private void updateList() {
-        loadEnabledServices();
-
-        getServices(mConfig, mListAdapter, mPM);
-        mListAdapter.sort(new PackageItemInfo.DisplayNameComparator(mPM));
-
-        getListView().setAdapter(mListAdapter);
-    }
-
-    protected static int getEnabledServicesCount(Config config, Context context) {
-        final String flat = Settings.Secure.getString(context.getContentResolver(), config.setting);
-        if (flat == null || "".equals(flat)) return 0;
-        final String[] components = flat.split(":");
-        return components.length;
-    }
-
-    protected static int getServicesCount(Config c, PackageManager pm) {
-        return getServices(c, null, pm);
-    }
-
-    private static int getServices(Config c, ArrayAdapter<ServiceInfo> adapter, PackageManager pm) {
-        int services = 0;
-        if (adapter != null) {
-            adapter.clear();
-        }
-        final int user = ActivityManager.getCurrentUser();
-
-        List<ResolveInfo> installedServices = pm.queryIntentServicesAsUser(
-                new Intent(c.intentAction),
-                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
-                user);
-
-        for (int i = 0, count = installedServices.size(); i < count; i++) {
-            ResolveInfo resolveInfo = installedServices.get(i);
-            ServiceInfo info = resolveInfo.serviceInfo;
-
-            if (!c.permission.equals(info.permission)) {
-                Slog.w(c.tag, "Skipping " + c.noun + " service "
-                        + info.packageName + "/" + info.name
-                        + ": it does not require the permission "
-                        + c.permission);
-                continue;
-            }
-            if (adapter != null) {
-                adapter.add(info);
-            }
-            services++;
-        }
-        return services;
-    }
-
-    private boolean isServiceEnabled(ServiceInfo info) {
-        final ComponentName cn = new ComponentName(info.packageName, info.name);
-        return mEnabledServices.contains(cn);
-    }
-
-    @Override
-    public void onListItemClick(ListView l, View v, int position, long id) {
-        ServiceInfo info = mListAdapter.getItem(position);
-        final ComponentName cn = new ComponentName(info.packageName, info.name);
-        if (mEnabledServices.contains(cn)) {
-            // the simple version: disabling
-            mEnabledServices.remove(cn);
-            saveEnabledServices();
-        } else {
-            // show a scary dialog
-            new ScaryWarningDialogFragment()
-                .setServiceInfo(cn, info.loadLabel(mPM).toString())
-                .show(getFragmentManager(), "dialog");
-        }
-    }
-
     private static class ViewHolder {
         ImageView icon;
         TextView name;
@@ -327,7 +215,8 @@
             } else {
                 vh.description.setVisibility(View.GONE);
             }
-            vh.checkbox.setChecked(isServiceEnabled(info));
+            final ComponentName cn = new ComponentName(info.packageName, info.name);
+            vh.checkbox.setChecked(mServiceListing.isEnabled(cn));
         }
     }
 
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index ced71a4..5104d4a 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -46,10 +46,10 @@
     }
 
     public static int getListenersCount(PackageManager pm) {
-        return getServicesCount(CONFIG, pm);
+        return ServiceListing.getServicesCount(CONFIG, pm);
     }
 
     public static int getEnabledListenersCount(Context context) {
-        return getEnabledServicesCount(CONFIG, context);
+        return ServiceListing.getEnabledServicesCount(CONFIG, context);
     }
 }
diff --git a/src/com/android/settings/notification/NotificationAppList.java b/src/com/android/settings/notification/NotificationAppList.java
deleted file mode 100644
index cd1474f..0000000
--- a/src/com/android/settings/notification/NotificationAppList.java
+++ /dev/null
@@ -1,598 +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.notification;
-
-import static com.android.settings.notification.AppNotificationSettings.EXTRA_HAS_SETTINGS_INTENT;
-import static com.android.settings.notification.AppNotificationSettings.EXTRA_SETTINGS_INTENT;
-
-import android.animation.LayoutTransition;
-import android.app.INotificationManager;
-import android.app.Notification;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.LauncherActivityInfo;
-import android.content.pm.LauncherApps;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.Signature;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Parcelable;
-import android.os.ServiceManager;
-import android.os.SystemClock;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.service.notification.NotificationListenerService;
-import android.util.ArrayMap;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.SectionIndexer;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.android.settings.PinnedHeaderListFragment;
-import com.android.settings.R;
-import com.android.settings.Settings.NotificationAppListActivity;
-import com.android.settings.UserSpinnerAdapter;
-import com.android.settings.Utils;
-
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/** Just a sectioned list of installed applications, nothing else to index **/
-public class NotificationAppList extends PinnedHeaderListFragment
-        implements OnItemSelectedListener {
-    private static final String TAG = "NotificationAppList";
-    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
-
-    private static final String EMPTY_SUBTITLE = "";
-    private static final String SECTION_BEFORE_A = "*";
-    private static final String SECTION_AFTER_Z = "**";
-    private static final Intent APP_NOTIFICATION_PREFS_CATEGORY_INTENT
-            = new Intent(Intent.ACTION_MAIN)
-                .addCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES);
-
-    private final Handler mHandler = new Handler();
-    private final ArrayMap<String, AppRow> mRows = new ArrayMap<String, AppRow>();
-    private final ArrayList<AppRow> mSortedRows = new ArrayList<AppRow>();
-    private final ArrayList<String> mSections = new ArrayList<String>();
-
-    private Context mContext;
-    private LayoutInflater mInflater;
-    private NotificationAppAdapter mAdapter;
-    private Signature[] mSystemSignature;
-    private Parcelable mListViewState;
-    private Backend mBackend = new Backend();
-    private UserSpinnerAdapter mProfileSpinnerAdapter;
-    private Spinner mSpinner;
-
-    private PackageManager mPM;
-    private UserManager mUM;
-    private LauncherApps mLauncherApps;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mContext = getActivity();
-        mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        mAdapter = new NotificationAppAdapter(mContext);
-        mUM = UserManager.get(mContext);
-        mPM = mContext.getPackageManager();
-        mLauncherApps = (LauncherApps) mContext.getSystemService(Context.LAUNCHER_APPS_SERVICE);
-        getActivity().setTitle(R.string.app_notifications_title);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.notification_app_list, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        mProfileSpinnerAdapter = Utils.createUserSpinnerAdapter(mUM, mContext);
-        if (mProfileSpinnerAdapter != null) {
-            mSpinner = (Spinner) getActivity().getLayoutInflater().inflate(
-                    R.layout.spinner_view, null);
-            mSpinner.setAdapter(mProfileSpinnerAdapter);
-            mSpinner.setOnItemSelectedListener(this);
-            setPinnedHeaderView(mSpinner);
-        }
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        repositionScrollbar();
-        getListView().setAdapter(mAdapter);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (DEBUG) Log.d(TAG, "Saving listView state");
-        mListViewState = getListView().onSaveInstanceState();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mListViewState = null;  // you're dead to me
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        loadAppsList();
-    }
-
-    @Override
-    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        UserHandle selectedUser = mProfileSpinnerAdapter.getUserHandle(position);
-        if (selectedUser.getIdentifier() != UserHandle.myUserId()) {
-            Intent intent = new Intent(getActivity(), NotificationAppListActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-            mContext.startActivityAsUser(intent, selectedUser);
-            // Go back to default selection, which is the first one; this makes sure that pressing
-            // the back button takes you into a consistent state
-            mSpinner.setSelection(0);
-        }
-    }
-
-    @Override
-    public void onNothingSelected(AdapterView<?> parent) {
-    }
-
-    public void setBackend(Backend backend) {
-        mBackend = backend;
-    }
-
-    private void loadAppsList() {
-        AsyncTask.execute(mCollectAppsRunnable);
-    }
-
-    private String getSection(CharSequence label) {
-        if (label == null || label.length() == 0) return SECTION_BEFORE_A;
-        final char c = Character.toUpperCase(label.charAt(0));
-        if (c < 'A') return SECTION_BEFORE_A;
-        if (c > 'Z') return SECTION_AFTER_Z;
-        return Character.toString(c);
-    }
-
-    private void repositionScrollbar() {
-        final int sbWidthPx = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-                getListView().getScrollBarSize(),
-                getResources().getDisplayMetrics());
-        final View parent = (View)getView().getParent();
-        final int eat = Math.min(sbWidthPx, parent.getPaddingEnd());
-        if (eat <= 0) return;
-        if (DEBUG) Log.d(TAG, String.format("Eating %dpx into %dpx padding for %dpx scroll, ld=%d",
-                eat, parent.getPaddingEnd(), sbWidthPx, getListView().getLayoutDirection()));
-        parent.setPaddingRelative(parent.getPaddingStart(), parent.getPaddingTop(),
-                parent.getPaddingEnd() - eat, parent.getPaddingBottom());
-    }
-
-    private static class ViewHolder {
-        ViewGroup row;
-        ImageView icon;
-        TextView title;
-        TextView subtitle;
-        View rowDivider;
-    }
-
-    private class NotificationAppAdapter extends ArrayAdapter<Row> implements SectionIndexer {
-        public NotificationAppAdapter(Context context) {
-            super(context, 0, 0);
-        }
-
-        @Override
-        public boolean hasStableIds() {
-            return true;
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return 2;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            Row r = getItem(position);
-            return r instanceof AppRow ? 1 : 0;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            Row r = getItem(position);
-            View v;
-            if (convertView == null) {
-                v = newView(parent, r);
-            } else {
-                v = convertView;
-            }
-            bindView(v, r, false /*animate*/);
-            return v;
-        }
-
-        public View newView(ViewGroup parent, Row r) {
-            if (!(r instanceof AppRow)) {
-                return mInflater.inflate(R.layout.notification_app_section, parent, false);
-            }
-            final View v = mInflater.inflate(R.layout.notification_app, parent, false);
-            final ViewHolder vh = new ViewHolder();
-            vh.row = (ViewGroup) v;
-            vh.row.setLayoutTransition(new LayoutTransition());
-            vh.row.setLayoutTransition(new LayoutTransition());
-            vh.icon = (ImageView) v.findViewById(android.R.id.icon);
-            vh.title = (TextView) v.findViewById(android.R.id.title);
-            vh.subtitle = (TextView) v.findViewById(android.R.id.text1);
-            vh.rowDivider = v.findViewById(R.id.row_divider);
-            v.setTag(vh);
-            return v;
-        }
-
-        private void enableLayoutTransitions(ViewGroup vg, boolean enabled) {
-            if (enabled) {
-                vg.getLayoutTransition().enableTransitionType(LayoutTransition.APPEARING);
-                vg.getLayoutTransition().enableTransitionType(LayoutTransition.DISAPPEARING);
-            } else {
-                vg.getLayoutTransition().disableTransitionType(LayoutTransition.APPEARING);
-                vg.getLayoutTransition().disableTransitionType(LayoutTransition.DISAPPEARING);
-            }
-        }
-
-        public void bindView(final View view, Row r, boolean animate) {
-            if (!(r instanceof AppRow)) {
-                // it's a section row
-                final TextView tv = (TextView)view.findViewById(android.R.id.title);
-                tv.setText(r.section);
-                return;
-            }
-
-            final AppRow row = (AppRow)r;
-            final ViewHolder vh = (ViewHolder) view.getTag();
-            enableLayoutTransitions(vh.row, animate);
-            vh.rowDivider.setVisibility(row.first ? View.GONE : View.VISIBLE);
-            vh.row.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mContext.startActivity(new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                            .putExtra(Settings.EXTRA_APP_PACKAGE, row.pkg)
-                            .putExtra(Settings.EXTRA_APP_UID, row.uid)
-                            .putExtra(EXTRA_HAS_SETTINGS_INTENT, row.settingsIntent != null)
-                            .putExtra(EXTRA_SETTINGS_INTENT, row.settingsIntent));
-                }
-            });
-            enableLayoutTransitions(vh.row, animate);
-            vh.icon.setImageDrawable(row.icon);
-            vh.title.setText(row.label);
-            final String sub = getSubtitle(row);
-            vh.subtitle.setText(sub);
-            vh.subtitle.setVisibility(!sub.isEmpty() ? View.VISIBLE : View.GONE);
-        }
-
-        private String getSubtitle(AppRow row) {
-            if (row.banned) {
-                return mContext.getString(R.string.app_notification_row_banned);
-            }
-            if (!row.priority && !row.sensitive) {
-                return EMPTY_SUBTITLE;
-            }
-            final String priString = mContext.getString(R.string.app_notification_row_priority);
-            final String senString = mContext.getString(R.string.app_notification_row_sensitive);
-            if (row.priority != row.sensitive) {
-                return row.priority ? priString : senString;
-            }
-            return priString + mContext.getString(R.string.summary_divider_text) + senString;
-        }
-
-        @Override
-        public Object[] getSections() {
-            return mSections.toArray(new Object[mSections.size()]);
-        }
-
-        @Override
-        public int getPositionForSection(int sectionIndex) {
-            final String section = mSections.get(sectionIndex);
-            final int n = getCount();
-            for (int i = 0; i < n; i++) {
-                final Row r = getItem(i);
-                if (r.section.equals(section)) {
-                    return i;
-                }
-            }
-            return 0;
-        }
-
-        @Override
-        public int getSectionForPosition(int position) {
-            Row row = getItem(position);
-            return mSections.indexOf(row.section);
-        }
-    }
-
-    private static class Row {
-        public String section;
-    }
-
-    public static class AppRow extends Row {
-        public String pkg;
-        public int uid;
-        public Drawable icon;
-        public CharSequence label;
-        public Intent settingsIntent;
-        public boolean banned;
-        public boolean priority;
-        public boolean sensitive;
-        public boolean first;  // first app in section
-    }
-
-    private static final Comparator<AppRow> mRowComparator = new Comparator<AppRow>() {
-        private final Collator sCollator = Collator.getInstance();
-        @Override
-        public int compare(AppRow lhs, AppRow rhs) {
-            return sCollator.compare(lhs.label, rhs.label);
-        }
-    };
-
-
-    public static AppRow loadAppRow(PackageManager pm, ApplicationInfo app,
-            Backend backend) {
-        final AppRow row = new AppRow();
-        row.pkg = app.packageName;
-        row.uid = app.uid;
-        try {
-            row.label = app.loadLabel(pm);
-        } catch (Throwable t) {
-            Log.e(TAG, "Error loading application label for " + row.pkg, t);
-            row.label = row.pkg;
-        }
-        row.icon = app.loadIcon(pm);
-        row.banned = backend.getNotificationsBanned(row.pkg, row.uid);
-        row.priority = backend.getHighPriority(row.pkg, row.uid);
-        row.sensitive = backend.getSensitive(row.pkg, row.uid);
-        return row;
-    }
-
-    public static List<ResolveInfo> queryNotificationConfigActivities(PackageManager pm) {
-        if (DEBUG) Log.d(TAG, "APP_NOTIFICATION_PREFS_CATEGORY_INTENT is "
-                + APP_NOTIFICATION_PREFS_CATEGORY_INTENT);
-        final List<ResolveInfo> resolveInfos = pm.queryIntentActivities(
-                APP_NOTIFICATION_PREFS_CATEGORY_INTENT,
-                0 //PackageManager.MATCH_DEFAULT_ONLY
-        );
-        return resolveInfos;
-    }
-    public static void collectConfigActivities(PackageManager pm, ArrayMap<String, AppRow> rows) {
-        final List<ResolveInfo> resolveInfos = queryNotificationConfigActivities(pm);
-        applyConfigActivities(pm, rows, resolveInfos);
-    }
-
-    public static void applyConfigActivities(PackageManager pm, ArrayMap<String, AppRow> rows,
-            List<ResolveInfo> resolveInfos) {
-        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 AppRow row = rows.get(appInfo.packageName);
-            if (row == null) {
-                Log.v(TAG, "Ignoring notification preference activity ("
-                        + activityInfo.name + ") for unknown package "
-                        + activityInfo.packageName);
-                continue;
-            }
-            if (row.settingsIntent != null) {
-                Log.v(TAG, "Ignoring duplicate notification preference activity ("
-                        + activityInfo.name + ") for package "
-                        + activityInfo.packageName);
-                continue;
-            }
-            row.settingsIntent = new Intent(APP_NOTIFICATION_PREFS_CATEGORY_INTENT)
-                    .setClassName(activityInfo.packageName, activityInfo.name);
-        }
-    }
-
-    private final Runnable mCollectAppsRunnable = new Runnable() {
-        @Override
-        public void run() {
-            synchronized (mRows) {
-                final long start = SystemClock.uptimeMillis();
-                if (DEBUG) Log.d(TAG, "Collecting apps...");
-                mRows.clear();
-                mSortedRows.clear();
-
-                // collect all launchable apps, plus any packages that have notification settings
-                final List<ApplicationInfo> appInfos = new ArrayList<ApplicationInfo>();
-
-                final List<LauncherActivityInfo> lais
-                        = mLauncherApps.getActivityList(null /* all */,
-                            UserHandle.getCallingUserHandle());
-                if (DEBUG) Log.d(TAG, "  launchable activities:");
-                for (LauncherActivityInfo lai : lais) {
-                    if (DEBUG) Log.d(TAG, "    " + lai.getComponentName().toString());
-                    appInfos.add(lai.getApplicationInfo());
-                }
-
-                final List<ResolveInfo> resolvedConfigActivities
-                        = queryNotificationConfigActivities(mPM);
-                if (DEBUG) Log.d(TAG, "  config activities:");
-                for (ResolveInfo ri : resolvedConfigActivities) {
-                    if (DEBUG) Log.d(TAG, "    "
-                            + ri.activityInfo.packageName + "/" + ri.activityInfo.name);
-                    appInfos.add(ri.activityInfo.applicationInfo);
-                }
-
-                for (ApplicationInfo info : appInfos) {
-                    final String key = info.packageName;
-                    if (mRows.containsKey(key)) {
-                        // we already have this app, thanks
-                        continue;
-                    }
-
-                    final AppRow row = loadAppRow(mPM, info, mBackend);
-                    mRows.put(key, row);
-                }
-
-                // add config activities to the list
-                applyConfigActivities(mPM, mRows, resolvedConfigActivities);
-
-                // sort rows
-                mSortedRows.addAll(mRows.values());
-                Collections.sort(mSortedRows, mRowComparator);
-                // compute sections
-                mSections.clear();
-                String section = null;
-                for (AppRow r : mSortedRows) {
-                    r.section = getSection(r.label);
-                    if (!r.section.equals(section)) {
-                        section = r.section;
-                        mSections.add(section);
-                    }
-                }
-                mHandler.post(mRefreshAppsListRunnable);
-                final long elapsed = SystemClock.uptimeMillis() - start;
-                if (DEBUG) Log.d(TAG, "Collected " + mRows.size() + " apps in " + elapsed + "ms");
-            }
-        }
-    };
-
-    private void refreshDisplayedItems() {
-        if (DEBUG) Log.d(TAG, "Refreshing apps...");
-        mAdapter.clear();
-        synchronized (mSortedRows) {
-            String section = null;
-            final int N = mSortedRows.size();
-            boolean first = true;
-            for (int i = 0; i < N; i++) {
-                final AppRow row = mSortedRows.get(i);
-                if (!row.section.equals(section)) {
-                    section = row.section;
-                    Row r = new Row();
-                    r.section = section;
-                    mAdapter.add(r);
-                    first = true;
-                }
-                row.first = first;
-                mAdapter.add(row);
-                first = false;
-            }
-        }
-        if (mListViewState != null) {
-            if (DEBUG) Log.d(TAG, "Restoring listView state");
-            getListView().onRestoreInstanceState(mListViewState);
-            mListViewState = null;
-        }
-        if (DEBUG) Log.d(TAG, "Refreshed " + mSortedRows.size() + " displayed items");
-    }
-
-    private final Runnable mRefreshAppsListRunnable = new Runnable() {
-        @Override
-        public void run() {
-            refreshDisplayedItems();
-        }
-    };
-
-    public static class Backend {
-        static INotificationManager sINM = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-
-        public boolean setNotificationsBanned(String pkg, int uid, boolean banned) {
-            try {
-                sINM.setNotificationsEnabledForPackage(pkg, uid, !banned);
-                return true;
-            } catch (Exception e) {
-               Log.w(TAG, "Error calling NoMan", e);
-               return false;
-            }
-        }
-
-        public boolean getNotificationsBanned(String pkg, int uid) {
-            try {
-                final boolean enabled = sINM.areNotificationsEnabledForPackage(pkg, uid);
-                return !enabled;
-            } catch (Exception e) {
-                Log.w(TAG, "Error calling NoMan", e);
-                return false;
-            }
-        }
-
-        public boolean getHighPriority(String pkg, int uid) {
-            try {
-                return sINM.getPackagePriority(pkg, uid) == Notification.PRIORITY_MAX;
-            } catch (Exception e) {
-                Log.w(TAG, "Error calling NoMan", e);
-                return false;
-            }
-        }
-
-        public boolean setHighPriority(String pkg, int uid, boolean highPriority) {
-            try {
-                sINM.setPackagePriority(pkg, uid,
-                        highPriority ? Notification.PRIORITY_MAX : Notification.PRIORITY_DEFAULT);
-                return true;
-            } catch (Exception e) {
-                Log.w(TAG, "Error calling NoMan", e);
-                return false;
-            }
-        }
-
-        public boolean getSensitive(String pkg, int uid) {
-            try {
-                return sINM.getPackageVisibilityOverride(pkg, uid) == Notification.VISIBILITY_PRIVATE;
-            } catch (Exception e) {
-                Log.w(TAG, "Error calling NoMan", e);
-                return false;
-            }
-        }
-
-        public boolean setSensitive(String pkg, int uid, boolean sensitive) {
-            try {
-                sINM.setPackageVisibilityOverride(pkg, uid,
-                        sensitive ? Notification.VISIBILITY_PRIVATE
-                                : NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE);
-                return true;
-            } catch (Exception e) {
-                Log.w(TAG, "Error calling NoMan", e);
-                return false;
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
new file mode 100644
index 0000000..2060719
--- /dev/null
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -0,0 +1,150 @@
+/*
+ * 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.INotificationManager;
+import android.app.Notification;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.os.ServiceManager;
+import android.service.notification.NotificationListenerService;
+import android.util.Log;
+
+public class NotificationBackend {
+    private static final String TAG = "NotificationBackend";
+
+    static INotificationManager sINM = INotificationManager.Stub.asInterface(
+            ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+
+    public AppRow loadAppRow(PackageManager pm, ApplicationInfo app) {
+        final AppRow row = new AppRow();
+        row.pkg = app.packageName;
+        row.uid = app.uid;
+        try {
+            row.label = app.loadLabel(pm);
+        } catch (Throwable t) {
+            Log.e(TAG, "Error loading application label for " + row.pkg, t);
+            row.label = row.pkg;
+        }
+        row.icon = app.loadIcon(pm);
+        row.banned = getNotificationsBanned(row.pkg, row.uid);
+        row.priority = getHighPriority(row.pkg, row.uid);
+        row.peekable = getPeekable(row.pkg, row.uid);
+        row.sensitive = getSensitive(row.pkg, row.uid);
+        return row;
+    }
+
+    public boolean setNotificationsBanned(String pkg, int uid, boolean banned) {
+        try {
+            sINM.setNotificationsEnabledForPackage(pkg, uid, !banned);
+            return true;
+        } catch (Exception e) {
+           Log.w(TAG, "Error calling NoMan", e);
+           return false;
+        }
+    }
+
+    public boolean getNotificationsBanned(String pkg, int uid) {
+        try {
+            final boolean enabled = sINM.areNotificationsEnabledForPackage(pkg, uid);
+            return !enabled;
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return false;
+        }
+    }
+
+    public boolean getHighPriority(String pkg, int uid) {
+        try {
+            return sINM.getPackagePriority(pkg, uid) == Notification.PRIORITY_MAX;
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return false;
+        }
+    }
+
+    public boolean setHighPriority(String pkg, int uid, boolean highPriority) {
+        try {
+            sINM.setPackagePriority(pkg, uid,
+                    highPriority ? Notification.PRIORITY_MAX : Notification.PRIORITY_DEFAULT);
+            return true;
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return false;
+        }
+    }
+
+    public boolean getPeekable(String pkg, int uid) {
+        try {
+            return sINM.getPackagePeekable(pkg, uid);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return false;
+        }
+    }
+
+    public boolean setPeekable(String pkg, int uid, boolean peekable) {
+        try {
+            sINM.setPackagePeekable(pkg, uid, peekable);
+            return true;
+        } catch (Exception e) {
+           Log.w(TAG, "Error calling NoMan", e);
+           return false;
+        }
+    }
+
+    public boolean getSensitive(String pkg, int uid) {
+        try {
+            return sINM.getPackageVisibilityOverride(pkg, uid) == Notification.VISIBILITY_PRIVATE;
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return false;
+        }
+    }
+
+    public boolean setSensitive(String pkg, int uid, boolean sensitive) {
+        try {
+            sINM.setPackageVisibilityOverride(pkg, uid,
+                    sensitive ? Notification.VISIBILITY_PRIVATE
+                            : NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE);
+            return true;
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return false;
+        }
+    }
+
+    static class Row {
+        public String section;
+    }
+
+    public static class AppRow extends Row {
+        public String pkg;
+        public int uid;
+        public Drawable icon;
+        public CharSequence label;
+        public Intent settingsIntent;
+        public boolean banned;
+        public boolean priority;
+        public boolean peekable;
+        public boolean sensitive;
+        public boolean first;  // first app in section
+    }
+
+}
diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/NotificationSettings.java
index b392484..581b707 100644
--- a/src/com/android/settings/notification/NotificationSettings.java
+++ b/src/com/android/settings/notification/NotificationSettings.java
@@ -48,7 +48,9 @@
 import android.provider.Settings;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.DropDownPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -71,6 +73,7 @@
     private static final String KEY_PHONE_RINGTONE = "ringtone";
     private static final String KEY_NOTIFICATION_RINGTONE = "notification_ringtone";
     private static final String KEY_VIBRATE_WHEN_RINGING = "vibrate_when_ringing";
+    private static final String KEY_WIFI_DISPLAY = "wifi_display";
     private static final String KEY_NOTIFICATION = "notification";
     private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
     private static final String KEY_LOCK_SCREEN_NOTIFICATIONS = "lock_screen_notifications";
@@ -103,6 +106,11 @@
     private int mRingerMode = -1;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mContext = getActivity();
@@ -120,7 +128,7 @@
 
         final PreferenceCategory sound = (PreferenceCategory) findPreference(KEY_SOUND);
         initVolumePreference(KEY_MEDIA_VOLUME, AudioManager.STREAM_MUSIC,
-                com.android.internal.R.drawable.ic_audio_vol_mute);
+                com.android.internal.R.drawable.ic_audio_media_mute);
         initVolumePreference(KEY_ALARM_VOLUME, AudioManager.STREAM_ALARM,
                 com.android.internal.R.drawable.ic_audio_alarm_mute);
         if (mVoiceCapable) {
@@ -601,6 +609,7 @@
             } else {
                 rt.add(KEY_RING_VOLUME);
                 rt.add(KEY_PHONE_RINGTONE);
+                rt.add(KEY_WIFI_DISPLAY);
                 rt.add(KEY_VIBRATE_WHEN_RINGING);
             }
             return rt;
diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java
index 3f4d3df..a54e3dd 100644
--- a/src/com/android/settings/notification/NotificationStation.java
+++ b/src/com/android/settings/notification/NotificationStation.java
@@ -46,6 +46,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -137,6 +138,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_STATION;
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         logd("onActivityCreated(%s)", savedInstanceState);
         super.onActivityCreated(savedInstanceState);
diff --git a/src/com/android/settings/notification/OtherSoundSettings.java b/src/com/android/settings/notification/OtherSoundSettings.java
index 8528ec7..c226906 100644
--- a/src/com/android/settings/notification/OtherSoundSettings.java
+++ b/src/com/android/settings/notification/OtherSoundSettings.java
@@ -33,6 +33,7 @@
 import android.provider.Settings.System;
 import android.telephony.TelephonyManager;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -166,6 +167,16 @@
     private Context mContext;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_OTHER_SOUND;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_other_sounds;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index 2bfad1a..a6df6ec 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.notification;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -59,6 +60,11 @@
         private RadioButton mHideAllButton;
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.NOTIFICATION_REDACTION;
+        }
+
+        @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
             View view = inflater.inflate(R.layout.redaction_interstitial, container, false);
diff --git a/src/com/android/settings/notification/ServiceListing.java b/src/com/android/settings/notification/ServiceListing.java
new file mode 100644
index 0000000..d296139
--- /dev/null
+++ b/src/com/android/settings/notification/ServiceListing.java
@@ -0,0 +1,206 @@
+/*
+ * 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.ActivityManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Settings;
+import android.util.Slog;
+
+import com.android.settings.notification.ManagedServiceSettings.Config;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+public class ServiceListing {
+    private final ContentResolver mContentResolver;
+    private final Context mContext;
+    private final Config mConfig;
+    private final HashSet<ComponentName> mEnabledServices = new HashSet<ComponentName>();
+    private final List<ServiceInfo> mServices = new ArrayList<ServiceInfo>();
+    private final List<Callback> mCallbacks = new ArrayList<Callback>();
+
+    private boolean mListening;
+
+    public ServiceListing(Context context, Config config) {
+        mContext = context;
+        mConfig = config;
+        mContentResolver = context.getContentResolver();
+    }
+
+    public void addCallback(Callback callback) {
+        mCallbacks.add(callback);
+    }
+
+    public void removeCallback(Callback callback) {
+        mCallbacks.remove(callback);
+    }
+
+    public void setListening(boolean listening) {
+        if (mListening == listening) return;
+        mListening = listening;
+        if (mListening) {
+            // listen for package changes
+            IntentFilter filter = new IntentFilter();
+            filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+            filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+            filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+            filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+            filter.addDataScheme("package");
+            mContext.registerReceiver(mPackageReceiver, filter);
+            mContentResolver.registerContentObserver(Settings.Secure.getUriFor(mConfig.setting),
+                    false, mSettingsObserver);
+        } else {
+            mContext.unregisterReceiver(mPackageReceiver);
+            mContentResolver.unregisterContentObserver(mSettingsObserver);
+        }
+    }
+
+    public static int getEnabledServicesCount(Config config, Context context) {
+        final String flat = Settings.Secure.getString(context.getContentResolver(), config.setting);
+        if (flat == null || "".equals(flat)) return 0;
+        final String[] components = flat.split(":");
+        return components.length;
+    }
+
+    public static int getServicesCount(Config c, PackageManager pm) {
+        return getServices(c, null, pm);
+    }
+
+    public static ServiceInfo findService(Context context, Config config, final ComponentName cn) {
+        final ServiceListing listing = new ServiceListing(context, config);
+        final List<ServiceInfo> services = listing.reload();
+        for (ServiceInfo service : services) {
+            final ComponentName serviceCN = new ComponentName(service.packageName, service.name);
+            if (serviceCN.equals(cn)) {
+                return service;
+            }
+        }
+        return null;
+    }
+
+    private static int getServices(Config c, List<ServiceInfo> list, PackageManager pm) {
+        int services = 0;
+        if (list != null) {
+            list.clear();
+        }
+        final int user = ActivityManager.getCurrentUser();
+
+        List<ResolveInfo> installedServices = pm.queryIntentServicesAsUser(
+                new Intent(c.intentAction),
+                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
+                user);
+
+        for (int i = 0, count = installedServices.size(); i < count; i++) {
+            ResolveInfo resolveInfo = installedServices.get(i);
+            ServiceInfo info = resolveInfo.serviceInfo;
+
+            if (!c.permission.equals(info.permission)) {
+                Slog.w(c.tag, "Skipping " + c.noun + " service "
+                        + info.packageName + "/" + info.name
+                        + ": it does not require the permission "
+                        + c.permission);
+                continue;
+            }
+            if (list != null) {
+                list.add(info);
+            }
+            services++;
+        }
+        return services;
+    }
+
+    private void saveEnabledServices() {
+        StringBuilder sb = null;
+        for (ComponentName cn : mEnabledServices) {
+            if (sb == null) {
+                sb = new StringBuilder();
+            } else {
+                sb.append(':');
+            }
+            sb.append(cn.flattenToString());
+        }
+        Settings.Secure.putString(mContentResolver, mConfig.setting,
+                sb != null ? sb.toString() : "");
+    }
+
+    private void loadEnabledServices() {
+        mEnabledServices.clear();
+        final String flat = Settings.Secure.getString(mContentResolver, mConfig.setting);
+        if (flat != null && !"".equals(flat)) {
+            final String[] names = flat.split(":");
+            for (int i = 0; i < names.length; i++) {
+                final ComponentName cn = ComponentName.unflattenFromString(names[i]);
+                if (cn != null) {
+                    mEnabledServices.add(cn);
+                }
+            }
+        }
+    }
+
+    public List<ServiceInfo> reload() {
+        loadEnabledServices();
+        getServices(mConfig, mServices, mContext.getPackageManager());
+        for (Callback callback : mCallbacks) {
+            callback.onServicesReloaded(mServices);
+        }
+        return mServices;
+    }
+
+    public boolean isEnabled(ComponentName cn) {
+        return mEnabledServices.contains(cn);
+    }
+
+    public void setEnabled(ComponentName cn, boolean enabled) {
+        if (enabled) {
+            mEnabledServices.add(cn);
+        } else {
+            mEnabledServices.remove(cn);
+        }
+        saveEnabledServices();
+    }
+
+    private final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            reload();
+        }
+    };
+
+    private final BroadcastReceiver mPackageReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            reload();
+        }
+    };
+
+    public interface Callback {
+        void onServicesReloaded(List<ServiceInfo> services);
+    }
+}
diff --git a/src/com/android/settings/notification/SettingPref.java b/src/com/android/settings/notification/SettingPref.java
index a06c35a..a20d1b4 100644
--- a/src/com/android/settings/notification/SettingPref.java
+++ b/src/com/android/settings/notification/SettingPref.java
@@ -26,6 +26,7 @@
 import android.provider.Settings.Global;
 import android.provider.Settings.System;
 
+import com.android.settings.DropDownPreference;
 import com.android.settings.SettingsPreferenceFragment;
 
 /** Helper to manage a two-state or dropdown preference bound to a global or system setting. */
diff --git a/src/com/android/settings/notification/ZenModeAutomaticConditionSelection.java b/src/com/android/settings/notification/ZenModeAutomaticConditionSelection.java
deleted file mode 100644
index 0e77632..0000000
--- a/src/com/android/settings/notification/ZenModeAutomaticConditionSelection.java
+++ /dev/null
@@ -1,157 +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.notification;
-
-import android.animation.LayoutTransition;
-import android.app.INotificationManager;
-import android.content.Context;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Message;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.service.notification.Condition;
-import android.service.notification.IConditionListener;
-import android.util.ArraySet;
-import android.util.Log;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-
-import com.android.settings.R;
-
-public class ZenModeAutomaticConditionSelection extends LinearLayout {
-    private static final String TAG = "ZenModeAutomaticConditionSelection";
-    private static final boolean DEBUG = true;
-
-    private final INotificationManager mNoMan;
-    private final H mHandler = new H();
-    private final Context mContext;
-    private final ArraySet<Uri> mSelectedConditions = new ArraySet<Uri>();
-
-    public ZenModeAutomaticConditionSelection(Context context) {
-        super(context);
-        mContext = context;
-        setOrientation(VERTICAL);
-        setLayoutTransition(new LayoutTransition());
-        final int p = mContext.getResources().getDimensionPixelSize(R.dimen.content_margin_left);
-        setPadding(p, p, p, 0);
-        mNoMan = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        refreshSelectedConditions();
-    }
-
-    private void refreshSelectedConditions() {
-        try {
-            final Condition[] automatic = mNoMan.getAutomaticZenModeConditions();
-            mSelectedConditions.clear();
-            if (automatic != null) {
-                for (Condition c : automatic) {
-                    mSelectedConditions.add(c.id);
-                }
-            }
-        } catch (RemoteException e) {
-            Log.w(TAG, "Error calling getAutomaticZenModeConditions", e);
-        }
-    }
-
-    private CheckBox newCheckBox(Object tag) {
-        final CheckBox button = new CheckBox(mContext);
-        button.setTag(tag);
-        button.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                 setSelectedCondition((Uri)button.getTag(), isChecked);
-            }
-        });
-        addView(button);
-        return button;
-    }
-
-    private void setSelectedCondition(Uri conditionId, boolean selected) {
-        if (DEBUG) Log.d(TAG, "setSelectedCondition conditionId=" + conditionId
-                + " selected=" + selected);
-        if (selected) {
-            mSelectedConditions.add(conditionId);
-        } else {
-            mSelectedConditions.remove(conditionId);
-        }
-        final Uri[] automatic = new Uri[mSelectedConditions.size()];
-        for (int i = 0; i < automatic.length; i++) {
-            automatic[i] = mSelectedConditions.valueAt(i);
-        }
-        try {
-            mNoMan.setAutomaticZenModeConditions(automatic);
-        } catch (RemoteException e) {
-            Log.w(TAG, "Error calling setAutomaticZenModeConditions", e);
-        }
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        requestZenModeConditions(Condition.FLAG_RELEVANT_ALWAYS);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        requestZenModeConditions(0 /*none*/);
-    }
-
-    protected void requestZenModeConditions(int relevance) {
-        if (DEBUG) Log.d(TAG, "requestZenModeConditions " + Condition.relevanceToString(relevance));
-        try {
-            mNoMan.requestZenModeConditions(mListener, relevance);
-        } catch (RemoteException e) {
-            Log.w(TAG, "Error calling requestZenModeConditions", e);
-        }
-    }
-
-    protected void handleConditions(Condition[] conditions) {
-        for (final Condition c : conditions) {
-            CheckBox v = (CheckBox) findViewWithTag(c.id);
-            if (c.state != Condition.STATE_ERROR) {
-                if (v == null) {
-                    v = newCheckBox(c.id);
-                }
-            }
-            if (v != null) {
-                v.setText(c.summary);
-                v.setEnabled(c.state != Condition.STATE_ERROR);
-                v.setChecked(mSelectedConditions.contains(c.id));
-            }
-        }
-    }
-
-    private final IConditionListener mListener = new IConditionListener.Stub() {
-        @Override
-        public void onConditionsReceived(Condition[] conditions) {
-            if (conditions == null || conditions.length == 0) return;
-            mHandler.obtainMessage(H.CONDITIONS, conditions).sendToTarget();
-        }
-    };
-
-    private final class H extends Handler {
-        private static final int CONDITIONS = 1;
-
-        @Override
-        public void handleMessage(Message msg) {
-            if (msg.what == CONDITIONS) handleConditions((Condition[])msg.obj);
-        }
-    }
-}
diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java
new file mode 100644
index 0000000..dab0a0d
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java
@@ -0,0 +1,251 @@
+/*
+ * 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 static android.service.notification.ZenModeConfig.ALL_DAYS;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.ServiceInfo;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.provider.Settings.Global;
+import android.service.notification.ConditionProviderService;
+import android.service.notification.ZenModeConfig;
+import android.service.notification.ZenModeConfig.ScheduleInfo;
+import android.service.notification.ZenModeConfig.ZenRule;
+import android.text.format.DateFormat;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.R;
+import com.android.settings.notification.ManagedServiceSettings.Config;
+import com.android.settings.notification.ZenRuleNameDialog.RuleInfo;
+import com.android.settings.widget.FloatingActionButton;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.List;
+import java.util.TreeSet;
+
+public class ZenModeAutomationSettings extends ZenModeSettingsBase {
+
+    static final Config CONFIG = getConditionProviderConfig();
+
+    // per-instance to ensure we're always using the current locale
+    private final SimpleDateFormat mDayFormat = new SimpleDateFormat("EEE");
+    private final Calendar mCalendar = Calendar.getInstance();
+
+    private ServiceListing mServiceListing;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.zen_mode_automation_settings);
+        mServiceListing = new ServiceListing(mContext, CONFIG);
+        mServiceListing.addCallback(mServiceListingCallback);
+        mServiceListing.reload();
+        mServiceListing.setListening(true);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        final FloatingActionButton fab = getFloatingActionButton();
+        fab.setVisibility(View.VISIBLE);
+        fab.setImageResource(R.drawable.ic_menu_add_white);
+        fab.setContentDescription(getString(R.string.zen_mode_time_add_rule));
+        fab.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showAddRuleDialog();
+            }
+        });
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mServiceListing.setListening(false);
+        mServiceListing.removeCallback(mServiceListingCallback);
+    }
+
+    @Override
+    protected void onZenModeChanged() {
+        // don't care
+    }
+
+    @Override
+    protected void onZenModeConfigChanged() {
+        updateControls();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateControls();
+    }
+
+    private void showAddRuleDialog() {
+        new ZenRuleNameDialog(mContext, mServiceListing, null, mConfig.getAutomaticRuleNames()) {
+            @Override
+            public void onOk(String ruleName, RuleInfo ri) {
+                final ZenRule rule = new ZenRule();
+                rule.name = ruleName;
+                rule.enabled = true;
+                rule.zenMode = Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+                rule.conditionId = ri.defaultConditionId;
+                rule.component = ri.serviceComponent;
+                final ZenModeConfig newConfig = mConfig.copy();
+                final String ruleId = newConfig.newRuleId();
+                newConfig.automaticRules.put(ruleId, rule);
+                if (setZenModeConfig(newConfig)) {
+                    showRule(ri.settingsAction, ri.configurationActivity, ruleId, rule.name);
+                }
+            }
+        }.show();
+    }
+
+    private void showRule(String settingsAction, ComponentName configurationActivity,
+            String ruleId, String ruleName) {
+        if (DEBUG) Log.d(TAG, "showRule " + ruleId + " name=" + ruleName);
+        mContext.startActivity(new Intent(settingsAction)
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                .putExtra(ZenModeRuleSettingsBase.EXTRA_RULE_ID, ruleId));
+    }
+
+    private void updateControls() {
+        final PreferenceScreen root = getPreferenceScreen();
+        root.removeAll();
+        if (mConfig == null) return;
+        for (int i = 0; i < mConfig.automaticRules.size(); i++) {
+            final String id = mConfig.automaticRules.keyAt(i);
+            final ZenRule rule = mConfig.automaticRules.valueAt(i);
+            final boolean isSchedule = ZenModeConfig.isValidScheduleConditionId(rule.conditionId);
+            final Preference p = new Preference(mContext);
+            p.setTitle(rule.name);
+            p.setSummary(computeRuleSummary(rule));
+            p.setPersistent(false);
+            p.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    final String action = isSchedule ? ZenModeScheduleRuleSettings.ACTION
+                            : ZenModeExternalRuleSettings.ACTION;
+                    showRule(action, null, id, rule.name);
+                    return true;
+                }
+            });
+            root.addPreference(p);
+        }
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_ZEN_MODE_AUTOMATION;
+    }
+
+    private String computeRuleSummary(ZenRule rule) {
+        if (rule == null || !rule.enabled) return getString(R.string.switch_off_text);
+        final ScheduleInfo schedule = ZenModeConfig.tryParseScheduleConditionId(rule.conditionId);
+        final String mode = ZenModeSettings.computeZenModeCaption(getResources(), rule.zenMode);
+        String summary = getString(R.string.switch_on_text);
+        if (schedule != null) {
+            final String days = computeContiguousDayRanges(schedule.days);
+            final String start = getTime(schedule.startHour, schedule.startMinute);
+            final String end = getTime(schedule.endHour, schedule.endMinute);
+            final String time = getString(R.string.summary_range_verbal_combination, start, end);
+            summary = getString(R.string.zen_mode_rule_summary_combination, days, time);
+        }
+        return getString(R.string.zen_mode_rule_summary_combination, summary, mode);
+    }
+
+    private String getTime(int hour, int minute) {
+        mCalendar.set(Calendar.HOUR_OF_DAY, hour);
+        mCalendar.set(Calendar.MINUTE, minute);
+        return DateFormat.getTimeFormat(mContext).format(mCalendar.getTime());
+    }
+
+    private String computeContiguousDayRanges(int[] days) {
+        final TreeSet<Integer> daySet = new TreeSet<>();
+        for (int i = 0; days != null && i < days.length; i++) {
+            daySet.add(days[i]);
+        }
+        if (daySet.isEmpty()) {
+            return getString(R.string.zen_mode_schedule_rule_days_none);
+        }
+        final int N = ALL_DAYS.length;
+        if (daySet.size() == N) {
+            return getString(R.string.zen_mode_schedule_rule_days_all);
+        }
+        String rt = null;
+        for (int i = 0; i < N; i++) {
+            final int startDay = ALL_DAYS[i];
+            final boolean active = daySet.contains(startDay);
+            if (!active) continue;
+            int end = 0;
+            while (daySet.contains(ALL_DAYS[(i + end + 1) % N])) {
+                end++;
+            }
+            if (!(i == 0 && daySet.contains(ALL_DAYS[N - 1]))) {
+                final String v = end == 0 ? dayString(startDay)
+                        : getString(R.string.summary_range_symbol_combination,
+                                dayString(startDay),
+                                dayString(ALL_DAYS[(i + end) % N]));
+                rt = rt == null ? v : getString(R.string.summary_divider_text, rt, v);
+            }
+            i += end;
+        }
+        return rt;
+    }
+
+    private String dayString(int day) {
+        mCalendar.set(Calendar.DAY_OF_WEEK, day);
+        return mDayFormat.format(mCalendar.getTime());
+    }
+
+    private static Config getConditionProviderConfig() {
+        final Config c = new Config();
+        c.tag = TAG;
+        c.setting = Settings.Secure.ENABLED_CONDITION_PROVIDERS;
+        c.intentAction = ConditionProviderService.SERVICE_INTERFACE;
+        c.permission = android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE;
+        c.noun = "condition provider";
+        return c;
+    }
+
+    private final ServiceListing.Callback mServiceListingCallback = new ServiceListing.Callback() {
+        @Override
+        public void onServicesReloaded(List<ServiceInfo> services) {
+            for (ServiceInfo service : services) {
+                final RuleInfo ri = ZenModeExternalRuleSettings.getRuleInfo(service);
+                if (ri != null && ri.serviceComponent != null
+                        && ri.settingsAction == ZenModeExternalRuleSettings.ACTION) {
+                    if (!mServiceListing.isEnabled(ri.serviceComponent)) {
+                        Log.i(TAG, "Enabling external condition provider: " + ri.serviceComponent);
+                        mServiceListing.setEnabled(ri.serviceComponent, true);
+                    }
+                }
+            }
+        }
+    };
+
+}
diff --git a/src/com/android/settings/notification/ZenModeConditionSelection.java b/src/com/android/settings/notification/ZenModeConditionSelection.java
index 87f55a3..481bd88 100644
--- a/src/com/android/settings/notification/ZenModeConditionSelection.java
+++ b/src/com/android/settings/notification/ZenModeConditionSelection.java
@@ -27,7 +27,6 @@
 import android.service.notification.Condition;
 import android.service.notification.IConditionListener;
 import android.service.notification.ZenModeConfig;
-import android.text.TextUtils;
 import android.util.Log;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
@@ -46,11 +45,14 @@
     private final H mHandler = new H();
     private final Context mContext;
     private final List<Condition> mConditions;
+    private final int mZenMode;
+
     private Condition mCondition;
 
-    public ZenModeConditionSelection(Context context) {
+    public ZenModeConditionSelection(Context context, int zenMode) {
         super(context);
         mContext = context;
+        mZenMode = zenMode;
         mConditions = new ArrayList<Condition>();
         setLayoutTransition(new LayoutTransition());
         final int p = mContext.getResources().getDimensionPixelSize(R.dimen.content_margin_left);
@@ -117,7 +119,7 @@
             }
         }
         if (v != null) {
-            v.setText(!TextUtils.isEmpty(c.line1) ? c.line1 : c.summary);
+            v.setText(ZenModeSettings.computeConditionText(c));
             v.setEnabled(c.state == Condition.STATE_TRUE);
         }
         mConditions.add(c);
@@ -131,7 +133,7 @@
     public void confirmCondition() {
         if (DEBUG) Log.d(TAG, "confirmCondition " + mCondition);
         try {
-            mNoMan.setZenModeCondition(mCondition);
+            mNoMan.setZenMode(mZenMode, mCondition != null ? mCondition.id : null, TAG);
         } catch (RemoteException e) {
             // noop
         }
diff --git a/src/com/android/settings/notification/ZenModeExternalRuleSettings.java b/src/com/android/settings/notification/ZenModeExternalRuleSettings.java
new file mode 100644
index 0000000..9f9dc8a
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeExternalRuleSettings.java
@@ -0,0 +1,133 @@
+/*
+ * 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.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.ServiceInfo;
+import android.net.Uri;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.service.notification.ZenModeConfig.ZenRule;
+import android.util.Log;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.R;
+import com.android.settings.notification.ZenRuleNameDialog.RuleInfo;
+
+public class ZenModeExternalRuleSettings extends ZenModeRuleSettingsBase {
+    private static final String KEY_TYPE = "type";
+    private static final String KEY_CONFIGURE = "configure";
+
+    public static final String ACTION = Settings.ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS;
+    private static final int REQUEST_CODE_CONFIGURE = 1;
+
+    private static final String MD_RULE_TYPE = "automatic.ruleType";
+    private static final String MD_DEFAULT_CONDITION_ID = "automatic.defaultConditionId";
+    private static final String MD_CONFIGURATION_ACTIVITY = "automatic.configurationActivity";
+    private static final String EXTRA_CONDITION_ID = "automatic.conditionId";
+
+    private Preference mType;
+    private Preference mConfigure;
+
+    @Override
+    protected boolean setRule(ZenRule rule) {
+        return rule != null;
+    }
+
+    @Override
+    protected String getZenModeDependency() {
+        return null;
+    }
+
+    @Override
+    protected void onCreateInternal() {
+        addPreferencesFromResource(R.xml.zen_mode_external_rule_settings);
+        final PreferenceScreen root = getPreferenceScreen();
+        final ServiceInfo si = ServiceListing.findService(mContext,
+                ZenModeAutomationSettings.CONFIG, mRule.component);
+        if (DEBUG) Log.d(TAG, "ServiceInfo: " + si);
+        final RuleInfo ri = getRuleInfo(si);
+        if (DEBUG) Log.d(TAG, "RuleInfo: " + ri);
+        mType = root.findPreference(KEY_TYPE);
+        if (ri == null) {
+            mType.setSummary(R.string.zen_mode_rule_type_unknown);
+        } else {
+            mType.setSummary(ri.caption);
+        }
+
+        mConfigure = root.findPreference(KEY_CONFIGURE);
+        if (ri == null || ri.configurationActivity == null) {
+            mConfigure.setEnabled(false);
+        } else {
+            mConfigure.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    startActivityForResult(new Intent().setComponent(ri.configurationActivity),
+                            REQUEST_CODE_CONFIGURE);
+                    return true;
+                }
+            });
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_CODE_CONFIGURE) {
+            if (resultCode == Activity.RESULT_OK && data != null) {
+                final Uri conditionId = data.getParcelableExtra(EXTRA_CONDITION_ID);
+                if (conditionId != null && !conditionId.equals(mRule.conditionId)) {
+                    updateRule(conditionId);
+                }
+            }
+        }
+    }
+
+    public static RuleInfo getRuleInfo(ServiceInfo si) {
+        if (si == null || si.metaData == null) return null;
+        final String ruleType = si.metaData.getString(MD_RULE_TYPE);
+        final String defaultConditionId = si.metaData.getString(MD_DEFAULT_CONDITION_ID);
+        final String configurationActivity = si.metaData.getString(MD_CONFIGURATION_ACTIVITY);
+        if (ruleType != null && !ruleType.trim().isEmpty() && defaultConditionId != null) {
+            final RuleInfo ri = new RuleInfo();
+            ri.serviceComponent = new ComponentName(si.packageName, si.name);
+            ri.settingsAction = ZenModeExternalRuleSettings.ACTION;
+            ri.caption = ruleType;
+            ri.defaultConditionId = Uri.parse(defaultConditionId);
+            if (configurationActivity != null) {
+                ri.configurationActivity = ComponentName.unflattenFromString(configurationActivity);
+            }
+            return ri;
+        }
+        return null;
+    }
+
+    @Override
+    protected void updateControlsInternal() {
+        // everything done up front
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_ZEN_MODE_EXTERNAL_RULE;
+    }
+
+}
diff --git a/src/com/android/settings/notification/ZenModePrioritySettings.java b/src/com/android/settings/notification/ZenModePrioritySettings.java
new file mode 100644
index 0000000..89e9ea3
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModePrioritySettings.java
@@ -0,0 +1,179 @@
+/*
+ * 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.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.service.notification.ZenModeConfig;
+import android.util.Log;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.DropDownPreference;
+import com.android.settings.R;
+import com.android.settings.search.Indexable;
+
+public class ZenModePrioritySettings extends ZenModeSettingsBase implements Indexable {
+    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_STARRED = "starred";
+    private static final String KEY_REPEAT_CALLERS = "repeat_callers";
+
+    private boolean mDisableListeners;
+    private SwitchPreference mReminders;
+    private SwitchPreference mEvents;
+    private SwitchPreference mMessages;
+    private SwitchPreference mCalls;
+    private DropDownPreference mStarred;
+    private SwitchPreference mRepeatCallers;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.zen_mode_priority_settings);
+        final PreferenceScreen root = getPreferenceScreen();
+
+        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;
+                if (val == mConfig.allowReminders) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange allowReminders=" + val);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.allowReminders = val;
+                return setZenModeConfig(newConfig);
+            }
+        });
+
+        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;
+                if (val == mConfig.allowEvents) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange allowEvents=" + val);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.allowEvents = val;
+                return setZenModeConfig(newConfig);
+            }
+        });
+
+        mMessages = (SwitchPreference) root.findPreference(KEY_MESSAGES);
+        mMessages.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (mDisableListeners) return true;
+                final boolean val = (Boolean) newValue;
+                if (val == mConfig.allowMessages) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange allowMessages=" + val);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.allowMessages = val;
+                return setZenModeConfig(newConfig);
+            }
+        });
+
+        mCalls = (SwitchPreference) root.findPreference(KEY_CALLS);
+        mCalls.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (mDisableListeners) return true;
+                final boolean val = (Boolean) newValue;
+                if (val == mConfig.allowCalls) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange allowCalls=" + val);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.allowCalls = val;
+                return setZenModeConfig(newConfig);
+            }
+        });
+
+        mStarred = (DropDownPreference) root.findPreference(KEY_STARRED);
+        mStarred.addItem(R.string.zen_mode_from_anyone, ZenModeConfig.SOURCE_ANYONE);
+        mStarred.addItem(R.string.zen_mode_from_contacts, ZenModeConfig.SOURCE_CONTACT);
+        mStarred.addItem(R.string.zen_mode_from_starred, ZenModeConfig.SOURCE_STAR);
+        mStarred.setCallback(new DropDownPreference.Callback() {
+            @Override
+            public boolean onItemSelected(int pos, Object newValue) {
+                if (mDisableListeners) return true;
+                final int val = (Integer) newValue;
+                if (val == mConfig.allowFrom) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange allowFrom=" +
+                        ZenModeConfig.sourceToString(val));
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.allowFrom = val;
+                return setZenModeConfig(newConfig);
+            }
+        });
+
+        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;
+                if (val == mConfig.allowRepeatCallers) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange allowRepeatCallers=" + val);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.allowRepeatCallers = val;
+                return setZenModeConfig(newConfig);
+            }
+        });
+
+        updateControls();
+    }
+
+    @Override
+    protected void onZenModeChanged() {
+        // don't care
+    }
+
+    @Override
+    protected void onZenModeConfigChanged() {
+        updateControls();
+    }
+
+    private void updateControls() {
+        mDisableListeners = true;
+        if (mCalls != null) {
+            mCalls.setChecked(mConfig.allowCalls);
+        }
+        mMessages.setChecked(mConfig.allowMessages);
+        mStarred.setSelectedValue(mConfig.allowFrom);
+        mStarred.setEnabled(mConfig.allowCalls || mConfig.allowMessages);
+        mReminders.setChecked(mConfig.allowReminders);
+        mEvents.setChecked(mConfig.allowEvents);
+        mRepeatCallers.setChecked(mConfig.allowRepeatCallers);
+        mRepeatCallers.setEnabled(!mConfig.allowCalls
+                || mConfig.allowFrom != ZenModeConfig.SOURCE_ANYONE);
+        mDisableListeners = false;
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_ZEN_MODE_PRIORITY;
+    }
+
+}
diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
new file mode 100644
index 0000000..f6bc75f
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
@@ -0,0 +1,256 @@
+/*
+ * 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.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceScreen;
+import android.provider.Settings.Global;
+import android.service.notification.ZenModeConfig;
+import android.service.notification.ZenModeConfig.ZenRule;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.Switch;
+import android.widget.Toast;
+
+import com.android.settings.DropDownPreference;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.widget.SwitchBar;
+
+public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase
+        implements SwitchBar.OnSwitchChangeListener {
+    protected static final String TAG = ZenModeSettingsBase.TAG;
+    protected static final boolean DEBUG = ZenModeSettingsBase.DEBUG;
+
+    public static final String EXTRA_RULE_ID = "rule_id";
+    private static final String KEY_RULE_NAME = "rule_name";
+    private static final String KEY_ZEN_MODE = "zen_mode";
+
+    protected Context mContext;
+    protected boolean mDisableListeners;
+    protected ZenRule mRule;
+
+    private String mRuleId;
+    private boolean mDeleting;
+    private Preference mRuleName;
+    private SwitchBar mSwitchBar;
+    private DropDownPreference mZenMode;
+
+    abstract protected void onCreateInternal();
+    abstract protected boolean setRule(ZenRule rule);
+    abstract protected String getZenModeDependency();
+    abstract protected void updateControlsInternal();
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mContext = getActivity();
+
+        final Intent intent = getActivity().getIntent();
+        if (DEBUG) Log.d(TAG, "onCreate getIntent()=" + intent);
+        if (intent == null) {
+            Log.w(TAG, "No intent");
+            toastAndFinish();
+            return;
+        }
+
+        mRuleId = intent.getStringExtra(EXTRA_RULE_ID);
+        if (DEBUG) Log.d(TAG, "mRuleId=" + mRuleId);
+        if (refreshRuleOrFinish()) {
+            return;
+        }
+
+        setHasOptionsMenu(true);
+
+        onCreateInternal();
+
+        final PreferenceScreen root = getPreferenceScreen();
+        mRuleName = root.findPreference(KEY_RULE_NAME);
+        mRuleName.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                showRuleNameDialog();
+                return true;
+            }
+        });
+
+        mZenMode = (DropDownPreference) root.findPreference(KEY_ZEN_MODE);
+        mZenMode.addItem(R.string.zen_mode_option_important_interruptions,
+                Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+        mZenMode.addItem(R.string.zen_mode_option_alarms, Global.ZEN_MODE_ALARMS);
+        mZenMode.addItem(R.string.zen_mode_option_no_interruptions,
+                Global.ZEN_MODE_NO_INTERRUPTIONS);
+        mZenMode.setCallback(new DropDownPreference.Callback() {
+            @Override
+            public boolean onItemSelected(int pos, Object value) {
+                if (mDisableListeners) return true;
+                final int zenMode = (Integer) value;
+                if (zenMode == mRule.zenMode) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange zenMode=" + zenMode);
+                mRule.zenMode = zenMode;
+                setZenModeConfig(mConfig);
+                return true;
+            }
+        });
+        mZenMode.setOrder(10);  // sort at the bottom of the category
+        mZenMode.setDependency(getZenModeDependency());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateControls();
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final SettingsActivity activity = (SettingsActivity) getActivity();
+        mSwitchBar = activity.getSwitchBar();
+        mSwitchBar.addOnSwitchChangeListener(this);
+        mSwitchBar.show();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mSwitchBar.removeOnSwitchChangeListener(this);
+        mSwitchBar.hide();
+    }
+
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        if (DEBUG) Log.d(TAG, "onSwitchChanged " + isChecked);
+        if (mDisableListeners) return;
+        final boolean enabled = isChecked;
+        if (enabled == mRule.enabled) return;
+        if (DEBUG) Log.d(TAG, "onSwitchChanged enabled=" + enabled);
+        mRule.enabled = enabled;
+        mRule.snoozing = false;
+        setZenModeConfig(mConfig);
+    }
+
+    protected void updateRule(Uri newConditionId) {
+        mRule.conditionId = newConditionId;
+        mRule.condition = null;
+        mRule.snoozing = false;
+        setZenModeConfig(mConfig);
+    }
+
+    @Override
+    protected void onZenModeChanged() {
+        // noop
+    }
+
+    @Override
+    protected void onZenModeConfigChanged() {
+        if (!refreshRuleOrFinish()) {
+            updateControls();
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu");
+        inflater.inflate(R.menu.zen_mode_rule, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (DEBUG) Log.d(TAG, "onOptionsItemSelected " + item.getItemId());
+        if (item.getItemId() == R.id.delete) {
+            showDeleteRuleDialog();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void showRuleNameDialog() {
+        new ZenRuleNameDialog(mContext, null, mRule.name, mConfig.getAutomaticRuleNames()) {
+            @Override
+            public void onOk(String ruleName, RuleInfo type) {
+                final ZenModeConfig newConfig = mConfig.copy();
+                final ZenRule rule = newConfig.automaticRules.get(mRuleId);
+                if (rule == null) return;
+                rule.name = ruleName;
+                setZenModeConfig(newConfig);
+            }
+        }.show();
+    }
+
+    private boolean refreshRuleOrFinish() {
+        mRule = mConfig.automaticRules.get(mRuleId);
+        if (DEBUG) Log.d(TAG, "mRule=" + mRule);
+        if (!setRule(mRule)) {
+            toastAndFinish();
+            return true;
+        }
+        return false;
+    }
+
+    private void showDeleteRuleDialog() {
+        new AlertDialog.Builder(mContext)
+                .setMessage(getString(R.string.zen_mode_delete_rule_confirmation, mRule.name))
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.zen_mode_delete_rule_button, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        mDeleting = true;
+                        mConfig.automaticRules.remove(mRuleId);
+                        setZenModeConfig(mConfig);
+                    }
+                })
+                .show();
+    }
+
+    private void toastAndFinish() {
+        if (!mDeleting) {
+            Toast.makeText(mContext, R.string.zen_mode_rule_not_found_text, Toast.LENGTH_SHORT)
+                    .show();
+        }
+        getActivity().finish();
+    }
+
+    private void updateRuleName() {
+        getActivity().setTitle(mRule.name);
+        mRuleName.setSummary(mRule.name);
+    }
+
+    private void updateControls() {
+        mDisableListeners = true;
+        updateRuleName();
+        updateControlsInternal();
+        mZenMode.setSelectedValue(mRule.zenMode);
+        mDisableListeners = false;
+        if (mSwitchBar != null) {
+            mSwitchBar.setChecked(mRule.enabled);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java b/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
similarity index 69%
rename from src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
rename to src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
index 3361ad0..3e88046 100644
--- a/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
+++ b/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
@@ -17,37 +17,43 @@
 package com.android.settings.notification;
 
 import android.content.Context;
-import android.service.notification.ZenModeConfig;
 import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.ScrollView;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 
 import com.android.settings.R;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Calendar;
 
-public class ZenModeDowntimeDaysSelection extends ScrollView {
+public class ZenModeScheduleDaysSelection extends ScrollView {
     public static final int[] DAYS = {
-        Calendar.MONDAY, Calendar.TUESDAY, Calendar.WEDNESDAY, Calendar.THURSDAY, Calendar.FRIDAY,
-        Calendar.SATURDAY, Calendar.SUNDAY
+        Calendar.SUNDAY,
+        Calendar.MONDAY,
+        Calendar.TUESDAY,
+        Calendar.WEDNESDAY,
+        Calendar.THURSDAY,
+        Calendar.FRIDAY,
+        Calendar.SATURDAY,
     };
-    private static final SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("EEEE");
 
+    // per-instance to ensure we're always using the current locale
+    private final SimpleDateFormat mDayFormat = new SimpleDateFormat("EEEE");
     private final SparseBooleanArray mDays = new SparseBooleanArray();
     private final LinearLayout mLayout;
 
-    public ZenModeDowntimeDaysSelection(Context context, String mode) {
+    public ZenModeScheduleDaysSelection(Context context, int[] days) {
         super(context);
         mLayout = new LinearLayout(mContext);
-        final int hPad = context.getResources().getDimensionPixelSize(R.dimen.zen_downtime_margin);
+        final int hPad = context.getResources()
+                .getDimensionPixelSize(R.dimen.zen_schedule_day_margin);
         mLayout.setPadding(hPad, 0, hPad, 0);
         addView(mLayout);
-        final int[] days = ZenModeConfig.tryParseDays(mode);
         if (days != null) {
             for (int i = 0; i < days.length; i++) {
                 mDays.put(days[i], true);
@@ -58,39 +64,38 @@
         final LayoutInflater inflater = LayoutInflater.from(context);
         for (int i = 0; i < DAYS.length; i++) {
             final int day = DAYS[i];
-            final CheckBox checkBox = (CheckBox) inflater.inflate(R.layout.zen_downtime_day,
+            final CheckBox checkBox = (CheckBox) inflater.inflate(R.layout.zen_schedule_rule_day,
                     this, false);
             c.set(Calendar.DAY_OF_WEEK, day);
-            checkBox.setText(DAY_FORMAT.format(c.getTime()));
+            checkBox.setText(mDayFormat.format(c.getTime()));
             checkBox.setChecked(mDays.get(day));
             checkBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                     mDays.put(day, isChecked);
-                    onChanged(getMode());
+                    onChanged(getDays());
                 }
             });
             mLayout.addView(checkBox);
         }
     }
 
-    private String getMode() {
-        final StringBuilder sb = new StringBuilder(ZenModeConfig.SLEEP_MODE_DAYS_PREFIX);
-        boolean empty = true;
+    private int[] getDays() {
+        final SparseBooleanArray rt = new SparseBooleanArray(mDays.size());
         for (int i = 0; i < mDays.size(); i++) {
             final int day = mDays.keyAt(i);
             if (!mDays.valueAt(i)) continue;
-            if (empty) {
-                empty = false;
-            } else {
-                sb.append(',');
-            }
-            sb.append(day);
+            rt.put(day, true);
         }
-        return empty ? null : sb.toString();
+        final int[] rta = new int[rt.size()];
+        for (int i = 0; i < rta.length; i++) {
+            rta[i] = rt.keyAt(i);
+        }
+        Arrays.sort(rta);
+        return rta;
     }
 
-    protected void onChanged(String mode) {
+    protected void onChanged(int[] days) {
         // event hook for subclasses
     }
 }
diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
new file mode 100644
index 0000000..fef3175
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
@@ -0,0 +1,286 @@
+/*
+ * 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 static com.android.settings.notification.ZenModeScheduleDaysSelection.DAYS;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
+import android.app.TimePickerDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.service.notification.ZenModeConfig;
+import android.service.notification.ZenModeConfig.ScheduleInfo;
+import android.service.notification.ZenModeConfig.ZenRule;
+import android.text.format.DateFormat;
+import android.util.Log;
+import android.widget.TimePicker;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.R;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+
+public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
+    private static final String KEY_DAYS = "days";
+    private static final String KEY_START_TIME = "start_time";
+    private static final String KEY_END_TIME = "end_time";
+
+    public static final String ACTION = Settings.ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS;
+
+    // per-instance to ensure we're always using the current locale
+    private final SimpleDateFormat mDayFormat = new SimpleDateFormat("EEE");
+
+    private Preference mDays;
+    private TimePickerPreference mStart;
+    private TimePickerPreference mEnd;
+
+    private ScheduleInfo mSchedule;
+
+    @Override
+    protected boolean setRule(ZenRule rule) {
+        mSchedule = rule != null ? ZenModeConfig.tryParseScheduleConditionId(rule.conditionId)
+                : null;
+        return mSchedule != null;
+    }
+
+    @Override
+    protected String getZenModeDependency() {
+        return mDays.getKey();
+    }
+
+    @Override
+    protected void onCreateInternal() {
+        addPreferencesFromResource(R.xml.zen_mode_schedule_rule_settings);
+        final PreferenceScreen root = getPreferenceScreen();
+
+        mDays = root.findPreference(KEY_DAYS);
+        mDays.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                showDaysDialog();
+                return true;
+            }
+        });
+
+        final FragmentManager mgr = getFragmentManager();
+
+        mStart = new TimePickerPreference(mContext, mgr);
+        mStart.setKey(KEY_START_TIME);
+        mStart.setTitle(R.string.zen_mode_start_time);
+        mStart.setCallback(new TimePickerPreference.Callback() {
+            @Override
+            public boolean onSetTime(final int hour, final int minute) {
+                if (mDisableListeners) return true;
+                if (!ZenModeConfig.isValidHour(hour)) return false;
+                if (!ZenModeConfig.isValidMinute(minute)) return false;
+                if (hour == mSchedule.startHour && minute == mSchedule.startMinute) {
+                    return true;
+                }
+                if (DEBUG) Log.d(TAG, "onPrefChange start h=" + hour + " m=" + minute);
+                mSchedule.startHour = hour;
+                mSchedule.startMinute = minute;
+                updateRule(ZenModeConfig.toScheduleConditionId(mSchedule));
+                return true;
+            }
+        });
+        root.addPreference(mStart);
+        mStart.setDependency(mDays.getKey());
+
+        mEnd = new TimePickerPreference(mContext, mgr);
+        mEnd.setKey(KEY_END_TIME);
+        mEnd.setTitle(R.string.zen_mode_end_time);
+        mEnd.setCallback(new TimePickerPreference.Callback() {
+            @Override
+            public boolean onSetTime(final int hour, final int minute) {
+                if (mDisableListeners) return true;
+                if (!ZenModeConfig.isValidHour(hour)) return false;
+                if (!ZenModeConfig.isValidMinute(minute)) return false;
+                if (hour == mSchedule.endHour && minute == mSchedule.endMinute) {
+                    return true;
+                }
+                if (DEBUG) Log.d(TAG, "onPrefChange end h=" + hour + " m=" + minute);
+                mSchedule.endHour = hour;
+                mSchedule.endMinute = minute;
+                updateRule(ZenModeConfig.toScheduleConditionId(mSchedule));
+                return true;
+            }
+        });
+        root.addPreference(mEnd);
+        mEnd.setDependency(mDays.getKey());
+    }
+
+    private void updateDays() {
+        // Compute an ordered, delimited list of day names based on the persisted user config.
+        final int[] days = mSchedule.days;
+        if (days != null && days.length > 0) {
+            final StringBuilder sb = new StringBuilder();
+            final Calendar c = Calendar.getInstance();
+            for (int i = 0; i < DAYS.length; i++) {
+                final int day = DAYS[i];
+                for (int j = 0; j < days.length; j++) {
+                    if (day == days[j]) {
+                        c.set(Calendar.DAY_OF_WEEK, day);
+                        if (sb.length() > 0) {
+                            sb.append(mContext.getString(R.string.summary_divider_text));
+                        }
+                        sb.append(mDayFormat.format(c.getTime()));
+                        break;
+                    }
+                }
+            }
+            if (sb.length() > 0) {
+                mDays.setSummary(sb);
+                mDays.notifyDependencyChange(false);
+                return;
+            }
+        }
+        mDays.setSummary(R.string.zen_mode_schedule_rule_days_none);
+        mDays.notifyDependencyChange(true);
+    }
+
+    private void updateEndSummary() {
+        final int startMin = 60 * mSchedule.startHour + mSchedule.startMinute;
+        final int endMin = 60 * mSchedule.endHour + mSchedule.endMinute;
+        final boolean nextDay = startMin >= endMin;
+        final int summaryFormat = nextDay ? R.string.zen_mode_end_time_next_day_summary_format : 0;
+        mEnd.setSummaryFormat(summaryFormat);
+    }
+
+    @Override
+    protected void updateControlsInternal() {
+        updateDays();
+        mStart.setTime(mSchedule.startHour, mSchedule.startMinute);
+        mEnd.setTime(mSchedule.endHour, mSchedule.endMinute);
+        updateEndSummary();
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_ZEN_MODE_SCHEDULE_RULE;
+    }
+
+    private void showDaysDialog() {
+        new AlertDialog.Builder(mContext)
+                .setTitle(R.string.zen_mode_schedule_rule_days)
+                .setView(new ZenModeScheduleDaysSelection(mContext, mSchedule.days) {
+                      @Override
+                      protected void onChanged(final int[] days) {
+                          if (mDisableListeners) return;
+                          if (Arrays.equals(days, mSchedule.days)) return;
+                          if (DEBUG) Log.d(TAG, "days.onChanged days=" + Arrays.asList(days));
+                          mSchedule.days = days;
+                          updateRule(ZenModeConfig.toScheduleConditionId(mSchedule));
+                      }
+                })
+                .setOnDismissListener(new OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        updateDays();
+                    }
+                })
+                .setPositiveButton(R.string.done_button, null)
+                .show();
+    }
+
+    private static class TimePickerPreference extends Preference {
+        private final Context mContext;
+
+        private int mSummaryFormat;
+        private int mHourOfDay;
+        private int mMinute;
+        private Callback mCallback;
+
+        public TimePickerPreference(Context context, final FragmentManager mgr) {
+            super(context);
+            mContext = context;
+            setPersistent(false);
+            setOnPreferenceClickListener(new OnPreferenceClickListener(){
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    final TimePickerFragment frag = new TimePickerFragment();
+                    frag.pref = TimePickerPreference.this;
+                    frag.show(mgr, TimePickerPreference.class.getName());
+                    return true;
+                }
+            });
+        }
+
+        public void setCallback(Callback callback) {
+            mCallback = callback;
+        }
+
+        public void setSummaryFormat(int resId) {
+            mSummaryFormat = resId;
+            updateSummary();
+        }
+
+        public void setTime(int hourOfDay, int minute) {
+            if (mCallback != null && !mCallback.onSetTime(hourOfDay, minute)) return;
+            mHourOfDay = hourOfDay;
+            mMinute = minute;
+            updateSummary();
+        }
+
+        private void updateSummary() {
+            final Calendar c = Calendar.getInstance();
+            c.set(Calendar.HOUR_OF_DAY, mHourOfDay);
+            c.set(Calendar.MINUTE, mMinute);
+            String time = DateFormat.getTimeFormat(mContext).format(c.getTime());
+            if (mSummaryFormat != 0) {
+                time = mContext.getResources().getString(mSummaryFormat, time);
+            }
+            setSummary(time);
+        }
+
+        public static class TimePickerFragment extends DialogFragment implements
+                TimePickerDialog.OnTimeSetListener {
+            public TimePickerPreference pref;
+
+            @Override
+            public Dialog onCreateDialog(Bundle savedInstanceState) {
+                final boolean usePref = pref != null && pref.mHourOfDay >= 0 && pref.mMinute >= 0;
+                final Calendar c = Calendar.getInstance();
+                final int hour = usePref ? pref.mHourOfDay : c.get(Calendar.HOUR_OF_DAY);
+                final int minute = usePref ? pref.mMinute : c.get(Calendar.MINUTE);
+                return new TimePickerDialog(getActivity(), this, hour, minute,
+                        DateFormat.is24HourFormat(getActivity()));
+            }
+
+            public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+                if (pref != null) {
+                    pref.setTime(hourOfDay, minute);
+                }
+            }
+        }
+
+        public interface Callback {
+            boolean onSetTime(int hour, int minute);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 420f974..34abf59 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -16,516 +16,171 @@
 
 package com.android.settings.notification;
 
-import static com.android.settings.notification.ZenModeDowntimeDaysSelection.DAYS;
-
 import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.app.INotificationManager;
-import android.app.NotificationManager;
-import android.app.TimePickerDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnDismissListener;
-import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.database.ContentObserver;
-import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.ServiceManager;
+import android.os.UserHandle;
 import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
 import android.provider.Settings.Global;
 import android.service.notification.Condition;
 import android.service.notification.ZenModeConfig;
-import android.text.format.DateFormat;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 import android.widget.ScrollView;
-import android.widget.TimePicker;
+import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.SettingsActivity;
 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.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.List;
-import java.util.Objects;
 
-public class ZenModeSettings extends SettingsPreferenceFragment implements Indexable {
-    private static final String TAG = "ZenModeSettings";
-    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+public class ZenModeSettings extends ZenModeSettingsBase
+        implements Indexable, SwitchBar.OnSwitchChangeListener {
+    private static final String KEY_PRIORITY_SETTINGS = "priority_settings";
+    private static final String KEY_AUTOMATION_SETTINGS = "automation_settings";
 
-    private static final String KEY_ZEN_MODE = "zen_mode";
-    private static final String KEY_IMPORTANT = "important";
-    private static final String KEY_CALLS = "calls";
-    private static final String KEY_MESSAGES = "messages";
-    private static final String KEY_STARRED = "starred";
-    private static final String KEY_EVENTS = "events";
-    private static final String KEY_ALARM_INFO = "alarm_info";
-
-    private static final String KEY_DOWNTIME = "downtime";
-    private static final String KEY_DAYS = "days";
-    private static final String KEY_START_TIME = "start_time";
-    private static final String KEY_END_TIME = "end_time";
-    private static final String KEY_DOWNTIME_MODE = "downtime_mode";
-
-    private static final String KEY_AUTOMATION = "automation";
-    private static final String KEY_ENTRY = "entry";
-    private static final String KEY_CONDITION_PROVIDERS = "manage_condition_providers";
-
-    private static final SettingPrefWithCallback PREF_ZEN_MODE = new SettingPrefWithCallback(
-            SettingPref.TYPE_GLOBAL, KEY_ZEN_MODE, Global.ZEN_MODE, Global.ZEN_MODE_OFF,
-            Global.ZEN_MODE_OFF, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
-            Global.ZEN_MODE_NO_INTERRUPTIONS) {
-        protected String getCaption(Resources res, int value) {
-            switch (value) {
-                case Global.ZEN_MODE_NO_INTERRUPTIONS:
-                    return res.getString(R.string.zen_mode_option_no_interruptions);
-                case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
-                    return res.getString(R.string.zen_mode_option_important_interruptions);
-                default:
-                    return res.getString(R.string.zen_mode_option_off);
-            }
-        }
-    };
-
-    private static final SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("EEE");
-
-    private static SparseArray<String> allKeyTitles(Context context) {
-        final SparseArray<String> rt = new SparseArray<String>();
-        rt.put(R.string.zen_mode_important_category, KEY_IMPORTANT);
-        rt.put(R.string.zen_mode_calls, KEY_CALLS);
-        rt.put(R.string.zen_mode_option_title, KEY_ZEN_MODE);
-        rt.put(R.string.zen_mode_messages, KEY_MESSAGES);
-        rt.put(R.string.zen_mode_from_starred, KEY_STARRED);
-        rt.put(R.string.zen_mode_events, KEY_EVENTS);
-        rt.put(R.string.zen_mode_alarm_info, KEY_ALARM_INFO);
-        rt.put(R.string.zen_mode_downtime_category, KEY_DOWNTIME);
-        rt.put(R.string.zen_mode_downtime_days, KEY_DAYS);
-        rt.put(R.string.zen_mode_start_time, KEY_START_TIME);
-        rt.put(R.string.zen_mode_end_time, KEY_END_TIME);
-        rt.put(R.string.zen_mode_downtime_mode_title, KEY_DOWNTIME_MODE);
-        rt.put(R.string.zen_mode_automation_category, KEY_AUTOMATION);
-        rt.put(R.string.manage_condition_providers, KEY_CONDITION_PROVIDERS);
-        return rt;
-    }
-
-    private final Handler mHandler = new Handler();
-    private final SettingsObserver mSettingsObserver = new SettingsObserver();
-
-    private Context mContext;
-    private PackageManager mPM;
-    private ZenModeConfig mConfig;
-    private boolean mDisableListeners;
-    private SwitchPreference mCalls;
-    private SwitchPreference mMessages;
-    private DropDownPreference mStarred;
-    private SwitchPreference mEvents;
-    private boolean mDowntimeSupported;
-    private Preference mDays;
-    private TimePickerPreference mStart;
-    private TimePickerPreference mEnd;
-    private DropDownPreference mDowntimeMode;
-    private PreferenceCategory mAutomationCategory;
-    private Preference mEntry;
-    private Preference mConditionProviders;
+    private Preference mPrioritySettings;
     private AlertDialog mDialog;
+    private SwitchBar mSwitchBar;
+    private boolean mShowing;
+    private boolean mUpdatingControls;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mContext = getActivity();
-        mPM = mContext.getPackageManager();
 
         addPreferencesFromResource(R.xml.zen_mode_settings);
         final PreferenceScreen root = getPreferenceScreen();
 
-        mConfig = getZenModeConfig();
-        if (DEBUG) Log.d(TAG, "Loaded mConfig=" + mConfig);
-
-        PREF_ZEN_MODE.init(this);
-        PREF_ZEN_MODE.setCallback(new SettingPrefWithCallback.Callback() {
-            @Override
-            public void onSettingSelected(int value) {
-                if (value != Global.ZEN_MODE_OFF) {
-                    showConditionSelection(value);
-                }
-            }
-        });
-
-        final PreferenceCategory important =
-                (PreferenceCategory) root.findPreference(KEY_IMPORTANT);
-
-        mCalls = (SwitchPreference) important.findPreference(KEY_CALLS);
-        mCalls.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (mDisableListeners) return true;
-                final boolean val = (Boolean) newValue;
-                if (val == mConfig.allowCalls) return true;
-                if (DEBUG) Log.d(TAG, "onPrefChange allowCalls=" + val);
-                final ZenModeConfig newConfig = mConfig.copy();
-                newConfig.allowCalls = val;
-                return setZenModeConfig(newConfig);
-            }
-        });
-
-        mMessages = (SwitchPreference) important.findPreference(KEY_MESSAGES);
-        mMessages.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (mDisableListeners) return true;
-                final boolean val = (Boolean) newValue;
-                if (val == mConfig.allowMessages) return true;
-                if (DEBUG) Log.d(TAG, "onPrefChange allowMessages=" + val);
-                final ZenModeConfig newConfig = mConfig.copy();
-                newConfig.allowMessages = val;
-                return setZenModeConfig(newConfig);
-            }
-        });
-
-        mStarred = (DropDownPreference) important.findPreference(KEY_STARRED);
-        mStarred.addItem(R.string.zen_mode_from_anyone, ZenModeConfig.SOURCE_ANYONE);
-        mStarred.addItem(R.string.zen_mode_from_starred, ZenModeConfig.SOURCE_STAR);
-        mStarred.addItem(R.string.zen_mode_from_contacts, ZenModeConfig.SOURCE_CONTACT);
-        mStarred.setCallback(new DropDownPreference.Callback() {
-            @Override
-            public boolean onItemSelected(int pos, Object newValue) {
-                if (mDisableListeners) return true;
-                final int val = (Integer) newValue;
-                if (val == mConfig.allowFrom) return true;
-                if (DEBUG) Log.d(TAG, "onPrefChange allowFrom=" +
-                        ZenModeConfig.sourceToString(val));
-                final ZenModeConfig newConfig = mConfig.copy();
-                newConfig.allowFrom = val;
-                return setZenModeConfig(newConfig);
-            }
-        });
-        important.addPreference(mStarred);
-
-        mEvents = (SwitchPreference) important.findPreference(KEY_EVENTS);
-        mEvents.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (mDisableListeners) return true;
-                final boolean val = (Boolean) newValue;
-                if (val == mConfig.allowEvents) return true;
-                if (DEBUG) Log.d(TAG, "onPrefChange allowEvents=" + val);
-                final ZenModeConfig newConfig = mConfig.copy();
-                newConfig.allowEvents = val;
-                return setZenModeConfig(newConfig);
-            }
-        });
-
-        final PreferenceCategory downtime = (PreferenceCategory) root.findPreference(KEY_DOWNTIME);
-        mDowntimeSupported = isDowntimeSupported(mContext);
-        if (!mDowntimeSupported) {
-            removePreference(KEY_DOWNTIME);
-        } else {
-            mDays = downtime.findPreference(KEY_DAYS);
-            mDays.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    new AlertDialog.Builder(mContext)
-                            .setTitle(R.string.zen_mode_downtime_days)
-                            .setView(new ZenModeDowntimeDaysSelection(mContext, mConfig.sleepMode) {
-                                  @Override
-                                  protected void onChanged(String mode) {
-                                      if (mDisableListeners) return;
-                                      if (Objects.equals(mode, mConfig.sleepMode)) return;
-                                      if (DEBUG) Log.d(TAG, "days.onChanged sleepMode=" + mode);
-                                      final ZenModeConfig newConfig = mConfig.copy();
-                                      newConfig.sleepMode = mode;
-                                      setZenModeConfig(newConfig);
-                                  }
-                            })
-                            .setOnDismissListener(new OnDismissListener() {
-                                @Override
-                                public void onDismiss(DialogInterface dialog) {
-                                    updateDays();
-                                }
-                            })
-                            .setPositiveButton(R.string.done_button, null)
-                            .show();
-                    return true;
-                }
-            });
-
-            final FragmentManager mgr = getFragmentManager();
-
-            mStart = new TimePickerPreference(mContext, mgr);
-            mStart.setKey(KEY_START_TIME);
-            mStart.setTitle(R.string.zen_mode_start_time);
-            mStart.setCallback(new TimePickerPreference.Callback() {
-                @Override
-                public boolean onSetTime(int hour, int minute) {
-                    if (mDisableListeners) return true;
-                    if (!ZenModeConfig.isValidHour(hour)) return false;
-                    if (!ZenModeConfig.isValidMinute(minute)) return false;
-                    if (hour == mConfig.sleepStartHour && minute == mConfig.sleepStartMinute) {
-                        return true;
-                    }
-                    if (DEBUG) Log.d(TAG, "onPrefChange sleepStart h=" + hour + " m=" + minute);
-                    final ZenModeConfig newConfig = mConfig.copy();
-                    newConfig.sleepStartHour = hour;
-                    newConfig.sleepStartMinute = minute;
-                    return setZenModeConfig(newConfig);
-                }
-            });
-            downtime.addPreference(mStart);
-            mStart.setDependency(mDays.getKey());
-
-            mEnd = new TimePickerPreference(mContext, mgr);
-            mEnd.setKey(KEY_END_TIME);
-            mEnd.setTitle(R.string.zen_mode_end_time);
-            mEnd.setCallback(new TimePickerPreference.Callback() {
-                @Override
-                public boolean onSetTime(int hour, int minute) {
-                    if (mDisableListeners) return true;
-                    if (!ZenModeConfig.isValidHour(hour)) return false;
-                    if (!ZenModeConfig.isValidMinute(minute)) return false;
-                    if (hour == mConfig.sleepEndHour && minute == mConfig.sleepEndMinute) {
-                        return true;
-                    }
-                    if (DEBUG) Log.d(TAG, "onPrefChange sleepEnd h=" + hour + " m=" + minute);
-                    final ZenModeConfig newConfig = mConfig.copy();
-                    newConfig.sleepEndHour = hour;
-                    newConfig.sleepEndMinute = minute;
-                    return setZenModeConfig(newConfig);
-                }
-            });
-            downtime.addPreference(mEnd);
-            mEnd.setDependency(mDays.getKey());
-
-            mDowntimeMode = (DropDownPreference) downtime.findPreference(KEY_DOWNTIME_MODE);
-            mDowntimeMode.addItem(R.string.zen_mode_downtime_mode_priority, false);
-            mDowntimeMode.addItem(R.string.zen_mode_downtime_mode_none, true);
-            mDowntimeMode.setCallback(new DropDownPreference.Callback() {
-                @Override
-                public boolean onItemSelected(int pos, Object value) {
-                    if (mDisableListeners) return true;
-                    final boolean sleepNone = value instanceof Boolean ? ((Boolean) value) : false;
-                    if (mConfig == null || mConfig.sleepNone == sleepNone) return false;
-                    final ZenModeConfig newConfig = mConfig.copy();
-                    newConfig.sleepNone = sleepNone;
-                    if (DEBUG) Log.d(TAG, "onPrefChange sleepNone=" + sleepNone);
-                    return setZenModeConfig(newConfig);
-                }
-            });
-            mDowntimeMode.setOrder(10);  // sort at the bottom of the category
-            mDowntimeMode.setDependency(mDays.getKey());
-        }
-
-        mAutomationCategory = (PreferenceCategory) findPreference(KEY_AUTOMATION);
-        mEntry = findPreference(KEY_ENTRY);
-        mEntry.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                new AlertDialog.Builder(mContext)
-                    .setTitle(R.string.zen_mode_entry_conditions_title)
-                    .setView(new ZenModeAutomaticConditionSelection(mContext))
-                    .setOnDismissListener(new OnDismissListener() {
-                        @Override
-                        public void onDismiss(DialogInterface dialog) {
-                            refreshAutomationSection();
-                        }
-                    })
-                    .setPositiveButton(R.string.dlg_ok, null)
-                    .show();
-                return true;
-            }
-        });
-        mConditionProviders = findPreference(KEY_CONDITION_PROVIDERS);
-
-        updateControls();
-    }
-
-    private void updateDays() {
-        if (mConfig != null) {
-            final int[] days = ZenModeConfig.tryParseDays(mConfig.sleepMode);
-            if (days != null && days.length != 0) {
-                final StringBuilder sb = new StringBuilder();
-                final Calendar c = Calendar.getInstance();
-                for (int i = 0; i < DAYS.length; i++) {
-                    final int day = DAYS[i];
-                    for (int j = 0; j < days.length; j++) {
-                        if (day == days[j]) {
-                            c.set(Calendar.DAY_OF_WEEK, day);
-                            if (sb.length() > 0) {
-                                sb.append(mContext.getString(R.string.summary_divider_text));
-                            }
-                            sb.append(DAY_FORMAT.format(c.getTime()));
-                            break;
-                        }
-                    }
-                }
-                if (sb.length() > 0) {
-                    mDays.setSummary(sb);
-                    mDays.notifyDependencyChange(false);
-                    return;
-                }
-            }
-        }
-        mDays.setSummary(R.string.zen_mode_downtime_days_none);
-        mDays.notifyDependencyChange(true);
-    }
-
-    private void updateEndSummary() {
-        if (!mDowntimeSupported) return;
-        final int startMin = 60 * mConfig.sleepStartHour + mConfig.sleepStartMinute;
-        final int endMin = 60 * mConfig.sleepEndHour + mConfig.sleepEndMinute;
-        final boolean nextDay = startMin >= endMin;
-        final int summaryFormat;
-        if (mConfig.sleepNone) {
-            summaryFormat = nextDay ? R.string.zen_mode_end_time_none_next_day_summary_format
-                    : R.string.zen_mode_end_time_none_same_day_summary_format;
-        } else {
-            summaryFormat = nextDay ? R.string.zen_mode_end_time_priority_next_day_summary_format
-                    : 0;
-        }
-        mEnd.setSummaryFormat(summaryFormat);
-    }
-
-    private void updateControls() {
-        mDisableListeners = true;
-        if (mCalls != null) {
-            mCalls.setChecked(mConfig.allowCalls);
-        }
-        mMessages.setChecked(mConfig.allowMessages);
-        mStarred.setSelectedValue(mConfig.allowFrom);
-        mEvents.setChecked(mConfig.allowEvents);
-        updateStarredEnabled();
-        if (mDowntimeSupported) {
-            updateDays();
-            mStart.setTime(mConfig.sleepStartHour, mConfig.sleepStartMinute);
-            mEnd.setTime(mConfig.sleepEndHour, mConfig.sleepEndMinute);
-            mDowntimeMode.setSelectedValue(mConfig.sleepNone);
-        }
-        mDisableListeners = false;
-        refreshAutomationSection();
-        updateEndSummary();
-    }
-
-    private void updateStarredEnabled() {
-        mStarred.setEnabled(mConfig.allowCalls || mConfig.allowMessages);
-    }
-
-    private void refreshAutomationSection() {
-        if (mConditionProviders != null) {
-            final int total = ConditionProviderSettings.getProviderCount(mPM);
-            if (total == 0) {
-                getPreferenceScreen().removePreference(mAutomationCategory);
-            } else {
-                final int n = ConditionProviderSettings.getEnabledProviderCount(mContext);
-                if (n == 0) {
-                    mConditionProviders.setSummary(getResources().getString(
-                            R.string.manage_condition_providers_summary_zero));
-                } else {
-                    mConditionProviders.setSummary(String.format(getResources().getQuantityString(
-                            R.plurals.manage_condition_providers_summary_nonzero,
-                            n, n)));
-                }
-                final String entrySummary = getEntryConditionSummary();
-                if (n == 0 || entrySummary == null) {
-                    mEntry.setSummary(R.string.zen_mode_entry_conditions_summary_none);
-                } else {
-                    mEntry.setSummary(entrySummary);
-                }
-            }
+        mPrioritySettings = root.findPreference(KEY_PRIORITY_SETTINGS);
+        if (!isScheduleSupported(mContext)) {
+            removePreference(KEY_AUTOMATION_SETTINGS);
         }
     }
 
-    private String getEntryConditionSummary() {
-        final INotificationManager nm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        try {
-            final Condition[] automatic = nm.getAutomaticZenModeConditions();
-            if (automatic == null || automatic.length == 0) {
-                return null;
-            }
-            final String divider = getString(R.string.summary_divider_text);
-            final StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < automatic.length; i++) {
-                if (i > 0) sb.append(divider);
-                sb.append(automatic[i].summary);
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            Log.w(TAG, "Error calling getAutomaticZenModeConditions", e);
-            return null;
-        }
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final SettingsActivity activity = (SettingsActivity) getActivity();
+        mSwitchBar = activity.getSwitchBar();
+        mSwitchBar.addOnSwitchChangeListener(this);
+        mSwitchBar.show();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mSwitchBar.removeOnSwitchChangeListener(this);
+        mSwitchBar.hide();
     }
 
     @Override
     public void onResume() {
         super.onResume();
         updateControls();
-        mSettingsObserver.register();
+        mShowing = true;
     }
 
     @Override
     public void onPause() {
+        mShowing = false;
         super.onPause();
-        mSettingsObserver.unregister();
     }
 
-    private void updateZenModeConfig() {
-        final ZenModeConfig config = getZenModeConfig();
-        if (Objects.equals(config, mConfig)) return;
-        mConfig = config;
-        if (DEBUG) Log.d(TAG, "updateZenModeConfig mConfig=" + mConfig);
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        if (DEBUG) Log.d(TAG, "onSwitchChanged " + isChecked + " mShowing=" + mShowing
+                + " mUpdatingControls=" + mUpdatingControls);
+        if (!mShowing || mUpdatingControls) return; // not from the user
+        if (isChecked) {
+            setZenMode(Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, null);
+            showConditionSelection(Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+        } else {
+            setZenMode(Global.ZEN_MODE_OFF, null);
+        }
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_ZEN_MODE;
+    }
+
+    @Override
+    protected void onZenModeChanged() {
         updateControls();
     }
 
-    private ZenModeConfig getZenModeConfig() {
-        final INotificationManager nm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        try {
-            return nm.getZenModeConfig();
-        } catch (Exception e) {
-           Log.w(TAG, "Error calling NoMan", e);
-           return new ZenModeConfig();
+    @Override
+    protected void onZenModeConfigChanged() {
+        updateControls();
+    }
+
+    public static String computeZenModeCaption(Resources res, int zenMode) {
+        switch (zenMode) {
+            case Global.ZEN_MODE_ALARMS:
+                return res.getString(R.string.zen_mode_option_alarms);
+            case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
+                return res.getString(R.string.zen_mode_option_important_interruptions);
+            case Global.ZEN_MODE_NO_INTERRUPTIONS:
+                return res.getString(R.string.zen_mode_option_no_interruptions);
+            default:
+                return null;
         }
     }
 
-    private boolean setZenModeConfig(ZenModeConfig config) {
-        final INotificationManager nm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        try {
-            final boolean success = nm.setZenModeConfig(config);
-            if (success) {
-                mConfig = config;
-                if (DEBUG) Log.d(TAG, "Saved mConfig=" + mConfig);
-                updateEndSummary();
-                updateStarredEnabled();
-            }
-            return success;
-        } catch (Exception e) {
-           Log.w(TAG, "Error calling NoMan", e);
-           return false;
+    private String computeZenModeSummaryLine() {
+        final String caption = computeZenModeCaption(getResources(), mZenMode);
+        if (caption == null) return null;  // zen mode off
+        final String conditionText = ZenModeConfig.getConditionLine1(mContext, mConfig,
+                UserHandle.myUserId());
+        return getString(R.string.zen_mode_summary_combination, caption, conditionText);
+    }
+
+    private void updateControls() {
+        if (mSwitchBar != null) {
+            final String summaryLine = computeZenModeSummaryLine();
+            mUpdatingControls = true;
+            mSwitchBar.setChecked(summaryLine != null);
+            mUpdatingControls = false;
+            mSwitchBar.setSummary(summaryLine);
         }
+        updatePrioritySettingsSummary();
     }
 
-    protected void putZenModeSetting(int value) {
-        Global.putInt(getContentResolver(), Global.ZEN_MODE, value);
+    private void updatePrioritySettingsSummary() {
+        final boolean callers = mConfig.allowCalls || mConfig.allowRepeatCallers;
+        String s = getResources().getString(R.string.zen_mode_alarms);
+        s = appendLowercase(s, mConfig.allowReminders, R.string.zen_mode_reminders);
+        s = appendLowercase(s, mConfig.allowEvents, R.string.zen_mode_events);
+        s = appendLowercase(s, callers, R.string.zen_mode_selected_callers);
+        s = appendLowercase(s, mConfig.allowMessages, R.string.zen_mode_messages);
+        mPrioritySettings.setSummary(s);
     }
 
-    protected void showConditionSelection(final int newSettingsValue) {
+    private String appendLowercase(String s, boolean condition, int resId) {
+        if (condition) {
+            return getResources().getString(R.string.join_many_items_middle, s,
+                    getResources().getString(resId).toLowerCase());
+        }
+        return s;
+    }
+
+    protected void showConditionSelection(final int zenMode) {
         if (mDialog != null) return;
 
         final ZenModeConditionSelection zenModeConditionSelection =
-                new ZenModeConditionSelection(mContext);
+                new ZenModeConditionSelection(mContext, zenMode);
         DialogInterface.OnClickListener positiveListener = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -533,37 +188,50 @@
                 mDialog = null;
             }
         };
-        final int oldSettingsValue = PREF_ZEN_MODE.getValue(mContext);
         ScrollView scrollView = new ScrollView(mContext);
         scrollView.addView(zenModeConditionSelection);
         mDialog = new AlertDialog.Builder(getActivity())
-                .setTitle(PREF_ZEN_MODE.getCaption(getResources(), newSettingsValue))
+                .setTitle(computeZenModeCaption(getResources(), zenMode))
                 .setView(scrollView)
                 .setPositiveButton(R.string.okay, positiveListener)
-                .setNegativeButton(R.string.cancel_all_caps, new DialogInterface.OnClickListener() {
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        cancelDialog(oldSettingsValue);
+                        cancelDialog();
                     }
                 })
                 .setOnCancelListener(new DialogInterface.OnCancelListener() {
                     @Override
                     public void onCancel(DialogInterface dialog) {
-                        cancelDialog(oldSettingsValue);
+                        cancelDialog();
                     }
                 }).create();
         mDialog.show();
     }
 
-    protected void cancelDialog(int oldSettingsValue) {
-        // If not making a decision, reset drop down to current setting.
-        PREF_ZEN_MODE.setValueWithoutCallback(mContext, oldSettingsValue);
+    private void cancelDialog() {
+        if (DEBUG) Log.d(TAG, "cancelDialog");
+        // If not making a decision, reset zen to off.
+        setZenMode(Global.ZEN_MODE_OFF, null);
         mDialog = null;
     }
 
-    private static boolean isDowntimeSupported(Context context) {
-        return NotificationManager.from(context)
-                .isSystemConditionProviderEnabled(ZenModeConfig.DOWNTIME_PATH);
+    public static String computeConditionText(Condition c) {
+        return !TextUtils.isEmpty(c.line1) ? c.line1
+                : !TextUtils.isEmpty(c.summary) ? c.summary
+                : "";
+    }
+
+    private static SparseArray<String> allKeyTitles(Context context) {
+        final SparseArray<String> rt = new SparseArray<String>();
+        rt.put(R.string.zen_mode_priority_settings_title, KEY_PRIORITY_SETTINGS);
+        rt.put(R.string.zen_mode_automation_settings_title, KEY_AUTOMATION_SETTINGS);
+        return rt;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_interruptions;
     }
 
     // Enable indexing of searchable data
@@ -589,173 +257,10 @@
             @Override
             public List<String> getNonIndexableKeys(Context context) {
                 final ArrayList<String> rt = new ArrayList<String>();
-                if (!isDowntimeSupported(context)) {
-                    rt.add(KEY_DOWNTIME);
-                    rt.add(KEY_DAYS);
-                    rt.add(KEY_START_TIME);
-                    rt.add(KEY_END_TIME);
-                    rt.add(KEY_DOWNTIME_MODE);
+                if (!isScheduleSupported(context)) {
+                    rt.add(KEY_AUTOMATION_SETTINGS);
                 }
                 return rt;
             }
         };
-
-    private static class SettingPrefWithCallback extends SettingPref {
-
-        private Callback mCallback;
-        private int mValue;
-
-        public SettingPrefWithCallback(int type, String key, String setting, int def,
-                int... values) {
-            super(type, key, setting, def, values);
-        }
-
-        public void setCallback(Callback callback) {
-            mCallback = callback;
-        }
-
-        @Override
-        public void update(Context context) {
-            // Avoid callbacks from non-user changes.
-            mValue = getValue(context);
-            super.update(context);
-        }
-
-        @Override
-        protected boolean setSetting(Context context, int value) {
-            if (value == mValue) return true;
-            mValue = value;
-            if (mCallback != null) {
-                mCallback.onSettingSelected(value);
-            }
-            return super.setSetting(context, value);
-        }
-
-        @Override
-        public Preference init(SettingsPreferenceFragment settings) {
-            Preference ret = super.init(settings);
-            mValue = getValue(settings.getActivity());
-
-            return ret;
-        }
-
-        public boolean setValueWithoutCallback(Context context, int value) {
-            // Set the current value ahead of time, this way we won't trigger a callback.
-            mValue = value;
-            return putInt(mType, context.getContentResolver(), mSetting, value);
-        }
-
-        public int getValue(Context context) {
-            return getInt(mType, context.getContentResolver(), mSetting, mDefault);
-        }
-
-        public interface Callback {
-            void onSettingSelected(int value);
-        }
-    }
-
-    private final class SettingsObserver extends ContentObserver {
-        private final Uri ZEN_MODE_URI = Global.getUriFor(Global.ZEN_MODE);
-        private final Uri ZEN_MODE_CONFIG_ETAG_URI = Global.getUriFor(Global.ZEN_MODE_CONFIG_ETAG);
-
-        public SettingsObserver() {
-            super(mHandler);
-        }
-
-        public void register() {
-            getContentResolver().registerContentObserver(ZEN_MODE_URI, false, this);
-            getContentResolver().registerContentObserver(ZEN_MODE_CONFIG_ETAG_URI, false, this);
-        }
-
-        public void unregister() {
-            getContentResolver().unregisterContentObserver(this);
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            super.onChange(selfChange, uri);
-            if (ZEN_MODE_URI.equals(uri)) {
-                PREF_ZEN_MODE.update(mContext);
-            }
-            if (ZEN_MODE_CONFIG_ETAG_URI.equals(uri)) {
-                updateZenModeConfig();
-            }
-        }
-    }
-
-    private static class TimePickerPreference extends Preference {
-        private final Context mContext;
-
-        private int mSummaryFormat;
-        private int mHourOfDay;
-        private int mMinute;
-        private Callback mCallback;
-
-        public TimePickerPreference(Context context, final FragmentManager mgr) {
-            super(context);
-            mContext = context;
-            setPersistent(false);
-            setOnPreferenceClickListener(new OnPreferenceClickListener(){
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    final TimePickerFragment frag = new TimePickerFragment();
-                    frag.pref = TimePickerPreference.this;
-                    frag.show(mgr, TimePickerPreference.class.getName());
-                    return true;
-                }
-            });
-        }
-
-        public void setCallback(Callback callback) {
-            mCallback = callback;
-        }
-
-        public void setSummaryFormat(int resId) {
-            mSummaryFormat = resId;
-            updateSummary();
-        }
-
-        public void setTime(int hourOfDay, int minute) {
-            if (mCallback != null && !mCallback.onSetTime(hourOfDay, minute)) return;
-            mHourOfDay = hourOfDay;
-            mMinute = minute;
-            updateSummary();
-        }
-
-        private void updateSummary() {
-            final Calendar c = Calendar.getInstance();
-            c.set(Calendar.HOUR_OF_DAY, mHourOfDay);
-            c.set(Calendar.MINUTE, mMinute);
-            String time = DateFormat.getTimeFormat(mContext).format(c.getTime());
-            if (mSummaryFormat != 0) {
-                time = mContext.getResources().getString(mSummaryFormat, time);
-            }
-            setSummary(time);
-        }
-
-        public static class TimePickerFragment extends DialogFragment implements
-                TimePickerDialog.OnTimeSetListener {
-            public TimePickerPreference pref;
-
-            @Override
-            public Dialog onCreateDialog(Bundle savedInstanceState) {
-                final boolean usePref = pref != null && pref.mHourOfDay >= 0 && pref.mMinute >= 0;
-                final Calendar c = Calendar.getInstance();
-                final int hour = usePref ? pref.mHourOfDay : c.get(Calendar.HOUR_OF_DAY);
-                final int minute = usePref ? pref.mMinute : c.get(Calendar.MINUTE);
-                return new TimePickerDialog(getActivity(), this, hour, minute,
-                        DateFormat.is24HourFormat(getActivity()));
-            }
-
-            public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-                if (pref != null) {
-                    pref.setTime(hourOfDay, minute);
-                }
-            }
-        }
-
-        public interface Callback {
-            boolean onSetTime(int hour, int minute);
-        }
-    }
 }
diff --git a/src/com/android/settings/notification/ZenModeSettingsBase.java b/src/com/android/settings/notification/ZenModeSettingsBase.java
new file mode 100644
index 0000000..9824dc7
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeSettingsBase.java
@@ -0,0 +1,143 @@
+/*
+ * 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.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.provider.Settings;
+import android.provider.Settings.Global;
+import android.service.notification.ZenModeConfig;
+import android.util.Log;
+
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.util.Objects;
+
+abstract public class ZenModeSettingsBase extends SettingsPreferenceFragment {
+    protected static final String TAG = "ZenModeSettings";
+    protected static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    private final Handler mHandler = new Handler();
+    private final SettingsObserver mSettingsObserver = new SettingsObserver();
+
+    protected Context mContext;
+    protected ZenModeConfig mConfig;
+    protected int mZenMode;
+
+    abstract protected void onZenModeChanged();
+    abstract protected void onZenModeConfigChanged();
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mContext = getActivity();
+        updateZenMode(false /*fireChanged*/);
+        updateZenModeConfig(false /*fireChanged*/);
+        if (DEBUG) Log.d(TAG, "Loaded mConfig=" + mConfig);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateZenMode(true /*fireChanged*/);
+        updateZenModeConfig(true /*fireChanged*/);
+        mSettingsObserver.register();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mSettingsObserver.unregister();
+    }
+
+    private void updateZenMode(boolean fireChanged) {
+        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();
+        }
+    }
+
+    private void updateZenModeConfig(boolean fireChanged) {
+        final ZenModeConfig config = getZenModeConfig();
+        if (Objects.equals(config, mConfig)) return;
+        mConfig = config;
+        if (DEBUG) Log.d(TAG, "updateZenModeConfig mConfig=" + mConfig);
+        if (fireChanged) {
+            onZenModeConfigChanged();
+        }
+    }
+
+    protected boolean setZenModeConfig(ZenModeConfig config) {
+        final String reason = getClass().getSimpleName();
+        final boolean success = NotificationManager.from(mContext).setZenModeConfig(config, reason);
+        if (success) {
+            mConfig = config;
+            if (DEBUG) Log.d(TAG, "Saved mConfig=" + mConfig);
+            onZenModeConfigChanged();
+        }
+        return success;
+    }
+
+    protected void setZenMode(int zenMode, Uri conditionId) {
+        NotificationManager.from(mContext).setZenMode(zenMode, conditionId, TAG);
+    }
+
+    protected static boolean isScheduleSupported(Context context) {
+        return NotificationManager.from(context)
+                .isSystemConditionProviderEnabled(ZenModeConfig.SCHEDULE_PATH);
+    }
+
+    private ZenModeConfig getZenModeConfig() {
+        return NotificationManager.from(mContext).getZenModeConfig();
+    }
+
+    private final class SettingsObserver extends ContentObserver {
+        private final Uri ZEN_MODE_URI = Global.getUriFor(Global.ZEN_MODE);
+        private final Uri ZEN_MODE_CONFIG_ETAG_URI = Global.getUriFor(Global.ZEN_MODE_CONFIG_ETAG);
+
+        private SettingsObserver() {
+            super(mHandler);
+        }
+
+        public void register() {
+            getContentResolver().registerContentObserver(ZEN_MODE_URI, false, this);
+            getContentResolver().registerContentObserver(ZEN_MODE_CONFIG_ETAG_URI, false, this);
+        }
+
+        public void unregister() {
+            getContentResolver().unregisterContentObserver(this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            super.onChange(selfChange, uri);
+            if (ZEN_MODE_URI.equals(uri)) {
+                updateZenMode(true /*fireChanged*/);
+            }
+            if (ZEN_MODE_CONFIG_ETAG_URI.equals(uri)) {
+                updateZenModeConfig(true /*fireChanged*/);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeVoiceActivity.java b/src/com/android/settings/notification/ZenModeVoiceActivity.java
new file mode 100644
index 0000000..2994ed1
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeVoiceActivity.java
@@ -0,0 +1,240 @@
+/*
+ * 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 static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES;
+import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED;
+
+import com.android.settings.R;
+import com.android.settings.utils.VoiceSelectionAdapter;
+import com.android.settings.utils.VoiceSelection;
+import com.android.settings.utils.VoiceSelectionFragment;
+import com.android.settings.utils.VoiceSettingsActivity;
+
+import android.app.Fragment;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.UserHandle;
+import android.provider.Settings.Global;
+import android.service.notification.Condition;
+import android.service.notification.ZenModeConfig;
+import android.text.format.DateFormat;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Activity for modifying the Zen mode (Do not disturb) by voice
+ * using the Voice Interaction API.
+ */
+public class ZenModeVoiceActivity extends VoiceSettingsActivity {
+    private static final String TAG = "ZenModeVoiceActivity";
+    private static final int MINUTES_MS = 60 * 1000;
+
+    @Override
+    protected boolean onVoiceSettingInteraction(Intent intent) {
+        setContentView(R.layout.voice_interaction);
+        pickNotificationMode(intent);
+        return false;
+    }
+
+    /**
+     * Start a voice interaction to ask what kind of interruptions should
+     * be permitted. The intent can optionally include extra information about the type
+     * of interruptions desired or how long interruptions should be limited to that are
+     * used as hints.
+     */
+    private void pickNotificationMode(final Intent intent) {
+        boolean enabled = intent.getBooleanExtra(EXTRA_DO_NOT_DISTURB_MODE_ENABLED, false);
+        boolean specified = intent.hasExtra(EXTRA_DO_NOT_DISTURB_MODE_ENABLED);
+
+        setHeader(getString(R.string.zen_mode_interruptions_voice_header));
+
+        List<VoiceSelection> states = new ArrayList<VoiceSelection>();
+        if (!specified || enabled) {
+            states.add(new ModeSelection(this, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
+                    R.string.zen_mode_option_voice_important_interruptions,
+                    R.string.zen_mode_option_voice_important_synonyms));
+            states.add(new ModeSelection(this, Global.ZEN_MODE_ALARMS,
+                    R.string.zen_mode_option_voice_alarms,
+                    R.string.zen_mode_option_voice_alarms_synonyms));
+            states.add(new ModeSelection(this, Global.ZEN_MODE_NO_INTERRUPTIONS,
+                    R.string.zen_mode_option_voice_no_interruptions,
+                    R.string.zen_mode_option_voice_no_interruptions_synonyms));
+        }
+        if (!specified || !enabled) {
+            states.add(new ModeSelection(this, Global.ZEN_MODE_OFF,
+                    R.string.zen_mode_option_voice_all_interruptions,
+                    R.string.zen_mode_option_voice_all_interruptions_synonyms));
+        }
+        VoiceSelectionFragment fragment = new VoiceSelectionFragment();
+        fragment.setArguments(VoiceSelectionFragment.createArguments(
+                getString(R.string.zen_mode_interruptions_voice_prompt)));
+        fragment.setListAdapter(
+                new VoiceSelectionAdapter(this, R.layout.voice_item_row, states));
+        fragment.setOnItemSelectedHandler(new VoiceSelection.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(int index, VoiceSelection selection) {
+                int mode = ((ModeSelection) selection).mMode;
+                ConditionSelection conditionSelection = getConditionSelection(
+                        intent.getIntExtra(EXTRA_DO_NOT_DISTURB_MODE_MINUTES, 0));
+                if (mode != Global.ZEN_MODE_OFF) {
+                    if (conditionSelection == null) {
+                        pickDuration(selection.getLabel(), mode);
+                        return;
+                    }
+                    setZenModeConfig(mode, conditionSelection.mCondition);
+                } else {
+                    setZenModeConfig(Global.ZEN_MODE_OFF, null);
+                }
+                notifySuccess(getChangeSummary(mode, conditionSelection));
+                finish();
+            }
+        });
+        showFragment(fragment, "pick_mode_fragment");
+    }
+
+    /**
+     * Start a voice interaction to ask for the zen mode duration.
+     */
+    private void pickDuration(CharSequence label, final int mode) {
+        setTitle(label.toString());
+        setHeader(null);
+
+        List<VoiceSelection> states = new ArrayList<VoiceSelection>();
+        states.add(new ConditionSelection(null, -1,
+              getString(R.string.zen_mode_duration_indefinte_voice_label),
+              getString(R.string.zen_mode_duration_indefinite_voice_synonyms)));
+        for (int i = ZenModeConfig.MINUTE_BUCKETS.length - 1; i >= 0; --i) {
+            states.add(getConditionSelection(ZenModeConfig.MINUTE_BUCKETS[i]));
+        }
+
+        VoiceSelectionFragment fragment = new VoiceSelectionFragment();
+        fragment.setArguments(VoiceSelectionFragment.createArguments(
+                getString(R.string.zen_mode_duration_voice_prompt)));
+        fragment.setListAdapter(
+                new VoiceSelectionAdapter(this, R.layout.voice_item_row, states));
+        fragment.setOnItemSelectedHandler(new VoiceSelection.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(int index, VoiceSelection item) {
+                ConditionSelection selection = ((ConditionSelection) item);
+                setZenModeConfig(mode, selection.mCondition);
+                notifySuccess(getChangeSummary(mode, selection));
+                finish();
+            }
+        });
+        showFragment(fragment, "pick_duration_fragment");
+    }
+
+    private void setZenModeConfig(int mode, Condition condition) {
+        if (condition != null) {
+            NotificationManager.from(this).setZenMode(mode, condition.id, TAG);
+        } else {
+            NotificationManager.from(this).setZenMode(mode, null, TAG);
+        }
+    }
+
+    /**
+     * Produce a summary of the Zen mode change to be read aloud as TTS.
+     */
+    private CharSequence getChangeSummary(int mode, ConditionSelection duration) {
+        int indefinite = -1;
+        int byMinute = -1;
+        int byHour = -1;
+
+        switch (mode) {
+            case Global.ZEN_MODE_ALARMS:
+                indefinite = R.string.zen_mode_summary_alarams_only_indefinite;
+                byMinute = R.plurals.zen_mode_summary_alarms_only_by_minute;
+                byHour = R.plurals.zen_mode_summary_alarms_only_by_hour;
+                break;
+            case Global.ZEN_MODE_NO_INTERRUPTIONS:
+                indefinite = R.string.zen_mode_summary_no_interruptions_indefinite;
+                byMinute = R.plurals.zen_mode_summary_no_interruptions_by_minute;
+                byHour = R.plurals.zen_mode_summary_no_interruptions_by_hour;
+                break;
+            case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
+                indefinite = R.string.zen_mode_summary_priority_indefinitely;
+                byMinute = R.plurals.zen_mode_summary_priority_by_minute;
+                byHour = R.plurals.zen_mode_summary_priority_by_hour;
+                break;
+            default:
+            case Global.ZEN_MODE_OFF:
+                indefinite = R.string.zen_mode_summary_always;
+                break;
+        };
+
+        if (duration == null || duration.mCondition == null) {
+            return getString(indefinite);
+        }
+
+        long time = System.currentTimeMillis() + duration.mMinutes * MINUTES_MS;
+        String skeleton = DateFormat.is24HourFormat(this, UserHandle.myUserId()) ? "Hm" : "hma";
+        String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), skeleton);
+        CharSequence formattedTime = DateFormat.format(pattern, time);
+        Resources res = getResources();
+
+        if (duration.mMinutes < 60) {
+            return res.getQuantityString(byMinute,
+                    duration.mMinutes, duration.mMinutes, formattedTime);
+        } else {
+            int hours = duration.mMinutes / 60;
+            return res.getQuantityString(byHour, hours, hours, formattedTime);
+        }
+    }
+
+    private ConditionSelection getConditionSelection(int minutes) {
+        Condition condition = ZenModeConfig.toTimeCondition(this, minutes, UserHandle.myUserId());
+        Resources res = getResources();
+        if (minutes <= 0) {
+            return null;
+        } else if (minutes < 60) {
+            String label = res.getQuantityString(R.plurals.zen_mode_duration_minutes_voice_label,
+                    minutes, minutes);
+            return new ConditionSelection(condition, minutes, label, Integer.toString(minutes));
+        } else {
+            int hours = minutes / 60;
+            String label = res.getQuantityString(R.plurals.zen_mode_duration_hours_voice_label,
+                    hours, hours);
+            return new ConditionSelection(condition, minutes, label, Integer.toString(hours));
+        }
+    }
+
+    private static class ConditionSelection extends VoiceSelection {
+        Condition mCondition;
+        int mMinutes;
+
+        public ConditionSelection(Condition condition, int minutes, CharSequence label,
+                CharSequence synonyms) {
+            super(label, synonyms);
+            mMinutes = minutes;
+            mCondition = condition;
+        }
+    }
+
+    private static class ModeSelection extends VoiceSelection {
+        int mMode;
+
+        public ModeSelection(Context context, int mode, int label, int synonyms) {
+            super(context.getString(label), context.getString(synonyms));
+            mMode = mode;
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/ZenRuleNameDialog.java b/src/com/android/settings/notification/ZenRuleNameDialog.java
new file mode 100644
index 0000000..8b44e46
--- /dev/null
+++ b/src/com/android/settings/notification/ZenRuleNameDialog.java
@@ -0,0 +1,196 @@
+/*
+ * 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.AlertDialog;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.content.pm.ServiceInfo;
+import android.net.Uri;
+import android.service.notification.ZenModeConfig;
+import android.service.notification.ZenModeConfig.ScheduleInfo;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.ArraySet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+
+import com.android.settings.R;
+
+import java.util.List;
+
+public abstract class ZenRuleNameDialog {
+    private static final String TAG = ZenModeSettings.TAG;
+    private static final boolean DEBUG = ZenModeSettings.DEBUG;
+
+    private final AlertDialog mDialog;
+    private final EditText mEditText;
+    private final RadioGroup mTypes;
+    private final ArraySet<String> mExistingNames;
+    private final ServiceListing mServiceListing;
+    private final RuleInfo[] mExternalRules = new RuleInfo[3];
+
+    public ZenRuleNameDialog(Context context, ServiceListing serviceListing, String ruleName,
+            ArraySet<String> existingNames) {
+        mServiceListing = serviceListing;
+        final View v = LayoutInflater.from(context).inflate(R.layout.zen_rule_name, null, false);
+        mEditText = (EditText) v.findViewById(R.id.rule_name);
+        if (ruleName != null) {
+            mEditText.setText(ruleName);
+        }
+        mEditText.setSelectAllOnFocus(true);
+        mTypes = (RadioGroup) v.findViewById(R.id.rule_types);
+        if (mServiceListing != null) {
+            bindType(R.id.rule_type_schedule, defaultNewSchedule());
+            bindExternalRules();
+            mServiceListing.addCallback(mServiceListingCallback);
+            mServiceListing.reload();
+        }
+        mDialog = new AlertDialog.Builder(context)
+                .setTitle(R.string.zen_mode_rule_name)
+                .setView(v)
+                .setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        onOk(trimmedText(), selectedRuleInfo());
+                    }
+                })
+                .setOnDismissListener(new OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        if (mServiceListing != null) {
+                            mServiceListing.removeCallback(mServiceListingCallback);
+                        }
+                    }
+                })
+                .setNegativeButton(R.string.cancel, null)
+                .create();
+        mEditText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                // noop
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                // noop
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                updatePositiveButton();
+            }
+        });
+        mExistingNames = new ArraySet<String>(existingNames.size());
+        for (String existingName : existingNames) {
+            mExistingNames.add(existingName.toLowerCase());
+        }
+    }
+
+    abstract public void onOk(String ruleName, RuleInfo ruleInfo);
+
+    public void show() {
+        mDialog.show();
+        updatePositiveButton();
+    }
+
+    private void bindType(int id, RuleInfo ri) {
+        final RadioButton rb = (RadioButton) mTypes.findViewById(id);
+        if (ri == null) {
+            rb.setVisibility(View.GONE);
+            return;
+        }
+        rb.setVisibility(View.VISIBLE);
+        if (ri.caption != null) {
+            rb.setText(ri.caption);
+        }
+        rb.setTag(ri);
+    }
+
+    private RuleInfo selectedRuleInfo() {
+        final int id = mTypes.getCheckedRadioButtonId();
+        if (id == -1) return null;
+        final RadioButton rb = (RadioButton) mTypes.findViewById(id);
+        return (RuleInfo) rb.getTag();
+    }
+
+    private String trimmedText() {
+        return mEditText.getText() == null ? null : mEditText.getText().toString().trim();
+    }
+
+    private void updatePositiveButton() {
+        final String name = trimmedText();
+        final boolean validName = !TextUtils.isEmpty(name)
+                && !mExistingNames.contains(name.toLowerCase());
+        mDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(validName);
+    }
+
+    private static RuleInfo defaultNewSchedule() {
+        final ScheduleInfo schedule = new ScheduleInfo();
+        schedule.days = ZenModeConfig.ALL_DAYS;
+        schedule.startHour = 22;
+        schedule.endHour = 7;
+        final RuleInfo rt = new RuleInfo();
+        rt.settingsAction = ZenModeScheduleRuleSettings.ACTION;
+        rt.defaultConditionId = ZenModeConfig.toScheduleConditionId(schedule);
+        return rt;
+    }
+
+    private void bindExternalRules() {
+        bindType(R.id.rule_type_2, mExternalRules[0]);
+        bindType(R.id.rule_type_3, mExternalRules[1]);
+        bindType(R.id.rule_type_4, mExternalRules[2]);
+        // show radio group if we have at least one external rule type
+        mTypes.setVisibility(mExternalRules[0] != null ? View.VISIBLE : View.GONE);
+    }
+
+    private final ServiceListing.Callback mServiceListingCallback = new ServiceListing.Callback() {
+        @Override
+        public void onServicesReloaded(List<ServiceInfo> services) {
+            if (DEBUG) Log.d(TAG, "Services reloaded: count=" + services.size());
+            mExternalRules[0] = mExternalRules[1] = mExternalRules[2] = null;
+            int i = 0;
+            for (ServiceInfo si : services) {
+                final RuleInfo ri = ZenModeExternalRuleSettings.getRuleInfo(si);
+                if (ri != null) {
+                    mExternalRules[i] = ri;
+                    i++;
+                    if (i == mExternalRules.length) {
+                        break;
+                    }
+                }
+            }
+            bindExternalRules();
+        }
+    };
+
+    public static class RuleInfo {
+        public String caption;
+        public String settingsAction;
+        public Uri defaultConditionId;
+        public ComponentName serviceComponent;
+        public ComponentName configurationActivity;
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index ccdfc0e..b16c63d 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.print;
 
-import android.app.ActivityManager;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -33,6 +32,7 @@
 import android.view.MenuItem;
 import android.view.View;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -69,6 +69,11 @@
     private PrintJob mPrintJob;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.PRINT_JOB_SETTINGS;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index e36e92c..e42fddd 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -59,6 +59,7 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -140,6 +141,11 @@
     private SearchView mSearchView;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.PRINT_SERVICE_SETTINGS;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         mSettingsContentObserver.register(getContentResolver());
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 581321b..cea65d7 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.print;
 
-import android.app.ActivityManager;
 import android.app.LoaderManager.LoaderCallbacks;
 import android.content.AsyncTaskLoader;
 import android.content.ComponentName;
@@ -33,7 +32,6 @@
 import android.os.Message;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.os.Process;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
@@ -54,14 +52,16 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.Spinner;
 import android.widget.TextView;
 
 import com.android.internal.content.PackageMonitor;
-import com.android.settings.UserSpinnerAdapter;
-import com.android.settings.UserSpinnerAdapter.UserDetails;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.DialogCreatable;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.UserAdapter;
 import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
@@ -71,9 +71,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.Spinner;
-
 /**
  * Fragment with the top level print settings.
  */
@@ -123,10 +120,20 @@
     private PreferenceCategory mPrintServicesCategory;
 
     private PrintJobsController mPrintJobsController;
-    private UserSpinnerAdapter mProfileSpinnerAdapter;
+    private UserAdapter mProfileSpinnerAdapter;
     private Spinner mSpinner;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.PRINT_SETTINGS;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_printing;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.print_settings);
diff --git a/src/com/android/settings/print/PrintSettingsUtils.java b/src/com/android/settings/print/PrintSettingsUtils.java
index 24f20d5..ad866a0 100644
--- a/src/com/android/settings/print/PrintSettingsUtils.java
+++ b/src/com/android/settings/print/PrintSettingsUtils.java
@@ -19,6 +19,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.text.TextUtils.SimpleStringSplitter;
 
 import java.util.ArrayList;import java.util.List;
@@ -39,7 +40,7 @@
 
         String enabledServicesSetting = Settings.Secure.getString(context
                 .getContentResolver(), Settings.Secure.ENABLED_PRINT_SERVICES);
-        if (enabledServicesSetting == null) {
+        if (TextUtils.isEmpty(enabledServicesSetting)) {
             return enabledServices;
         }
 
@@ -51,7 +52,9 @@
             String componentNameString = colonSplitter.next();
             ComponentName enabledService = ComponentName.unflattenFromString(
                     componentNameString);
-            enabledServices.add(enabledService);
+            if (enabledService != null) {
+                enabledServices.add(enabledService);
+            }
         }
 
         return enabledServices;
diff --git a/src/com/android/settings/quicklaunch/BookmarkPicker.java b/src/com/android/settings/quicklaunch/BookmarkPicker.java
deleted file mode 100644
index 32594b6..0000000
--- a/src/com/android/settings/quicklaunch/BookmarkPicker.java
+++ /dev/null
@@ -1,331 +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.quicklaunch;
-
-import com.android.settings.R;
-
-import android.app.ListActivity;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * Activity to pick a bookmark that will be returned to the caller.
- * <p>
- * Currently, bookmarks are either:
- * <li> Activities that are in the launcher
- * <li> Activities that are within an app that is capable of being launched with
- * the {@link Intent#ACTION_CREATE_SHORTCUT}.
- */
-public class BookmarkPicker extends ListActivity implements SimpleAdapter.ViewBinder {
-
-    private static final String TAG = "BookmarkPicker";
-
-    /** Extra in the returned intent from this activity. */
-    public static final String EXTRA_TITLE = "com.android.settings.quicklaunch.TITLE";
-    
-    /** Extra that should be provided, and will be returned. */
-    public static final String EXTRA_SHORTCUT = "com.android.settings.quicklaunch.SHORTCUT";
-
-    /**
-     * The request code for the screen to create a bookmark that is WITHIN an
-     * application. For example, Gmail can return a bookmark for the inbox
-     * folder.
-     */
-    private static final int REQUEST_CREATE_SHORTCUT = 1;
-
-    /** Intent used to get all the activities that are launch-able */
-    private static Intent sLaunchIntent;
-    /** Intent used to get all the activities that are {@link #REQUEST_CREATE_SHORTCUT}-able */
-    private static Intent sShortcutIntent;
-    
-    /**
-     * List of ResolveInfo for activities that we can bookmark (either directly
-     * to the activity, or by launching the activity and it returning a bookmark
-     * WITHIN that application).
-     */
-    private List<ResolveInfo> mResolveList;
-    
-    // List adapter stuff
-    private static final String KEY_TITLE = "TITLE";
-    private static final String KEY_RESOLVE_INFO = "RESOLVE_INFO";
-    private static final String sKeys[] = new String[] { KEY_TITLE, KEY_RESOLVE_INFO };
-    private static final int sResourceIds[] = new int[] { R.id.title, R.id.icon };
-    private SimpleAdapter mMyAdapter;
-
-    /** Display those activities that are launch-able */
-    private static final int DISPLAY_MODE_LAUNCH = 0;
-    /** Display those activities that are able to have bookmarks WITHIN the application */
-    private static final int DISPLAY_MODE_SHORTCUT = 1;
-    private int mDisplayMode = DISPLAY_MODE_LAUNCH;
-    
-    private Handler mUiHandler = new Handler();
-    
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        updateListAndAdapter();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add(0, DISPLAY_MODE_LAUNCH, 0, R.string.quick_launch_display_mode_applications)
-                .setIcon(com.android.internal.R.drawable.ic_menu_archive);
-        menu.add(0, DISPLAY_MODE_SHORTCUT, 0, R.string.quick_launch_display_mode_shortcuts)
-                .setIcon(com.android.internal.R.drawable.ic_menu_goto);
-        return true;
-    }
-    
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        menu.findItem(DISPLAY_MODE_LAUNCH).setVisible(mDisplayMode != DISPLAY_MODE_LAUNCH);
-        menu.findItem(DISPLAY_MODE_SHORTCUT).setVisible(mDisplayMode != DISPLAY_MODE_SHORTCUT);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        
-        switch (item.getItemId()) {
-
-            case DISPLAY_MODE_LAUNCH: 
-                mDisplayMode = DISPLAY_MODE_LAUNCH;
-                break;
-            
-            case DISPLAY_MODE_SHORTCUT:
-                mDisplayMode = DISPLAY_MODE_SHORTCUT;
-                break;
-            
-            default:
-                return false;
-        }
-        
-        updateListAndAdapter();
-        return true;
-    }
-
-    private void ensureIntents() {
-        if (sLaunchIntent == null) {
-            sLaunchIntent = new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER);
-            sShortcutIntent = new Intent(Intent.ACTION_CREATE_SHORTCUT);
-        }
-    }
-
-    /**
-     * This should be called from the UI thread.
-     */
-    private void updateListAndAdapter() {
-        // Get the activities in a separate thread
-        new Thread("data updater") {
-            @Override
-            public void run() {
-                synchronized (BookmarkPicker.this) {
-                    /*
-                     * Don't touch any of the lists that are being used by the
-                     * adapter in this thread!
-                     */
-                    ArrayList<ResolveInfo> newResolveList = new ArrayList<ResolveInfo>();
-                    ArrayList<Map<String, ?>> newAdapterList = new ArrayList<Map<String, ?>>();
-
-                    fillResolveList(newResolveList);
-                    Collections.sort(newResolveList,
-                            new ResolveInfo.DisplayNameComparator(getPackageManager()));
-                    
-                    fillAdapterList(newAdapterList, newResolveList);
-                    
-                    updateAdapterToUseNewLists(newAdapterList, newResolveList);
-                }
-            }
-        }.start();  
-    }
-    
-    private void updateAdapterToUseNewLists(final ArrayList<Map<String, ?>> newAdapterList,
-            final ArrayList<ResolveInfo> newResolveList) {
-        // Post this back on the UI thread
-        mUiHandler.post(new Runnable() {
-            public void run() {
-                /*
-                 * SimpleAdapter does not support changing the lists after it
-                 * has been created. We just create a new instance.
-                 */
-                mMyAdapter = createResolveAdapter(newAdapterList);
-                mResolveList = newResolveList;
-                setListAdapter(mMyAdapter);
-            }
-        });
-    }
-    
-    /**
-     * Gets all activities matching our current display mode.
-     * 
-     * @param list The list to fill.
-     */
-    private void fillResolveList(List<ResolveInfo> list) {
-        ensureIntents();
-        PackageManager pm = getPackageManager();
-        list.clear();
-        
-        if (mDisplayMode == DISPLAY_MODE_LAUNCH) {
-            list.addAll(pm.queryIntentActivities(sLaunchIntent, 0));
-        } else if (mDisplayMode == DISPLAY_MODE_SHORTCUT) {
-            list.addAll(pm.queryIntentActivities(sShortcutIntent, 0)); 
-        }
-    }
-    
-    private SimpleAdapter createResolveAdapter(List<Map<String, ?>> list) {
-        SimpleAdapter adapter = new SimpleAdapter(this, list,
-                R.layout.bookmark_picker_item, sKeys, sResourceIds);
-        adapter.setViewBinder(this);
-        return adapter;
-    }
-
-    private void fillAdapterList(List<Map<String, ?>> list,
-            List<ResolveInfo> resolveList) {
-        list.clear();
-        int resolveListSize = resolveList.size();
-        for (int i = 0; i < resolveListSize; i++) {
-            ResolveInfo info = resolveList.get(i);
-            /*
-             * Simple adapter craziness. For each item, we need to create a map
-             * from a key to its value (the value can be any object--the view
-             * binder will take care of filling the View with a representation
-             * of that object).
-             */
-            Map<String, Object> map = new TreeMap<String, Object>();
-            map.put(KEY_TITLE, getResolveInfoTitle(info));
-            map.put(KEY_RESOLVE_INFO, info);
-            list.add(map);
-        }
-    }
-
-    /** Get the title for a resolve info. */
-    private String getResolveInfoTitle(ResolveInfo info) {
-        CharSequence label = info.loadLabel(getPackageManager());
-        if (label == null) label = info.activityInfo.name;
-        return label != null ? label.toString() : null;
-    }
-
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        if (position >= mResolveList.size()) return;
-
-        ResolveInfo info = mResolveList.get(position);
-        
-        switch (mDisplayMode) {
-
-            case DISPLAY_MODE_LAUNCH: 
-                // We can go ahead and return the clicked info's intent
-                Intent intent = getIntentForResolveInfo(info, Intent.ACTION_MAIN);
-                intent.addCategory(Intent.CATEGORY_LAUNCHER);
-                finish(intent, getResolveInfoTitle(info));
-                break;
-
-            case DISPLAY_MODE_SHORTCUT:
-                // Start the shortcut activity so the user can pick the actual intent
-                // (example: Gmail's shortcut activity shows a list of mailboxes)
-                startShortcutActivity(info);
-                break;
-        }
-        
-    }
-    
-    private static Intent getIntentForResolveInfo(ResolveInfo info, String action) {
-        Intent intent = new Intent(action);
-        ActivityInfo ai = info.activityInfo;
-        intent.setClassName(ai.packageName, ai.name);
-        return intent;
-    }
-
-    /**
-     * Starts an activity to get a shortcut.
-     * <p>
-     * For example, Gmail has an activity that lists the available labels. It
-     * returns a shortcut intent for going directly to this label.
-     */
-    private void startShortcutActivity(ResolveInfo info) {
-        Intent intent = getIntentForResolveInfo(info, Intent.ACTION_CREATE_SHORTCUT);
-        startActivityForResult(intent, REQUEST_CREATE_SHORTCUT);
-        
-        // Will get a callback to onActivityResult
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode != RESULT_OK) {
-            return;
-        }
-        
-        switch (requestCode) {
-            
-            case REQUEST_CREATE_SHORTCUT:
-                if (data != null) {
-                    finish((Intent) data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT),
-                            data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME));
-                }
-                break;
-                
-            default:
-                super.onActivityResult(requestCode, resultCode, data);
-                break;
-        }
-    }
-    
-    /**
-     * Finishes the activity and returns the given data.
-     */
-    private void finish(Intent intent, String title) {
-        // Give back what was given to us (it will have the shortcut, for example)
-        intent.putExtras(getIntent());
-        // Put our information
-        intent.putExtra(EXTRA_TITLE, title);
-        setResult(RESULT_OK, intent);
-        finish();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean setViewValue(View view, Object data, String textRepresentation) {
-        if (view.getId() == R.id.icon) {
-            Drawable icon = ((ResolveInfo) data).loadIcon(getPackageManager());
-            if (icon != null) {
-                ((ImageView) view).setImageDrawable(icon);
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-    
-}
diff --git a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
deleted file mode 100644
index 1367018..0000000
--- a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
+++ /dev/null
@@ -1,370 +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.quicklaunch;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.Preference;
-import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
-import android.provider.Settings.Bookmarks;
-import android.util.Log;
-import android.util.SparseArray;
-import android.util.SparseBooleanArray;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.AdapterView;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import java.net.URISyntaxException;
-
-/**
- * Settings activity for quick launch.
- * <p>
- * Shows a list of possible shortcuts, the current application each is bound to,
- * and allows choosing a new bookmark for a shortcut.
- */
-public class QuickLaunchSettings extends SettingsPreferenceFragment implements
-        AdapterView.OnItemLongClickListener, DialogInterface.OnClickListener {
-
-    private static final String TAG = "QuickLaunchSettings";
-
-    private static final String KEY_SHORTCUT_CATEGORY = "shortcut_category";
-
-    private static final int DIALOG_CLEAR_SHORTCUT = 0;
-
-    private static final int REQUEST_PICK_BOOKMARK = 1;
-
-    private static final int COLUMN_SHORTCUT = 0;
-    private static final int COLUMN_TITLE = 1;
-    private static final int COLUMN_INTENT = 2;
-    private static final String[] sProjection = new String[] {
-            Bookmarks.SHORTCUT, Bookmarks.TITLE, Bookmarks.INTENT
-    };
-    private static final String sShortcutSelection = Bookmarks.SHORTCUT + "=?";
-    
-    private Handler mUiHandler = new Handler();
-    
-    private static final String DEFAULT_BOOKMARK_FOLDER = "@quicklaunch";
-    /** Cursor for Bookmarks provider. */
-    private Cursor mBookmarksCursor;
-    /** Listens for changes to Bookmarks provider. */
-    private BookmarksObserver mBookmarksObserver;
-    /** Used to keep track of which shortcuts have bookmarks. */
-    private SparseBooleanArray mBookmarkedShortcuts;
-    
-    /** Preference category to hold the shortcut preferences. */
-    private PreferenceGroup mShortcutGroup;
-    /** Mapping of a shortcut to its preference. */
-    private SparseArray<ShortcutPreference> mShortcutToPreference;
-
-    /** The bookmark title of the shortcut that is being cleared. */
-    private CharSequence mClearDialogBookmarkTitle;
-    private static final String CLEAR_DIALOG_BOOKMARK_TITLE = "CLEAR_DIALOG_BOOKMARK_TITLE";
-    /** The shortcut that is being cleared. */
-    private char mClearDialogShortcut;
-    private static final String CLEAR_DIALOG_SHORTCUT = "CLEAR_DIALOG_SHORTCUT";
-    
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        addPreferencesFromResource(R.xml.quick_launch_settings);
-        
-        mShortcutGroup = (PreferenceGroup) findPreference(KEY_SHORTCUT_CATEGORY);
-        mShortcutToPreference = new SparseArray<ShortcutPreference>();
-        mBookmarksObserver = new BookmarksObserver(mUiHandler);
-        initShortcutPreferences();
-        mBookmarksCursor = getActivity().getContentResolver().query(Bookmarks.CONTENT_URI,
-                sProjection, null, null, null);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mBookmarksCursor = getActivity().getContentResolver().query(Bookmarks.CONTENT_URI,
-                sProjection, null, null, null);
-        getContentResolver().registerContentObserver(Bookmarks.CONTENT_URI, true,
-                mBookmarksObserver);
-        refreshShortcuts();
-    }
-    
-    @Override
-    public void onPause() {
-        super.onPause();
-        getContentResolver().unregisterContentObserver(mBookmarksObserver);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        mBookmarksCursor.close();
-    }
-
-    @Override
-    public void onActivityCreated(Bundle state) {
-        super.onActivityCreated(state);
-
-        getListView().setOnItemLongClickListener(this);
-
-        if (state != null) {
-            // Restore the clear dialog's info
-            mClearDialogBookmarkTitle = state.getString(CLEAR_DIALOG_BOOKMARK_TITLE);
-            mClearDialogShortcut = (char) state.getInt(CLEAR_DIALOG_SHORTCUT, 0);
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        
-        // Save the clear dialog's info
-        outState.putCharSequence(CLEAR_DIALOG_BOOKMARK_TITLE, mClearDialogBookmarkTitle);
-        outState.putInt(CLEAR_DIALOG_SHORTCUT, mClearDialogShortcut);
-    }
-
-    @Override
-    public Dialog onCreateDialog(int id) {
-        switch (id) {
-            
-            case DIALOG_CLEAR_SHORTCUT: {
-                // Create the dialog for clearing a shortcut
-                return new AlertDialog.Builder(getActivity())
-                        .setTitle(getString(R.string.quick_launch_clear_dialog_title))
-                        .setMessage(getString(R.string.quick_launch_clear_dialog_message,
-                                mClearDialogShortcut, mClearDialogBookmarkTitle))
-                        .setPositiveButton(R.string.quick_launch_clear_ok_button, this)
-                        .setNegativeButton(R.string.quick_launch_clear_cancel_button, this)
-                        .create();
-            }
-        }
-        
-        return super.onCreateDialog(id);
-    }
-    
-    private void showClearDialog(ShortcutPreference pref) {
-
-        if (!pref.hasBookmark()) return;
-        
-        mClearDialogBookmarkTitle = pref.getTitle();
-        mClearDialogShortcut = pref.getShortcut();
-        showDialog(DIALOG_CLEAR_SHORTCUT);
-    }
-    
-    public void onClick(DialogInterface dialog, int which) {
-        if (mClearDialogShortcut > 0 && which == AlertDialog.BUTTON_POSITIVE) {
-            // Clear the shortcut
-            clearShortcut(mClearDialogShortcut);
-        }
-        mClearDialogBookmarkTitle = null;
-        mClearDialogShortcut = 0;
-    }
-
-    private void clearShortcut(char shortcut) {
-        getContentResolver().delete(Bookmarks.CONTENT_URI, sShortcutSelection,
-                new String[] { String.valueOf((int) shortcut) });
-    }
-    
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (!(preference instanceof ShortcutPreference)) return false;
-
-        // Open the screen to pick a bookmark for this shortcut
-        ShortcutPreference pref = (ShortcutPreference) preference;
-        Intent intent = new Intent(getActivity(), BookmarkPicker.class);
-        intent.putExtra(BookmarkPicker.EXTRA_SHORTCUT, pref.getShortcut());
-        startActivityForResult(intent, REQUEST_PICK_BOOKMARK);
-        
-        return true;
-    }
-
-    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-        
-        // Open the clear shortcut dialog
-        Preference pref = (Preference) getPreferenceScreen().getRootAdapter().getItem(position);
-        if (!(pref instanceof ShortcutPreference)) return false;
-        showClearDialog((ShortcutPreference) pref);
-        return true;
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode != Activity.RESULT_OK) {
-            return;
-        }
-
-        if (requestCode == REQUEST_PICK_BOOKMARK) {
-            
-            // Returned from the 'pick bookmark for this shortcut' screen
-            if (data == null) {
-                Log.w(TAG, "Result from bookmark picker does not have an intent.");
-                return;
-            }
-
-            char shortcut = data.getCharExtra(BookmarkPicker.EXTRA_SHORTCUT, (char) 0);
-            updateShortcut(shortcut, data);
-            
-        } else {
-            super.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-    private void updateShortcut(char shortcut, Intent intent) {
-        // Update the bookmark for a shortcut
-        // Pass an empty title so it gets resolved each time this bookmark is
-        // displayed (since the locale could change after we insert into the provider).
-        Bookmarks.add(getContentResolver(), intent, "", DEFAULT_BOOKMARK_FOLDER, shortcut, 0);
-    }
-    
-    private ShortcutPreference getOrCreatePreference(char shortcut) {
-        ShortcutPreference pref = mShortcutToPreference.get(shortcut);
-        if (pref != null) {
-            return pref;
-        } else {
-            Log.w(TAG, "Unknown shortcut '" + shortcut + "', creating preference anyway");
-            return createPreference(shortcut);
-        }
-    }
-    
-    private ShortcutPreference createPreference(char shortcut) {
-        ShortcutPreference pref = new ShortcutPreference(getActivity(), shortcut);
-        mShortcutGroup.addPreference(pref);
-        mShortcutToPreference.put(shortcut, pref);
-        return pref;
-    }
-
-    private void initShortcutPreferences() {
-        
-        /** Whether the shortcut has been seen already.  The array index is the shortcut. */
-        SparseBooleanArray shortcutSeen = new SparseBooleanArray();
-        KeyCharacterMap keyMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
-
-        // Go through all the key codes and create a preference for the appropriate keys
-        for (int keyCode = KeyEvent.getMaxKeyCode() - 1; keyCode >= 0; keyCode--) {
-            // Get the label for the primary char on the key that produces this key code
-            char shortcut = (char) Character.toLowerCase(keyMap.getDisplayLabel(keyCode));
-            if (shortcut == 0 || shortcutSeen.get(shortcut, false)) continue;
-            // TODO: need a to tell if the current keyboard can produce this key code, for now
-            // only allow the letter or digits
-            if (!Character.isLetterOrDigit(shortcut)) continue;
-            shortcutSeen.put(shortcut, true);
-            
-            createPreference(shortcut);
-        }
-    }
-    
-    private synchronized void refreshShortcuts() {
-        Cursor c = mBookmarksCursor;
-        if (c == null) {
-            // Haven't finished querying yet
-            return;
-        }
-        
-        if (!c.requery()) {
-            Log.e(TAG, "Could not requery cursor when refreshing shortcuts.");
-            return;
-        }
-        
-        /**
-         * We use the previous bookmarked shortcuts array to filter out those
-         * shortcuts that had bookmarks before this method call, and don't after
-         * (so we can set the preferences to be without bookmarks).
-         */
-        SparseBooleanArray noLongerBookmarkedShortcuts = mBookmarkedShortcuts;
-        SparseBooleanArray newBookmarkedShortcuts = new SparseBooleanArray(); 
-        while (c.moveToNext()) {
-            char shortcut = Character.toLowerCase((char) c.getInt(COLUMN_SHORTCUT));
-            if (shortcut == 0) continue;
-            
-            ShortcutPreference pref = getOrCreatePreference(shortcut);
-            CharSequence title = Bookmarks.getTitle(getActivity(), c);
-
-            /*
-             * The title retrieved from Bookmarks.getTitle() will be in
-             * the original boot locale, not the current locale.
-             * Try to look up a localized title from the PackageManager.
-             */
-            int intentColumn = c.getColumnIndex(Bookmarks.INTENT);
-            String intentUri = c.getString(intentColumn);
-            PackageManager packageManager = getPackageManager();
-            try {
-                Intent intent = Intent.parseUri(intentUri, 0);
-                ResolveInfo info = packageManager.resolveActivity(intent, 0);
-                if (info != null) {
-                    title = info.loadLabel(packageManager);
-                }
-            } catch (URISyntaxException e) {
-                // Just use the non-localized title, then.
-            }
-
-            pref.setTitle(title);
-            pref.setSummary(getString(R.string.quick_launch_shortcut,
-                    String.valueOf(shortcut)));
-            pref.setHasBookmark(true);
-            
-            newBookmarkedShortcuts.put(shortcut, true);
-            if (noLongerBookmarkedShortcuts != null) {
-                // After this loop, the shortcuts with value true in this array
-                // will no longer have bookmarks
-                noLongerBookmarkedShortcuts.put(shortcut, false);
-            }
-        }
-        
-        if (noLongerBookmarkedShortcuts != null) {
-            for (int i = noLongerBookmarkedShortcuts.size() - 1; i >= 0; i--) {
-                if (noLongerBookmarkedShortcuts.valueAt(i)) {
-                    // True, so there is no longer a bookmark for this shortcut
-                    char shortcut = (char) noLongerBookmarkedShortcuts.keyAt(i);
-                    ShortcutPreference pref = mShortcutToPreference.get(shortcut);
-                    if (pref != null) {
-                        pref.setHasBookmark(false);
-                    }
-                }
-            }
-        }
-        
-        mBookmarkedShortcuts = newBookmarkedShortcuts;
-        
-        c.deactivate();
-    }
-
-    private class BookmarksObserver extends ContentObserver {
-
-        public BookmarksObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            super.onChange(selfChange);
-            
-            refreshShortcuts();
-        }
-    }
-}
diff --git a/src/com/android/settings/quicklaunch/ShortcutPreference.java b/src/com/android/settings/quicklaunch/ShortcutPreference.java
deleted file mode 100644
index 92efdeb..0000000
--- a/src/com/android/settings/quicklaunch/ShortcutPreference.java
+++ /dev/null
@@ -1,151 +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.quicklaunch;
-
-import com.android.settings.R;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.preference.Preference;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.TextView;
-
-/**
- * Preference type for a shortcut in {@link QuickLaunchSettings}.
- */
-public class ShortcutPreference extends Preference implements Comparable<Preference> {
-
-    private static Object sStaticVarsLock = new Object();
-    
-    // These static fields are used across all instances of ShortcutPreference.
-    // There will be many ShortcutPreference instances (~36 for US).
-    private static String STRING_ASSIGN_APPLICATION;
-    private static String STRING_NO_SHORTCUT;
-
-    private static int sDimAlpha;
-    private static ColorStateList sRegularTitleColor;
-    private static ColorStateList sDimTitleColor;
-    private static ColorStateList sRegularSummaryColor;
-    private static ColorStateList sDimSummaryColor;
-    
-    private char mShortcut;
-    private boolean mHasBookmark;
-    
-    public ShortcutPreference(Context context, char shortcut) {
-        super(context);
-
-        synchronized (sStaticVarsLock) {
-            // Init statics. This should only happen for the first ShortcutPreference created,
-            // the rest will already have them initialized.
-            if (STRING_ASSIGN_APPLICATION == null) {
-                STRING_ASSIGN_APPLICATION = context.getString(R.string.quick_launch_assign_application);
-                STRING_NO_SHORTCUT = context.getString(R.string.quick_launch_no_shortcut);
-    
-                TypedValue outValue = new TypedValue();
-                context.getTheme().resolveAttribute(android.R.attr.disabledAlpha, outValue, true);
-                sDimAlpha = (int) (outValue.getFloat() * 255);
-            }
-        }
-        
-        mShortcut = shortcut;
-
-        setWidgetLayoutResource(R.layout.preference_widget_shortcut);
-    }
-
-    public char getShortcut() {
-        return mShortcut;
-    }
-
-    public void setShortcut(char shortcut) {
-        if (shortcut != mShortcut) {
-            mShortcut = shortcut;
-            notifyChanged();
-        }
-    }
-
-    public boolean hasBookmark() {
-        return mHasBookmark;
-    }
-
-    public void setHasBookmark(boolean hasBookmark) {
-        if (hasBookmark != mHasBookmark) {
-            mHasBookmark = hasBookmark;
-            notifyChanged();
-        }
-    }
-
-    @Override
-    public CharSequence getTitle() {
-        return mHasBookmark ? super.getTitle() : STRING_ASSIGN_APPLICATION;
-    }
-
-    @Override
-    public CharSequence getSummary() {
-        return mHasBookmark ? super.getSummary() : STRING_NO_SHORTCUT;
-    }
-
-    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-        
-        TextView shortcutView = (TextView) view.findViewById(R.id.shortcut);
-        if (shortcutView != null) {
-            shortcutView.setText(String.valueOf(mShortcut));
-        }
-    
-        TextView titleView = (TextView) view.findViewById(android.R.id.title);
-
-        synchronized (sStaticVarsLock) {
-            if (sRegularTitleColor == null) {
-                sRegularTitleColor = titleView.getTextColors();
-                sDimTitleColor = sRegularTitleColor.withAlpha(sDimAlpha);
-            }
-        }
-        
-        ColorStateList color = mHasBookmark ? sRegularTitleColor : sDimTitleColor;
-        if (color != null) {
-            titleView.setTextColor(color);
-        }
-        
-        TextView summaryView = (TextView) view.findViewById(android.R.id.summary);
-
-        synchronized (sStaticVarsLock) {
-            if (sRegularSummaryColor == null) {
-                sRegularSummaryColor = summaryView.getTextColors();
-                sDimSummaryColor = sRegularSummaryColor.withAlpha(sDimAlpha);
-            }
-        }
-        
-        color = mHasBookmark ? sRegularSummaryColor : sDimSummaryColor;
-        if (color != null) {
-            summaryView.setTextColor(color);
-        }
-        
-    }
-
-    public int compareTo(Preference another) {
-        if (!(another instanceof ShortcutPreference)) return super.compareTo(another);
-
-        // Letters before digits
-        char other = ((ShortcutPreference) another).mShortcut;
-        if (Character.isDigit(mShortcut) && Character.isLetter(other)) return 1;
-        else if (Character.isDigit(other) && Character.isLetter(mShortcut)) return -1;
-        else return mShortcut - other;
-    }
-    
-}
diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index 3957cf6..267c6c0 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -30,6 +30,7 @@
 import android.database.DatabaseUtils;
 import android.database.MergeCursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.provider.SearchIndexableData;
@@ -448,7 +449,8 @@
         final PackageManager pm = mContext.getPackageManager();
         try {
             PackageInfo packInfo = pm.getPackageInfo(packageName, 0);
-            return ((packInfo.applicationInfo.flags & ApplicationInfo.FLAG_PRIVILEGED) != 0);
+            return ((packInfo.applicationInfo.privateFlags
+                & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) != 0);
         } catch (PackageManager.NameNotFoundException e) {
             return false;
         }
@@ -500,7 +502,12 @@
     }
 
     private SQLiteDatabase getWritableDatabase() {
-        return IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
+        try {
+            return IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
+        } catch (SQLiteException e) {
+            Log.e(LOG_TAG, "Cannot open writable database", e);
+            return null;
+        }
     }
 
     private static Uri buildUriForXmlResources(String authority) {
@@ -1171,6 +1178,10 @@
             final boolean forceUpdate = params[0].forceUpdate;
 
             final SQLiteDatabase database = getWritableDatabase();
+            if (database == null) {
+                Log.e(LOG_TAG, "Cannot update Index as I cannot get a writable database");
+                return null;
+            }
             final String localeStr = Locale.getDefault().toString();
 
             try {
@@ -1291,8 +1302,12 @@
             values.put(IndexDatabaseHelper.SavedQueriesColums.TIME_STAMP, now);
 
             final SQLiteDatabase database = getWritableDatabase();
+            if (database == null) {
+                Log.e(LOG_TAG, "Cannot save Search queries as I cannot get a writable database");
+                return -1L;
+            }
 
-            long lastInsertedRowId = -1;
+            long lastInsertedRowId = -1L;
             try {
                 // First, delete all saved queries that are the same
                 database.delete(Tables.TABLE_SAVED_QUERIES,
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 0022338..e1eec5f 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -23,22 +23,28 @@
 import com.android.settings.DeviceInfoSettings;
 import com.android.settings.DisplaySettings;
 import com.android.settings.HomeSettings;
-import com.android.settings.ScreenPinningSettings;
 import com.android.settings.PrivacySettings;
+import com.android.settings.ScreenPinningSettings;
 import com.android.settings.SecuritySettings;
 import com.android.settings.WallpaperTypeSettings;
+import com.android.settings.WifiCallingSettings;
 import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
+import com.android.settings.applications.AdvancedAppSettings;
+import com.android.settings.applications.ManageDefaultApps;
 import com.android.settings.bluetooth.BluetoothSettings;
-import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.deviceinfo.UsbSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.location.LocationSettings;
+import com.android.settings.location.ScanningSettings;
 import com.android.settings.net.DataUsageMeteredSettings;
 import com.android.settings.notification.NotificationSettings;
 import com.android.settings.notification.OtherSoundSettings;
+import com.android.settings.notification.ZenModeAutomationSettings;
+import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeSettings;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.sim.SimSettings;
@@ -47,7 +53,6 @@
 import com.android.settings.wifi.AdvancedWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.WifiCallingSettings;
 
 import java.util.HashMap;
 
@@ -67,16 +72,17 @@
     public static final int RANK_NOTIFICATIONS = 9;
     public static final int RANK_STORAGE = 10;
     public static final int RANK_POWER_USAGE = 11;
-    public static final int RANK_USERS = 12;
-    public static final int RANK_LOCATION = 13;
-    public static final int RANK_SECURITY = 14;
-    public static final int RANK_IME = 15;
-    public static final int RANK_PRIVACY = 16;
-    public static final int RANK_DATE_TIME = 17;
-    public static final int RANK_ACCESSIBILITY = 18;
-    public static final int RANK_PRINTING = 19;
-    public static final int RANK_DEVELOPEMENT = 20;
-    public static final int RANK_DEVICE_INFO = 21;
+    public static final int RANK_APPS = 12;
+    public static final int RANK_USERS = 13;
+    public static final int RANK_LOCATION = 14;
+    public static final int RANK_SECURITY = 15;
+    public static final int RANK_IME = 16;
+    public static final int RANK_PRIVACY = 17;
+    public static final int RANK_DATE_TIME = 18;
+    public static final int RANK_ACCESSIBILITY = 19;
+    public static final int RANK_PRINTING = 20;
+    public static final int RANK_DEVELOPEMENT = 21;
+    public static final int RANK_DEVICE_INFO = 22;
 
     public static final int RANK_UNDEFINED = -1;
     public static final int RANK_OTHERS = 1024;
@@ -120,20 +126,27 @@
         sRankMap.put(NotificationSettings.class.getName(), RANK_NOTIFICATIONS);
         sRankMap.put(OtherSoundSettings.class.getName(), RANK_NOTIFICATIONS);
         sRankMap.put(ZenModeSettings.class.getName(), RANK_NOTIFICATIONS);
+        sRankMap.put(ZenModePrioritySettings.class.getName(), RANK_NOTIFICATIONS);
+        sRankMap.put(ZenModeAutomationSettings.class.getName(), RANK_NOTIFICATIONS);
 
         // Storage
-        sRankMap.put(Memory.class.getName(), RANK_STORAGE);
+        sRankMap.put(StorageSettings.class.getName(), RANK_STORAGE);
         sRankMap.put(UsbSettings.class.getName(), RANK_STORAGE);
 
         // Battery
         sRankMap.put(PowerUsageSummary.class.getName(), RANK_POWER_USAGE);
         sRankMap.put(BatterySaverSettings.class.getName(), RANK_POWER_USAGE);
 
+        // Advanced app settings
+        sRankMap.put(AdvancedAppSettings.class.getName(), RANK_APPS);
+        sRankMap.put(ManageDefaultApps.class.getName(), RANK_APPS);
+
         // Users
         sRankMap.put(UserSettings.class.getName(), RANK_USERS);
 
         // Location
         sRankMap.put(LocationSettings.class.getName(), RANK_LOCATION);
+        sRankMap.put(ScanningSettings.class.getName(), RANK_LOCATION);
 
         // Security
         sRankMap.put(SecuritySettings.class.getName(), RANK_SECURITY);
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index d774469..a3d2ddc 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -24,23 +24,28 @@
 import com.android.settings.DeviceInfoSettings;
 import com.android.settings.DisplaySettings;
 import com.android.settings.HomeSettings;
-import com.android.settings.ScreenPinningSettings;
 import com.android.settings.PrivacySettings;
 import com.android.settings.R;
+import com.android.settings.ScreenPinningSettings;
 import com.android.settings.SecuritySettings;
 import com.android.settings.WallpaperTypeSettings;
+import com.android.settings.WifiCallingSettings;
 import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
+import com.android.settings.applications.AdvancedAppSettings;
+import com.android.settings.applications.ManageDefaultApps;
 import com.android.settings.bluetooth.BluetoothSettings;
-import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.deviceinfo.UsbSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.location.LocationSettings;
+import com.android.settings.location.ScanningSettings;
 import com.android.settings.net.DataUsageMeteredSettings;
 import com.android.settings.notification.NotificationSettings;
 import com.android.settings.notification.OtherSoundSettings;
+import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeSettings;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.sim.SimSettings;
@@ -49,7 +54,6 @@
 import com.android.settings.wifi.AdvancedWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.WifiCallingSettings;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -160,11 +164,18 @@
                         ZenModeSettings.class.getName(),
                         R.drawable.ic_settings_notifications));
 
-        sResMap.put(Memory.class.getName(),
+        sResMap.put(ZenModePrioritySettings.class.getName(),
                 new SearchIndexableResource(
-                        Ranking.getRankForClassName(Memory.class.getName()),
+                        Ranking.getRankForClassName(ZenModePrioritySettings.class.getName()),
+                        R.xml.zen_mode_priority_settings,
+                        ZenModePrioritySettings.class.getName(),
+                        R.drawable.ic_settings_notifications));
+
+        sResMap.put(StorageSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(StorageSettings.class.getName()),
                         NO_DATA_RES_ID,
-                        Memory.class.getName(),
+                        StorageSettings.class.getName(),
                         R.drawable.ic_settings_storage));
 
         sResMap.put(UsbSettings.class.getName(),
@@ -188,6 +199,20 @@
                         BatterySaverSettings.class.getName(),
                         R.drawable.ic_settings_battery));
 
+        sResMap.put(AdvancedAppSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(AdvancedAppSettings.class.getName()),
+                        R.xml.advanced_apps,
+                        AdvancedAppSettings.class.getName(),
+                        R.drawable.ic_settings_applications));
+
+        sResMap.put(ManageDefaultApps.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(ManageDefaultApps.class.getName()),
+                        NO_DATA_RES_ID,
+                        ManageDefaultApps.class.getName(),
+                        R.drawable.ic_settings_applications));
+
         sResMap.put(UserSettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(UserSettings.class.getName()),
@@ -202,6 +227,13 @@
                         LocationSettings.class.getName(),
                         R.drawable.ic_settings_location));
 
+        sResMap.put(ScanningSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(ScanningSettings.class.getName()),
+                        R.xml.location_scanning,
+                        ScanningSettings.class.getName(),
+                        R.drawable.ic_settings_location));
+
         sResMap.put(SecuritySettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(SecuritySettings.class.getName()),
diff --git a/src/com/android/settings/sim/SimBootReceiver.java b/src/com/android/settings/sim/SimBootReceiver.java
index f9c7216..1e802f0 100644
--- a/src/com/android/settings/sim/SimBootReceiver.java
+++ b/src/com/android/settings/sim/SimBootReceiver.java
@@ -119,7 +119,7 @@
         NotificationCompat.Builder builder =
                 new NotificationCompat.Builder(context)
                 .setSmallIcon(R.drawable.ic_sim_card_alert_white_48dp)
-                .setColor(resources.getColor(R.color.sim_noitification))
+                .setColor(context.getColor(R.color.sim_noitification))
                 .setContentTitle(resources.getString(R.string.sim_notification_title))
                 .setContentText(resources.getString(R.string.sim_notification_summary));
         Intent resultIntent = new Intent(context, SimSettingsActivity.class);
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 4566662..03a9daf 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
@@ -30,8 +29,6 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -44,9 +41,6 @@
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneFactory;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -86,7 +80,8 @@
     private void displayPreferredDialog(final int slotId) {
         final Resources res = getResources();
         final Context context = getApplicationContext();
-        final SubscriptionInfo sir = Utils.findRecordBySlotId(context, slotId);
+        final SubscriptionInfo sir = SubscriptionManager.from(context)
+                .getActiveSubscriptionInfoForSimSlotIndex(slotId);
 
         if (sir != null) {
             AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
@@ -139,17 +134,14 @@
 
     private PhoneAccountHandle subscriptionIdToPhoneAccountHandle(final int subId) {
         final TelecomManager telecomManager = TelecomManager.from(this);
+        final TelephonyManager telephonyManager = TelephonyManager.from(this);
         final Iterator<PhoneAccountHandle> phoneAccounts =
                 telecomManager.getCallCapablePhoneAccounts().listIterator();
 
         while (phoneAccounts.hasNext()) {
             final PhoneAccountHandle phoneAccountHandle = phoneAccounts.next();
             final PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
-            final String phoneAccountId = phoneAccountHandle.getId();
-
-            if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)
-                    && TextUtils.isDigitsOnly(phoneAccountId)
-                    && Integer.parseInt(phoneAccountId) == subId){
+            if (subId == telephonyManager.getSubIdForPhoneAccount(phoneAccount)) {
                 return phoneAccountHandle;
             }
         }
@@ -223,7 +215,8 @@
                 list.add((String)phoneAccount.getLabel());
                 int subId = telephonyManager.getSubIdForPhoneAccount(phoneAccount);
                 if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
-                    final SubscriptionInfo sir = Utils.findRecordBySubId(context, subId);
+                    final SubscriptionInfo sir = SubscriptionManager.from(context)
+                            .getActiveSubscriptionInfo(subId);
                     callsSubInfoList.add(sir);
                 } else {
                     callsSubInfoList.add(null);
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 5d963ed..efc71d8 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -29,6 +29,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.provider.SearchIndexableResource;
+import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -46,11 +47,14 @@
 import android.widget.TextView;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.R;
+import android.os.SystemProperties;
+import com.android.internal.telephony.TelephonyProperties;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -116,6 +120,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.SIM;
+    }
+
+    @Override
     public void onCreate(final Bundle bundle) {
         super.onCreate(bundle);
 
@@ -145,7 +154,10 @@
         mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
         mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
         for (int i = 0; i < numSlots; ++i) {
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i);
+            // Less efficient than getActiveSubscriptionInfoList but we need to show a disable
+            // preference if the slot is empty
+            final SubscriptionInfo sir = mSubscriptionManager
+                    .getActiveSubscriptionInfoForSimSlotIndex(i);
             SimPreference simPreference = new SimPreference(getActivity(), sir, i);
             simPreference.setOrder(i-numSlots);
             mSimCards.addPreference(simPreference);
@@ -159,17 +171,7 @@
     }
 
     private void updateAvailableSubInfos(){
-        final TelephonyManager tm =
-            (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
-        final int numSlots = tm.getSimCount();
-
-        mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
-        for (int i = 0; i < numSlots; ++i) {
-            final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i);
-            mAvailableSubInfos.add(sir);
-            if (sir != null) {
-            }
-        }
+        mAvailableSubInfos = mSubscriptionManager.getActiveSubscriptionInfoList();
     }
 
     private void updateAllOptions() {
@@ -197,8 +199,7 @@
 
     private void updateSmsValues() {
         final Preference simPref = findPreference(KEY_SMS);
-        final SubscriptionInfo sir = Utils.findRecordBySubId(getActivity(),
-                mSubscriptionManager.getDefaultSmsSubId());
+        final SubscriptionInfo sir = mSubscriptionManager.getDefaultSmsSubscriptionInfo();
         simPref.setTitle(R.string.sms_messages_title);
         if (DBG) log("[updateSmsValues] mSubInfoList=" + mSubInfoList);
 
@@ -212,8 +213,7 @@
 
     private void updateCellularDataValues() {
         final Preference simPref = findPreference(KEY_CELLULAR_DATA);
-        final SubscriptionInfo sir = Utils.findRecordBySubId(getActivity(),
-                mSubscriptionManager.getDefaultDataSubId());
+        final SubscriptionInfo sir = mSubscriptionManager.getDefaultDataSubscriptionInfo();
         simPref.setTitle(R.string.cellular_data_title);
         if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList);
 
@@ -230,11 +230,14 @@
         final TelecomManager telecomManager = TelecomManager.from(getActivity());
         final PhoneAccountHandle phoneAccount =
             telecomManager.getUserSelectedOutgoingPhoneAccount();
+        final List<PhoneAccountHandle> allPhoneAccounts =
+            telecomManager.getCallCapablePhoneAccounts();
 
         simPref.setTitle(R.string.calls_title);
         simPref.setSummary(phoneAccount == null
                 ? getResources().getString(R.string.sim_calls_ask_first_prefs_title)
                 : (String)telecomManager.getPhoneAccount(phoneAccount).getLabel());
+        simPref.setEnabled(allPhoneAccounts.size() > 1);
     }
 
     @Override
@@ -245,11 +248,39 @@
         // FIXME: b/18385348, needs to handle null from getActiveSubscriptionInfoList
         if (DBG) log("[onResme] mSubInfoList=" + mSubInfoList);
 
+        final TelephonyManager tm =
+                (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
+        tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+
         updateAvailableSubInfos();
         updateAllOptions();
     }
 
     @Override
+    public void onPause() {
+        super.onPause();
+        final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+        tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+    }
+
+    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
+        // Disable Sim selection for Data when voice call is going on as changing the default data
+        // sim causes a modem reset currently and call gets disconnected
+        // ToDo : Add subtext on disabled preference to let user know that default data sim cannot
+        // be changed while call is going on
+        @Override
+        public void onCallStateChanged(int state, String incomingNumber) {
+            if (DBG) log("PhoneStateListener.onCallStateChanged: state=" + state);
+             final Preference pref = findPreference(KEY_CELLULAR_DATA);
+            if (pref != null) {
+                final boolean ecbMode = SystemProperties.getBoolean(
+                        TelephonyProperties.PROPERTY_INECM_MODE, false);
+                pref.setEnabled((state == TelephonyManager.CALL_STATE_IDLE) && !ecbMode);
+            }
+        }
+    };
+
+    @Override
     public boolean onPreferenceTreeClick(final PreferenceScreen preferenceScreen,
             final Preference preference) {
         final Context context = getActivity();
@@ -387,14 +418,12 @@
                     mSubInfoRecord.setDisplayName(displayName);
                     mSubscriptionManager.setDisplayName(displayName, subId,
                             SubscriptionManager.NAME_SOURCE_USER_INPUT);
-                    Utils.findRecordBySubId(getActivity(), subId).setDisplayName(displayName);
 
                     final int tintSelected = tintSpinner.getSelectedItemPosition();
                     int subscriptionId = mSubInfoRecord.getSubscriptionId();
                     int tint = mTintArr[tintSelected];
                     mSubInfoRecord.setIconTint(tint);
                     mSubscriptionManager.setIconTint(tint, subscriptionId);
-                    Utils.findRecordBySubId(getActivity(), subscriptionId).setIconTint(tint);
 
                     updateAllOptions();
                     update();
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index b16ab56..c8a4c3d 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -19,6 +19,7 @@
 import static android.provider.Settings.Secure.TTS_DEFAULT_RATE;
 import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -28,7 +29,6 @@
 import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Intent;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -144,6 +144,11 @@
     };
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.TTS_TEXT_TO_SPEECH;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.tts_settings);
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index 542de41..691e155 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -33,6 +33,7 @@
 import android.util.Log;
 import android.util.Pair;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -99,6 +100,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.TTS_ENGINE_SETTINGS;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.tts_engine_settings);
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 206ed95..a166f0d 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -23,6 +23,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.RestrictionEntry;
+import android.content.RestrictionsManager;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageManager;
@@ -31,7 +32,6 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
-import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -50,18 +50,17 @@
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
-import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
-import com.android.settings.drawable.CircleFramedDrawable;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -180,16 +179,6 @@
             return immutable;
         }
 
-        RestrictionEntry getRestriction(String key) {
-            if (restrictions == null) return null;
-            for (RestrictionEntry entry : restrictions) {
-                if (entry.getKey().equals(key)) {
-                    return entry;
-                }
-            }
-            return null;
-        }
-
         ArrayList<RestrictionEntry> getRestrictions() {
             return restrictions;
         }
@@ -271,6 +260,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.USERS_APP_RESTRICTIONS;
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(EXTRA_USER_ID, mUser.getIdentifier());
@@ -327,20 +321,6 @@
         return getPreferenceScreen();
     }
 
-    Drawable getCircularUserIcon() {
-        Bitmap userIcon = mUserManager.getUserIcon(mUser.getIdentifier());
-        if (userIcon == null) {
-            return null;
-        }
-        CircleFramedDrawable circularIcon =
-                CircleFramedDrawable.getInstance(this.getActivity(), userIcon);
-        return circularIcon;
-    }
-
-    protected void clearSelectedApps() {
-        mSelectedPackages.clear();
-    }
-
     private void applyUserAppsStates() {
         final int userId = mUser.getIdentifier();
         if (!mUserManager.getUserInfo(userId).isRestricted() && userId != UserHandle.myUserId()) {
@@ -368,7 +348,7 @@
                         Log.d(TAG, "Installing " + packageName);
                     }
                 }
-                if (info != null && (info.flags&ApplicationInfo.FLAG_HIDDEN) != 0
+                if (info != null && (info.privateFlags&ApplicationInfo.PRIVATE_FLAG_HIDDEN) != 0
                         && (info.flags&ApplicationInfo.FLAG_INSTALLED) != 0) {
                     disableUiForPackage(packageName);
                     mIPm.setApplicationHiddenSettingAsUser(packageName, false, userId);
@@ -635,9 +615,10 @@
     private boolean isAppEnabledForUser(PackageInfo pi) {
         if (pi == null) return false;
         final int flags = pi.applicationInfo.flags;
+        final int privateFlags = pi.applicationInfo.privateFlags;
         // Return true if it is installed and not hidden
         return ((flags&ApplicationInfo.FLAG_INSTALLED) != 0
-                && (flags&ApplicationInfo.FLAG_HIDDEN) == 0);
+                && (privateFlags&ApplicationInfo.PRIVATE_FLAG_HIDDEN) == 0);
     }
 
     private void populateApps() {
@@ -654,25 +635,18 @@
         mAppList.removeAll();
         Intent restrictionsIntent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
         final List<ResolveInfo> receivers = pm.queryBroadcastReceivers(restrictionsIntent, 0);
-        int i = 0;
         for (SelectableAppInfo app : mVisibleApps) {
             String packageName = app.packageName;
             if (packageName == null) continue;
             final boolean isSettingsApp = packageName.equals(context.getPackageName());
             AppRestrictionsPreference p = new AppRestrictionsPreference(context, this);
             final boolean hasSettings = resolveInfoListHasPackage(receivers, packageName);
-            p.setIcon(app.icon != null ? app.icon.mutate() : null);
-            p.setChecked(false);
-            p.setTitle(app.activityName);
-            if (app.masterEntry != null) {
-                p.setSummary(context.getString(R.string.user_restrictions_controlled_by,
-                        app.masterEntry.activityName));
+            if (isSettingsApp) {
+                addLocationAppRestrictionsPreference(app, p);
+                // Settings app should be available to restricted user
+                mSelectedPackages.put(packageName, true);
+                continue;
             }
-            p.setKey(getKeyForPackage(packageName));
-            p.setSettingsEnabled((hasSettings || isSettingsApp) && app.masterEntry == null);
-            p.setPersistent(false);
-            p.setOnPreferenceChangeListener(this);
-            p.setOnPreferenceClickListener(this);
             PackageInfo pi = null;
             try {
                 pi = ipm.getPackageInfo(packageName,
@@ -683,44 +657,42 @@
             if (pi == null) {
                 continue;
             }
+            if (mRestrictedProfile && isAppUnsupportedInRestrictedProfile(pi)) {
+                continue;
+            }
+            p.setIcon(app.icon != null ? app.icon.mutate() : null);
+            p.setChecked(false);
+            p.setTitle(app.activityName);
+            p.setKey(getKeyForPackage(packageName));
+            p.setSettingsEnabled(hasSettings && app.masterEntry == null);
+            p.setPersistent(false);
+            p.setOnPreferenceChangeListener(this);
+            p.setOnPreferenceClickListener(this);
+            p.setSummary(getPackageSummary(pi, app));
             if (pi.requiredForAllUsers || isPlatformSigned(pi)) {
                 p.setChecked(true);
                 p.setImmutable(true);
                 // If the app is required and has no restrictions, skip showing it
-                if (!hasSettings && !isSettingsApp) continue;
+                if (!hasSettings) continue;
                 // Get and populate the defaults, since the user is not going to be
                 // able to toggle this app ON (it's ON by default and immutable).
                 // Only do this for restricted profiles, not single-user restrictions
                 // Also don't do this for slave icons
-                if (hasSettings && app.masterEntry == null) {
+                if (app.masterEntry == null) {
                     requestRestrictionsForApp(packageName, p, false);
                 }
             } else if (!mNewUser && isAppEnabledForUser(pi)) {
                 p.setChecked(true);
             }
-            if (mRestrictedProfile
-                    && pi.requiredAccountType != null && pi.restrictedAccountType == null) {
-                p.setChecked(false);
-                p.setImmutable(true);
-                p.setSummary(R.string.app_not_supported_in_limited);
-            }
-            if (mRestrictedProfile && pi.restrictedAccountType != null) {
-                p.setSummary(R.string.app_sees_restricted_accounts);
-            }
             if (app.masterEntry != null) {
                 p.setImmutable(true);
                 p.setChecked(mSelectedPackages.get(packageName));
             }
-            mAppList.addPreference(p);
-            if (isSettingsApp) {
-                p.setOrder(MAX_APP_RESTRICTIONS * 1);
-            } else {
-                p.setOrder(MAX_APP_RESTRICTIONS * (i + 2));
-            }
+            p.setOrder(MAX_APP_RESTRICTIONS * (mAppList.getPreferenceCount() + 2));
             mSelectedPackages.put(packageName, p.isChecked());
-            mAppListChanged = true;
-            i++;
+            mAppList.addPreference(p);
         }
+        mAppListChanged = true;
         // If this is the first time for a new profile, install/uninstall default apps for profile
         // to avoid taking the hit in onPause(), which can cause race conditions on user switch.
         if (mNewUser && mFirstTime) {
@@ -729,6 +701,47 @@
         }
     }
 
+    private String getPackageSummary(PackageInfo pi, SelectableAppInfo app) {
+        // Check for 3 cases:
+        // - Slave entry that can see primary user accounts
+        // - Slave entry that cannot see primary user accounts
+        // - Master entry that can see primary user accounts
+        // Otherwise no summary is returned
+        if (app.masterEntry != null) {
+            if (mRestrictedProfile && pi.restrictedAccountType != null) {
+                return getString(R.string.app_sees_restricted_accounts_and_controlled_by,
+                        app.masterEntry.activityName);
+            }
+            return getString(R.string.user_restrictions_controlled_by,
+                    app.masterEntry.activityName);
+        } else if (pi.restrictedAccountType != null) {
+            return getString(R.string.app_sees_restricted_accounts);
+        }
+        return null;
+    }
+
+    private static boolean isAppUnsupportedInRestrictedProfile(PackageInfo pi) {
+        return pi.requiredAccountType != null && pi.restrictedAccountType == null;
+    }
+
+    private void addLocationAppRestrictionsPreference(SelectableAppInfo app,
+            AppRestrictionsPreference p) {
+        String packageName = app.packageName;
+        p.setIcon(R.drawable.ic_settings_location);
+        p.setKey(getKeyForPackage(packageName));
+        ArrayList<RestrictionEntry> restrictions = RestrictionUtils.getRestrictions(
+                getActivity(), mUser);
+        RestrictionEntry locationRestriction = restrictions.get(0);
+        p.setTitle(locationRestriction.getTitle());
+        p.setRestrictions(restrictions);
+        p.setSummary(locationRestriction.getDescription());
+        p.setChecked(locationRestriction.getSelectedState());
+        p.setPersistent(false);
+        p.setOnPreferenceClickListener(this);
+        p.setOrder(MAX_APP_RESTRICTIONS);
+        mAppList.addPreference(p);
+    }
+
     private String getKeyForPackage(String packageName) {
         return PKG_PREFIX + packageName;
     }
@@ -772,6 +785,12 @@
             } else if (!pref.isImmutable()) {
                 pref.setChecked(!pref.isChecked());
                 final String packageName = pref.getKey().substring(PKG_PREFIX.length());
+                // Settings/Location is handled as a top-level entry
+                if (packageName.equals(getActivity().getPackageName())) {
+                    pref.restrictions.get(0).setSelectedState(pref.isChecked());
+                    RestrictionUtils.setRestrictions(getActivity(), pref.restrictions, mUser);
+                    return;
+                }
                 mSelectedPackages.put(packageName, pref.isChecked());
                 if (pref.isChecked() && pref.hasSettings
                         && pref.restrictions == null) {
@@ -822,13 +841,9 @@
                         default:
                             continue;
                         }
-                        if (packageName.equals(getActivity().getPackageName())) {
-                            RestrictionUtils.setRestrictions(getActivity(), restrictions, mUser);
-                        } else {
-                            mUserManager.setApplicationRestrictions(packageName,
-                                    RestrictionUtils.restrictionsToBundle(restrictions),
-                                    mUser);
-                        }
+                        mUserManager.setApplicationRestrictions(packageName,
+                                RestrictionsManager.convertRestrictionsToBundle(restrictions),
+                                mUser);
                         break;
                     }
                 }
@@ -850,14 +865,7 @@
                 removeRestrictionsForApp(preference);
             } else {
                 String packageName = preference.getKey().substring(PKG_PREFIX.length());
-                if (packageName.equals(getActivity().getPackageName())) {
-                    // Settings, fake it by using user restrictions
-                    ArrayList<RestrictionEntry> restrictions = RestrictionUtils.getRestrictions(
-                            getActivity(), mUser);
-                    onRestrictionsReceived(preference, packageName, restrictions);
-                } else {
-                    requestRestrictionsForApp(packageName, preference, true /*invoke if custom*/);
-                }
+                requestRestrictionsForApp(packageName, preference, true /*invoke if custom*/);
             }
             preference.setPanelOpen(!preference.isPanelOpen());
         }
@@ -908,7 +916,7 @@
                 onRestrictionsReceived(preference, packageName, restrictions);
                 if (mRestrictedProfile) {
                     mUserManager.setApplicationRestrictions(packageName,
-                            RestrictionUtils.restrictionsToBundle(restrictions), mUser);
+                            RestrictionsManager.convertRestrictionsToBundle(restrictions), mUser);
                 }
             } else if (restrictionsIntent != null) {
                 preference.setRestrictions(restrictions);
@@ -979,9 +987,7 @@
                 ((MultiSelectListPreference)p).setEntryValues(entry.getChoiceValues());
                 ((MultiSelectListPreference)p).setEntries(entry.getChoiceEntries());
                 HashSet<String> set = new HashSet<String>();
-                for (String s : entry.getAllSelectedStrings()) {
-                    set.add(s);
-                }
+                Collections.addAll(set, entry.getAllSelectedStrings());
                 ((MultiSelectListPreference)p).setValues(set);
                 ((MultiSelectListPreference)p).setDialogTitle(entry.getTitle());
                 break;
@@ -1041,7 +1047,7 @@
                 // If there's a valid result, persist it to the user manager.
                 pref.setRestrictions(list);
                 mUserManager.setApplicationRestrictions(packageName,
-                        RestrictionUtils.restrictionsToBundle(list), mUser);
+                        RestrictionsManager.convertRestrictionsToBundle(list), mUser);
             } else if (bundle != null) {
                 // If there's a valid result, persist it to the user manager.
                 mUserManager.setApplicationRestrictions(packageName, bundle, mUser);
diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java
index 0f844a7..ab77101 100644
--- a/src/com/android/settings/users/EditUserInfoController.java
+++ b/src/com/android/settings/users/EditUserInfoController.java
@@ -37,6 +37,7 @@
 import android.widget.ImageView;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.drawable.CircleFramedDrawable;
 
 /**
@@ -98,16 +99,6 @@
         }
     }
 
-    Drawable getCircularUserIcon(Activity activity) {
-        Bitmap userIcon = mUserManager.getUserIcon(mUser.getIdentifier());
-        if (userIcon == null) {
-            return null;
-        }
-        CircleFramedDrawable circularIcon =
-                CircleFramedDrawable.getInstance(activity, userIcon);
-        return circularIcon;
-    }
-
     public Dialog createDialog(final Fragment fragment, final Drawable currentUserIcon,
             final CharSequence currentUserName,
             int titleResId, final OnContentChangedCallback callback, UserHandle user) {
@@ -131,7 +122,7 @@
         } else {
             drawable = currentUserIcon;
             if (drawable == null) {
-                drawable = getCircularUserIcon(activity);
+                drawable = Utils.getUserIcon(activity, mUserManager, info);
             }
         }
         userPhotoView.setImageDrawable(drawable);
diff --git a/src/com/android/settings/users/ProfileUpdateReceiver.java b/src/com/android/settings/users/ProfileUpdateReceiver.java
index 955ee4d..69484f7 100644
--- a/src/com/android/settings/users/ProfileUpdateReceiver.java
+++ b/src/com/android/settings/users/ProfileUpdateReceiver.java
@@ -22,8 +22,6 @@
 import android.content.SharedPreferences;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-
 import com.android.settings.Utils;
 
 
diff --git a/src/com/android/settings/users/RestrictedProfileSettings.java b/src/com/android/settings/users/RestrictedProfileSettings.java
index c0e8cb7..03a55d4 100644
--- a/src/com/android/settings/users/RestrictedProfileSettings.java
+++ b/src/com/android/settings/users/RestrictedProfileSettings.java
@@ -22,7 +22,6 @@
 import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.os.UserHandle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -31,8 +30,6 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 
-import java.util.List;
-
 public class RestrictedProfileSettings extends AppRestrictionsFragment
         implements EditUserInfoController.OnContentChangedCallback {
 
@@ -93,7 +90,7 @@
         } else {
             ((TextView) mHeaderView.findViewById(android.R.id.title)).setText(info.name);
             ((ImageView) mHeaderView.findViewById(android.R.id.icon)).setImageDrawable(
-                    getCircularUserIcon());
+                    Utils.getUserIcon(getActivity(), mUserManager, info));
         }
     }
 
@@ -129,7 +126,7 @@
                     this, mUser);
         } else if (dialogId == DIALOG_CONFIRM_REMOVE) {
             Dialog dlg =
-                    Utils.createRemoveConfirmationDialog(getActivity(), mUser.getIdentifier(),
+                    UserDialogs.createRemoveDialog(getActivity(), mUser.getIdentifier(),
                             new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int which) {
                                     removeUser();
diff --git a/src/com/android/settings/users/RestrictionUtils.java b/src/com/android/settings/users/RestrictionUtils.java
index e8d46e9..b36cb3e 100644
--- a/src/com/android/settings/users/RestrictionUtils.java
+++ b/src/com/android/settings/users/RestrictionUtils.java
@@ -90,18 +90,4 @@
         }
         um.setUserRestrictions(userRestrictions, user);
     }
-
-    public static Bundle restrictionsToBundle(ArrayList<RestrictionEntry> entries) {
-        final Bundle bundle = new Bundle();
-        for (RestrictionEntry entry : entries) {
-            if (entry.getType() == RestrictionEntry.TYPE_BOOLEAN) {
-                bundle.putBoolean(entry.getKey(), entry.getSelectedState());
-            } else if (entry.getType() == RestrictionEntry.TYPE_MULTI_SELECT) {
-                bundle.putStringArray(entry.getKey(), entry.getAllSelectedStrings());
-            } else {
-                bundle.putString(entry.getKey(), entry.getSelectedString());
-            }
-        }
-        return bundle;
-    }
 }
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 366b628..90e5a43 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -26,9 +26,9 @@
 import android.preference.Preference;
 import android.preference.SwitchPreference;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
 
 import java.util.List;
 
@@ -55,7 +55,7 @@
 
     private static final int DIALOG_CONFIRM_REMOVE = 1;
     private static final int DIALOG_CONFIRM_ENABLE_CALLING = 2;
-    private static final int DIALOG_CONFIRM_ENABLE_CALLING_SMS = 3;
+    private static final int DIALOG_CONFIRM_ENABLE_CALLING_AND_SMS = 3;
 
     private UserManager mUserManager;
     private SwitchPreference mPhonePref;
@@ -66,6 +66,11 @@
     private Bundle mDefaultGuestRestrictions;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.USER_DETAILS;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
@@ -117,10 +122,18 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (Boolean.TRUE.equals(newValue)) {
+            showDialog(mGuestUser? DIALOG_CONFIRM_ENABLE_CALLING : DIALOG_CONFIRM_ENABLE_CALLING_AND_SMS);
+            return false;
+        }
+        enableCallsAndSms(false);
+        return true;
+    }
+
+    void enableCallsAndSms(boolean enabled) {
+        mPhonePref.setChecked(enabled);
         if (mGuestUser) {
-            // TODO: Show confirmation dialog: b/15761405
-            mDefaultGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS,
-                    !((Boolean) newValue));
+            mDefaultGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS, !enabled);
             // SMS is always disabled for guest
             mDefaultGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true);
             mUserManager.setDefaultGuestRestrictions(mDefaultGuestRestrictions);
@@ -135,14 +148,11 @@
                 }
             }
         } else {
-            // TODO: Show confirmation dialog: b/15761405
             UserHandle userHandle = new UserHandle(mUserInfo.id);
-            mUserManager.setUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS,
-                    !((Boolean) newValue), userHandle);
-            mUserManager.setUserRestriction(UserManager.DISALLOW_SMS,
-                    !((Boolean) newValue), userHandle);
+            mUserManager.setUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS, !enabled,
+                    userHandle);
+            mUserManager.setUserRestriction(UserManager.DISALLOW_SMS, !enabled, userHandle);
         }
-        return true;
     }
 
     @Override
@@ -150,20 +160,29 @@
         Context context = getActivity();
         if (context == null) return null;
         switch (dialogId) {
-            case DIALOG_CONFIRM_REMOVE: {
-                Dialog dlg = Utils.createRemoveConfirmationDialog(getActivity(), mUserInfo.id,
+            case DIALOG_CONFIRM_REMOVE:
+                return UserDialogs.createRemoveDialog(getActivity(), mUserInfo.id,
                         new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
                                 removeUser();
                             }
                         });
-                return dlg;
-            }
             case DIALOG_CONFIRM_ENABLE_CALLING:
-            case DIALOG_CONFIRM_ENABLE_CALLING_SMS:
-                // TODO: b/15761405
+                return UserDialogs.createEnablePhoneCallsDialog(getActivity(),
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                enableCallsAndSms(true);
+                            }
+                        });
+            case DIALOG_CONFIRM_ENABLE_CALLING_AND_SMS:
+                return UserDialogs.createEnablePhoneCallsAndSmsDialog(getActivity(),
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                enableCallsAndSms(true);
+                            }
+                        });
         }
-        return null;
+        throw new IllegalArgumentException("Unsupported dialogId " + dialogId);
     }
 
     void removeUser() {
diff --git a/src/com/android/settings/users/UserDialogs.java b/src/com/android/settings/users/UserDialogs.java
new file mode 100644
index 0000000..2d92464
--- /dev/null
+++ b/src/com/android/settings/users/UserDialogs.java
@@ -0,0 +1,99 @@
+/*
+ * 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.users;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.settings.R;
+
+/**
+ * Helper class for displaying dialogs related to user settings.
+ */
+public final class UserDialogs {
+
+    /**
+     * Creates a dialog to confirm with the user if it's ok to remove the user
+     * and delete all the data.
+     *
+     * @param context a Context object
+     * @param removingUserId The userId of the user to remove
+     * @param onConfirmListener Callback object for positive action
+     * @return the created Dialog
+     */
+    public static Dialog createRemoveDialog(Context context, int removingUserId,
+            DialogInterface.OnClickListener onConfirmListener) {
+        UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        UserInfo userInfo = um.getUserInfo(removingUserId);
+        int titleResId;
+        int messageResId;
+        if (UserHandle.myUserId() == removingUserId) {
+            titleResId = R.string.user_confirm_remove_self_title;
+            messageResId = R.string.user_confirm_remove_self_message;
+        } else if (userInfo.isRestricted()) {
+            titleResId = R.string.user_profile_confirm_remove_title;
+            messageResId = R.string.user_profile_confirm_remove_message;
+        } else if (userInfo.isManagedProfile()) {
+            titleResId = R.string.work_profile_confirm_remove_title;
+            messageResId = R.string.work_profile_confirm_remove_message;
+        } else {
+            titleResId = R.string.user_confirm_remove_title;
+            messageResId = R.string.user_confirm_remove_message;
+        }
+        return new AlertDialog.Builder(context)
+                .setTitle(titleResId)
+                .setMessage(messageResId)
+                .setPositiveButton(R.string.user_delete_button, onConfirmListener)
+                .setNegativeButton(android.R.string.cancel, null)
+                .create();
+    }
+
+    /**
+     * Creates a dialog to confirm that the user is ok to enable phone calls and SMS.
+     *
+     * @param onConfirmListener Callback object for positive action
+     */
+    public static Dialog createEnablePhoneCallsAndSmsDialog(Context context,
+            DialogInterface.OnClickListener onConfirmListener) {
+        return new AlertDialog.Builder(context)
+                .setTitle(R.string.user_enable_calling_and_sms_confirm_title)
+                .setMessage(R.string.user_enable_calling_and_sms_confirm_message)
+                .setPositiveButton(R.string.okay, onConfirmListener)
+                .setNegativeButton(android.R.string.cancel, null)
+                .create();
+    }
+
+    /**
+     * Creates a dialog to confirm that the user is ok to enable phone calls (no SMS).
+     *
+     * @param onConfirmListener Callback object for positive action
+     */
+    public static Dialog createEnablePhoneCallsDialog(Context context,
+            DialogInterface.OnClickListener onConfirmListener) {
+        return new AlertDialog.Builder(context)
+                .setTitle(R.string.user_enable_calling_confirm_title)
+                .setMessage(R.string.user_enable_calling_confirm_message)
+                .setPositiveButton(R.string.okay, onConfirmListener)
+                .setNegativeButton(android.R.string.cancel, null)
+                .create();
+    }
+}
diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java
index 23359ec..5079dd2 100644
--- a/src/com/android/settings/users/UserPreference.java
+++ b/src/com/android/settings/users/UserPreference.java
@@ -26,10 +26,26 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 
+import java.util.Comparator;
+
 public class UserPreference extends Preference {
 
     public static final int USERID_UNKNOWN = -10;
     public static final int USERID_GUEST_DEFAULTS = -11;
+    public static final Comparator<UserPreference> SERIAL_NUMBER_COMPARATOR =
+            new Comparator<UserPreference>() {
+                @Override
+                public int compare(UserPreference p1, UserPreference p2) {
+                    int sn1 = p1.getSerialNumber();
+                    int sn2 = p2.getSerialNumber();
+                    if (sn1 < sn2) {
+                        return -1;
+                    } else if (sn1 > sn2) {
+                        return 1;
+                    }
+                    return 0;
+                }
+            };
 
     private OnClickListener mDeleteClickListener;
     private OnClickListener mSettingsClickListener;
@@ -105,12 +121,4 @@
     public int getUserId() {
         return mUserId;
     }
-
-    public int compareTo(Preference another) {
-        if (another instanceof UserPreference) {
-            return getSerialNumber() > ((UserPreference) another).getSerialNumber() ? 1 : -1;
-        } else {
-            return 1;
-        }
-    }
 }
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index d7923ee..f3b60fc 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -44,6 +44,7 @@
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.provider.Settings.Secure;
 import android.util.Log;
@@ -55,7 +56,7 @@
 import android.view.View.OnClickListener;
 import android.widget.SimpleAdapter;
 
-import com.android.internal.util.UserIcons;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.ChooseLockGeneric;
 import com.android.settings.OwnerInfoSettings;
@@ -67,6 +68,7 @@
 import com.android.settings.drawable.CircleFramedDrawable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -123,13 +125,14 @@
     private static final String KEY_SUMMARY = "summary";
 
     private PreferenceGroup mUserListCategory;
-    private Preference mMePreference;
+    private UserPreference mMePreference;
     private SelectableEditTextPreference mNicknamePreference;
     private Preference mAddUser;
     private int mRemovingUserId = -1;
     private int mAddedUserId = 0;
     private boolean mAddingUser;
     private boolean mEnabled = true;
+    private boolean mCanAddUser = true;
     private boolean mCanAddRestrictedProfile = true;
 
     private final Object mUserLock = new Object();
@@ -177,6 +180,11 @@
     };
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.USER;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
@@ -212,17 +220,21 @@
             mMePreference.setSummary(R.string.user_owner);
         }
         mAddUser = findPreference(KEY_ADD_USER);
+        DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
+                Context.DEVICE_POLICY_SERVICE);
+        // No restricted profiles for tablets with a device owner, or phones.
+        if (dpm.getDeviceOwner() != null || Utils.isVoiceCapable(context)) {
+            mCanAddRestrictedProfile = false;
+        }
+        // Determine if add user/profile button should be visible
         if (!mIsOwner || UserManager.getMaxSupportedUsers() < 2
                 || !UserManager.supportsMultipleUsers()
                 || mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) {
-            removePreference(KEY_ADD_USER);
+            mCanAddUser = false;
         } else {
             mAddUser.setOnPreferenceClickListener(this);
-            DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
-                    Context.DEVICE_POLICY_SERVICE);
-            // No restricted profiles for tablets with a device owner, or phones.
-            if (dpm.getDeviceOwner() != null || Utils.isVoiceCapable(context)) {
-                mCanAddRestrictedProfile = false;
+            // change label to only mention user, if restricted profiles are not supported
+            if (!mCanAddRestrictedProfile) {
                 mAddUser.setTitle(R.string.user_add_user_menu);
             }
         }
@@ -449,16 +461,7 @@
                     null, 0);
         } else if (info.id == UserHandle.myUserId()) {
             // Jump to owner info panel
-            Bundle extras = new Bundle();
-            if (!info.isRestricted()) {
-                extras.putBoolean(OwnerInfoSettings.EXTRA_SHOW_NICKNAME, true);
-            }
-            int titleResId = info.id == UserHandle.USER_OWNER ? R.string.owner_info_settings_title
-                    : (info.isRestricted() ? R.string.profile_info_settings_title
-                            : R.string.user_info_settings_title);
-            ((SettingsActivity) getActivity()).startPreferencePanel(
-                    OwnerInfoSettings.class.getName(),
-                    extras, titleResId, null, null, 0);
+            OwnerInfoSettings.show(this);
         } else if (mIsOwner) {
             Bundle extras = new Bundle();
             extras.putInt(UserDetailsSettings.EXTRA_USER_ID, userId);
@@ -495,7 +498,7 @@
         switch (dialogId) {
             case DIALOG_CONFIRM_REMOVE: {
                 Dialog dlg =
-                        Utils.createRemoveConfirmationDialog(getActivity(), mRemovingUserId,
+                        UserDialogs.createRemoveDialog(getActivity(), mRemovingUserId,
                                 new DialogInterface.OnClickListener() {
                                     public void onClick(DialogInterface dialog, int which) {
                                         removeUserNow();
@@ -712,18 +715,17 @@
         List<UserInfo> users = mUserManager.getUsers(true);
         final Context context = getActivity();
 
-        mUserListCategory.removeAll();
-        mUserListCategory.setOrderingAsAdded(false);
-        mUserListCategory.addPreference(mMePreference);
-
         final boolean voiceCapable = Utils.isVoiceCapable(context);
-        final ArrayList<Integer> missingIcons = new ArrayList<Integer>();
+        final ArrayList<Integer> missingIcons = new ArrayList<>();
+        final ArrayList<UserPreference> userPreferences = new ArrayList<>();
+        userPreferences.add(mMePreference);
+
         for (UserInfo user : users) {
             if (user.isManagedProfile()) {
                 // Managed profiles appear under Accounts Settings instead
                 continue;
             }
-            Preference pref;
+            UserPreference pref;
             if (user.id == UserHandle.myUserId()) {
                 pref = mMePreference;
             } else if (user.isGuest()) {
@@ -746,7 +748,7 @@
                         showDelete ? this : null);
                 pref.setOnPreferenceClickListener(this);
                 pref.setKey("id=" + user.id);
-                mUserListCategory.addPreference(pref);
+                userPreferences.add(pref);
                 if (user.id == UserHandle.USER_OWNER) {
                     pref.setSummary(R.string.user_owner);
                 }
@@ -777,14 +779,66 @@
 
         // Add a temporary entry for the user being created
         if (mAddingUser) {
-            Preference pref = new UserPreference(getActivity(), null, UserPreference.USERID_UNKNOWN,
-                    null, null);
+            UserPreference pref = new UserPreference(getActivity(), null,
+                    UserPreference.USERID_UNKNOWN, null, null);
             pref.setEnabled(false);
             pref.setTitle(R.string.user_new_user_name);
             pref.setIcon(getEncircledDefaultIcon());
-            mUserListCategory.addPreference(pref);
+            userPreferences.add(pref);
         }
 
+        if (shouldShowGuestUserPreference(users)) {
+            // Add a virtual Guest user for guest defaults
+            UserPreference pref = new UserPreference(getActivity(), null,
+                    UserPreference.USERID_GUEST_DEFAULTS,
+                    mIsOwner && voiceCapable? this : null /* settings icon handler */,
+                    null /* delete icon handler */);
+            pref.setTitle(R.string.user_guest);
+            pref.setIcon(getEncircledDefaultIcon());
+            pref.setOnPreferenceClickListener(this);
+            userPreferences.add(pref);
+        }
+
+        // Sort list of users by serialNum
+        Collections.sort(userPreferences, UserPreference.SERIAL_NUMBER_COMPARATOR);
+
+        getActivity().invalidateOptionsMenu();
+
+        // Load the icons
+        if (missingIcons.size() > 0) {
+            loadIconsAsync(missingIcons);
+        }
+
+        PreferenceScreen preferenceScreen = getPreferenceScreen();
+        preferenceScreen.removeAll();
+
+        // If profiles are supported, userPreferences will be added to the category labeled
+        // "User & Profiles", otherwise the category is skipped and elements are added directly
+        // to preferenceScreen
+        PreferenceGroup groupToAddUsers;
+        if (mCanAddRestrictedProfile) {
+            mUserListCategory.removeAll();
+            mUserListCategory.setOrder(Preference.DEFAULT_ORDER);
+            preferenceScreen.addPreference(mUserListCategory);
+            groupToAddUsers = mUserListCategory;
+        } else {
+            groupToAddUsers = preferenceScreen;
+        }
+        for (UserPreference userPreference : userPreferences) {
+            userPreference.setOrder(Preference.DEFAULT_ORDER);
+            groupToAddUsers.addPreference(userPreference);
+        }
+
+        // Append Add user to the end of the list
+        if (mCanAddUser) {
+            boolean moreUsers = mUserManager.canAddMoreUsers();
+            mAddUser.setEnabled(moreUsers);
+            mAddUser.setOrder(Preference.DEFAULT_ORDER);
+            preferenceScreen.addPreference(mAddUser);
+        }
+    }
+
+    private boolean shouldShowGuestUserPreference(List<UserInfo> users) {
         boolean showGuestPreference = !mIsGuest;
         // If user has DISALLOW_ADD_USER don't allow creating a guest either.
         if (showGuestPreference && mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) {
@@ -797,28 +851,10 @@
                 }
             }
         }
-        if (showGuestPreference) {
-            // Add a virtual Guest user for guest defaults
-            Preference pref = new UserPreference(getActivity(), null,
-                    UserPreference.USERID_GUEST_DEFAULTS,
-                    mIsOwner && voiceCapable? this : null /* settings icon handler */,
-                    null /* delete icon handler */);
-            pref.setTitle(R.string.user_guest);
-            pref.setIcon(getEncircledDefaultIcon());
-            pref.setOnPreferenceClickListener(this);
-            mUserListCategory.addPreference(pref);
-        }
-
-        getActivity().invalidateOptionsMenu();
-
-        // Load the icons
-        if (missingIcons.size() > 0) {
-            loadIconsAsync(missingIcons);
-        }
-        boolean moreUsers = mUserManager.canAddMoreUsers();
-        mAddUser.setEnabled(moreUsers);
+        return showGuestPreference;
     }
 
+
     private void loadIconsAsync(List<Integer> missingIcons) {
         final Resources resources = getResources();
         new AsyncTask<List<Integer>, Void, Void>() {
@@ -832,8 +868,7 @@
                 for (int userId : values[0]) {
                     Bitmap bitmap = mUserManager.getUserIcon(userId);
                     if (bitmap == null) {
-                        bitmap = UserIcons.convertToBitmap(UserIcons.getDefaultUserIcon(userId,
-                                /* light= */ false));
+                        bitmap = Utils.getDefaultUserIconAsBitmap(userId);
                     }
                     mUserIcons.append(userId, bitmap);
                 }
@@ -849,15 +884,13 @@
     }
 
     private void assignDefaultPhoto(UserInfo user) {
-        Bitmap bitmap = UserIcons.convertToBitmap(UserIcons.getDefaultUserIcon(user.id,
-                /* light= */ false));
+        Bitmap bitmap = Utils.getDefaultUserIconAsBitmap(user.id);
         mUserManager.setUserIcon(user.id, bitmap);
     }
 
     private Drawable getEncircledDefaultIcon() {
         if (mDefaultIconDrawable == null) {
-            mDefaultIconDrawable = encircle(UserIcons.convertToBitmap(
-                    UserIcons.getDefaultUserIcon(UserHandle.USER_NULL, /* light= */ false)));
+            mDefaultIconDrawable = encircle(Utils.getDefaultUserIconAsBitmap(UserHandle.USER_NULL));
         }
         return mDefaultIconDrawable;
     }
diff --git a/src/com/android/settings/utils/VoiceSelection.java b/src/com/android/settings/utils/VoiceSelection.java
new file mode 100644
index 0000000..997d2cc
--- /dev/null
+++ b/src/com/android/settings/utils/VoiceSelection.java
@@ -0,0 +1,74 @@
+/*
+ * 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.utils;
+
+import android.app.VoiceInteractor.PickOptionRequest.Option;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+/**
+ * Model for a single item that can be selected by a {@link VoiceSelectionFragment}.
+ * Each item consists of a visual label and several alternative synonyms for the item
+ * that can be used to identify the item by voice.
+ */
+public class VoiceSelection {
+    final CharSequence mLabel;
+    final CharSequence[] mSynonyms;
+
+    /**
+     * Created a new selectable item with a visual label and a set of synonyms.
+     */
+    public VoiceSelection(CharSequence label, CharSequence synonyms) {
+        mLabel = label;
+        mSynonyms = TextUtils.split(synonyms.toString(), ",");
+    }
+
+    /**
+     * Created a new selectable item with a visual label and no synonyms.
+     */
+    public VoiceSelection(CharSequence label) {
+        mLabel = label;
+        mSynonyms = null;
+    }
+
+    public CharSequence getLabel() {
+        return mLabel;
+    }
+
+    public CharSequence[] getSynonyms() {
+        return mSynonyms;
+    }
+
+    Option toOption(int index) {
+        Option result = new Option(mLabel);
+        Bundle extras = new Bundle();
+        extras.putInt("index", index);
+        result.setExtras(extras);
+
+        for (CharSequence synonym : mSynonyms) {
+            result.addSynonym(synonym);
+        }
+        return result;
+    }
+
+    /**
+     * Listener interface for when an item is selected.
+     */
+    public interface OnItemSelectedListener {
+        abstract void onItemSelected(int position, VoiceSelection selection);
+    };
+}
diff --git a/src/com/android/settings/utils/VoiceSelectionAdapter.java b/src/com/android/settings/utils/VoiceSelectionAdapter.java
new file mode 100644
index 0000000..2c060c2
--- /dev/null
+++ b/src/com/android/settings/utils/VoiceSelectionAdapter.java
@@ -0,0 +1,63 @@
+/*
+ * 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.utils;
+
+import android.content.Context;
+import android.widget.ArrayAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import android.app.Activity;
+import com.android.settings.R;
+
+import java.util.List;
+import android.util.Log;
+
+/**
+ * Array adapter for selecting an item by voice interaction. Each row includes a visual
+ * indication of the 1-indexed position of the item so that a user can easily say
+ * "number 4" to select it.
+ */
+public class VoiceSelectionAdapter extends ArrayAdapter<VoiceSelection> {
+    public VoiceSelectionAdapter(Context context, int resource, List<VoiceSelection> objects) {
+        super(context, resource, objects);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        VoiceSelection item = getItem(position);
+        View row = convertView;
+        if (row == null) {
+            LayoutInflater inflater = ((Activity) getContext()).getLayoutInflater();
+            row = inflater.inflate(R.layout.voice_item_row, parent, false);
+        }
+
+        TextView label = (TextView) row.findViewById(R.id.voice_item_label);
+        if (label != null) {
+            label.setText(item.getLabel());
+        }
+
+        TextView positionLabel = (TextView) row.findViewById(R.id.voice_item_position);
+        if (positionLabel != null) {
+            positionLabel.setText(Integer.toString(position + 1));
+        }
+
+        return row;
+    }
+};
diff --git a/src/com/android/settings/utils/VoiceSelectionFragment.java b/src/com/android/settings/utils/VoiceSelectionFragment.java
new file mode 100644
index 0000000..1e4e7e4
--- /dev/null
+++ b/src/com/android/settings/utils/VoiceSelectionFragment.java
@@ -0,0 +1,133 @@
+/*
+ * 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.utils;
+
+import android.app.ListFragment;
+import android.app.VoiceInteractor;
+import android.app.VoiceInteractor.PickOptionRequest;
+import android.app.VoiceInteractor.PickOptionRequest.Option;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+import java.util.List;
+
+/**
+ * An Activity fragment that presents a set of options as a visual list and also allows
+ * items to be selected by the users voice.
+ */
+public class VoiceSelectionFragment extends ListFragment {
+    private static final String EXTRA_SELECTION_PROMPT = "selection_prompt";
+
+    private CharSequence mPrompt = null;
+    private VoiceInteractor.Request mRequest = null;
+    private VoiceInteractor mVoiceInteractor = null;
+    private VoiceSelection.OnItemSelectedListener mOnItemSelectedListener = null;
+
+    /**
+     * No-args ctor required for fragment.
+     */
+    public VoiceSelectionFragment() {}
+
+    @Override
+    public void onCreate(Bundle args) {
+        super.onCreate(args);
+        mPrompt = getArguments().getCharSequence(EXTRA_SELECTION_PROMPT);
+    }
+
+    /**
+     * Set the prompt spoken when the fragment is presented.
+     */
+    static public Bundle createArguments(CharSequence prompt) {
+        Bundle args = new Bundle();
+        args.putCharSequence(EXTRA_SELECTION_PROMPT, prompt);
+        return args;
+    }
+
+    private VoiceSelection getSelectionAt(int position) {
+        return ((ArrayAdapter<VoiceSelection>) getListAdapter()).getItem(position);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        final int numItems = getListAdapter().getCount();
+        if (numItems <= 0) {
+            return;
+        }
+
+        Option[] options = new Option[numItems];
+        for (int idx = 0; idx < numItems; idx++) {
+            options[idx] = getSelectionAt(idx).toOption(idx);
+        }
+        mRequest = new PickOptionRequest(mPrompt, options, null) {
+            @Override
+            public void onPickOptionResult(boolean isComplete, Option[] options, Bundle args) {
+                if (!isComplete || options == null) {
+                    return;
+                }
+                if (options.length == 1 && mOnItemSelectedListener != null) {
+                    int idx = options[0].getExtras().getInt("index", -1);
+                    mOnItemSelectedListener.onItemSelected(idx, getSelectionAt(idx));
+                } else {
+                    onCancel();
+                }
+            }
+        };
+        mVoiceInteractor = getActivity().getVoiceInteractor();
+        if (mVoiceInteractor != null) {
+            mVoiceInteractor.submitRequest(mRequest);
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mVoiceInteractor = null;
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        if (mRequest != null) {
+            mRequest.cancel();
+            mRequest = null;
+        }
+
+        if (mOnItemSelectedListener != null) {
+            mOnItemSelectedListener.onItemSelected(position, getSelectionAt(position));
+        }
+    }
+
+
+    /**
+     * Sets the selection handler for an item either by voice or by touch.
+     */
+    public void setOnItemSelectedHandler(VoiceSelection.OnItemSelectedListener listener) {
+        mOnItemSelectedListener = listener;
+    }
+
+    /**
+     * Called when the user cancels the interaction. The default implementation is to
+     * finish the activity.
+     */
+    public void onCancel() {
+        getActivity().finish();
+    }
+};
diff --git a/src/com/android/settings/utils/VoiceSettingsActivity.java b/src/com/android/settings/utils/VoiceSettingsActivity.java
new file mode 100644
index 0000000..2553a54
--- /dev/null
+++ b/src/com/android/settings/utils/VoiceSettingsActivity.java
@@ -0,0 +1,111 @@
+/*
+ * 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.utils;
+
+import com.android.settings.R;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.VoiceInteractor;
+import android.app.VoiceInteractor.AbortVoiceRequest;
+import android.app.VoiceInteractor.CompleteVoiceRequest;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.util.Log;
+
+/**
+ * Activity for modifying a setting using the Voice Interaction API. This activity
+ * will only allow modifying the setting if the intent was sent using
+ * {@link android.service.voice.VoiceInteractionSession#startVoiceActivity startVoiceActivity}
+ * by the current Voice Interaction Service.
+ */
+abstract public class VoiceSettingsActivity extends Activity {
+
+    private static final String TAG = "VoiceSettingsActivity";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (isVoiceInteraction() || savedInstanceState == null) {
+            // Only permit if this is a voice interaction.
+            if (onVoiceSettingInteraction(getIntent())) {
+                // If it's complete, finish.
+                finish();
+            }
+        } else {
+            Log.v(TAG, "Cannot modify settings without voice interaction");
+            finish();
+        }
+    }
+
+    /**
+     * Modify the setting as a voice interaction. Should return true if the
+     * voice interaction is complete or false if more interaction is required.
+     */
+    abstract protected boolean onVoiceSettingInteraction(Intent intent);
+
+    /**
+     * Send a notification that the interaction was successful. If {@link prompt} is
+     * not null, then it will be read to the user.
+     */
+    protected void notifySuccess(CharSequence prompt) {
+        if (prompt != null) {
+            Toast.makeText(this, prompt, Toast.LENGTH_LONG).show();
+        }
+
+        if (getVoiceInteractor() != null) {
+            getVoiceInteractor().submitRequest(new CompleteVoiceRequest(prompt, null));
+        }
+    }
+
+    protected void setHeader(String label) {
+        TextView header = (TextView) findViewById(R.id.voice_fragment_header);
+        if (header != null) {
+            if (label != null) {
+                header.setText(label);
+                header.setVisibility(View.VISIBLE);
+            } else {
+                header.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    /**
+     * Indicates when the setting could not be changed.
+     */
+    protected void notifyFailure(CharSequence prompt) {
+        if (prompt != null) {
+            Toast.makeText(this, prompt, Toast.LENGTH_LONG).show();
+        }
+
+        if (getVoiceInteractor() != null) {
+            getVoiceInteractor().submitRequest(new AbortVoiceRequest(prompt, null));
+        }
+    }
+
+    protected void showFragment(Fragment fragment, String tag) {
+        getFragmentManager()
+                .beginTransaction()
+                .replace(R.id.voice_fragment_root, fragment, tag)
+                .commit();
+    }
+
+}
diff --git a/src/com/android/settings/voice/VoiceInputHelper.java b/src/com/android/settings/voice/VoiceInputHelper.java
index 63b891a..916e0b4 100644
--- a/src/com/android/settings/voice/VoiceInputHelper.java
+++ b/src/com/android/settings/voice/VoiceInputHelper.java
@@ -136,10 +136,8 @@
                 continue;
             }
             mAvailableInteractionInfos.add(new InteractionInfo(mContext.getPackageManager(), info));
-            if (info.getRecognitionService() != null) {
-                interactorRecognizers.add(new ComponentName(resolveInfo.serviceInfo.packageName,
-                        info.getRecognitionService()));
-            }
+            interactorRecognizers.add(new ComponentName(resolveInfo.serviceInfo.packageName,
+                    info.getRecognitionService()));
         }
         Collections.sort(mAvailableInteractionInfos);
 
diff --git a/src/com/android/settings/voice/VoiceInputSettings.java b/src/com/android/settings/voice/VoiceInputSettings.java
index 262f145..bac297e 100644
--- a/src/com/android/settings/voice/VoiceInputSettings.java
+++ b/src/com/android/settings/voice/VoiceInputSettings.java
@@ -27,6 +27,7 @@
 import android.service.voice.VoiceInteractionService;
 import android.service.voice.VoiceInteractionServiceInfo;
 import android.speech.RecognitionService;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -73,6 +74,11 @@
     private VoiceInputHelper mHelper;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.VOICE_INPUT;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.voice_input_settings);
@@ -146,12 +152,11 @@
                 // Put the new value back into secure settings.
                 Settings.Secure.putString(getActivity().getContentResolver(),
                         Settings.Secure.VOICE_INTERACTION_SERVICE, key);
-                // Eventually we will require that an interactor always specify a recognizer
-                if (info.settings != null) {
-                    Settings.Secure.putString(getActivity().getContentResolver(),
-                            Settings.Secure.VOICE_RECOGNITION_SERVICE,
-                            info.settings.flattenToShortString());
-                }
+                Settings.Secure.putString(getActivity().getContentResolver(),
+                        Settings.Secure.VOICE_RECOGNITION_SERVICE,
+                        new ComponentName(info.service.packageName,
+                                info.serviceInfo.getRecognitionService())
+                                .flattenToShortString());
                 return;
             }
         }
diff --git a/src/com/android/settings/vpn2/AppDialog.java b/src/com/android/settings/vpn2/AppDialog.java
new file mode 100644
index 0000000..2145297
--- /dev/null
+++ b/src/com/android/settings/vpn2/AppDialog.java
@@ -0,0 +1,100 @@
+/*
+ * 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.vpn2;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.internal.net.VpnConfig;
+import com.android.settings.R;
+
+/**
+ * UI for managing the connection controlled by an app.
+ *
+ * Among the actions available are (depending on context):
+ * <ul>
+ *   <li><strong>Forget</strong>: revoke the managing app's VPN permission</li>
+ *   <li><strong>Dismiss</strong>: continue to use the VPN</li>
+ * </ul>
+ *
+ * {@see ConfigDialog}
+ */
+class AppDialog extends AlertDialog implements DialogInterface.OnClickListener {
+    private final PackageInfo mPkgInfo;
+    private final Listener mListener;
+    private final boolean mConnected;
+
+    AppDialog(Context context, Listener listener, PackageInfo pkgInfo, boolean connected) {
+        super(context);
+
+        mListener = listener;
+        mPkgInfo = pkgInfo;
+        mConnected = connected;
+    }
+
+    public final PackageInfo getPackageInfo() {
+        return mPkgInfo;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedState) {
+        CharSequence vpnName;
+        try {
+            vpnName = VpnConfig.getVpnLabel(getContext(), mPkgInfo.packageName);
+        } catch (PackageManager.NameNotFoundException ex) {
+            vpnName = mPkgInfo.packageName;
+        }
+
+        setTitle(vpnName);
+        setMessage(getContext().getString(R.string.vpn_version, mPkgInfo.versionName));
+
+        createButtons();
+        super.onCreate(savedState);
+    }
+
+    protected void createButtons() {
+        Context context = getContext();
+
+        if (mConnected) {
+            // Forget the network
+            setButton(DialogInterface.BUTTON_NEGATIVE,
+                    context.getString(R.string.vpn_forget), this);
+        }
+
+        // Dismiss
+        setButton(DialogInterface.BUTTON_POSITIVE,
+                context.getString(R.string.vpn_done), this);
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == DialogInterface.BUTTON_NEGATIVE) {
+            mListener.onForget(dialog);
+        }
+        dismiss();
+    }
+
+    public interface Listener {
+        public void onForget(DialogInterface dialog);
+    }
+}
diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java
new file mode 100644
index 0000000..fc8d9e3
--- /dev/null
+++ b/src/com/android/settings/vpn2/AppDialogFragment.java
@@ -0,0 +1,136 @@
+/*
+ * 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.vpn2;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.IConnectivityManager;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.Log;
+
+import com.android.internal.net.VpnConfig;
+import com.android.settings.R;
+
+/**
+ * Fragment wrapper around an {@link AppDialog}.
+ */
+public class AppDialogFragment extends DialogFragment implements AppDialog.Listener {
+    private static final String TAG_APP_DIALOG = "vpnappdialog";
+    private static final String TAG = "AppDialogFragment";
+
+    private static final String ARG_MANAGING = "managing";
+    private static final String ARG_PACKAGE = "package";
+    private static final String ARG_CONNECTED = "connected";
+
+    private final IConnectivityManager mService = IConnectivityManager.Stub.asInterface(
+            ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
+
+    public static void show(VpnSettings parent, PackageInfo pkgInfo, boolean managing,
+            boolean connected) {
+        if (!parent.isAdded()) return;
+
+        Bundle args = new Bundle();
+        args.putParcelable(ARG_PACKAGE, pkgInfo);
+        args.putBoolean(ARG_MANAGING, managing);
+        args.putBoolean(ARG_CONNECTED, connected);
+
+        final AppDialogFragment frag = new AppDialogFragment();
+        frag.setArguments(args);
+        frag.setTargetFragment(parent, 0);
+        frag.show(parent.getFragmentManager(), TAG_APP_DIALOG);
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Bundle args = getArguments();
+        PackageInfo pkgInfo = (PackageInfo) args.getParcelable(ARG_PACKAGE);
+        boolean managing = args.getBoolean(ARG_MANAGING);
+        boolean connected = args.getBoolean(ARG_CONNECTED);
+
+        if (managing) {
+            return new AppDialog(getActivity(), this, pkgInfo, connected);
+        } else {
+            // Build an AlertDialog with an option to disconnect.
+
+            CharSequence vpnName;
+            try {
+                vpnName = VpnConfig.getVpnLabel(getActivity(), pkgInfo.packageName);
+            } catch (PackageManager.NameNotFoundException ex) {
+                vpnName = pkgInfo.packageName;
+            }
+
+            AlertDialog.Builder dlog = new AlertDialog.Builder(getActivity())
+                    .setTitle(vpnName)
+                    .setMessage(getActivity().getString(R.string.vpn_disconnect_confirm))
+                    .setNegativeButton(getActivity().getString(R.string.vpn_cancel), null);
+
+            if (connected) {
+                dlog.setPositiveButton(getActivity().getString(R.string.vpn_disconnect),
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                onDisconnect(dialog);
+                            }
+                        });
+            }
+            return dlog.create();
+        }
+    }
+
+    @Override
+    public void dismiss() {
+        ((VpnSettings) getTargetFragment()).update();
+        super.dismiss();
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        dismiss();
+        super.onCancel(dialog);
+    }
+
+    @Override
+    public void onForget(final DialogInterface dialog) {
+        PackageInfo pkgInfo = (PackageInfo) getArguments().getParcelable(ARG_PACKAGE);
+        final String pkg = pkgInfo.packageName;
+        try {
+            VpnConfig vpnConfig = mService.getVpnConfig();
+            if (vpnConfig != null && pkg.equals(vpnConfig.user) && !vpnConfig.legacy) {
+                mService.setVpnPackageAuthorization(false);
+                onDisconnect(dialog);
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to forget authorization for " + pkg, e);
+        }
+    }
+
+    private void onDisconnect(final DialogInterface dialog) {
+        PackageInfo pkgInfo = (PackageInfo) getArguments().getParcelable(ARG_PACKAGE);
+        try {
+            mService.prepareVpn(pkgInfo.packageName, VpnConfig.LEGACY_VPN);
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to disconnect package " + pkgInfo.packageName, e);
+        }
+    }
+}
diff --git a/src/com/android/settings/vpn2/AppPreference.java b/src/com/android/settings/vpn2/AppPreference.java
new file mode 100644
index 0000000..1935dd8
--- /dev/null
+++ b/src/com/android/settings/vpn2/AppPreference.java
@@ -0,0 +1,132 @@
+/*
+ * 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.vpn2;
+
+import android.app.AppGlobals;
+import android.content.Context;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.preference.Preference;
+import android.view.View.OnClickListener;
+
+import com.android.internal.net.LegacyVpnInfo;
+import com.android.internal.net.VpnConfig;
+import com.android.settings.R;
+
+/**
+ * {@link android.preference.Preference} containing information about a VPN
+ * application. Tracks the package name and connection state.
+ */
+public class AppPreference extends ManageablePreference {
+    public static final int STATE_CONNECTED = LegacyVpnInfo.STATE_CONNECTED;
+    public static final int STATE_DISCONNECTED = LegacyVpnInfo.STATE_DISCONNECTED;
+
+    private int mState = STATE_DISCONNECTED;
+    private String mPackageName;
+    private String mName;
+    private int mUid;
+
+    public AppPreference(Context context, OnClickListener onManage, final String packageName,
+            int uid) {
+        super(context, null /* attrs */, onManage);
+        mPackageName = packageName;
+        mUid = uid;
+        update();
+    }
+
+    public PackageInfo getPackageInfo() {
+        UserHandle user = new UserHandle(UserHandle.getUserId(mUid));
+        try {
+            IPackageManager ipm = AppGlobals.getPackageManager();
+            return ipm.getPackageInfo(mPackageName, 0 /* flags */, user.getIdentifier());
+        } catch (RemoteException rme) {
+            return null;
+        }
+    }
+
+    public String getPackageName() {
+        return mPackageName;
+    }
+
+    public int getUid() {
+        return mUid;
+    }
+
+    public int getState() {
+        return mState;
+    }
+
+    public void setState(int state) {
+        mState = state;
+        update();
+    }
+
+    private void update() {
+        final String[] states = getContext().getResources().getStringArray(R.array.vpn_states);
+        setSummary(mState != STATE_DISCONNECTED ? states[mState] : "");
+
+        mName = mPackageName;
+        Drawable icon = null;
+        try {
+            // Make all calls to the package manager as the appropriate user.
+            int userId = UserHandle.getUserId(mUid);
+            Context userContext = getContext().createPackageContextAsUser(
+                    getContext().getPackageName(), 0 /* flags */, new UserHandle(userId));
+            PackageManager pm = userContext.getPackageManager();
+
+            // Fetch icon and VPN label
+            PackageInfo pkgInfo = pm.getPackageInfo(mPackageName, 0 /* flags */);
+            if (pkgInfo != null) {
+                icon = pkgInfo.applicationInfo.loadIcon(pm);
+                mName = VpnConfig.getVpnLabel(userContext, mPackageName).toString();
+            }
+        } catch (PackageManager.NameNotFoundException nnfe) {
+            // Failed - use default app label and icon as fallback
+        }
+        if (icon == null) {
+            icon = getContext().getPackageManager().getDefaultActivityIcon();
+        }
+        setTitle(mName);
+        setIcon(icon);
+
+        notifyHierarchyChanged();
+    }
+
+    public int compareTo(Preference preference) {
+        if (preference instanceof AppPreference) {
+            AppPreference another = (AppPreference) preference;
+            int result;
+            if ((result = another.mState - mState) == 0 &&
+                    (result = mName.compareToIgnoreCase(another.mName)) == 0 &&
+                    (result = mPackageName.compareTo(another.mPackageName)) == 0) {
+                result = mUid - another.mUid;
+            }
+            return result;
+        } else if (preference instanceof ConfigPreference) {
+            // Use comparator from ConfigPreference
+            ConfigPreference another = (ConfigPreference) preference;
+            return -another.compareTo(this);
+        } else {
+            return super.compareTo(preference);
+        }
+    }
+}
+
diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java
similarity index 95%
rename from src/com/android/settings/vpn2/VpnDialog.java
rename to src/com/android/settings/vpn2/ConfigDialog.java
index 9ef269b..57f43f4 100644
--- a/src/com/android/settings/vpn2/VpnDialog.java
+++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.vpn2;
 
-import com.android.internal.net.VpnProfile;
-import com.android.settings.R;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -31,20 +28,30 @@
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.android.internal.net.VpnProfile;
+import com.android.settings.R;
+
 import java.net.InetAddress;
 
-class VpnDialog extends AlertDialog implements TextWatcher,
+/**
+ * Dialog showing information about a VPN configuration. The dialog
+ * can be launched to either edit or prompt for credentials to connect
+ * to a user-added VPN.
+ *
+ * {@see AppDialog}
+ */
+class ConfigDialog extends AlertDialog implements TextWatcher,
         View.OnClickListener, AdapterView.OnItemSelectedListener {
     private final KeyStore mKeyStore = KeyStore.getInstance();
     private final DialogInterface.OnClickListener mListener;
     private final VpnProfile mProfile;
 
     private boolean mEditing;
+    private boolean mExists;
 
     private View mView;
 
@@ -65,19 +72,20 @@
     private Spinner mIpsecServerCert;
     private CheckBox mSaveLogin;
 
-    VpnDialog(Context context, DialogInterface.OnClickListener listener,
-            VpnProfile profile, boolean editing) {
+    ConfigDialog(Context context, DialogInterface.OnClickListener listener,
+            VpnProfile profile, boolean editing, boolean exists) {
         super(context);
+
         mListener = listener;
         mProfile = profile;
         mEditing = editing;
+        mExists = exists;
     }
 
     @Override
     protected void onCreate(Bundle savedState) {
         mView = getLayoutInflater().inflate(R.layout.vpn_dialog, null);
         setView(mView);
-        setInverseBackgroundForced(true);
 
         Context context = getContext();
 
@@ -155,6 +163,12 @@
                 onClick(showOptions);
             }
 
+            // Create a button to forget the profile if it has already been saved..
+            if (mExists) {
+                setButton(DialogInterface.BUTTON_NEUTRAL,
+                        context.getString(R.string.vpn_forget), mListener);
+            }
+
             // Create a button to save the profile.
             setButton(DialogInterface.BUTTON_POSITIVE,
                     context.getString(R.string.vpn_save), mListener);
@@ -174,7 +188,7 @@
                 context.getString(R.string.vpn_cancel), mListener);
 
         // Let AlertDialog create everything.
-        super.onCreate(null);
+        super.onCreate(savedState);
 
         // Disable the action button if necessary.
         getButton(DialogInterface.BUTTON_POSITIVE)
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
new file mode 100644
index 0000000..42e1614
--- /dev/null
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -0,0 +1,160 @@
+/*
+ * 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.vpn2;
+
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.net.IConnectivityManager;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.security.Credentials;
+import android.security.KeyStore;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.android.internal.net.LegacyVpnInfo;
+import com.android.internal.net.VpnConfig;
+import com.android.internal.net.VpnProfile;
+import com.android.settings.R;
+
+/**
+ * Fragment wrapper around a {@link ConfigDialog}.
+ */
+public class ConfigDialogFragment extends DialogFragment implements
+        DialogInterface.OnClickListener {
+    private static final String TAG_CONFIG_DIALOG = "vpnconfigdialog";
+    private static final String TAG = "ConfigDialogFragment";
+
+    private static final String ARG_PROFILE = "profile";
+    private static final String ARG_EDITING = "editing";
+    private static final String ARG_EXISTS = "exists";
+
+    private final IConnectivityManager mService = IConnectivityManager.Stub.asInterface(
+            ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
+
+    private boolean mUnlocking = false;
+
+    public static void show(VpnSettings parent, VpnProfile profile, boolean edit, boolean exists) {
+        if (!parent.isAdded()) return;
+
+        Bundle args = new Bundle();
+        args.putParcelable(ARG_PROFILE, profile);
+        args.putBoolean(ARG_EDITING, edit);
+        args.putBoolean(ARG_EXISTS, exists);
+
+        final ConfigDialogFragment frag = new ConfigDialogFragment();
+        frag.setArguments(args);
+        frag.setTargetFragment(parent, 0);
+        frag.show(parent.getFragmentManager(), TAG_CONFIG_DIALOG);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Check KeyStore here, so others do not need to deal with it.
+        if (!KeyStore.getInstance().isUnlocked()) {
+            if (!mUnlocking) {
+                // Let us unlock KeyStore. See you later!
+                Credentials.getInstance().unlock(getActivity());
+            } else {
+                // We already tried, but it is still not working!
+                dismiss();
+            }
+            mUnlocking = !mUnlocking;
+            return;
+        }
+
+        // Now KeyStore is always unlocked. Reset the flag.
+        mUnlocking = false;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Bundle args = getArguments();
+        VpnProfile profile = (VpnProfile) args.getParcelable(ARG_PROFILE);
+        boolean editing = args.getBoolean(ARG_EDITING);
+        boolean exists = args.getBoolean(ARG_EXISTS);
+
+        return new ConfigDialog(getActivity(), this, profile, editing, exists);
+    }
+
+    @Override
+    public void onClick(DialogInterface dialogInterface, int button) {
+        ConfigDialog dialog = (ConfigDialog) getDialog();
+        VpnProfile profile = dialog.getProfile();
+
+        if (button == DialogInterface.BUTTON_POSITIVE) {
+            // Update KeyStore entry
+            KeyStore.getInstance().put(Credentials.VPN + profile.key, profile.encode(),
+                    KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED);
+
+            // Flush out old version of profile
+            disconnect(profile);
+
+            // If we are not editing, connect!
+            if (!dialog.isEditing()) {
+                try {
+                    connect(profile);
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Failed to connect", e);
+                }
+            }
+        } else if (button == DialogInterface.BUTTON_NEUTRAL) {
+            // Disable profile if connected
+            disconnect(profile);
+
+            // Delete from KeyStore
+            KeyStore.getInstance().delete(Credentials.VPN + profile.key, KeyStore.UID_SELF);
+        }
+        dismiss();
+    }
+
+    @Override
+    public void dismiss() {
+        ((VpnSettings) getTargetFragment()).update();
+        super.dismiss();
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        dismiss();
+        super.onCancel(dialog);
+    }
+
+    private void connect(VpnProfile profile) throws RemoteException {
+        try {
+            mService.startLegacyVpn(profile);
+        } catch (IllegalStateException e) {
+            Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private void disconnect(VpnProfile profile) {
+        try {
+            LegacyVpnInfo connected = mService.getLegacyVpnInfo();
+            if (connected != null && profile.key.equals(connected.key)) {
+                mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN);
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to disconnect", e);
+        }
+    }
+}
diff --git a/src/com/android/settings/vpn2/ConfigPreference.java b/src/com/android/settings/vpn2/ConfigPreference.java
new file mode 100644
index 0000000..4e6e16f
--- /dev/null
+++ b/src/com/android/settings/vpn2/ConfigPreference.java
@@ -0,0 +1,93 @@
+/*
+ * 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.vpn2;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.view.View.OnClickListener;
+
+import static com.android.internal.net.LegacyVpnInfo.STATE_CONNECTED;
+
+import com.android.internal.net.VpnProfile;
+import com.android.settings.R;
+
+/**
+ * {@link android.preference.Preference} referencing a VPN
+ * configuration. Tracks the underlying profile and its connection
+ * state.
+ */
+public class ConfigPreference extends ManageablePreference {
+    private VpnProfile mProfile;
+    private int mState = -1;
+
+    ConfigPreference(Context context, OnClickListener onManage, VpnProfile profile) {
+        super(context, null /* attrs */, onManage);
+        setProfile(profile);
+    }
+
+    public VpnProfile getProfile() {
+        return mProfile;
+    }
+
+    public void setProfile(VpnProfile profile) {
+        mProfile = profile;
+        update();
+    }
+
+    public void setState(int state) {
+        mState = state;
+        update();
+    }
+
+    private void update() {
+        if (mState < 0) {
+            setSummary("");
+        } else {
+            String[] states = getContext().getResources()
+                    .getStringArray(R.array.vpn_states);
+            setSummary(states[mState]);
+        }
+        setIcon(R.mipmap.ic_launcher_settings);
+        setTitle(mProfile.name);
+        notifyHierarchyChanged();
+    }
+
+    @Override
+    public int compareTo(Preference preference) {
+        if (preference instanceof ConfigPreference) {
+            ConfigPreference another = (ConfigPreference) preference;
+            int result;
+            if ((result = another.mState - mState) == 0 &&
+                    (result = mProfile.name.compareTo(another.mProfile.name)) == 0 &&
+                    (result = mProfile.type - another.mProfile.type) == 0) {
+                result = mProfile.key.compareTo(another.mProfile.key);
+            }
+            return result;
+        } else if (preference instanceof AppPreference) {
+            // Try to sort connected VPNs first
+            AppPreference another = (AppPreference) preference;
+            if (mState != STATE_CONNECTED && another.getState() == AppPreference.STATE_CONNECTED) {
+                return 1;
+            }
+            // Show configured VPNs before app VPNs
+            return -1;
+        } else {
+            return super.compareTo(preference);
+        }
+    }
+}
+
diff --git a/src/com/android/settings/vpn2/LockdownConfigFragment.java b/src/com/android/settings/vpn2/LockdownConfigFragment.java
new file mode 100644
index 0000000..f36cb46
--- /dev/null
+++ b/src/com/android/settings/vpn2/LockdownConfigFragment.java
@@ -0,0 +1,137 @@
+/*
+ * 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.vpn2;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.net.ConnectivityManager;
+import android.os.Bundle;
+import android.security.Credentials;
+import android.security.KeyStore;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import com.android.internal.net.VpnProfile;
+import com.android.settings.R;
+import com.google.android.collect.Lists;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Dialog to configure always-on VPN.
+ */
+public class LockdownConfigFragment extends DialogFragment {
+    private List<VpnProfile> mProfiles;
+    private List<CharSequence> mTitles;
+    private int mCurrentIndex;
+
+    private static final String TAG_LOCKDOWN = "lockdown";
+
+    private static class TitleAdapter extends ArrayAdapter<CharSequence> {
+        public TitleAdapter(Context context, List<CharSequence> objects) {
+            super(context, com.android.internal.R.layout.select_dialog_singlechoice_material,
+                    android.R.id.text1, objects);
+        }
+    }
+
+    public static void show(VpnSettings parent) {
+        if (!parent.isAdded()) return;
+
+        final LockdownConfigFragment dialog = new LockdownConfigFragment();
+        dialog.show(parent.getFragmentManager(), TAG_LOCKDOWN);
+    }
+
+    private static String getStringOrNull(KeyStore keyStore, String key) {
+        if (!keyStore.isUnlocked()) {
+            return null;
+        }
+        final byte[] value = keyStore.get(key);
+        return value == null ? null : new String(value);
+    }
+
+    private void initProfiles(KeyStore keyStore, Resources res) {
+        final String lockdownKey = getStringOrNull(keyStore, Credentials.LOCKDOWN_VPN);
+
+        mProfiles = VpnSettings.loadVpnProfiles(keyStore, VpnProfile.TYPE_PPTP);
+        mTitles = new ArrayList<>(1 + mProfiles.size());
+        mTitles.add(res.getText(R.string.vpn_lockdown_none));
+
+        mCurrentIndex = 0;
+        for (VpnProfile profile : mProfiles) {
+            if (TextUtils.equals(profile.key, lockdownKey)) {
+                mCurrentIndex = mTitles.size();
+            }
+            mTitles.add(profile.name);
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Context context = getActivity();
+        final KeyStore keyStore = KeyStore.getInstance();
+
+        initProfiles(keyStore, context.getResources());
+
+        final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
+
+        builder.setTitle(R.string.vpn_menu_lockdown);
+
+        final View view = dialogInflater.inflate(R.layout.vpn_lockdown_editor, null, false);
+        final ListView listView = (ListView) view.findViewById(android.R.id.list);
+        listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+        listView.setAdapter(new TitleAdapter(context, mTitles));
+        listView.setItemChecked(mCurrentIndex, true);
+        builder.setView(view);
+
+        builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                final int newIndex = listView.getCheckedItemPosition();
+                if (mCurrentIndex == newIndex) return;
+
+                if (newIndex == 0) {
+                    keyStore.delete(Credentials.LOCKDOWN_VPN);
+                } else {
+                    final VpnProfile profile = mProfiles.get(newIndex - 1);
+                    if (!profile.isValidLockdownProfile()) {
+                        Toast.makeText(context, R.string.vpn_lockdown_config_error,
+                                Toast.LENGTH_LONG).show();
+                        return;
+                    }
+                    keyStore.put(Credentials.LOCKDOWN_VPN, profile.key.getBytes(),
+                            KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED);
+                }
+
+                // kick profiles since we changed them
+                ConnectivityManager.from(getActivity()).updateLockdownVpn();
+            }
+        });
+
+        return builder.create();
+    }
+}
+
diff --git a/src/com/android/settings/vpn2/ManageablePreference.java b/src/com/android/settings/vpn2/ManageablePreference.java
new file mode 100644
index 0000000..5e507c1
--- /dev/null
+++ b/src/com/android/settings/vpn2/ManageablePreference.java
@@ -0,0 +1,50 @@
+/*
+ * 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.vpn2;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import com.android.settings.R;
+
+/**
+ * Preference with an additional gear icon. Touching the gear icon triggers an
+ * onChange event.
+ */
+public class ManageablePreference extends Preference {
+    OnClickListener mListener;
+    View mManageView;
+
+    public ManageablePreference(Context context, AttributeSet attrs, OnClickListener onManage) {
+        super(context, attrs);
+        mListener = onManage;
+        setPersistent(false);
+        setOrder(0);
+        setWidgetLayoutResource(R.layout.preference_vpn);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        mManageView = view.findViewById(R.id.manage);
+        mManageView.setOnClickListener(mListener);
+        mManageView.setTag(this);
+        super.onBindView(view);
+    }
+}
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 7516392..a333de9 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -16,42 +16,38 @@
 
 package com.android.settings.vpn2;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
+import android.app.AppOpsManager;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.Resources;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
 import android.net.IConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.security.Credentials;
 import android.security.KeyStore;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.LayoutInflater;
+import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.Spinner;
 import android.widget.TextView;
-import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
 import com.android.internal.net.VpnProfile;
@@ -62,59 +58,69 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 
-public class VpnSettings extends SettingsPreferenceFragment implements
-        Handler.Callback, Preference.OnPreferenceClickListener,
-        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
-    private static final String TAG = "VpnSettings";
+import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
 
-    private static final String TAG_LOCKDOWN = "lockdown";
+/**
+ * Settings screen listing VPNs. Configured VPNs and networks managed by apps
+ * are shown in the same list.
+ */
+public class VpnSettings extends SettingsPreferenceFragment implements
+        Handler.Callback, Preference.OnPreferenceClickListener {
+    private static final String LOG_TAG = "VpnSettings";
 
     private static final String EXTRA_PICK_LOCKDOWN = "android.net.vpn.PICK_LOCKDOWN";
+    private static final NetworkRequest VPN_REQUEST = new NetworkRequest.Builder()
+            .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
+            .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
+            .removeCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED)
+            .build();
 
-    // TODO: migrate to using DialogFragment when editing
-
-    private final IConnectivityManager mService = IConnectivityManager.Stub
+    private final IConnectivityManager mConnectivityService = IConnectivityManager.Stub
             .asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
-    private final KeyStore mKeyStore = KeyStore.getInstance();
-    private boolean mUnlocking = false;
+    private ConnectivityManager mConnectivityManager;
+    private UserManager mUserManager;
 
-    private HashMap<String, VpnPreference> mPreferences = new HashMap<String, VpnPreference>();
-    private VpnDialog mDialog;
+    private final KeyStore mKeyStore = KeyStore.getInstance();
+
+    private HashMap<String, ConfigPreference> mConfigPreferences = new HashMap<>();
+    private HashMap<String, AppPreference> mAppPreferences = new HashMap<>();
 
     private Handler mUpdater;
-    private LegacyVpnInfo mInfo;
-    private UserManager mUm;
-
-    // The key of the profile for the current ContextMenu.
-    private String mSelectedKey;
+    private LegacyVpnInfo mConnectedLegacyVpn;
+    private HashSet<String> mConnectedVpns = new HashSet<>();
 
     private boolean mUnavailable;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.VPN;
+    }
+
+    @Override
     public void onCreate(Bundle savedState) {
         super.onCreate(savedState);
 
-        mUm = (UserManager) getSystemService(Context.USER_SERVICE);
-
-        if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
+        mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
+        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
             mUnavailable = true;
             setPreferenceScreen(new PreferenceScreen(getActivity(), null));
             return;
         }
 
+        mConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+        mConnectivityManager.registerNetworkCallback(VPN_REQUEST, mNetworkCallback);
+
         setHasOptionsMenu(true);
         addPreferencesFromResource(R.xml.vpn_settings2);
+    }
 
-        if (savedState != null) {
-            VpnProfile profile = VpnProfile.decode(savedState.getString("VpnKey"),
-                    savedState.getByteArray("VpnProfile"));
-            if (profile != null) {
-                mDialog = new VpnDialog(getActivity(), this, profile,
-                        savedState.getBoolean("VpnEditing"));
-            }
-        }
+    @Override
+    public void onDestroy() {
+        mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
+        super.onDestroy();
     }
 
     @Override
@@ -139,13 +145,11 @@
             case R.id.vpn_create: {
                 // Generate a new key. Here we just use the current time.
                 long millis = System.currentTimeMillis();
-                while (mPreferences.containsKey(Long.toHexString(millis))) {
+                while (mConfigPreferences.containsKey(Long.toHexString(millis))) {
                     ++millis;
                 }
-                mDialog = new VpnDialog(
-                        getActivity(), this, new VpnProfile(Long.toHexString(millis)), true);
-                mDialog.setOnDismissListener(this);
-                mDialog.show();
+                VpnProfile profile = new VpnProfile(Long.toHexString(millis));
+                ConfigDialogFragment.show(this, profile, true /* editing */, false /* exists */);
                 return true;
             }
             case R.id.vpn_lockdown: {
@@ -157,18 +161,6 @@
     }
 
     @Override
-    public void onSaveInstanceState(Bundle savedState) {
-        // We do not save view hierarchy, as they are just profiles.
-        if (mDialog != null) {
-            VpnProfile profile = mDialog.getProfile();
-            savedState.putString("VpnKey", profile.key);
-            savedState.putByteArray("VpnProfile", profile.encode());
-            savedState.putBoolean("VpnEditing", mDialog.isEditing());
-        }
-        // else?
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
 
@@ -187,42 +179,32 @@
             LockdownConfigFragment.show(this);
         }
 
-        // Check KeyStore here, so others do not need to deal with it.
-        if (!mKeyStore.isUnlocked()) {
-            if (!mUnlocking) {
-                // Let us unlock KeyStore. See you later!
-                Credentials.getInstance().unlock(getActivity());
-            } else {
-                // We already tried, but it is still not working!
-                finishFragment();
-            }
-            mUnlocking = !mUnlocking;
-            return;
+        update();
+    }
+
+    public void update() {
+        // Pref group within which to list VPNs
+        PreferenceGroup vpnGroup = getPreferenceScreen();
+        vpnGroup.removeAll();
+        mConfigPreferences.clear();
+        mAppPreferences.clear();
+
+        // Fetch configured VPN profiles from KeyStore
+        for (VpnProfile profile : loadVpnProfiles(mKeyStore)) {
+            final ConfigPreference pref = new ConfigPreference(getActivity(), mManageListener,
+                    profile);
+            pref.setOnPreferenceClickListener(this);
+            mConfigPreferences.put(profile.key, pref);
+            vpnGroup.addPreference(pref);
         }
 
-        // Now KeyStore is always unlocked. Reset the flag.
-        mUnlocking = false;
-
-        // Currently we are the only user of profiles in KeyStore.
-        // Assuming KeyStore and KeyGuard do the right thing, we can
-        // safely cache profiles in the memory.
-        if (mPreferences.size() == 0) {
-            PreferenceGroup group = getPreferenceScreen();
-
-            final Context context = getActivity();
-            final List<VpnProfile> profiles = loadVpnProfiles(mKeyStore);
-            for (VpnProfile profile : profiles) {
-                final VpnPreference pref = new VpnPreference(context, profile);
-                pref.setOnPreferenceClickListener(this);
-                mPreferences.put(profile.key, pref);
-                group.addPreference(pref);
-            }
-        }
-
-        // Show the dialog if there is one.
-        if (mDialog != null) {
-            mDialog.setOnDismissListener(this);
-            mDialog.show();
+        // 3rd-party VPN apps can change elsewhere. Reload them every time.
+        for (AppOpsManager.PackageOps pkg : getVpnApps()) {
+            final AppPreference pref = new AppPreference(getActivity(), mManageListener,
+                    pkg.getPackageName(), pkg.getUid());
+            pref.setOnPreferenceClickListener(this);
+            mAppPreferences.put(pkg.getPackageName(), pref);
+            vpnGroup.addPreference(pref);
         }
 
         // Start monitoring.
@@ -230,172 +212,111 @@
             mUpdater = new Handler(this);
         }
         mUpdater.sendEmptyMessage(0);
-
-        // Register for context menu. Hmmm, getListView() is hidden?
-        registerForContextMenu(getListView());
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-
-        if (mUnavailable) {
-            return;
-        }
-
-        // Hide the dialog if there is one.
-        if (mDialog != null) {
-            mDialog.setOnDismissListener(null);
-            mDialog.dismiss();
-        }
-
-        // Unregister for context menu.
-        if (getView() != null) {
-            unregisterForContextMenu(getListView());
-        }
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        // Here is the exit of a dialog.
-        mDialog = null;
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int button) {
-        if (button == DialogInterface.BUTTON_POSITIVE) {
-            // Always save the profile.
-            VpnProfile profile = mDialog.getProfile();
-            mKeyStore.put(Credentials.VPN + profile.key, profile.encode(), KeyStore.UID_SELF,
-                    KeyStore.FLAG_ENCRYPTED);
-
-            // Update the preference.
-            VpnPreference preference = mPreferences.get(profile.key);
-            if (preference != null) {
-                disconnect(profile.key);
-                preference.update(profile);
-            } else {
-                preference = new VpnPreference(getActivity(), profile);
-                preference.setOnPreferenceClickListener(this);
-                mPreferences.put(profile.key, preference);
-                getPreferenceScreen().addPreference(preference);
-            }
-
-            // If we are not editing, connect!
-            if (!mDialog.isEditing()) {
-                try {
-                    connect(profile);
-                } catch (Exception e) {
-                    Log.e(TAG, "connect", e);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
-        if (mDialog != null) {
-            Log.v(TAG, "onCreateContextMenu() is called when mDialog != null");
-            return;
-        }
-
-        if (info instanceof AdapterContextMenuInfo) {
-            Preference preference = (Preference) getListView().getItemAtPosition(
-                    ((AdapterContextMenuInfo) info).position);
-            if (preference instanceof VpnPreference) {
-                VpnProfile profile = ((VpnPreference) preference).getProfile();
-                mSelectedKey = profile.key;
-                menu.setHeaderTitle(profile.name);
-                menu.add(Menu.NONE, R.string.vpn_menu_edit, 0, R.string.vpn_menu_edit);
-                menu.add(Menu.NONE, R.string.vpn_menu_delete, 0, R.string.vpn_menu_delete);
-            }
-        }
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        if (mDialog != null) {
-            Log.v(TAG, "onContextItemSelected() is called when mDialog != null");
-            return false;
-        }
-
-        VpnPreference preference = mPreferences.get(mSelectedKey);
-        if (preference == null) {
-            Log.v(TAG, "onContextItemSelected() is called but no preference is found");
-            return false;
-        }
-
-        switch (item.getItemId()) {
-            case R.string.vpn_menu_edit:
-                mDialog = new VpnDialog(getActivity(), this, preference.getProfile(), true);
-                mDialog.setOnDismissListener(this);
-                mDialog.show();
-                return true;
-            case R.string.vpn_menu_delete:
-                disconnect(mSelectedKey);
-                getPreferenceScreen().removePreference(preference);
-                mPreferences.remove(mSelectedKey);
-                mKeyStore.delete(Credentials.VPN + mSelectedKey);
-                return true;
-        }
-        return false;
     }
 
     @Override
     public boolean onPreferenceClick(Preference preference) {
-        if (mDialog != null) {
-            Log.v(TAG, "onPreferenceClick() is called when mDialog != null");
-            return true;
-        }
-
-        if (preference instanceof VpnPreference) {
-            VpnProfile profile = ((VpnPreference) preference).getProfile();
-            if (mInfo != null && profile.key.equals(mInfo.key) &&
-                    mInfo.state == LegacyVpnInfo.STATE_CONNECTED) {
+        if (preference instanceof ConfigPreference) {
+            VpnProfile profile = ((ConfigPreference) preference).getProfile();
+            if (mConnectedLegacyVpn != null && profile.key.equals(mConnectedLegacyVpn.key) &&
+                    mConnectedLegacyVpn.state == LegacyVpnInfo.STATE_CONNECTED) {
                 try {
-                    mInfo.intent.send();
+                    mConnectedLegacyVpn.intent.send();
                     return true;
                 } catch (Exception e) {
                     // ignore
                 }
             }
-            mDialog = new VpnDialog(getActivity(), this, profile, false);
-        } else {
-            // Generate a new key. Here we just use the current time.
-            long millis = System.currentTimeMillis();
-            while (mPreferences.containsKey(Long.toHexString(millis))) {
-                ++millis;
+            ConfigDialogFragment.show(this, profile, false /* editing */, true /* exists */);
+            return true;
+        } else if (preference instanceof AppPreference) {
+            AppPreference pref = (AppPreference) preference;
+            boolean connected = (pref.getState() == AppPreference.STATE_CONNECTED);
+
+            if (!connected) {
+                try {
+                    UserHandle user = new UserHandle(UserHandle.getUserId(pref.getUid()));
+                    Context userContext = getActivity().createPackageContextAsUser(
+                            getActivity().getPackageName(), 0 /* flags */, user);
+                    PackageManager pm = userContext.getPackageManager();
+                    Intent appIntent = pm.getLaunchIntentForPackage(pref.getPackageName());
+                    if (appIntent != null) {
+                        userContext.startActivityAsUser(appIntent, user);
+                        return true;
+                    }
+                } catch (PackageManager.NameNotFoundException nnfe) {
+                    // Fall through
+                }
             }
-            mDialog = new VpnDialog(getActivity(), this,
-                    new VpnProfile(Long.toHexString(millis)), true);
+
+            // Already onnected or no launch intent available - show an info dialog
+            PackageInfo pkgInfo = pref.getPackageInfo();
+            AppDialogFragment.show(this, pkgInfo, false /* editing */, connected);
+            return true;
         }
-        mDialog.setOnDismissListener(this);
-        mDialog.show();
-        return true;
+        return false;
     }
 
+    private View.OnClickListener mManageListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View view) {
+            Object tag = view.getTag();
+
+            if (tag instanceof ConfigPreference) {
+                ConfigPreference pref = (ConfigPreference) tag;
+                ConfigDialogFragment.show(VpnSettings.this, pref.getProfile(), true /* editing */,
+                        true /* exists */);
+            } else if (tag instanceof AppPreference) {
+                AppPreference pref = (AppPreference) tag;
+                AppDialogFragment.show(VpnSettings.this, pref.getPackageInfo(), true /* editing */,
+                        (pref.getState() == AppPreference.STATE_CONNECTED) /* connected */);
+            }
+        }
+    };
+
     @Override
     public boolean handleMessage(Message message) {
         mUpdater.removeMessages(0);
 
         if (isResumed()) {
             try {
-                LegacyVpnInfo info = mService.getLegacyVpnInfo();
-                if (mInfo != null) {
-                    VpnPreference preference = mPreferences.get(mInfo.key);
+                // Legacy VPNs
+                LegacyVpnInfo info = mConnectivityService.getLegacyVpnInfo();
+                if (mConnectedLegacyVpn != null) {
+                    ConfigPreference preference = mConfigPreferences.get(mConnectedLegacyVpn.key);
                     if (preference != null) {
-                        preference.update(-1);
+                        preference.setState(-1);
                     }
-                    mInfo = null;
+                    mConnectedLegacyVpn = null;
                 }
                 if (info != null) {
-                    VpnPreference preference = mPreferences.get(info.key);
+                    ConfigPreference preference = mConfigPreferences.get(info.key);
                     if (preference != null) {
-                        preference.update(info.state);
-                        mInfo = info;
+                        preference.setState(info.state);
+                        mConnectedLegacyVpn = info;
                     }
                 }
-            } catch (Exception e) {
+
+                // VPN apps
+                for (String key : mConnectedVpns) {
+                    AppPreference preference = mAppPreferences.get(key);
+                    if (preference != null) {
+                        preference.setState(AppPreference.STATE_DISCONNECTED);
+                    }
+                }
+                mConnectedVpns.clear();
+                // TODO: also query VPN services in user profiles STOPSHIP
+                VpnConfig cfg = mConnectivityService.getVpnConfig();
+                if (cfg != null) {
+                    mConnectedVpns.add(cfg.user);
+                }
+                for (String key : mConnectedVpns) {
+                    AppPreference preference = mAppPreferences.get(key);
+                    if (preference != null) {
+                        preference.setState(AppPreference.STATE_CONNECTED);
+                    }
+                }
+            } catch (RemoteException e) {
                 // ignore
             }
             mUpdater.sendEmptyMessageDelayed(0, 1000);
@@ -403,186 +324,76 @@
         return true;
     }
 
-    private void connect(VpnProfile profile) throws Exception {
-        try {
-            mService.startLegacyVpn(profile);
-        } catch (IllegalStateException e) {
-            Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show();
-        }
-    }
-
-    private void disconnect(String key) {
-        if (mInfo != null && key.equals(mInfo.key)) {
-            try {
-                mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN);
-            } catch (Exception e) {
-                // ignore
+    private NetworkCallback mNetworkCallback = new NetworkCallback() {
+        @Override
+        public void onAvailable(Network network) {
+            if (mUpdater != null) {
+                mUpdater.sendEmptyMessage(0);
             }
         }
-    }
+
+        @Override
+        public void onLost(Network network) {
+            if (mUpdater != null) {
+                mUpdater.sendEmptyMessage(0);
+            }
+        }
+    };
 
     @Override
     protected int getHelpResource() {
         return R.string.help_url_vpn;
     }
 
-    private static class VpnPreference extends Preference {
-        private VpnProfile mProfile;
-        private int mState = -1;
+    private List<AppOpsManager.PackageOps> getVpnApps() {
+        List<AppOpsManager.PackageOps> result = Lists.newArrayList();
 
-        VpnPreference(Context context, VpnProfile profile) {
-            super(context);
-            setPersistent(false);
-            setOrder(0);
-
-            mProfile = profile;
-            update();
+        // Build a filter of currently active user profiles.
+        SparseArray<Boolean> currentProfileIds = new SparseArray<>();
+        for (UserHandle profile : mUserManager.getUserProfiles()) {
+            currentProfileIds.put(profile.getIdentifier(), Boolean.TRUE);
         }
 
-        VpnProfile getProfile() {
-            return mProfile;
-        }
-
-        void update(VpnProfile profile) {
-            mProfile = profile;
-            update();
-        }
-
-        void update(int state) {
-            mState = state;
-            update();
-        }
-
-        void update() {
-            if (mState < 0) {
-                String[] types = getContext().getResources()
-                        .getStringArray(R.array.vpn_types_long);
-                setSummary(types[mProfile.type]);
-            } else {
-                String[] states = getContext().getResources()
-                        .getStringArray(R.array.vpn_states);
-                setSummary(states[mState]);
-            }
-            setTitle(mProfile.name);
-            notifyHierarchyChanged();
-        }
-
-        @Override
-        public int compareTo(Preference preference) {
-            int result = -1;
-            if (preference instanceof VpnPreference) {
-                VpnPreference another = (VpnPreference) preference;
-                if ((result = another.mState - mState) == 0 &&
-                        (result = mProfile.name.compareTo(another.mProfile.name)) == 0 &&
-                        (result = mProfile.type - another.mProfile.type) == 0) {
-                    result = mProfile.key.compareTo(another.mProfile.key);
+        // Fetch VPN-enabled apps from AppOps.
+        AppOpsManager aom = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
+        List<AppOpsManager.PackageOps> apps = aom.getPackagesForOps(new int[] {OP_ACTIVATE_VPN});
+        if (apps != null) {
+            for (AppOpsManager.PackageOps pkg : apps) {
+                int userId = UserHandle.getUserId(pkg.getUid());
+                if (currentProfileIds.get(userId) == null) {
+                    // Skip packages for users outside of our profile group.
+                    continue;
+                }
+                // Look for a MODE_ALLOWED permission to activate VPN.
+                boolean allowed = false;
+                for (AppOpsManager.OpEntry op : pkg.getOps()) {
+                    if (op.getOp() == OP_ACTIVATE_VPN &&
+                            op.getMode() == AppOpsManager.MODE_ALLOWED) {
+                        allowed = true;
+                    }
+                }
+                if (allowed) {
+                    result.add(pkg);
                 }
             }
+        }
+        return result;
+    }
+
+    protected static List<VpnProfile> loadVpnProfiles(KeyStore keyStore, int... excludeTypes) {
+        final ArrayList<VpnProfile> result = Lists.newArrayList();
+
+        // This might happen if the user does not yet have a keystore. Quietly short-circuit because
+        // no keystore means no VPN configs.
+        if (!keyStore.isUnlocked()) {
             return result;
         }
-    }
 
-    /**
-     * Dialog to configure always-on VPN.
-     */
-    public static class LockdownConfigFragment extends DialogFragment {
-        private List<VpnProfile> mProfiles;
-        private List<CharSequence> mTitles;
-        private int mCurrentIndex;
-
-        private static class TitleAdapter extends ArrayAdapter<CharSequence> {
-            public TitleAdapter(Context context, List<CharSequence> objects) {
-                super(context, com.android.internal.R.layout.select_dialog_singlechoice_material,
-                        android.R.id.text1, objects);
-            }
-        }
-
-        public static void show(VpnSettings parent) {
-            if (!parent.isAdded()) return;
-
-            final LockdownConfigFragment dialog = new LockdownConfigFragment();
-            dialog.show(parent.getFragmentManager(), TAG_LOCKDOWN);
-        }
-
-        private static String getStringOrNull(KeyStore keyStore, String key) {
-            final byte[] value = keyStore.get(Credentials.LOCKDOWN_VPN);
-            return value == null ? null : new String(value);
-        }
-
-        private void initProfiles(KeyStore keyStore, Resources res) {
-            final String lockdownKey = getStringOrNull(keyStore, Credentials.LOCKDOWN_VPN);
-
-            mProfiles = loadVpnProfiles(keyStore, VpnProfile.TYPE_PPTP);
-            mTitles = Lists.newArrayList();
-            mTitles.add(res.getText(R.string.vpn_lockdown_none));
-            mCurrentIndex = 0;
-
-            for (VpnProfile profile : mProfiles) {
-                if (TextUtils.equals(profile.key, lockdownKey)) {
-                    mCurrentIndex = mTitles.size();
-                }
-                mTitles.add(profile.name);
-            }
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final Context context = getActivity();
-            final KeyStore keyStore = KeyStore.getInstance();
-
-            initProfiles(keyStore, context.getResources());
-
-            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
-
-            builder.setTitle(R.string.vpn_menu_lockdown);
-
-            final View view = dialogInflater.inflate(R.layout.vpn_lockdown_editor, null, false);
-            final ListView listView = (ListView) view.findViewById(android.R.id.list);
-            listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
-            listView.setAdapter(new TitleAdapter(context, mTitles));
-            listView.setItemChecked(mCurrentIndex, true);
-            builder.setView(view);
-
-            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    final int newIndex = listView.getCheckedItemPosition();
-                    if (mCurrentIndex == newIndex) return;
-
-                    if (newIndex == 0) {
-                        keyStore.delete(Credentials.LOCKDOWN_VPN);
-
-                    } else {
-                        final VpnProfile profile = mProfiles.get(newIndex - 1);
-                        if (!profile.isValidLockdownProfile()) {
-                            Toast.makeText(context, R.string.vpn_lockdown_config_error,
-                                    Toast.LENGTH_LONG).show();
-                            return;
-                        }
-                        keyStore.put(Credentials.LOCKDOWN_VPN, profile.key.getBytes(),
-                                KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED);
-                    }
-
-                    // kick profiles since we changed them
-                    ConnectivityManager.from(getActivity()).updateLockdownVpn();
-                }
-            });
-
-            return builder.create();
-        }
-    }
-
-    private static List<VpnProfile> loadVpnProfiles(KeyStore keyStore, int... excludeTypes) {
-        final ArrayList<VpnProfile> result = Lists.newArrayList();
-        final String[] keys = keyStore.saw(Credentials.VPN);
-        if (keys != null) {
-            for (String key : keys) {
-                final VpnProfile profile = VpnProfile.decode(
-                        key, keyStore.get(Credentials.VPN + key));
-                if (profile != null && !ArrayUtils.contains(excludeTypes, profile.type)) {
-                    result.add(profile);
-                }
+        // We are the only user of profiles in KeyStore so no locks are needed.
+        for (String key : keyStore.saw(Credentials.VPN)) {
+            final VpnProfile profile = VpnProfile.decode(key, keyStore.get(Credentials.VPN + key));
+            if (profile != null && !ArrayUtils.contains(excludeTypes, profile.type)) {
+                result.add(profile);
             }
         }
         return result;
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index fdaa042..7c5883a 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.wfd;
 
-import android.app.ActionBar;
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Service;
 import android.content.BroadcastReceiver;
@@ -61,6 +59,7 @@
 import android.widget.TextView;
 
 import com.android.internal.app.MediaRouteDialogPresenter;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -117,6 +116,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WFD_WIFI_DISPLAY;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java
index 4cd6f5f..b9516ab 100644
--- a/src/com/android/settings/widget/ChartGridView.java
+++ b/src/com/android/settings/widget/ChartGridView.java
@@ -29,15 +29,11 @@
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.util.AttributeSet;
-import android.util.Log;
-import android.util.TypedValue;
 import android.view.View;
 
 import com.android.internal.util.Preconditions;
 import com.android.settings.R;
 
-import java.util.Locale;
-
 /**
  * Background of {@link ChartView} that renders grid lines as requested by
  * {@link ChartAxis#getTickPoints()}.
diff --git a/src/com/android/settings/widget/FloatingActionButton.java b/src/com/android/settings/widget/FloatingActionButton.java
new file mode 100644
index 0000000..181c6c0
--- /dev/null
+++ b/src/com/android/settings/widget/FloatingActionButton.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.widget;
+
+import android.animation.AnimatorInflater;
+import android.content.Context;
+import android.graphics.Outline;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewOutlineProvider;
+import android.widget.ImageView;
+
+import com.android.settings.R;
+
+public class FloatingActionButton extends ImageView {
+
+    public FloatingActionButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setScaleType(ScaleType.CENTER);
+        setStateListAnimator(AnimatorInflater.loadStateListAnimator(context, R.anim.fab_elevation));
+        setOutlineProvider(new ViewOutlineProvider() {
+            @Override
+            public void getOutline(View view, Outline outline) {
+                outline.setOval(0, 0, getWidth(), getHeight());
+            }
+        });
+        setClipToOutline(true);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        invalidateOutline();
+    }
+}
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index a5d3658..1f5aaf4 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -41,8 +41,9 @@
 import android.widget.RemoteViews;
 
 import com.android.settings.R;
-import com.android.settings.bluetooth.LocalBluetoothAdapter;
-import com.android.settings.bluetooth.LocalBluetoothManager;
+import com.android.settings.bluetooth.Utils;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**
  * Provides control of power-related settings from a widget.
@@ -448,7 +449,7 @@
         @Override
         public int getActualState(Context context) {
             if (sLocalBluetoothAdapter == null) {
-                LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
+                LocalBluetoothManager manager = Utils.getLocalBtManager(context);
                 if (manager == null) {
                     return STATE_UNKNOWN;  // On emulator?
                 }
diff --git a/src/com/android/settings/widget/StickyHeaderListView.java b/src/com/android/settings/widget/StickyHeaderListView.java
index 3d9f158..a2ff51b 100644
--- a/src/com/android/settings/widget/StickyHeaderListView.java
+++ b/src/com/android/settings/widget/StickyHeaderListView.java
@@ -21,7 +21,6 @@
 import android.graphics.Canvas;
 import android.graphics.RectF;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowInsets;
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index c15ac41..094b95f 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -20,16 +20,18 @@
 import android.content.res.TypedArray;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.style.TextAppearanceSpan;
 import android.util.AttributeSet;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.LinearLayout;
-
 import android.widget.Switch;
 import android.widget.TextView;
+
 import com.android.settings.R;
 
 import java.util.ArrayList;
@@ -47,8 +49,12 @@
         void onSwitchChanged(Switch switchView, boolean isChecked);
     }
 
+    private final TextAppearanceSpan mSummarySpan;
+
     private ToggleSwitch mSwitch;
     private TextView mTextView;
+    private String mLabel;
+    private String mSummary;
 
     private ArrayList<OnSwitchChangeListener> mSwitchChangeListeners =
             new ArrayList<OnSwitchChangeListener>();
@@ -79,7 +85,9 @@
         a.recycle();
 
         mTextView = (TextView) findViewById(R.id.switch_text);
-        mTextView.setText(R.string.switch_off_text);
+        mLabel = getResources().getString(R.string.switch_off_text);
+        mSummarySpan = new TextAppearanceSpan(mContext, R.style.TextAppearance_Small_SwitchBar);
+        updateText();
         ViewGroup.MarginLayoutParams lp = (MarginLayoutParams) mTextView.getLayoutParams();
         lp.setMarginStart(switchBarMarginStart);
 
@@ -104,7 +112,26 @@
     }
 
     public void setTextViewLabel(boolean isChecked) {
-        mTextView.setText(isChecked ? R.string.switch_on_text : R.string.switch_off_text);
+        mLabel = getResources()
+                .getString(isChecked ? R.string.switch_on_text : R.string.switch_off_text);
+        updateText();
+    }
+
+    public void setSummary(String summary) {
+        mSummary = summary;
+        updateText();
+    }
+
+    private void updateText() {
+        if (TextUtils.isEmpty(mSummary)) {
+            mTextView.setText(mLabel);
+            return;
+        }
+        final SpannableStringBuilder ssb = new SpannableStringBuilder(mLabel).append('\n');
+        final int start = ssb.length();
+        ssb.append(mSummary);
+        ssb.setSpan(mSummarySpan, start, ssb.length(), 0);
+        mTextView.setText(ssb);
     }
 
     public void setChecked(boolean checked) {
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
deleted file mode 100644
index cb48f1f..0000000
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ /dev/null
@@ -1,734 +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 com.android.settings.R;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.StateListDrawable;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.DetailedState;
-import android.net.NetworkInfo.State;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.KeyMgmt;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.util.Log;
-import android.util.LruCache;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import java.util.Map;
-
-
-class AccessPoint extends Preference {
-    static final String TAG = "Settings.AccessPoint";
-
-    /**
-     * Lower bound on the 2.4 GHz (802.11b/g/n) WLAN channels
-     */
-    public static final int LOWER_FREQ_24GHZ = 2400;
-
-    /**
-     * Upper bound on the 2.4 GHz (802.11b/g/n) WLAN channels
-     */
-    public static final int HIGHER_FREQ_24GHZ = 2500;
-
-    /**
-     * Lower bound on the 5.0 GHz (802.11a/h/j/n/ac) WLAN channels
-     */
-    public static final int LOWER_FREQ_5GHZ = 4900;
-
-    /**
-     * Upper bound on the 5.0 GHz (802.11a/h/j/n/ac) WLAN channels
-     */
-    public static final int HIGHER_FREQ_5GHZ = 5900;
-
-    /**
-     * Experimental: we should be able to show the user the list of BSSIDs and bands
-     *  for that SSID.
-     *  For now this data is used only with Verbose Logging so as to show the band and number
-     *  of BSSIDs on which that network is seen.
-     */
-    public LruCache<String, ScanResult> mScanResultCache;
-
-
-    private static final String KEY_NETWORKINFO = "key_networkinfo";
-    private static final String KEY_WIFIINFO = "key_wifiinfo";
-    private static final String KEY_SCANRESULT = "key_scanresult";
-    private static final String KEY_CONFIG = "key_config";
-
-    private static final int[] STATE_SECURED = {
-        R.attr.state_encrypted
-    };
-    private static final int[] STATE_NONE = {};
-
-    private static int[] wifi_signal_attributes = { R.attr.wifi_signal };
-
-    /**
-     * These values are matched in string arrays -- changes must be kept in sync
-     */
-    static final int SECURITY_NONE = 0;
-    static final int SECURITY_WEP = 1;
-    static final int SECURITY_PSK = 2;
-    static final int SECURITY_EAP = 3;
-
-    enum PskType {
-        UNKNOWN,
-        WPA,
-        WPA2,
-        WPA_WPA2
-    }
-
-    String ssid;
-    String bssid;
-    int security;
-    int networkId = -1;
-    boolean wpsAvailable = false;
-    boolean showSummary = true;
-
-    PskType pskType = PskType.UNKNOWN;
-
-    private WifiConfiguration mConfig;
-    /* package */ScanResult mScanResult;
-
-    private int mRssi = Integer.MAX_VALUE;
-    private long mSeen = 0;
-
-    private WifiInfo mInfo;
-    private NetworkInfo mNetworkInfo;
-    private TextView mSummaryView;
-
-    private static final int VISIBILITY_MAX_AGE_IN_MILLI = 1000000;
-    private static final int VISIBILITY_OUTDATED_AGE_IN_MILLI = 20000;
-    private static final int SECOND_TO_MILLI = 1000;
-
-    static int getSecurity(WifiConfiguration config) {
-        if (config.allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
-            return SECURITY_PSK;
-        }
-        if (config.allowedKeyManagement.get(KeyMgmt.WPA_EAP) ||
-                config.allowedKeyManagement.get(KeyMgmt.IEEE8021X)) {
-            return SECURITY_EAP;
-        }
-        return (config.wepKeys[0] != null) ? SECURITY_WEP : SECURITY_NONE;
-    }
-
-    private static int getSecurity(ScanResult result) {
-        if (result.capabilities.contains("WEP")) {
-            return SECURITY_WEP;
-        } else if (result.capabilities.contains("PSK")) {
-            return SECURITY_PSK;
-        } else if (result.capabilities.contains("EAP")) {
-            return SECURITY_EAP;
-        }
-        return SECURITY_NONE;
-    }
-
-    public String getSecurityString(boolean concise) {
-        Context context = getContext();
-        switch(security) {
-            case SECURITY_EAP:
-                return concise ? context.getString(R.string.wifi_security_short_eap) :
-                    context.getString(R.string.wifi_security_eap);
-            case SECURITY_PSK:
-                switch (pskType) {
-                    case WPA:
-                        return concise ? context.getString(R.string.wifi_security_short_wpa) :
-                            context.getString(R.string.wifi_security_wpa);
-                    case WPA2:
-                        return concise ? context.getString(R.string.wifi_security_short_wpa2) :
-                            context.getString(R.string.wifi_security_wpa2);
-                    case WPA_WPA2:
-                        return concise ? context.getString(R.string.wifi_security_short_wpa_wpa2) :
-                            context.getString(R.string.wifi_security_wpa_wpa2);
-                    case UNKNOWN:
-                    default:
-                        return concise ? context.getString(R.string.wifi_security_short_psk_generic)
-                                : context.getString(R.string.wifi_security_psk_generic);
-                }
-            case SECURITY_WEP:
-                return concise ? context.getString(R.string.wifi_security_short_wep) :
-                    context.getString(R.string.wifi_security_wep);
-            case SECURITY_NONE:
-            default:
-                return concise ? "" : context.getString(R.string.wifi_security_none);
-        }
-    }
-
-    private static PskType getPskType(ScanResult result) {
-        boolean wpa = result.capabilities.contains("WPA-PSK");
-        boolean wpa2 = result.capabilities.contains("WPA2-PSK");
-        if (wpa2 && wpa) {
-            return PskType.WPA_WPA2;
-        } else if (wpa2) {
-            return PskType.WPA2;
-        } else if (wpa) {
-            return PskType.WPA;
-        } else {
-            Log.w(TAG, "Received abnormal flag string: " + result.capabilities);
-            return PskType.UNKNOWN;
-        }
-    }
-
-    AccessPoint(Context context, WifiConfiguration config) {
-        super(context);
-        loadConfig(config);
-        refresh();
-    }
-
-    AccessPoint(Context context, ScanResult result) {
-        super(context);
-        loadResult(result);
-        refresh();
-    }
-
-    AccessPoint(Context context, Bundle savedState) {
-        super(context);
-
-        mConfig = savedState.getParcelable(KEY_CONFIG);
-        if (mConfig != null) {
-            loadConfig(mConfig);
-        }
-        mScanResult = (ScanResult) savedState.getParcelable(KEY_SCANRESULT);
-        if (mScanResult != null) {
-            loadResult(mScanResult);
-        }
-        mInfo = (WifiInfo) savedState.getParcelable(KEY_WIFIINFO);
-        if (savedState.containsKey(KEY_NETWORKINFO)) {
-            mNetworkInfo = savedState.getParcelable(KEY_NETWORKINFO);
-        }
-        update(mInfo, mNetworkInfo);
-    }
-
-    public void saveWifiState(Bundle savedState) {
-        savedState.putParcelable(KEY_CONFIG, mConfig);
-        savedState.putParcelable(KEY_SCANRESULT, mScanResult);
-        savedState.putParcelable(KEY_WIFIINFO, mInfo);
-        if (mNetworkInfo != null) {
-            savedState.putParcelable(KEY_NETWORKINFO, mNetworkInfo);
-        }
-    }
-
-    private void loadConfig(WifiConfiguration config) {
-        if (config.isPasspoint())
-            ssid = config.providerFriendlyName;
-        else
-            ssid = (config.SSID == null ? "" : removeDoubleQuotes(config.SSID));
-
-        bssid = config.BSSID;
-        security = getSecurity(config);
-        networkId = config.networkId;
-        mConfig = config;
-    }
-
-    private void loadResult(ScanResult result) {
-        ssid = result.SSID;
-        bssid = result.BSSID;
-        security = getSecurity(result);
-        wpsAvailable = security != SECURITY_EAP && result.capabilities.contains("WPS");
-        if (security == SECURITY_PSK)
-            pskType = getPskType(result);
-        mRssi = result.level;
-        mScanResult = result;
-        if (result.seen > mSeen) {
-            mSeen = result.seen;
-        }
-    }
-
-    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-        updateIcon(getLevel(), getContext());
-
-        mSummaryView = (TextView) view.findViewById(com.android.internal.R.id.summary);
-        mSummaryView.setVisibility(showSummary ? View.VISIBLE : View.GONE);
-
-        notifyChanged();
-    }
-
-    protected void updateIcon(int level, Context context) {
-        if (level == -1) {
-            setIcon(null);
-        } else {
-            Drawable drawable = getIcon();
-
-            if (drawable == null) {
-                // To avoid a drawing race condition, we first set the state (SECURE/NONE) and then
-                // set the icon (drawable) to that state's drawable.
-                StateListDrawable sld = (StateListDrawable) context.getTheme()
-                        .obtainStyledAttributes(wifi_signal_attributes).getDrawable(0);
-                // If sld is null then we are indexing and therefore do not have access to
-                // (nor need to display) the drawable.
-                if (sld != null) {
-                    sld.setState((security != SECURITY_NONE) ? STATE_SECURED : STATE_NONE);
-                    drawable = sld.getCurrent();
-                    setIcon(drawable);
-                }
-            }
-
-            if (drawable != null) {
-                drawable.setLevel(level);
-            }
-        }
-    }
-
-    @Override
-    public int compareTo(Preference preference) {
-        if (!(preference instanceof AccessPoint)) {
-            return 1;
-        }
-        AccessPoint other = (AccessPoint) preference;
-        // Active one goes first.
-        if (isActive() && !other.isActive()) return -1;
-        if (!isActive() && other.isActive()) return 1;
-
-        // Reachable one goes before unreachable one.
-        if (mRssi != Integer.MAX_VALUE && other.mRssi == Integer.MAX_VALUE) return -1;
-        if (mRssi == Integer.MAX_VALUE && other.mRssi != Integer.MAX_VALUE) return 1;
-
-        // Configured one goes before unconfigured one.
-        if (networkId != WifiConfiguration.INVALID_NETWORK_ID
-                && other.networkId == WifiConfiguration.INVALID_NETWORK_ID) return -1;
-        if (networkId == WifiConfiguration.INVALID_NETWORK_ID
-                && other.networkId != WifiConfiguration.INVALID_NETWORK_ID) return 1;
-
-        // Sort by signal strength.
-        int difference = WifiManager.compareSignalLevel(other.mRssi, mRssi);
-        if (difference != 0) {
-            return difference;
-        }
-        // Sort by ssid.
-        return ssid.compareToIgnoreCase(other.ssid);
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (!(other instanceof AccessPoint)) return false;
-        return (this.compareTo((AccessPoint) other) == 0);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = 0;
-        if (mInfo != null) result += 13 * mInfo.hashCode();
-        result += 19 * mRssi;
-        result += 23 * networkId;
-        result += 29 * ssid.hashCode();
-        return result;
-    }
-
-    boolean update(ScanResult result) {
-        if (result.seen > mSeen) {
-            mSeen = result.seen;
-        }
-        if (WifiSettings.mVerboseLogging > 0) {
-            if (mScanResultCache == null) {
-                mScanResultCache = new LruCache<String, ScanResult>(32);
-            }
-            mScanResultCache.put(result.BSSID, result);
-        }
-
-        if (ssid.equals(result.SSID) && security == getSecurity(result)) {
-            if (WifiManager.compareSignalLevel(result.level, mRssi) > 0) {
-                int oldLevel = getLevel();
-                mRssi = result.level;
-                if (getLevel() != oldLevel) {
-                    notifyChanged();
-                }
-            }
-            // This flag only comes from scans, is not easily saved in config
-            if (security == SECURITY_PSK) {
-                pskType = getPskType(result);
-            }
-            mScanResult = result;
-            refresh();
-            return true;
-        }
-
-        return false;
-    }
-
-    /** Return whether the given {@link WifiInfo} is for this access point. */
-    private boolean isInfoForThisAccessPoint(WifiInfo info) {
-        if (networkId != WifiConfiguration.INVALID_NETWORK_ID) {
-            return networkId == info.getNetworkId();
-        } else {
-            // Might be an ephemeral connection with no WifiConfiguration. Try matching on SSID.
-            // (Note that we only do this if the WifiConfiguration explicitly equals INVALID).
-            // TODO: Handle hex string SSIDs.
-            return ssid.equals(removeDoubleQuotes(info.getSSID()));
-        }
-    }
-
-    void update(WifiInfo info, NetworkInfo networkInfo) {
-        boolean reorder = false;
-        if (info != null && isInfoForThisAccessPoint(info)) {
-            reorder = (mInfo == null);
-            mRssi = info.getRssi();
-            mInfo = info;
-            mNetworkInfo = networkInfo;
-            refresh();
-        } else if (mInfo != null) {
-            reorder = true;
-            mInfo = null;
-            mNetworkInfo = null;
-            refresh();
-        }
-        if (reorder) {
-            notifyHierarchyChanged();
-        }
-    }
-
-    void update(WifiConfiguration config) {
-        mConfig = config;
-        networkId = config.networkId;
-        refresh();
-    }
-
-    int getLevel() {
-        if (mRssi == Integer.MAX_VALUE) {
-            return -1;
-        }
-        return WifiManager.calculateSignalLevel(mRssi, 4);
-    }
-
-    WifiConfiguration getConfig() {
-        return mConfig;
-    }
-
-    WifiInfo getInfo() {
-        return mInfo;
-    }
-
-    NetworkInfo getNetworkInfo() {
-        return mNetworkInfo;
-    }
-
-    DetailedState getState() {
-        return mNetworkInfo != null ? mNetworkInfo.getDetailedState() : null;
-    }
-
-    static String removeDoubleQuotes(String string) {
-        int length = string.length();
-        if ((length > 1) && (string.charAt(0) == '"')
-                && (string.charAt(length - 1) == '"')) {
-            return string.substring(1, length - 1);
-        }
-        return string;
-    }
-
-    static String convertToQuotedString(String string) {
-        return "\"" + string + "\"";
-    }
-
-    /**
-     * Shows or Hides the Summary of an AccessPoint.
-     *
-     * @param showSummary true will show the summary, false will hide the summary
-     */
-    public void setShowSummary(boolean showSummary) {
-        this.showSummary = showSummary;
-        if (mSummaryView != null) {
-            mSummaryView.setVisibility(showSummary ? View.VISIBLE : View.GONE);
-        } // otherwise, will be handled in onBindView.
-    }
-
-    /**
-     * Returns the visibility status of the WifiConfiguration.
-     *
-     * @return autojoin debugging information
-     * TODO: use a string formatter
-     * ["rssi 5Ghz", "num results on 5GHz" / "rssi 5Ghz", "num results on 5GHz"]
-     * For instance [-40,5/-30,2]
-     */
-    private String getVisibilityStatus() {
-        StringBuilder visibility = new StringBuilder();
-        StringBuilder scans24GHz = null;
-        StringBuilder scans5GHz = null;
-        String bssid = null;
-
-        long now = System.currentTimeMillis();
-
-        if (mInfo != null) {
-            bssid = mInfo.getBSSID();
-            if (bssid != null) {
-                visibility.append(" ").append(bssid);
-            }
-            visibility.append(" rssi=").append(mInfo.getRssi());
-            visibility.append(" ");
-            visibility.append(" score=").append(mInfo.score);
-            visibility.append(String.format(" tx=%.1f,", mInfo.txSuccessRate));
-            visibility.append(String.format("%.1f,", mInfo.txRetriesRate));
-            visibility.append(String.format("%.1f ", mInfo.txBadRate));
-            visibility.append(String.format("rx=%.1f", mInfo.rxSuccessRate));
-        }
-
-        if (mScanResultCache != null) {
-            int rssi5 = WifiConfiguration.INVALID_RSSI;
-            int rssi24 = WifiConfiguration.INVALID_RSSI;
-            int num5 = 0;
-            int num24 = 0;
-            int numBlackListed = 0;
-            int n24 = 0; // Number scan results we included in the string
-            int n5 = 0; // Number scan results we included in the string
-            Map<String, ScanResult> list = mScanResultCache.snapshot();
-            // TODO: sort list by RSSI or age
-            for (ScanResult result : list.values()) {
-                if (result.seen == 0)
-                    continue;
-
-                if (result.autoJoinStatus != ScanResult.ENABLED) numBlackListed++;
-
-                if (result.frequency >= LOWER_FREQ_5GHZ
-                        && result.frequency <= HIGHER_FREQ_5GHZ) {
-                    // Strictly speaking: [4915, 5825]
-                    // number of known BSSID on 5GHz band
-                    num5 = num5 + 1;
-                } else if (result.frequency >= LOWER_FREQ_24GHZ
-                        && result.frequency <= HIGHER_FREQ_24GHZ) {
-                    // Strictly speaking: [2412, 2482]
-                    // number of known BSSID on 2.4Ghz band
-                    num24 = num24 + 1;
-                }
-
-                // Ignore results seen, older than 20 seconds
-                if (now - result.seen > VISIBILITY_OUTDATED_AGE_IN_MILLI) continue;
-
-                if (result.frequency >= LOWER_FREQ_5GHZ
-                        && result.frequency <= HIGHER_FREQ_5GHZ) {
-                    if (result.level > rssi5) {
-                        rssi5 = result.level;
-                    }
-                    if (n5 < 4) {
-                        if (scans5GHz == null) scans5GHz = new StringBuilder();
-                        scans5GHz.append(" \n{").append(result.BSSID);
-                        if (bssid != null && result.BSSID.equals(bssid)) scans5GHz.append("*");
-                        scans5GHz.append("=").append(result.frequency);
-                        scans5GHz.append(",").append(result.level);
-                        if (result.autoJoinStatus != 0) {
-                            scans5GHz.append(",st=").append(result.autoJoinStatus);
-                        }
-                        if (result.numIpConfigFailures != 0) {
-                            scans5GHz.append(",ipf=").append(result.numIpConfigFailures);
-                        }
-                        scans5GHz.append("}");
-                        n5++;
-                    }
-                } else if (result.frequency >= LOWER_FREQ_24GHZ
-                        && result.frequency <= HIGHER_FREQ_24GHZ) {
-                    if (result.level > rssi24) {
-                        rssi24 = result.level;
-                    }
-                    if (n24 < 4) {
-                        if (scans24GHz == null) scans24GHz = new StringBuilder();
-                        scans24GHz.append(" \n{").append(result.BSSID);
-                        if (bssid != null && result.BSSID.equals(bssid)) scans24GHz.append("*");
-                        scans24GHz.append("=").append(result.frequency);
-                        scans24GHz.append(",").append(result.level);
-                        if (result.autoJoinStatus != 0) {
-                            scans24GHz.append(",st=").append(result.autoJoinStatus);
-                        }
-                        if (result.numIpConfigFailures != 0) {
-                            scans24GHz.append(",ipf=").append(result.numIpConfigFailures);
-                        }
-                        scans24GHz.append("}");
-                        n24++;
-                    }
-                }
-            }
-            visibility.append(" [");
-            if (num24 > 0) {
-                visibility.append("(").append(num24).append(")");
-                if (n24 <= 4) {
-                    if (scans24GHz != null) {
-                        visibility.append(scans24GHz.toString());
-                    }
-                } else {
-                    visibility.append("max=").append(rssi24);
-                    if (scans24GHz != null) {
-                        visibility.append(",").append(scans24GHz.toString());
-                    }
-                }
-            }
-            visibility.append(";");
-            if (num5 > 0) {
-                visibility.append("(").append(num5).append(")");
-                if (n5 <= 4) {
-                    if (scans5GHz != null) {
-                        visibility.append(scans5GHz.toString());
-                    }
-                } else {
-                    visibility.append("max=").append(rssi5);
-                    if (scans5GHz != null) {
-                        visibility.append(",").append(scans5GHz.toString());
-                    }
-                }
-            }
-            if (numBlackListed > 0)
-                visibility.append("!").append(numBlackListed);
-            visibility.append("]");
-        } else {
-            if (mRssi != Integer.MAX_VALUE) {
-                visibility.append(" rssi=");
-                visibility.append(mRssi);
-                if (mScanResult != null) {
-                    visibility.append(", f=");
-                    visibility.append(mScanResult.frequency);
-                }
-            }
-        }
-
-        return visibility.toString();
-    }
-
-    /**
-     * Return whether this is the active connection.
-     * For ephemeral connections (networkId is invalid), this returns false if the network is
-     * disconnected.
-     */
-    boolean isActive() {
-        return mNetworkInfo != null &&
-                (networkId != WifiConfiguration.INVALID_NETWORK_ID ||
-                 mNetworkInfo.getState() != State.DISCONNECTED);
-    }
-
-    /**
-     * Updates the title and summary; may indirectly call notifyChanged().
-     */
-    private void refresh() {
-        setTitle(ssid);
-
-        final Context context = getContext();
-        updateIcon(getLevel(), context);
-
-        // Force new summary
-        setSummary(null);
-
-        // Update to new summary
-        StringBuilder summary = new StringBuilder();
-
-        if (isActive()) { // This is the active connection
-            String passpointProvider = (mConfig != null && mConfig.isPasspoint()) ?
-                    mConfig.providerFriendlyName : null;
-            summary.append(Summary.get(context, getState(),
-                    networkId == WifiConfiguration.INVALID_NETWORK_ID, passpointProvider));
-        } else if (mConfig != null && mConfig.isPasspoint()) {
-            String format = context.getString(R.string.available_via_passpoint);
-            summary.append(String.format(format, mConfig.providerFriendlyName));
-        } else if (mConfig != null && mConfig.hasNoInternetAccess()) {
-            summary.append(context.getString(R.string.wifi_no_internet));
-        } else if (mConfig != null && ((mConfig.status == WifiConfiguration.Status.DISABLED &&
-                mConfig.disableReason != WifiConfiguration.DISABLED_UNKNOWN_REASON)
-               || mConfig.autoJoinStatus
-                >= WifiConfiguration.AUTO_JOIN_DISABLED_ON_AUTH_FAILURE)) {
-            if (mConfig.autoJoinStatus
-                    >= WifiConfiguration.AUTO_JOIN_DISABLED_ON_AUTH_FAILURE) {
-                if (mConfig.disableReason == WifiConfiguration.DISABLED_DHCP_FAILURE) {
-                    summary.append(context.getString(R.string.wifi_disabled_network_failure));
-                } else if (mConfig.disableReason == WifiConfiguration.DISABLED_AUTH_FAILURE) {
-                    summary.append(context.getString(R.string.wifi_disabled_password_failure));
-                } else {
-                    summary.append(context.getString(R.string.wifi_disabled_wifi_failure));
-                }
-            } else {
-                switch (mConfig.disableReason) {
-                    case WifiConfiguration.DISABLED_AUTH_FAILURE:
-                        summary.append(context.getString(R.string.wifi_disabled_password_failure));
-                        break;
-                    case WifiConfiguration.DISABLED_DHCP_FAILURE:
-                    case WifiConfiguration.DISABLED_DNS_FAILURE:
-                        summary.append(context.getString(R.string.wifi_disabled_network_failure));
-                        break;
-                    case WifiConfiguration.DISABLED_UNKNOWN_REASON:
-                    case WifiConfiguration.DISABLED_ASSOCIATION_REJECT:
-                        summary.append(context.getString(R.string.wifi_disabled_generic));
-                        break;
-                }
-            }
-        } else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range
-            summary.append(context.getString(R.string.wifi_not_in_range));
-        } else { // In range, not disabled.
-            if (mConfig != null) { // Is saved network
-                summary.append(context.getString(R.string.wifi_remembered));
-            }
-        }
-
-        if (WifiSettings.mVerboseLogging > 0) {
-            // Add RSSI/band information for this config, what was seen up to 6 seconds ago
-            // verbose WiFi Logging is only turned on thru developers settings
-            if (mInfo != null && mNetworkInfo != null) { // This is the active connection
-                summary.append(" f=" + Integer.toString(mInfo.getFrequency()));
-            }
-            summary.append(" " + getVisibilityStatus());
-            if (mConfig != null && mConfig.autoJoinStatus > 0) {
-                summary.append(" (" + mConfig.autoJoinStatus);
-                if (mConfig.blackListTimestamp > 0) {
-                    long now = System.currentTimeMillis();
-                    long diff = (now - mConfig.blackListTimestamp)/1000;
-                    long sec = diff%60; //seconds
-                    long min = (diff/60)%60; //minutes
-                    long hour = (min/60)%60; //hours
-                    summary.append(", ");
-                    if (hour > 0) summary.append(Long.toString(hour) + "h ");
-                    summary.append( Long.toString(min) + "m ");
-                    summary.append( Long.toString(sec) + "s ");
-                }
-                summary.append(")");
-            }
-            if (mConfig != null && mConfig.numIpConfigFailures > 0) {
-                summary.append(" ipf=").append(mConfig.numIpConfigFailures);
-            }
-            if (mConfig != null && mConfig.numConnectionFailures > 0) {
-                summary.append(" cf=").append(mConfig.numConnectionFailures);
-            }
-            if (mConfig != null && mConfig.numAuthFailures > 0) {
-                summary.append(" authf=").append(mConfig.numAuthFailures);
-            }
-            if (mConfig != null && mConfig.numNoInternetAccessReports > 0) {
-                summary.append(" noInt=").append(mConfig.numNoInternetAccessReports);
-            }
-        }
-
-        if (summary.length() > 0) {
-            setSummary(summary.toString());
-            setShowSummary(true);
-        } else {
-            setShowSummary(false);
-        }
-    }
-
-    /**
-     * Generate and save a default wifiConfiguration with common values.
-     * Can only be called for unsecured networks.
-     * @hide
-     */
-    protected void generateOpenNetworkConfig() {
-        if (security != SECURITY_NONE)
-            throw new IllegalStateException();
-        if (mConfig != null)
-            return;
-        mConfig = new WifiConfiguration();
-        mConfig.SSID = AccessPoint.convertToQuotedString(ssid);
-        mConfig.allowedKeyManagement.set(KeyMgmt.NONE);
-    }
-}
diff --git a/src/com/android/settings/wifi/AccessPointPreference.java b/src/com/android/settings/wifi/AccessPointPreference.java
new file mode 100644
index 0000000..8a24bc9
--- /dev/null
+++ b/src/com/android/settings/wifi/AccessPointPreference.java
@@ -0,0 +1,128 @@
+/*
+ * 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.wifi;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.StateListDrawable;
+import android.preference.Preference;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settingslib.wifi.AccessPoint;
+
+public class AccessPointPreference extends Preference {
+
+    private static final int[] STATE_SECURED = {
+        R.attr.state_encrypted
+    };
+    private static final int[] STATE_NONE = {};
+
+    private static int[] wifi_signal_attributes = { R.attr.wifi_signal };
+
+    private TextView mSummaryView;
+    private boolean showSummary = true;
+    private AccessPoint mAccessPoint;
+
+    public AccessPointPreference(AccessPoint accessPoint, Context context) {
+        super(context);
+        mAccessPoint = accessPoint;
+        mAccessPoint.setTag(this);
+        refresh();
+    }
+
+    public AccessPoint getAccessPoint() {
+        return mAccessPoint;
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        updateIcon(mAccessPoint.getLevel(), getContext());
+
+        mSummaryView = (TextView) view.findViewById(com.android.internal.R.id.summary);
+        mSummaryView.setVisibility(showSummary ? View.VISIBLE : View.GONE);
+
+        notifyChanged();
+    }
+
+    protected void updateIcon(int level, Context context) {
+        if (level == -1) {
+            setIcon(null);
+        } else {
+            Drawable drawable = getIcon();
+
+            if (drawable == null) {
+                // To avoid a drawing race condition, we first set the state (SECURE/NONE) and then
+                // set the icon (drawable) to that state's drawable.
+                StateListDrawable sld = (StateListDrawable) context.getTheme()
+                        .obtainStyledAttributes(wifi_signal_attributes).getDrawable(0);
+                // If sld is null then we are indexing and therefore do not have access to
+                // (nor need to display) the drawable.
+                if (sld != null) {
+                    sld.setState((mAccessPoint.getSecurity() != AccessPoint.SECURITY_NONE)
+                            ? STATE_SECURED
+                            : STATE_NONE);
+                    drawable = sld.getCurrent();
+                    setIcon(drawable);
+                }
+            }
+
+            if (drawable != null) {
+                drawable.setLevel(level);
+            }
+        }
+    }
+
+    /**
+     * Shows or Hides the Summary of an AccessPoint.
+     *
+     * @param showSummary true will show the summary, false will hide the summary
+     */
+    public void setShowSummary(boolean showSummary) {
+        this.showSummary = showSummary;
+        if (mSummaryView != null) {
+            mSummaryView.setVisibility(showSummary ? View.VISIBLE : View.GONE);
+        } // otherwise, will be handled in onBindView.
+    }
+
+    /**
+     * Updates the title and summary; may indirectly call notifyChanged().
+     */
+    public void refresh() {
+        setTitle(mAccessPoint.getSsid());
+
+        final Context context = getContext();
+        updateIcon(mAccessPoint.getLevel(), context);
+
+        // Force new summary
+        setSummary(null);
+
+        String summary = mAccessPoint.getSummary();
+        if (summary.length() > 0) {
+            setSummary(summary);
+            setShowSummary(true);
+        } else {
+            setShowSummary(false);
+        }
+    }
+
+    public void onLevelChanged() {
+        notifyChanged();
+    }
+
+}
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index ac93c2e..4f5884e 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -42,6 +42,7 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.AppListSwitchPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -58,7 +59,6 @@
     private static final String KEY_FREQUENCY_BAND = "frequency_band";
     private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks";
     private static final String KEY_SLEEP_POLICY = "sleep_policy";
-    private static final String KEY_SCAN_ALWAYS_AVAILABLE = "wifi_scan_always_available";
     private static final String KEY_INSTALL_CREDENTIALS = "install_credentials";
     private static final String KEY_WIFI_ASSISTANT = "wifi_assistant";
     private static final String KEY_WIFI_DIRECT = "wifi_direct";
@@ -82,6 +82,11 @@
     };
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI_ADVANCED;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.wifi_advanced_settings);
@@ -119,11 +124,6 @@
                 Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
         notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
 
-        SwitchPreference scanAlwaysAvailable =
-            (SwitchPreference) findPreference(KEY_SCAN_ALWAYS_AVAILABLE);
-        scanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(),
-                    Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1);
-
         Intent intent = new Intent(Credentials.INSTALL_AS_USER_ACTION);
         intent.setClassName("com.android.certinstaller",
                 "com.android.certinstaller.CertInstallerMain");
@@ -245,10 +245,6 @@
             Global.putInt(getContentResolver(),
                     Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
                     ((SwitchPreference) preference).isChecked() ? 1 : 0);
-        } else if (KEY_SCAN_ALWAYS_AVAILABLE.equals(key)) {
-            Global.putInt(getContentResolver(),
-                    Global.WIFI_SCAN_ALWAYS_AVAILABLE,
-                    ((SwitchPreference) preference).isChecked() ? 1 : 0);
         } else {
             return super.onPreferenceTreeClick(screen, preference);
         }
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index bea720c..04094b3 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -16,32 +16,34 @@
 
 package com.android.settings.wifi;
 
+import android.app.AppGlobals;
 import android.app.Dialog;
 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.content.res.Resources;
-import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.UserHandle;
 import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceScreen;
+import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
+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 android.util.Log;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settingslib.wifi.AccessPoint;
+import com.android.settingslib.wifi.WifiTracker;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * UI to manage saved networks/access points.
@@ -60,6 +62,11 @@
     private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI_SAVED_ACCESS_POINTS;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.wifi_display_saved_access_points);
@@ -88,14 +95,38 @@
         PreferenceScreen preferenceScreen = getPreferenceScreen();
         final Context context = getActivity();
 
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        final List<AccessPoint> accessPoints = constructSavedAccessPoints(context, mWifiManager);
+        final List<AccessPoint> accessPoints = WifiTracker.getCurrentAccessPoints(context, true,
+                false);
 
         preferenceScreen.removeAll();
 
+        PackageManager pm = context.getPackageManager();
+        String systemName = pm.getNameForUid(android.os.Process.SYSTEM_UID);
+
         final int accessPointsSize = accessPoints.size();
         for (int i = 0; i < accessPointsSize; ++i){
-            preferenceScreen.addPreference(accessPoints.get(i));
+            AccessPointPreference preference = new AccessPointPreference(accessPoints.get(i),
+                    context);
+            WifiConfiguration config = accessPoints.get(i).getConfig();
+            if (config != null) {
+                int userId = UserHandle.getUserId(config.creatorUid);
+                ApplicationInfo appInfo = null;
+                if (config.creatorName != null && config.creatorName.equals(systemName)) {
+                    appInfo = context.getApplicationInfo();
+                } else {
+                    try {
+                        IPackageManager ipm = AppGlobals.getPackageManager();
+                        appInfo = ipm.getApplicationInfo(config.creatorName, 0 /* flags */, userId);
+                    } catch (RemoteException rex) {
+                    }
+                }
+                if (appInfo != null) {
+                    preference.setSummary(getResources().getString(appInfo.labelRes));
+                }
+            } else {
+                preference.setShowSummary(false);
+            }
+            preferenceScreen.addPreference(preference);
         }
 
         if(getPreferenceScreen().getPreferenceCount() < 1) {
@@ -103,62 +134,14 @@
         }
     }
 
-    private static List<AccessPoint> constructSavedAccessPoints(Context context,
-            WifiManager wifiManager){
-        List<AccessPoint> accessPoints = new ArrayList<AccessPoint>();
-        Map<String, List<ScanResult>> resultsMap = new HashMap<String, List<ScanResult>>();
-
-        final List<WifiConfiguration> configs = wifiManager.getConfiguredNetworks();
-        final List<ScanResult> scanResults = wifiManager.getScanResults();
-
-        if (configs != null) {
-            //Construct a Map for quick searching of a wifi network via ssid.
-            final int scanResultsSize = scanResults.size();
-            for (int i = 0; i < scanResultsSize; ++i){
-                final ScanResult result = scanResults.get(i);
-                List<ScanResult> res = resultsMap.get(result.SSID);
-
-                if(res == null){
-                    res = new ArrayList<ScanResult>();
-                    resultsMap.put(result.SSID, res);
-                }
-
-                res.add(result);
-            }
-
-            final int configsSize = configs.size();
-            for (int i = 0; i < configsSize; ++i){
-                WifiConfiguration config = configs.get(i);
-                if (config.selfAdded && config.numAssociation == 0) {
-                    continue;
-                }
-                AccessPoint accessPoint = new AccessPoint(context, config);
-                final List<ScanResult> results = resultsMap.get(accessPoint.ssid);
-
-                accessPoint.setShowSummary(false);
-                if(results != null){
-                    final int resultsSize = results.size();
-                    for (int j = 0; j < resultsSize; ++j){
-                        accessPoint.update(results.get(j));
-                        accessPoint.setIcon(null);
-                    }
-                }
-
-                accessPoints.add(accessPoint);
-            }
-        }
-
-        return accessPoints;
-    }
-
-    private void showDialog(AccessPoint accessPoint, boolean edit) {
+    private void showDialog(AccessPointPreference accessPoint, boolean edit) {
         if (mDialog != null) {
             removeDialog(WifiSettings.WIFI_DIALOG_ID);
             mDialog = null;
         }
 
         // Save the access point and edit mode
-        mDlgAccessPoint = accessPoint;
+        mDlgAccessPoint = accessPoint.getAccessPoint();
 
         showDialog(WifiSettings.WIFI_DIALOG_ID);
     }
@@ -173,8 +156,13 @@
                     mAccessPointSavedState = null;
                 }
                 mSelectedAccessPoint = mDlgAccessPoint;
+
+                // Hide forget button if config editing is locked down
+                final boolean hideForgetButton = WifiSettings.isCreatorDeviceOwner(getActivity(),
+                        mDlgAccessPoint.getConfig());
                 mDialog = new WifiDialog(getActivity(), this, mDlgAccessPoint,
-                        false /* not editting */, true /* hide the submit button */);
+                        false /* not editting */, true /* hide the submit button */,
+                        hideForgetButton);
                 return mDialog;
 
         }
@@ -198,16 +186,16 @@
     @Override
     public void onClick(DialogInterface dialogInterface, int button) {
         if (button == WifiDialog.BUTTON_FORGET && mSelectedAccessPoint != null) {
-            mWifiManager.forget(mSelectedAccessPoint.networkId, null);
-            getPreferenceScreen().removePreference(mSelectedAccessPoint);
+            mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, null);
+            getPreferenceScreen().removePreference((Preference) mSelectedAccessPoint.getTag());
             mSelectedAccessPoint = null;
         }
     }
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
-        if (preference instanceof AccessPoint) {
-            showDialog((AccessPoint) preference, false);
+        if (preference instanceof AccessPointPreference) {
+            showDialog((AccessPointPreference) preference, false);
             return true;
         } else{
             return super.onPreferenceTreeClick(screen, preference);
@@ -233,15 +221,13 @@
                 result.add(data);
 
                 // Add available Wi-Fi access points
-                WifiManager wifiManager =
-                        (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-                final List<AccessPoint> accessPoints =
-                        constructSavedAccessPoints(context, wifiManager);
+                final List<AccessPoint> accessPoints = WifiTracker.getCurrentAccessPoints(context,
+                        true, false);
 
                 final int accessPointsSize = accessPoints.size();
                 for (int i = 0; i < accessPointsSize; ++i){
                     data = new SearchIndexableRaw(context);
-                    data.title = accessPoints.get(i).getTitle().toString();
+                    data.title = accessPoints.get(i).getSsid();
                     data.screenTitle = title;
                     data.enabled = enabled;
                     result.add(data);
diff --git a/src/com/android/settings/wifi/Summary.java b/src/com/android/settings/wifi/Summary.java
deleted file mode 100644
index 2abe3b9..0000000
--- a/src/com/android/settings/wifi/Summary.java
+++ /dev/null
@@ -1,60 +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 com.android.settings.R;
-
-import android.content.Context;
-import android.net.NetworkInfo.DetailedState;
-import android.text.TextUtils;
-
-class Summary {
-    static String get(Context context, String ssid, DetailedState state, boolean isEphemeral,
-                      String passpointProvider) {
-        if (state == DetailedState.CONNECTED) {
-            if (TextUtils.isEmpty(passpointProvider) == false) {
-                // Special case for connected + ephemeral networks.
-                String format = context.getString(R.string.connected_via_passpoint);
-                return String.format(format, passpointProvider);
-            } else if (isEphemeral && ssid == null) {
-                // Special case for connected + ephemeral networks.
-                return context.getString(R.string.connected_via_wfa);
-            }
-        }
-
-        String[] formats = context.getResources().getStringArray((ssid == null)
-                ? R.array.wifi_status : R.array.wifi_status_with_ssid);
-        int index = state.ordinal();
-
-        if (index >= formats.length || formats[index].length() == 0) {
-            return null;
-        }
-        return String.format(formats[index], ssid);
-    }
-
-    static String get(Context context, String ssid, DetailedState state, boolean isEphemeral) {
-        return get(context, ssid, state, isEphemeral, null);
-    }
-    static String get(Context context, DetailedState state, boolean isEphemeral) {
-        return get(context, null, state, isEphemeral, null);
-    }
-
-    static String get(Context context, DetailedState state, boolean isEphemeral,
-                      String passpointProvider) {
-        return get(context, null, state, isEphemeral, passpointProvider);
-    }
-}
diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java
index 4a9a075..1b5d875 100644
--- a/src/com/android/settings/wifi/WifiAPITest.java
+++ b/src/com/android/settings/wifi/WifiAPITest.java
@@ -20,7 +20,6 @@
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.net.wifi.WifiManager;
 
 import android.os.Bundle;
diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
index 6aecf1f..bf2fa38 100644
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -16,28 +16,20 @@
 
 package com.android.settings.wifi;
 
-import com.android.settings.R;
-import com.android.settings.WirelessSettings;
-
-import java.util.ArrayList;
-
-import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.preference.SwitchPreference;
 import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-import android.widget.Toast;
+
+import com.android.settings.R;
+import com.android.settingslib.TetherUtil;
+
+import java.util.ArrayList;
 
 public class WifiApEnabler {
     private final Context mContext;
@@ -74,10 +66,8 @@
     public WifiApEnabler(Context context, SwitchPreference switchPreference) {
         mContext = context;
         mSwitch = switchPreference;
-        mOriginalSummary = switchPreference != null ? switchPreference.getSummary() : "";
-        if (switchPreference != null) {
-            switchPreference.setPersistent(false);
-        }
+        mOriginalSummary = switchPreference.getSummary();
+        switchPreference.setPersistent(false);
 
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
         mCm = (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -110,43 +100,13 @@
     }
 
     public void setSoftapEnabled(boolean enable) {
-        final ContentResolver cr = mContext.getContentResolver();
-        /**
-         * Disable Wifi if enabling tethering
-         */
-        int wifiState = mWifiManager.getWifiState();
-        if (enable && ((wifiState == WifiManager.WIFI_STATE_ENABLING) ||
-                    (wifiState == WifiManager.WIFI_STATE_ENABLED))) {
-            mWifiManager.setWifiEnabled(false);
-            Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 1);
-        }
-
-        if (mWifiManager.setWifiApEnabled(null, enable)) {
-            if (mSwitch != null) {
-                /* Disable here, enabled on receiving success broadcast */
-                mSwitch.setEnabled(false);
-            }
+        if (TetherUtil.setWifiTethering(enable, mContext)) {
+            /* Disable here, enabled on receiving success broadcast */
+            mSwitch.setEnabled(false);
         } else {
-            if (mSwitch != null) {
-                mSwitch.setSummary(R.string.wifi_error);
-            }
+            mSwitch.setSummary(R.string.wifi_error);
         }
 
-        /**
-         *  If needed, restore Wifi on tether disable
-         */
-        if (!enable) {
-            int wifiSavedState = 0;
-            try {
-                wifiSavedState = Settings.Global.getInt(cr, Settings.Global.WIFI_SAVED_STATE);
-            } catch (Settings.SettingNotFoundException e) {
-                ;
-            }
-            if (wifiSavedState == 1) {
-                mWifiManager.setWifiEnabled(true);
-                Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 0);
-            }
-        }
     }
 
     public void updateConfigSummary(WifiConfiguration wifiConfig) {
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 38ceead..ee53887 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.wifi;
 
-import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
-
-import android.app.ActivityManager;
 import android.content.Context;
 import android.content.res.Resources;
 import android.net.IpConfiguration;
@@ -28,7 +25,6 @@
 import android.net.NetworkInfo.DetailedState;
 import android.net.NetworkUtils;
 import android.net.ProxyInfo;
-import android.net.RouteInfo;
 import android.net.StaticIpConfiguration;
 import android.net.Uri;
 import android.net.wifi.WifiConfiguration;
@@ -39,7 +35,6 @@
 import android.net.wifi.WifiEnterpriseConfig.Phase2;
 import android.net.wifi.WifiInfo;
 import android.os.Handler;
-import android.os.UserHandle;
 import android.security.Credentials;
 import android.security.KeyStore;
 import android.text.Editable;
@@ -61,6 +56,7 @@
 
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
+import com.android.settingslib.wifi.AccessPoint;
 
 import java.net.InetAddress;
 import java.net.Inet4Address;
@@ -106,9 +102,6 @@
     /* Full list of phase2 methods */
     private final ArrayAdapter<String> PHASE2_FULL_ADAPTER;
 
-    // True when this instance is used in SetupWizard XL context.
-    private final boolean mInXlSetupWizard;
-
     private final Handler mTextViewChangedHandler;
 
     // e.g. AccessPoint.SECURITY_NONE
@@ -155,12 +148,11 @@
     public WifiConfigController(
             WifiConfigUiBase parent, View view, AccessPoint accessPoint, boolean edit) {
         mConfigUi = parent;
-        mInXlSetupWizard = (parent instanceof WifiConfigUiForSetupWizardXL);
 
         mView = view;
         mAccessPoint = accessPoint;
         mAccessPointSecurity = (accessPoint == null) ? AccessPoint.SECURITY_NONE :
-                accessPoint.security;
+                accessPoint.getSecurity();
         mEdit = edit;
 
         mTextViewChangedHandler = new Handler();
@@ -191,18 +183,7 @@
             mSsidView.addTextChangedListener(this);
             mSecuritySpinner = ((Spinner) mView.findViewById(R.id.security));
             mSecuritySpinner.setOnItemSelectedListener(this);
-            if (mInXlSetupWizard) {
-                mView.findViewById(R.id.type_ssid).setVisibility(View.VISIBLE);
-                mView.findViewById(R.id.type_security).setVisibility(View.VISIBLE);
-                // We want custom layout. The content must be same as the other cases.
-
-                ArrayAdapter<String> adapter = new ArrayAdapter<String>(mContext,
-                        R.layout.wifi_setup_custom_list_item_1, android.R.id.text1,
-                        res.getStringArray(R.array.wifi_security_no_eap));
-                mSecuritySpinner.setAdapter(adapter);
-            } else {
-                mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
-            }
+            mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
 
             showIpConfigFields();
             showProxyFields();
@@ -213,12 +194,12 @@
 
             mConfigUi.setSubmitButton(res.getString(R.string.wifi_save));
         } else {
-            mConfigUi.setTitle(mAccessPoint.ssid);
+            mConfigUi.setTitle(mAccessPoint.getSsid());
 
             ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);
 
             boolean showAdvancedFields = false;
-            if (mAccessPoint.networkId != INVALID_NETWORK_ID) {
+            if (mAccessPoint.isSaved()) {
                 WifiConfiguration config = mAccessPoint.getConfig();
                 if (config.getIpAssignment() == IpAssignment.STATIC) {
                     mIpSettingsSpinner.setSelection(STATIC_IP);
@@ -245,7 +226,7 @@
                 }
             }
 
-            if ((mAccessPoint.networkId == INVALID_NETWORK_ID && !mAccessPoint.isActive())
+            if ((!mAccessPoint.isSaved() && !mAccessPoint.isActive())
                     || mEdit) {
                 showSecurityFields();
                 showIpConfigFields();
@@ -262,22 +243,15 @@
             if (mEdit) {
                 mConfigUi.setSubmitButton(res.getString(R.string.wifi_save));
             } else {
-                final DetailedState state = mAccessPoint.getState();
+                final DetailedState state = mAccessPoint.getDetailedState();
                 final String signalLevel = getSignalString();
 
                 if (state == null && signalLevel != null) {
                     mConfigUi.setSubmitButton(res.getString(R.string.wifi_connect));
                 } else {
                     if (state != null) {
-                        WifiConfiguration config = mAccessPoint.getConfig();
-                        if (config != null && config.isPasspoint()) {
-                            addRow(group, R.string.wifi_status, Summary.get(mConfigUi.getContext(),
-                                    state, false, config.providerFriendlyName));
-                        } else {
-                            addRow(group, R.string.wifi_status, Summary.get(mConfigUi.getContext(),
-                                    state, mAccessPoint.networkId ==
-                                            WifiConfiguration.INVALID_NETWORK_ID));
-                        }
+                        addRow(group, R.string.wifi_status, AccessPoint.getSummary(
+                                mConfigUi.getContext(), state, !mAccessPoint.isSaved()));
                     }
 
                     if (signalLevel != null) {
@@ -311,15 +285,14 @@
                     addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false));
                     mView.findViewById(R.id.ip_fields).setVisibility(View.GONE);
                 }
-                if ((mAccessPoint.networkId != INVALID_NETWORK_ID || mAccessPoint.isActive())
-                        && ActivityManager.getCurrentUser() == UserHandle.USER_OWNER) {
+                if (mAccessPoint.isSaved() || mAccessPoint.isActive()) {
                     mConfigUi.setForgetButton(res.getString(R.string.wifi_forget));
                 }
             }
         }
 
         if ((mEdit) || (mAccessPoint != null
-                && mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){
+                && mAccessPoint.getDetailedState() == null && mAccessPoint.getLevel() != -1)){
             mConfigUi.setCancelButton(res.getString(R.string.wifi_cancel));
         }else{
             mConfigUi.setCancelButton(res.getString(R.string.wifi_display_options_done));
@@ -342,6 +315,13 @@
         return (level > -1 && level < mLevels.length) ? mLevels[level] : null;
     }
 
+    void hideForgetButton() {
+        Button forget = mConfigUi.getForgetButton();
+        if (forget == null) return;
+
+        forget.setVisibility(View.GONE);
+    }
+
     void hideSubmitButton() {
         Button submit = mConfigUi.getSubmitButton();
         if (submit == null) return;
@@ -364,7 +344,7 @@
         }
 
         if ((mSsidView != null && mSsidView.length() == 0) ||
-            ((mAccessPoint == null || mAccessPoint.networkId == INVALID_NETWORK_ID) &&
+            ((mAccessPoint == null || !mAccessPoint.isSaved()) &&
             passwordInvalid)) {
             enabled = false;
         } else {
@@ -378,7 +358,7 @@
     }
 
     /* package */ WifiConfiguration getConfig() {
-        if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID && !mEdit) {
+        if (mAccessPoint != null && mAccessPoint.isSaved() && !mEdit) {
             return null;
         }
 
@@ -389,11 +369,11 @@
                     mSsidView.getText().toString());
             // If the user adds a network manually, assume that it is hidden.
             config.hiddenSSID = true;
-        } else if (mAccessPoint.networkId == INVALID_NETWORK_ID) {
+        } else if (!mAccessPoint.isSaved()) {
             config.SSID = AccessPoint.convertToQuotedString(
-                    mAccessPoint.ssid);
+                    mAccessPoint.getSsid());
         } else {
-            config.networkId = mAccessPoint.networkId;
+            config.networkId = mAccessPoint.getConfig().networkId;
         }
 
         switch (mAccessPointSecurity) {
@@ -620,13 +600,6 @@
     }
 
     private void showSecurityFields() {
-        if (mInXlSetupWizard) {
-            // Note: XL SetupWizard won't hide "EAP" settings here.
-            if (!((WifiSettingsForSetupWizardXL)mConfigUi.getContext()).initSecurityFields(mView,
-                        mAccessPointSecurity)) {
-                return;
-            }
-        }
         if (mAccessPointSecurity == AccessPoint.SECURITY_NONE) {
             mView.findViewById(R.id.security_fields).setVisibility(View.GONE);
             return;
@@ -639,7 +612,7 @@
             ((CheckBox) mView.findViewById(R.id.show_password))
                 .setOnCheckedChangeListener(this);
 
-            if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
+            if (mAccessPoint != null && mAccessPoint.isSaved()) {
                 mPasswordView.setHint(R.string.wifi_unchanged);
             }
         }
@@ -663,7 +636,7 @@
             loadCertificates(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY);
 
             // Modifying an existing network
-            if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
+            if (mAccessPoint != null && mAccessPoint.isSaved()) {
                 WifiEnterpriseConfig enterpriseConfig = mAccessPoint.getConfig().enterpriseConfig;
                 int eapMethod = enterpriseConfig.getEapMethod();
                 int phase2Method = enterpriseConfig.getPhase2Method();
@@ -819,7 +792,7 @@
 
         mView.findViewById(R.id.ip_fields).setVisibility(View.VISIBLE);
 
-        if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
+        if (mAccessPoint != null && mAccessPoint.isSaved()) {
             config = mAccessPoint.getConfig();
         }
 
@@ -871,7 +844,7 @@
 
         mView.findViewById(R.id.proxy_settings_fields).setVisibility(View.VISIBLE);
 
-        if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
+        if (mAccessPoint != null && mAccessPoint.isSaved()) {
             config = mAccessPoint.getConfig();
         }
 
diff --git a/src/com/android/settings/wifi/WifiConfigUiBase.java b/src/com/android/settings/wifi/WifiConfigUiBase.java
index 11dcc00..a0f67ab 100644
--- a/src/com/android/settings/wifi/WifiConfigUiBase.java
+++ b/src/com/android/settings/wifi/WifiConfigUiBase.java
@@ -21,8 +21,7 @@
 import android.widget.Button;
 
 /**
- * Foundation interface glues between Activities and UIs like
- * {@link WifiDialog} or {@link WifiConfigUiForSetupWizardXL}.
+ * Foundation interface glues between Activities and UIs like {@link WifiDialog}.
  */
 public interface WifiConfigUiBase {
     public Context getContext();
diff --git a/src/com/android/settings/wifi/WifiConfigUiForSetupWizardXL.java b/src/com/android/settings/wifi/WifiConfigUiForSetupWizardXL.java
deleted file mode 100644
index 440e694..0000000
--- a/src/com/android/settings/wifi/WifiConfigUiForSetupWizardXL.java
+++ /dev/null
@@ -1,210 +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 com.android.settings.R;
-
-import android.content.Context;
-import android.os.Handler;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnFocusChangeListener;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.EditText;
-
-/**
- * Shows simplified UI for configuring a wifi network. Used only in SetupWizard for XLarge
- * screen.
- */
-public class WifiConfigUiForSetupWizardXL implements WifiConfigUiBase, OnFocusChangeListener {
-    private static final String TAG = "SetupWizard";
-
-    private Button mConnectButton;
-    private Button mCancelButton;
-
-    private final WifiSettingsForSetupWizardXL mActivity;
-    private View mView;
-    private WifiConfigController mController;
-    private AccessPoint mAccessPoint;
-    private boolean mEdit;
-    private Handler mHandler = new Handler();
-
-    private final InputMethodManager mInputMethodManager;
-
-    private LayoutInflater mInflater;
-
-    /**
-     * @param activity Activity which creates this object.
-     * @param parent Parent ViewGroup (typically some layout) holding a view object created by
-     * this object
-     * @param accessPoint target AccessPoint to be configured.
-     * @param edit
-     */
-    public WifiConfigUiForSetupWizardXL(
-            WifiSettingsForSetupWizardXL activity, ViewGroup parent,
-            AccessPoint accessPoint, boolean edit) {
-        mActivity = activity;
-        mConnectButton = (Button)activity.findViewById(R.id.wifi_setup_connect);
-        mCancelButton = (Button)activity.findViewById(R.id.wifi_setup_cancel);
-        mAccessPoint = accessPoint;
-        mEdit = edit;
-        mInflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-        mView = mInflater.inflate(R.layout.wifi_config_ui_for_setup_wizard, parent, true);
-        mController = new WifiConfigController(this, mView, mAccessPoint, edit);
-
-        mInputMethodManager = (InputMethodManager)
-                activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        if (mView.findViewById(R.id.security_fields).getVisibility() == View.VISIBLE) {
-            requestFocusAndShowKeyboard(R.id.password);
-        } else if (mView.findViewById(R.id.type_ssid).getVisibility() == View.VISIBLE) {
-            // Add Network flow.
-            requestFocusAndShowKeyboard(R.id.ssid);
-        }
-    }
-
-    /**
-     * @param editViewId must be EditView
-     */
-    public void requestFocusAndShowKeyboard(int editViewId) {
-        // Set Focus to password View.
-        final View viewToBeFocused = mView.findViewById(editViewId);
-        if (viewToBeFocused == null) {
-            Log.w(TAG, "password field to be focused not found.");
-        } else if (!(viewToBeFocused instanceof EditText)) {
-            Log.w(TAG, "password field is not EditText");
-        } else {
-            if (viewToBeFocused.isFocused()) {
-                Log.i(TAG, "Already focused");
-                if (!mInputMethodManager.showSoftInput(viewToBeFocused, 0)) {
-                    Log.w(TAG, "Failed to show SoftInput");
-                }
-            } else {
-                // After acquiring the focus, we show software keyboard.
-                viewToBeFocused.setOnFocusChangeListener(this);
-                final boolean requestFocusResult = viewToBeFocused.requestFocus();
-                Log.i(TAG, String.format("Focus request: %s",
-                        (requestFocusResult ? "successful" : "failed")));
-                if (!requestFocusResult) {
-                    viewToBeFocused.setOnFocusChangeListener(null);
-                }
-            }
-        }
-    }
-
-    public View getView() {
-        return mView;
-    }
-
-    public AccessPoint getAccessPoint() {
-        return mAccessPoint;
-    }
-
-    @Override
-    public WifiConfigController getController() {
-        return mController;
-    }
-
-    @Override
-    public boolean isEdit() {
-        return mEdit;
-    }
-
-    @Override
-    public LayoutInflater getLayoutInflater() {
-        return mInflater;
-    }
-
-    @Override
-    public Button getSubmitButton() {
-        return mConnectButton;
-    }
-
-    @Override
-    public Button getForgetButton() {
-        return null;
-    }
-
-    @Override
-    public Button getCancelButton() {
-        return mCancelButton;
-    }
-
-    @Override
-    public void setSubmitButton(CharSequence text) {
-        mConnectButton.setVisibility(View.VISIBLE);
-        mConnectButton.setText(text);
-    }
-
-    @Override
-    public void setForgetButton(CharSequence text) {
-        // In XL setup screen, we won't show Forget button for simplifying the UI.
-    }
-
-    @Override
-    public void setCancelButton(CharSequence text) {
-        mCancelButton.setVisibility(View.VISIBLE);
-        // We don't want "cancel" label given from caller.
-        // mCancelButton.setText(text);
-    }
-
-    @Override
-    public Context getContext() {
-        return mActivity;
-    }
-
-    @Override
-    public void setTitle(int id) {
-        Log.d(TAG, "Ignoring setTitle");
-    }
-
-    @Override
-    public void setTitle(CharSequence title) {
-        Log.d(TAG, "Ignoring setTitle");
-    }
-
-    private class FocusRunnable implements Runnable {
-        final View mViewToBeFocused;
-        public FocusRunnable(View viewToBeFocused) {
-            mViewToBeFocused = viewToBeFocused;
-        }
-
-        @Override
-        public void run() {
-            // mInputMethodManager.focusIn(mViewToBeFocused);
-            final boolean showSoftInputResult =
-                    mInputMethodManager.showSoftInput(mViewToBeFocused, 0);
-            if (showSoftInputResult) {
-                mActivity.setPaddingVisibility(View.GONE);
-            } else {
-                Log.w(TAG, "Failed to show software keyboard ");
-            }
-        }
-    }
-
-    @Override
-    public void onFocusChange(View view, boolean hasFocus) {
-        view.setOnFocusChangeListener(null);
-        if (hasFocus) {
-            mHandler.post(new FocusRunnable(view));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index ce554bc..c18baf5 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -17,6 +17,7 @@
 package com.android.settings.wifi;
 
 import com.android.settings.R;
+import com.android.settingslib.wifi.AccessPoint;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -36,11 +37,14 @@
     private View mView;
     private WifiConfigController mController;
     private boolean mHideSubmitButton;
+    private boolean mHideForgetButton;
 
     public WifiDialog(Context context, DialogInterface.OnClickListener listener,
-            AccessPoint accessPoint, boolean edit, boolean hideSubmitButton) {
+            AccessPoint accessPoint, boolean edit, boolean hideSubmitButton,
+            boolean hideForgetButton) {
         this(context, listener, accessPoint, edit);
         mHideSubmitButton = hideSubmitButton;
+        mHideForgetButton = hideForgetButton;
     }
 
     public WifiDialog(Context context, DialogInterface.OnClickListener listener,
@@ -50,6 +54,7 @@
         mListener = listener;
         mAccessPoint = accessPoint;
         mHideSubmitButton = false;
+        mHideForgetButton = false;
     }
 
     @Override
@@ -72,6 +77,10 @@
              * visibility. Right after creation, update button visibility */
             mController.enableSubmitIfAppropriate();
         }
+
+        if (mHideForgetButton) {
+            mController.hideForgetButton();
+        }
     }
 
     public void onRestoreInstanceState(Bundle savedInstanceState) {
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 0952941..fe52cf2 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -30,10 +30,11 @@
 import android.widget.Switch;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
-import com.android.settings.WirelessSettings;
 import com.android.settings.search.Index;
 import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.WirelessUtils;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -196,7 +197,7 @@
             return;
         }
         // Show toast message if Wi-Fi is not allowed in airplane mode
-        if (isChecked && !WirelessSettings.isRadioAllowed(mContext, Settings.Global.RADIO_WIFI)) {
+        if (isChecked && !WirelessUtils.isRadioAllowed(mContext, Settings.Global.RADIO_WIFI)) {
             Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
             // Reset switch to off. No infinite check/listenenr loop.
             mSwitchBar.setChecked(false);
@@ -209,7 +210,8 @@
                 (wifiApState == WifiManager.WIFI_AP_STATE_ENABLED))) {
             mWifiManager.setWifiApEnabled(null, false);
         }
-
+        MetricsLogger.action(mContext,
+                isChecked ? MetricsLogger.ACTION_WIFI_ON : MetricsLogger.ACTION_WIFI_OFF);
         if (!mWifiManager.setWifiEnabled(isChecked)) {
             // Error
             mSwitchBar.setEnabled(true);
diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java
new file mode 100644
index 0000000..a45d6a2
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java
@@ -0,0 +1,152 @@
+/*
+ * 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.wifi;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.Network;
+import android.net.NetworkInfo;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+import com.android.settings.R;
+
+public final class WifiNoInternetDialog extends AlertActivity implements
+        DialogInterface.OnClickListener {
+    private static final String TAG = "WifiNoInternetDialog";
+
+    private ConnectivityManager mCM;
+    private Network mNetwork;
+    private String mNetworkName;
+    private ConnectivityManager.NetworkCallback mNetworkCallback;
+    private CheckBox mAlwaysAllow;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Intent intent = getIntent();
+        if (intent == null ||
+                !intent.getAction().equals(ConnectivityManager.ACTION_PROMPT_UNVALIDATED)) {
+            Log.e(TAG, "Unexpected intent " + intent + ", exiting");
+            finish();
+            return;
+        }
+
+        mNetwork = intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
+        if (mNetwork == null) {
+            Log.e(TAG, "ACTION_PROMPT_UNVALIDATED for null network, exiting");
+            finish();
+            return;
+        }
+
+        // TODO: add a registerNetworkCallback(Network network, NetworkCallback networkCallback) and
+        // simplify this.
+        final NetworkRequest.Builder builder = new NetworkRequest.Builder();
+        for (int i = 0; i < 256; i++) {
+            try {
+                builder.removeCapability(i);
+            } catch (IllegalArgumentException e) {}
+        }
+        final NetworkRequest request = builder.build();
+        mNetworkCallback = new NetworkCallback() {
+            public void onLost(Network network) {
+                // Close the dialog if the network disconnects.
+                if (mNetwork.equals(network)) {
+                    Log.d(TAG, "Network " + mNetwork + " disconnected");
+                    finish();
+                }
+            }
+            // TODO: implement onNetworkCapabilitiesChanged so we can close the dialog if the
+            // network is now validated.
+        };
+
+        mCM = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+        mCM.registerNetworkCallback(request, mNetworkCallback);
+
+        final NetworkInfo ni = mCM.getNetworkInfo(mNetwork);
+        if (ni == null || !ni.isConnectedOrConnecting()) {
+            Log.d(TAG, "Network " + mNetwork + " is not connected: " + ni);
+            finish();
+            return;
+        }
+        mNetworkName = ni.getExtraInfo();
+        if (mNetworkName != null) {
+            mNetworkName = mNetworkName.replaceAll("^\"|\"$", "");  // Remove double quotes
+        }
+
+        createDialog();
+    }
+
+    private void createDialog() {
+        mAlert.setIcon(R.drawable.ic_settings_wireless);
+
+        final AlertController.AlertParams ap = mAlertParams;
+        ap.mTitle = mNetworkName;
+        ap.mMessage = getString(R.string.no_internet_access_text);
+        ap.mPositiveButtonText = getString(android.R.string.ok);
+        ap.mNegativeButtonText = getString(android.R.string.cancel);
+        ap.mPositiveButtonListener = this;
+        ap.mNegativeButtonListener = this;
+
+        final LayoutInflater inflater = LayoutInflater.from(ap.mContext);
+        final View checkbox = inflater.inflate(
+                com.android.internal.R.layout.always_use_checkbox, null);
+        ap.mView = checkbox;
+
+        mAlwaysAllow = (CheckBox) checkbox.findViewById(com.android.internal.R.id.alwaysUse);
+        mAlwaysAllow.setText(getString(R.string.no_internet_access_remember));
+
+        setupAlert();
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (mNetworkCallback != null) {
+            mCM.unregisterNetworkCallback(mNetworkCallback);
+            mNetworkCallback = null;
+        }
+        super.onDestroy();
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        final boolean accept = (which == BUTTON_POSITIVE);
+        final String action = (accept ? "Connect" : "Ignore");
+        final boolean always = mAlwaysAllow.isChecked();
+
+        switch (which) {
+            case BUTTON_POSITIVE:
+            case BUTTON_NEGATIVE:
+                mCM.setAcceptUnvalidated(mNetwork, accept, always);
+                Log.d(TAG, action +  " network=" + mNetwork + (always ? " and remember" : ""));
+                break;
+            default:
+                break;
+        }
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
index 4133eb8..e495ddd 100644
--- a/src/com/android/settings/wifi/WifiScanModeActivity.java
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -29,7 +29,6 @@
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.util.Log;
 
 /**
  * This activity requests users permission to allow scanning even when Wi-Fi is turned off
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 10175ec..4122f60 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -20,56 +20,63 @@
 import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
 
 import android.app.Activity;
-import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.app.AppGlobals;
 import android.app.Dialog;
-import android.content.BroadcastReceiver;
+import android.app.admin.DevicePolicyManager;
 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.IPackageManager;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.location.LocationManager;
+import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.NetworkInfo.DetailedState;
 import android.net.NetworkInfo.State;
-import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WpsInfo;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
+import android.os.RemoteException;
 import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
+import android.text.Spannable;
+import android.text.style.TextAppearanceSpan;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.TextView;
+import android.widget.TextView.BufferType;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.LinkifyUtils;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.SettingsActivity;
+import com.android.settings.location.ScanningSettings;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.wifi.AccessPoint;
+import com.android.settingslib.wifi.AccessPoint.AccessPointListener;
+import com.android.settingslib.wifi.WifiTracker;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Two types of UI are provided here.
@@ -80,7 +87,8 @@
  * and menus.
  */
 public class WifiSettings extends RestrictedSettingsFragment
-        implements DialogInterface.OnClickListener, Indexable  {
+        implements DialogInterface.OnClickListener, Indexable, WifiTracker.WifiListener,
+        AccessPointListener {
 
     private static final String TAG = "WifiSettings";
 
@@ -100,20 +108,13 @@
     private static final int WPS_PIN_DIALOG_ID = 3;
     private static final int WRITE_NFC_DIALOG_ID = 6;
 
-    // Combo scans can take 5-6s to complete - set to 10s.
-    private static final int WIFI_RESCAN_INTERVAL_MS = 10 * 1000;
-
     // Instance state keys
     private static final String SAVE_DIALOG_EDIT_MODE = "edit_mode";
     private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
 
     private static boolean savedNetworksExist;
 
-    private final IntentFilter mFilter;
-    private final BroadcastReceiver mReceiver;
-    private final Scanner mScanner;
-
-    /* package */ WifiManager mWifiManager;
+    protected WifiManager mWifiManager;
     private WifiManager.ActionListener mConnectListener;
     private WifiManager.ActionListener mSaveListener;
     private WifiManager.ActionListener mForgetListener;
@@ -122,11 +123,6 @@
     // An access point being editted is stored here.
     private AccessPoint mSelectedAccessPoint;
 
-    private NetworkInfo mLastNetworkInfo;
-    private WifiInfo mLastInfo;
-
-    private final AtomicBoolean mConnected = new AtomicBoolean(false);
-
     private WifiDialog mDialog;
     private WriteWifiConfigToNfcDialog mWifiToNfcDialog;
 
@@ -147,98 +143,20 @@
     private AccessPoint mDlgAccessPoint;
     private Bundle mAccessPointSavedState;
 
-    /** verbose logging flag. this flag is set thru developer debugging options
-     * and used so as to assist with in-the-field WiFi connectivity debugging  */
-    public static int mVerboseLogging = 0;
+    private WifiTracker mWifiTracker;
 
     /* End of "used in Wifi Setup context" */
 
-    /** A restricted multimap for use in constructAccessPoints */
-    private static class Multimap<K,V> {
-        private final HashMap<K,List<V>> store = new HashMap<K,List<V>>();
-        /** retrieve a non-null list of values with key K */
-        List<V> getAll(K key) {
-            List<V> values = store.get(key);
-            return values != null ? values : Collections.<V>emptyList();
-        }
-
-        void put(K key, V val) {
-            List<V> curVals = store.get(key);
-            if (curVals == null) {
-                curVals = new ArrayList<V>(3);
-                store.put(key, curVals);
-            }
-            curVals.add(val);
-        }
-    }
-
-    private static class Scanner extends Handler {
-        private int mRetry = 0;
-        private WifiSettings mWifiSettings = null;
-
-        Scanner(WifiSettings wifiSettings) {
-            mWifiSettings = wifiSettings;
-        }
-
-        void resume() {
-            if (!hasMessages(0)) {
-                sendEmptyMessage(0);
-            }
-        }
-
-        void forceScan() {
-            removeMessages(0);
-            sendEmptyMessage(0);
-        }
-
-        void pause() {
-            mRetry = 0;
-            removeMessages(0);
-        }
-
-        @Override
-        public void handleMessage(Message message) {
-            if (mWifiSettings.mWifiManager.startScan()) {
-                mRetry = 0;
-            } else if (++mRetry >= 3) {
-                mRetry = 0;
-                Activity activity = mWifiSettings.getActivity();
-                if (activity != null) {
-                    Toast.makeText(activity, R.string.wifi_fail_to_scan, Toast.LENGTH_LONG).show();
-                }
-                return;
-            }
-            sendEmptyMessageDelayed(0, WIFI_RESCAN_INTERVAL_MS);
-        }
-    }
-
     public WifiSettings() {
         super(DISALLOW_CONFIG_WIFI);
-        mFilter = new IntentFilter();
-        mFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
-        mFilter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
-
-        mReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                handleEvent(intent);
-            }
-        };
-
-        mScanner = new Scanner(this);
     }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        mWifiTracker = new WifiTracker(getActivity(), this, true, true);
+        mWifiManager = mWifiTracker.getManager();
 
         mConnectListener = new WifiManager.ActionListener() {
                                    @Override
@@ -318,14 +236,14 @@
 
         if (intent.hasExtra(EXTRA_START_CONNECT_SSID)) {
             String ssid = intent.getStringExtra(EXTRA_START_CONNECT_SSID);
-            updateAccessPoints();
+            onAccessPointsChanged();
             PreferenceScreen preferenceScreen = getPreferenceScreen();
             for (int i = 0; i < preferenceScreen.getPreferenceCount(); i++) {
                 Preference preference = preferenceScreen.getPreference(i);
-                if (preference instanceof AccessPoint) {
-                    AccessPoint accessPoint = (AccessPoint) preference;
-                    if (ssid.equals(accessPoint.ssid) && accessPoint.networkId == -1
-                            && accessPoint.security != AccessPoint.SECURITY_NONE) {
+                if (preference instanceof AccessPointPreference) {
+                    AccessPoint accessPoint = ((AccessPointPreference) preference).getAccessPoint();
+                    if (ssid.equals(accessPoint.getSsid()) && !accessPoint.isSaved()
+                            && accessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
                         onPreferenceTreeClick(preferenceScreen, preference);
                         break;
                     }
@@ -367,8 +285,7 @@
             mWifiEnabler.resume(activity);
         }
 
-        activity.registerReceiver(mReceiver, mFilter);
-        updateAccessPoints();
+        mWifiTracker.startTracking();
     }
 
     @Override
@@ -378,8 +295,7 @@
             mWifiEnabler.pause();
         }
 
-        getActivity().unregisterReceiver(mReceiver);
-        mScanner.pause();
+        mWifiTracker.stopTracking();
     }
 
     @Override
@@ -395,7 +311,7 @@
      * @param menu
      */
     void addOptionsMenuItems(Menu menu) {
-        final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
+        final boolean wifiIsEnabled = mWifiTracker.isWifiEnabled();
         TypedArray ta = getActivity().getTheme().obtainStyledAttributes(
                 new int[] {R.attr.ic_menu_add, R.attr.ic_wps});
         menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
@@ -417,6 +333,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI;
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 
@@ -458,12 +379,11 @@
                 showDialog(WPS_PIN_DIALOG_ID);
                 return true;
             case MENU_ID_SCAN:
-                if (mWifiManager.isWifiEnabled()) {
-                    mScanner.forceScan();
-                }
+                MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORCE_SCAN);
+                mWifiTracker.forceScan();
                 return true;
             case MENU_ID_ADD_NETWORK:
-                if (mWifiManager.isWifiEnabled()) {
+                if (mWifiTracker.isWifiEnabled()) {
                     onAddNetworkPressed();
                 }
                 return true;
@@ -499,29 +419,30 @@
             Preference preference = (Preference) getListView().getItemAtPosition(
                     ((AdapterContextMenuInfo) info).position);
 
-            if (preference instanceof AccessPoint) {
-                mSelectedAccessPoint = (AccessPoint) preference;
-                menu.setHeaderTitle(mSelectedAccessPoint.ssid);
-                if (mSelectedAccessPoint.getLevel() != -1) {
-                    if (mSelectedAccessPoint.getState() == null) {
-                        menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
-                    }
+            if (preference instanceof AccessPointPreference) {
+                mSelectedAccessPoint = ((AccessPointPreference) preference).getAccessPoint();
+                menu.setHeaderTitle(mSelectedAccessPoint.getSsid());
+                if (mSelectedAccessPoint.isConnectable()) {
+                    menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
                 }
 
-                if (ActivityManager.getCurrentUser() == UserHandle.USER_OWNER &&
-                        (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID ||
-                        (mSelectedAccessPoint.getNetworkInfo() != null &&
-                        mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED))) {
-                    // Allow forgetting a network if the current user is the owner and either the
-                    // network is saved or ephemerally connected. (In the latter case, "forget"
-                    // blacklists the network so it won't be used again, ephemerally).
+                WifiConfiguration config = mSelectedAccessPoint.getConfig();
+                // Device Owner created configs are uneditable
+                if (isCreatorDeviceOwner(getActivity(), config)) {
+                    return;
+                }
+
+                if (mSelectedAccessPoint.isSaved() || mSelectedAccessPoint.isEphemeral()) {
+                    // Allow forgetting a network if either the network is saved or ephemerally
+                    // connected. (In the latter case, "forget" blacklists the network so it won't
+                    // be used again, ephemerally).
                     menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget);
                 }
-                if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
+                if (mSelectedAccessPoint.isSaved()) {
                     menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);
                     NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
                     if (nfcAdapter != null && nfcAdapter.isEnabled() &&
-                            mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) {
+                            mSelectedAccessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
                         // Only allow writing of NFC tags for password-protected networks.
                         menu.add(Menu.NONE, MENU_ID_WRITE_NFC, 0, R.string.wifi_menu_write_to_nfc);
                     }
@@ -537,9 +458,9 @@
         }
         switch (item.getItemId()) {
             case MENU_ID_CONNECT: {
-                if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
-                    connect(mSelectedAccessPoint.networkId);
-                } else if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
+                if (mSelectedAccessPoint.isSaved()) {
+                    connect(mSelectedAccessPoint.getConfig());
+                } else if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) {
                     /** Bypass dialog for unsecured networks */
                     mSelectedAccessPoint.generateOpenNetworkConfig();
                     connect(mSelectedAccessPoint.getConfig());
@@ -566,12 +487,11 @@
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
-        if (preference instanceof AccessPoint) {
-            mSelectedAccessPoint = (AccessPoint) preference;
+        if (preference instanceof AccessPointPreference) {
+            mSelectedAccessPoint = ((AccessPointPreference) preference).getAccessPoint();
             /** Bypass dialog for unsecured, unsaved, and inactive networks */
-            if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE &&
-                    mSelectedAccessPoint.networkId == INVALID_NETWORK_ID &&
-                    !mSelectedAccessPoint.isActive()) {
+            if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE &&
+                    !mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {
                 mSelectedAccessPoint.generateOpenNetworkConfig();
                 if (!savedNetworksExist) {
                     savedNetworksExist = true;
@@ -588,6 +508,33 @@
     }
 
     private void showDialog(AccessPoint accessPoint, boolean edit) {
+        if (accessPoint != null) {
+            WifiConfiguration config = accessPoint.getConfig();
+            if (isCreatorDeviceOwner(getActivity(), config) && accessPoint.isActive()) {
+                final int userId = UserHandle.getUserId(config.creatorUid);
+                final PackageManager pm = getActivity().getPackageManager();
+                final IPackageManager ipm = AppGlobals.getPackageManager();
+                String appName = pm.getNameForUid(config.creatorUid);
+                try {
+                    final ApplicationInfo appInfo = ipm.getApplicationInfo(appName, /* flags */ 0,
+                            userId);
+                    final CharSequence label = pm.getApplicationLabel(appInfo);
+                    if (label != null) {
+                        appName = label.toString();
+                    }
+                } catch (RemoteException e) {
+                    // leave appName as packageName
+                }
+                final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                builder.setTitle(accessPoint.getSsid())
+                        .setMessage(getString(R.string.wifi_alert_lockdown_by_device_owner,
+                                appName))
+                        .setPositiveButton(android.R.string.ok, null)
+                        .show();
+                return;
+            }
+        }
+
         if (mDialog != null) {
             removeDialog(WIFI_DIALOG_ID);
             mDialog = null;
@@ -616,7 +563,11 @@
                 }
                 // If it's null, fine, it's for Add Network
                 mSelectedAccessPoint = ap;
-                mDialog = new WifiDialog(getActivity(), this, ap, mDlgEdit);
+                final boolean hideForget = (ap == null || isCreatorDeviceOwner(getActivity(),
+                        ap.getConfig()));
+                mDialog = new WifiDialog(getActivity(), this, ap, mDlgEdit,
+                        /* no hide submit/connect */ false,
+                        /* hide forget if config locked down */ hideForget);
                 return mDialog;
             case WPS_PBC_DIALOG_ID:
                 return new WpsDialog(getActivity(), WpsInfo.PBC);
@@ -637,7 +588,8 @@
      * Shows the latest access points available with supplemental information like
      * the strength of network and the security for it.
      */
-    private void updateAccessPoints() {
+    @Override
+    public void onAccessPointsChanged() {
         // Safeguard from some delayed event handling
         if (getActivity() == null) return;
 
@@ -647,16 +599,11 @@
         }
         final int wifiState = mWifiManager.getWifiState();
 
-        //when we update the screen, check if verbose logging has been turned on or off
-        mVerboseLogging = mWifiManager.getVerboseLoggingLevel();
-
         switch (wifiState) {
             case WifiManager.WIFI_STATE_ENABLED:
                 // AccessPoints are automatically sorted with TreeSet.
-                mLastInfo = mWifiManager.getConnectionInfo();
                 final Collection<AccessPoint> accessPoints =
-                        constructAccessPoints(getActivity(), mWifiManager, mLastInfo,
-                                mLastNetworkInfo);
+                        mWifiTracker.getAccessPoints();
                 getPreferenceScreen().removeAll();
                 if (accessPoints.size() == 0) {
                     addMessagePreference(R.string.wifi_empty_list_wifi_on);
@@ -665,7 +612,11 @@
                 for (AccessPoint accessPoint : accessPoints) {
                     // Ignore access points that are out of range.
                     if (accessPoint.getLevel() != -1) {
-                        getPreferenceScreen().addPreference(accessPoint);
+                        AccessPointPreference preference = new AccessPointPreference(accessPoint,
+                                getActivity());
+
+                        getPreferenceScreen().addPreference(preference);
+                        accessPoint.setListener(this);
                     }
                 }
                 break;
@@ -682,31 +633,50 @@
                 setOffMessage();
                 break;
         }
+        // Update "Saved Networks" menu option.
+        if (savedNetworksExist != mWifiTracker.doSavedNetworksExist()) {
+            savedNetworksExist = !savedNetworksExist;
+            getActivity().invalidateOptionsMenu();
+        }
     }
 
     protected TextView initEmptyView() {
         TextView emptyView = (TextView) getActivity().findViewById(android.R.id.empty);
+        emptyView.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
         getListView().setEmptyView(emptyView);
         return emptyView;
     }
 
     private void setOffMessage() {
-        if (mEmptyView != null) {
-            mEmptyView.setText(R.string.wifi_empty_list_wifi_off);
-            if (android.provider.Settings.Global.getInt(getActivity().getContentResolver(),
-                    android.provider.Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1) {
-                mEmptyView.append("\n\n");
-                int resId;
-                if (android.provider.Settings.Secure.isLocationProviderEnabled(
-                        getActivity().getContentResolver(), LocationManager.NETWORK_PROVIDER)) {
-                    resId = R.string.wifi_scan_notify_text_location_on;
-                } else {
-                    resId = R.string.wifi_scan_notify_text_location_off;
-                }
-                CharSequence charSeq = getText(resId);
-                mEmptyView.append(charSeq);
-            }
+        if (mEmptyView == null) {
+            return;
         }
+
+        final CharSequence briefText = getText(R.string.wifi_empty_list_wifi_off);
+        if (isUiRestricted()) {
+            // Show only the brief text if the user is not allowed to configure scanning settings.
+            mEmptyView.setText(briefText, BufferType.SPANNABLE);
+        } else {
+            // Append the description of scanning settings with link.
+            final StringBuilder contentBuilder = new StringBuilder();
+            contentBuilder.append(briefText);
+            contentBuilder.append("\n\n");
+            contentBuilder.append(getText(R.string.wifi_scan_notify_text));
+            LinkifyUtils.linkify(mEmptyView, contentBuilder, new LinkifyUtils.OnClickListener() {
+                @Override
+                public void onClick() {
+                    final SettingsActivity activity =
+                            (SettingsActivity) WifiSettings.this.getActivity();
+                    activity.startPreferencePanel(ScanningSettings.class.getName(), null,
+                            R.string.location_scanning_screen_title, null, null, 0);
+                }
+            });
+        }
+        // Embolden and enlarge the brief description anyway.
+        Spannable boldSpan = (Spannable) mEmptyView.getText();
+        boldSpan.setSpan(
+                new TextAppearanceSpan(getActivity(), android.R.style.TextAppearance_Medium), 0,
+                briefText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         getPreferenceScreen().removeAll();
     }
 
@@ -715,156 +685,14 @@
         getPreferenceScreen().removeAll();
     }
 
-    /** Returns sorted list of access points */
-    private static List<AccessPoint> constructAccessPoints(Context context,
-            WifiManager wifiManager, WifiInfo lastInfo, NetworkInfo lastNetworkInfo) {
-        ArrayList<AccessPoint> accessPoints = new ArrayList<AccessPoint>();
-        /** Lookup table to more quickly update AccessPoints by only considering objects with the
-         * correct SSID.  Maps SSID -> List of AccessPoints with the given SSID.  */
-        Multimap<String, AccessPoint> apMap = new Multimap<String, AccessPoint>();
-        WifiConfiguration connectionConfig = null;
-
-        final List<WifiConfiguration> configs = wifiManager.getConfiguredNetworks();
-        if (configs != null) {
-            // Update "Saved Networks" menu option.
-            if (savedNetworksExist != (configs.size() > 0)) {
-                savedNetworksExist = !savedNetworksExist;
-                if (context instanceof Activity) {
-                    ((Activity) context).invalidateOptionsMenu();
-                }
-            }
-            for (WifiConfiguration config : configs) {
-                if (lastInfo != null && lastInfo.getNetworkId() == config.networkId) {
-                    connectionConfig = config;
-                }
-
-                if (config.selfAdded && config.numAssociation == 0) {
-                    continue;
-                }
-
-                if (config.isPasspoint()) {
-                    continue;
-                }
-
-                AccessPoint accessPoint = new AccessPoint(context, config);
-                if (lastInfo != null && lastNetworkInfo != null) {
-                    accessPoint.update(lastInfo, lastNetworkInfo);
-                }
-
-                accessPoints.add(accessPoint);
-                apMap.put(accessPoint.ssid, accessPoint);
-            }
-        }
-
-        final List<ScanResult> results = wifiManager.getScanResults();
-        if (results != null) {
-            for (ScanResult result : results) {
-                // Ignore hidden and ad-hoc networks.
-                if (result.SSID == null || result.SSID.length() == 0 ||
-                        result.capabilities.contains("[IBSS]")) {
-                    continue;
-                }
-
-                boolean found = false;
-                for (AccessPoint accessPoint : apMap.getAll(result.SSID)) {
-                    if (accessPoint.update(result))
-                        found = true;
-                }
-
-                if (!found) {
-
-                    AccessPoint accessPoint = new AccessPoint(context, result);
-                    if (lastInfo != null && lastNetworkInfo != null) {
-                        accessPoint.update(lastInfo, lastNetworkInfo);
-                    }
-
-                    if (result.passpointNetwork) {
-                        WifiConfiguration config = wifiManager.getMatchingWifiConfig(result);
-                        if (config != null) {
-                            accessPoint.update(config);
-                        }
-                    }
-
-                    if (lastInfo != null && lastInfo.getBSSID() != null
-                            && lastInfo.getBSSID().equals(result.BSSID)
-                            && connectionConfig != null && connectionConfig.isPasspoint()) {
-                        /* This network is connected via this passpoint config */
-                        /* SSID match is not going to work for it; so update explicitly */
-                        accessPoint.update(connectionConfig);
-                    }
-
-                    accessPoints.add(accessPoint);
-                    apMap.put(accessPoint.ssid, accessPoint);
-                }
-            }
-        }
-
-        // Pre-sort accessPoints to speed preference insertion
-        Collections.sort(accessPoints);
-        return accessPoints;
-    }
-
-    private void handleEvent(Intent intent) {
-        String action = intent.getAction();
-        if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(action)) {
-            updateWifiState(intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
-                    WifiManager.WIFI_STATE_UNKNOWN));
-        } else if (WifiManager.SCAN_RESULTS_AVAILABLE_ACTION.equals(action) ||
-                WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION.equals(action) ||
-                WifiManager.LINK_CONFIGURATION_CHANGED_ACTION.equals(action)) {
-                updateAccessPoints();
-        } else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
-            NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(
-                    WifiManager.EXTRA_NETWORK_INFO);
-            mConnected.set(info.isConnected());
-            changeNextButtonState(info.isConnected());
-            updateAccessPoints();
-            updateNetworkInfo(info);
-        } else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {
-            updateNetworkInfo(null);
-        }
-    }
-
-    private void updateNetworkInfo(NetworkInfo networkInfo) {
-        /* sticky broadcasts can call this when wifi is disabled */
-        if (!mWifiManager.isWifiEnabled()) {
-            mScanner.pause();
-            return;
-        }
-
-        if (networkInfo != null &&
-                networkInfo.getDetailedState() == DetailedState.OBTAINING_IPADDR) {
-            mScanner.pause();
-        } else {
-            mScanner.resume();
-        }
-
-        mLastInfo = mWifiManager.getConnectionInfo();
-        if (networkInfo != null) {
-            mLastNetworkInfo = networkInfo;
-        }
-
-        for (int i = getPreferenceScreen().getPreferenceCount() - 1; i >= 0; --i) {
-            // Maybe there's a WifiConfigPreference
-            Preference preference = getPreferenceScreen().getPreference(i);
-            if (preference instanceof AccessPoint) {
-                final AccessPoint accessPoint = (AccessPoint) preference;
-                accessPoint.update(mLastInfo, mLastNetworkInfo);
-            }
-        }
-    }
-
-    private void updateWifiState(int state) {
+    @Override
+    public void onWifiStateChanged(int state) {
         Activity activity = getActivity();
         if (activity != null) {
             activity.invalidateOptionsMenu();
         }
 
         switch (state) {
-            case WifiManager.WIFI_STATE_ENABLED:
-                mScanner.resume();
-                return; // not break, to avoid the call to pause() below
-
             case WifiManager.WIFI_STATE_ENABLING:
                 addMessagePreference(R.string.wifi_starting);
                 break;
@@ -873,10 +701,11 @@
                 setOffMessage();
                 break;
         }
+    }
 
-        mLastInfo = null;
-        mLastNetworkInfo = null;
-        mScanner.pause();
+    @Override
+    public void onConnectedChanged() {
+        changeNextButtonState(mWifiTracker.isConnected());
     }
 
     /**
@@ -908,8 +737,8 @@
 
         if (config == null) {
             if (mSelectedAccessPoint != null
-                    && mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
-                connect(mSelectedAccessPoint.networkId);
+                    && mSelectedAccessPoint.isSaved()) {
+                connect(mSelectedAccessPoint.getConfig());
             }
         } else if (config.networkId != INVALID_NETWORK_ID) {
             if (mSelectedAccessPoint != null) {
@@ -923,42 +752,38 @@
             }
         }
 
-        if (mWifiManager.isWifiEnabled()) {
-            mScanner.resume();
-        }
-        updateAccessPoints();
+        mWifiTracker.resumeScanning();
     }
 
     /* package */ void forget() {
-        if (mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
+        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORGET);
+        if (!mSelectedAccessPoint.isSaved()) {
             if (mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
                 // Network is active but has no network ID - must be ephemeral.
                 mWifiManager.disableEphemeralNetwork(
-                        AccessPoint.convertToQuotedString(mSelectedAccessPoint.ssid));
+                        AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsid()));
             } else {
                 // Should not happen, but a monkey seems to trigger it
                 Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
                 return;
             }
         } else {
-            mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
+            mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener);
         }
 
-
-        if (mWifiManager.isWifiEnabled()) {
-            mScanner.resume();
-        }
-        updateAccessPoints();
+        mWifiTracker.resumeScanning();
 
         // We need to rename/replace "Next" button in wifi setup context.
         changeNextButtonState(false);
     }
 
     protected void connect(final WifiConfiguration config) {
+        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT);
         mWifiManager.connect(config, mConnectListener);
     }
 
     protected void connect(final int networkId) {
+        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT);
         mWifiManager.connect(networkId, mConnectListener);
     }
 
@@ -966,9 +791,7 @@
      * Refreshes acccess points and ask Wifi module to scan networks again.
      */
     /* package */ void refreshAccessPoints() {
-        if (mWifiManager.isWifiEnabled()) {
-            mScanner.resume();
-        }
+        mWifiTracker.resumeScanning();
 
         getPreferenceScreen().removeAll();
     }
@@ -977,13 +800,14 @@
      * Called when "add network" button is pressed.
      */
     /* package */ void onAddNetworkPressed() {
+        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_ADD_NETWORK);
         // No exact access point is selected.
         mSelectedAccessPoint = null;
         showDialog(null, true);
     }
 
     /* package */ int getAccessPointsCount() {
-        final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
+        final boolean wifiIsEnabled = mWifiTracker.isWifiEnabled();
         if (wifiIsEnabled) {
             return getPreferenceScreen().getPreferenceCount();
         } else {
@@ -995,18 +819,14 @@
      * Requests wifi module to pause wifi scan. May be ignored when the module is disabled.
      */
     /* package */ void pauseWifiScan() {
-        if (mWifiManager.isWifiEnabled()) {
-            mScanner.pause();
-        }
+        mWifiTracker.pauseScanning();
     }
 
     /**
      * Requests wifi module to resume wifi scan. May be ignored when the module is disabled.
      */
     /* package */ void resumeWifiScan() {
-        if (mWifiManager.isWifiEnabled()) {
-            mScanner.resume();
-        }
+        mWifiTracker.resumeScanning();
     }
 
     @Override
@@ -1014,6 +834,16 @@
         return R.string.help_url_wifi;
     }
 
+    @Override
+    public void onAccessPointChanged(AccessPoint accessPoint) {
+        ((AccessPointPreference) accessPoint.getTag()).refresh();
+    }
+
+    @Override
+    public void onLevelChanged(AccessPoint accessPoint) {
+        ((AccessPointPreference) accessPoint.getTag()).onLevelChanged();
+    }
+
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
         new BaseSearchIndexProvider() {
             @Override
@@ -1028,16 +858,12 @@
                 data.keywords = res.getString(R.string.keywords_wifi);
                 result.add(data);
 
-                // Add available Wi-Fi access points
-                WifiManager wifiManager =
-                        (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+                // Add saved Wi-Fi access points
                 final Collection<AccessPoint> accessPoints =
-                        constructAccessPoints(context, wifiManager, null, null);
+                        WifiTracker.getCurrentAccessPoints(context, true, false);
                 for (AccessPoint accessPoint : accessPoints) {
-                    // We are indexing only the saved Wi-Fi networks.
-                    if (accessPoint.getConfig() == null) continue;
                     data = new SearchIndexableRaw(context);
-                    data.title = accessPoint.getTitle().toString();
+                    data.title = accessPoint.getSsid();
                     data.screenTitle = res.getString(R.string.wifi_settings);
                     data.enabled = enabled;
                     result.add(data);
@@ -1046,4 +872,29 @@
                 return result;
             }
         };
+
+    /**
+     * Returns the true if the app that created this config is the device owner of the device.
+     * @param config The WiFi config.
+     * @return creator package name or null if creator package is not device owner.
+     */
+    static boolean isCreatorDeviceOwner(Context context, WifiConfiguration config) {
+        if (config == null) {
+            return false;
+        }
+        final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
+                Context.DEVICE_POLICY_SERVICE);
+        final String deviceOwnerPackageName = dpm.getDeviceOwner();
+        if (deviceOwnerPackageName == null) {
+            return false;
+        }
+        final PackageManager pm = context.getPackageManager();
+        try {
+            final int deviceOwnerUid = pm.getPackageUid(deviceOwnerPackageName,
+                    UserHandle.getUserId(config.creatorUid));
+            return deviceOwnerUid == config.creatorUid;
+        } catch (NameNotFoundException e) {
+            return false;
+        }
+    }
 }
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
index c4a5c96..ba78794 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
@@ -16,55 +16,43 @@
 
 package com.android.settings.wifi;
 
-import android.content.Intent;
-import android.content.res.TypedArray;
-import android.database.DataSetObserver;
+import android.app.Dialog;
 import android.net.wifi.WifiConfiguration;
 import android.os.Bundle;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.MenuItem;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.AbsListView.LayoutParams;
-import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
 import com.android.settings.R;
+import com.android.settings.SetupWizardUtils;
+import com.android.setupwizardlib.SetupWizardListLayout;
+import com.android.setupwizardlib.view.NavigationBar;
 
 /**
  * This customized version of WifiSettings is shown to the user only during Setup Wizard. Menu
- * selections are limited, clicking on an access point will auto-advance to the next screen (once
- * connected), and, if the user opts to skip ahead without a wifi connection, a warning message
- * alerts of possible carrier data charges or missing software updates.
+ * is not shown, clicking on an access point will auto-advance to the next screen (once connected),
+ * and, if the user opts to skip ahead without a wifi connection, a warning message alerts of
+ * possible carrier data charges or missing software updates.
  */
 public class WifiSettingsForSetupWizard extends WifiSettings {
 
     private static final String TAG = "WifiSettingsForSetupWizard";
 
-    // show a text regarding data charges when wifi connection is required during setup wizard
-    protected static final String EXTRA_SHOW_WIFI_REQUIRED_INFO = "wifi_show_wifi_required_info";
-
     private View mAddOtherNetworkItem;
-    private ListAdapter mAdapter;
     private TextView mEmptyFooter;
     private boolean mListLastEmpty = false;
 
     @Override
     public View onCreateView(final LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-
-        final View view = inflater.inflate(R.layout.setup_preference, container, false);
-
-        final ListView list = (ListView) view.findViewById(android.R.id.list);
-        final View title = view.findViewById(R.id.title);
-        if (title == null) {
-            final View header = inflater.inflate(R.layout.setup_wizard_header, list, false);
-            list.addHeaderView(header, null, false);
-        }
+        final SetupWizardListLayout layout = (SetupWizardListLayout) inflater.inflate(
+                R.layout.setup_wifi_layout, container, false);
+        final ListView list = layout.getListView();
 
         mAddOtherNetworkItem = inflater.inflate(R.layout.setup_wifi_add_network, list, false);
         list.addFooterView(mAddOtherNetworkItem, null, true);
@@ -77,36 +65,28 @@
             }
         });
 
-        final Intent intent = getActivity().getIntent();
-        if (intent.getBooleanExtra(EXTRA_SHOW_WIFI_REQUIRED_INFO, false)) {
-            view.findViewById(R.id.wifi_required_info).setVisibility(View.VISIBLE);
+        final NavigationBar navigationBar = layout.getNavigationBar();
+        if (navigationBar != null) {
+            WifiSetupActivity activity = (WifiSetupActivity) getActivity();
+            activity.onNavigationBarCreated(navigationBar);
         }
 
-        return view;
+        return layout;
     }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        getView().setSystemUiVisibility(
-                View.STATUS_BAR_DISABLE_HOME |
-                View.STATUS_BAR_DISABLE_RECENT |
-                View.STATUS_BAR_DISABLE_NOTIFICATION_ALERTS |
-                View.STATUS_BAR_DISABLE_CLOCK);
-
         if (hasNextButton()) {
             getNextButton().setVisibility(View.GONE);
         }
+    }
 
-        mAdapter = getPreferenceScreen().getRootAdapter();
-        mAdapter.registerDataSetObserver(new DataSetObserver() {
-            @Override
-            public void onChanged() {
-                super.onChanged();
-                updateFooter();
-            }
-        });
+    @Override
+    public void onAccessPointsChanged() {
+        super.onAccessPointsChanged();
+        updateFooter(getPreferenceScreen().getPreferenceCount() == 0);
     }
 
     @Override
@@ -121,18 +101,15 @@
     }
 
     @Override
-    /* package */ void addOptionsMenuItems(Menu menu) {
-        final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
-        final TypedArray ta = getActivity().getTheme()
-                .obtainStyledAttributes(new int[] {R.attr.ic_wps});
-        menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
-                .setIcon(ta.getDrawable(0))
-                .setEnabled(wifiIsEnabled)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
-                .setEnabled(wifiIsEnabled)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        ta.recycle();
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        // Do not show menu during setup wizard
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        final Dialog dialog = super.onCreateDialog(dialogId);
+        SetupWizardUtils.applyImmersiveFlags(dialog);
+        return dialog;
     }
 
     @Override
@@ -151,17 +128,12 @@
 
     @Override
     protected TextView initEmptyView() {
-        mEmptyFooter = new TextView(getActivity());
-        mEmptyFooter.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,
-                LayoutParams.MATCH_PARENT));
-        mEmptyFooter.setGravity(Gravity.CENTER);
-        mEmptyFooter.setCompoundDrawablesWithIntrinsicBounds(0,
-                R.drawable.ic_wifi_emptystate, 0,0);
+        final LayoutInflater inflater = LayoutInflater.from(getActivity());
+        mEmptyFooter = (TextView) inflater.inflate(R.layout.setup_wifi_empty, getListView(), false);
         return mEmptyFooter;
     }
 
-    protected void updateFooter() {
-        final boolean isEmpty = mAdapter.isEmpty();
+    protected void updateFooter(boolean isEmpty) {
         if (isEmpty != mListLastEmpty) {
             final ListView list = getListView();
             if (isEmpty) {
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
deleted file mode 100644
index 2588309..0000000
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ /dev/null
@@ -1,769 +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.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.net.NetworkInfo.DetailedState;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.preference.PreferenceScreen;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.List;
-
-/**
- * WifiSetings Activity specific for SetupWizard with X-Large screen size.
- */
-public class WifiSettingsForSetupWizardXL extends Activity implements OnClickListener {
-    private static final String TAG = "SetupWizard";
-    private static final boolean DEBUG = true;
-
-    // lock orientation into landscape or portrait
-    private static final String EXTRA_PREFS_LANDSCAPE_LOCK = "extra_prefs_landscape_lock";
-    private static final String EXTRA_PREFS_PORTRAIT_LOCK = "extra_prefs_portrait_lock";
-
-    private static final EnumMap<DetailedState, DetailedState> sNetworkStateMap =
-            new EnumMap<DetailedState, DetailedState>(DetailedState.class);
-
-    static {
-        sNetworkStateMap.put(DetailedState.IDLE, DetailedState.DISCONNECTED);
-        sNetworkStateMap.put(DetailedState.SCANNING, DetailedState.SCANNING);
-        sNetworkStateMap.put(DetailedState.CONNECTING, DetailedState.CONNECTING);
-        sNetworkStateMap.put(DetailedState.AUTHENTICATING, DetailedState.CONNECTING);
-        sNetworkStateMap.put(DetailedState.OBTAINING_IPADDR, DetailedState.CONNECTING);
-        sNetworkStateMap.put(DetailedState.CONNECTED, DetailedState.CONNECTED);
-        sNetworkStateMap.put(DetailedState.SUSPENDED, DetailedState.SUSPENDED);  // ?
-        sNetworkStateMap.put(DetailedState.DISCONNECTING, DetailedState.DISCONNECTED);
-        sNetworkStateMap.put(DetailedState.DISCONNECTED, DetailedState.DISCONNECTED);
-        sNetworkStateMap.put(DetailedState.FAILED, DetailedState.FAILED);
-    }
-
-    private WifiSettings mWifiSettings;
-    private WifiManager mWifiManager;
-
-    /** Used for resizing a padding above title. Hiden when software keyboard is shown. */
-    private View mTopPadding;
-
-    /** Used for resizing a padding of main content. Hiden when software keyboard is shown. */
-    private View mContentPadding;
-
-    private TextView mTitleView;
-    /**
-     * The name of a network currently connecting, or trying to connect.
-     * This may be empty ("") at first, and updated when configuration is changed.
-     */
-    private CharSequence mNetworkName = "";
-    private CharSequence mEditingTitle;
-
-    private ProgressBar mProgressBar;
-    private View mTopDividerNoProgress;
-    /**
-     * Used for resizing a padding between WifiSettings preference and bottom bar when
-     * ProgressBar is visible as a top divider.
-     */
-    private View mBottomPadding;
-
-    private Button mAddNetworkButton;
-    private Button mRefreshButton;
-    private Button mSkipOrNextButton;
-    private Button mBackButton;
-
-    private Button mConnectButton;
-
-    /**
-     * View enclosing {@link WifiSettings}.
-     */
-    private View mWifiSettingsFragmentLayout;
-    private View mConnectingStatusLayout;
-    private TextView mConnectingStatusView;
-
-    /*
-     * States of current screen, which should be saved and restored when Activity is relaunched
-     * with orientation change, etc.
-     */
-    private static final int SCREEN_STATE_DISCONNECTED = 0;
-    private static final int SCREEN_STATE_EDITING = 1;
-    private static final int SCREEN_STATE_CONNECTING = 2;
-    private static final int SCREEN_STATE_CONNECTED = 3;
-
-    /** Current screen state. */
-    private int mScreenState = SCREEN_STATE_DISCONNECTED;
-
-    private WifiConfigUiForSetupWizardXL mWifiConfig;
-
-    private InputMethodManager mInputMethodManager;
-
-    /**
-     * Previous network connection state reported by main Wifi module.
-     *
-     * Note that we don't use original {@link DetailedState} object but simplified one translated
-     * using sNetworkStateMap.
-     */
-    private DetailedState mPreviousNetworkState = DetailedState.DISCONNECTED;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.wifi_settings_for_setup_wizard_xl);
-
-        mWifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE);
-        // There's no button here enabling wifi network, so we need to enable it without
-        // users' request.
-        mWifiManager.setWifiEnabled(true);
-
-        mWifiSettings =
-                (WifiSettings)getFragmentManager().findFragmentById(R.id.wifi_setup_fragment);
-        mInputMethodManager = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        initViews();
-
-        // At first, Wifi module doesn't return SCANNING state (it's too early), so we manually
-        // show it.
-        showScanningState();
-    }
-
-    private void initViews() {
-        Intent intent = getIntent();
-
-        if (intent.getBooleanExtra("firstRun", false)) {
-            final View layoutRoot = findViewById(R.id.layout_root);
-            layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK);
-        }
-        if (intent.getBooleanExtra(EXTRA_PREFS_LANDSCAPE_LOCK, false)) {
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
-        }
-        if (intent.getBooleanExtra(EXTRA_PREFS_PORTRAIT_LOCK, false)) {
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
-        }
-
-        mTitleView = (TextView)findViewById(R.id.wifi_setup_title);
-        mProgressBar = (ProgressBar)findViewById(R.id.scanning_progress_bar);
-        mProgressBar.setMax(2);
-        mTopDividerNoProgress = findViewById(R.id.top_divider_no_progress);
-        mBottomPadding = findViewById(R.id.bottom_padding);
-
-        mProgressBar.setVisibility(View.VISIBLE);
-        mProgressBar.setIndeterminate(true);
-        mTopDividerNoProgress.setVisibility(View.GONE);
-
-        mAddNetworkButton = (Button)findViewById(R.id.wifi_setup_add_network);
-        mAddNetworkButton.setOnClickListener(this);
-        mRefreshButton = (Button)findViewById(R.id.wifi_setup_refresh_list);
-        mRefreshButton.setOnClickListener(this);
-        mSkipOrNextButton = (Button)findViewById(R.id.wifi_setup_skip_or_next);
-        mSkipOrNextButton.setOnClickListener(this);
-        mConnectButton = (Button)findViewById(R.id.wifi_setup_connect);
-        mConnectButton.setOnClickListener(this);
-        mBackButton = (Button)findViewById(R.id.wifi_setup_cancel);
-        mBackButton.setOnClickListener(this);
-
-        mTopPadding = findViewById(R.id.top_padding);
-        mContentPadding = findViewById(R.id.content_padding);
-
-        mWifiSettingsFragmentLayout = findViewById(R.id.wifi_settings_fragment_layout);
-        mConnectingStatusLayout = findViewById(R.id.connecting_status_layout);
-        mConnectingStatusView = (TextView) findViewById(R.id.connecting_status);
-    }
-
-    private void restoreFirstVisibilityState() {
-        showDefaultTitle();
-        mAddNetworkButton.setVisibility(View.VISIBLE);
-        mRefreshButton.setVisibility(View.VISIBLE);
-        mSkipOrNextButton.setVisibility(View.VISIBLE);
-        mConnectButton.setVisibility(View.GONE);
-        mBackButton.setVisibility(View.GONE);
-        setPaddingVisibility(View.VISIBLE);
-    }
-
-    @Override
-    public void onClick(View view) {
-        hideSoftwareKeyboard();
-        if (view == mAddNetworkButton) {
-            if (DEBUG) Log.d(TAG, "AddNetwork button pressed");
-            onAddNetworkButtonPressed();
-        } else if (view == mRefreshButton) {
-            if (DEBUG) Log.d(TAG, "Refresh button pressed");
-            refreshAccessPoints(true);
-        } else if (view == mSkipOrNextButton) {
-            if (DEBUG) Log.d(TAG, "Skip/Next button pressed");
-            if (TextUtils.equals(getString(R.string.wifi_setup_skip), ((Button)view).getText())) {
-                // We don't want to let Wifi enabled when a user press skip without choosing
-                // any access point.
-                mWifiManager.setWifiEnabled(false);
-                // Notify "skip"
-                setResult(RESULT_FIRST_USER);
-            } else {
-                setResult(RESULT_OK);
-            }
-            finish();
-        } else if (view == mConnectButton) {
-            if (DEBUG) Log.d(TAG, "Connect button pressed");
-            onConnectButtonPressed();
-        } else if (view == mBackButton) {
-            if (DEBUG) Log.d(TAG, "Back button pressed");
-            onBackButtonPressed();
-        }
-    }
-
-    private void hideSoftwareKeyboard() {
-        if (DEBUG) Log.i(TAG, "Hiding software keyboard.");
-        final View focusedView = getCurrentFocus();
-        if (focusedView != null) {
-            mInputMethodManager.hideSoftInputFromWindow(focusedView.getWindowToken(), 0);
-        }
-    }
-
-    // Called from WifiSettings
-    /* package */ void updateConnectionState(DetailedState originalState) {
-        final DetailedState state = sNetworkStateMap.get(originalState);
-
-        if (originalState == DetailedState.FAILED) {
-            // We clean up the current connectivity status and let users select another network
-            // if they want.
-            refreshAccessPoints(true);
-        }
-
-        switch (state) {
-        case SCANNING: {
-            if (mScreenState == SCREEN_STATE_DISCONNECTED) {
-                if (mWifiSettings.getAccessPointsCount() == 0) {
-                    showScanningState();
-                } else {
-                    showDisconnectedProgressBar();
-                    mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
-                    mBottomPadding.setVisibility(View.GONE);
-                }
-            } else {
-                showDisconnectedProgressBar();
-            }
-            break;
-        }
-        case CONNECTING: {
-            if (mScreenState == SCREEN_STATE_CONNECTING) {
-                showConnectingState();
-            }
-            break;
-        }
-        case CONNECTED: {
-            showConnectedState();
-            break;
-        }
-        default:  // DISCONNECTED, FAILED
-            if (mScreenState != SCREEN_STATE_CONNECTED &&
-                    mWifiSettings.getAccessPointsCount() > 0) {
-                showDisconnectedState(Summary.get(this, state, false /* isEphemeral */));
-            }
-            break;
-        }
-        mPreviousNetworkState = state;
-    }
-
-    private void showDisconnectedState(String stateString) {
-        showDisconnectedProgressBar();
-        if (mScreenState == SCREEN_STATE_DISCONNECTED &&
-                mWifiSettings.getAccessPointsCount() > 0) {
-            mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
-            mBottomPadding.setVisibility(View.GONE);
-        }
-        mAddNetworkButton.setEnabled(true);
-        mRefreshButton.setEnabled(true);
-    }
-
-    private void showConnectingState() {
-        mScreenState = SCREEN_STATE_CONNECTING;
-
-        mBackButton.setVisibility(View.VISIBLE);
-        // We save this title and show it when authentication failed.
-        mEditingTitle = mTitleView.getText();
-        showConnectingTitle();
-        showConnectingProgressBar();
-
-        setPaddingVisibility(View.VISIBLE);
-    }
-
-    private void showConnectedState() {
-        // Once we show "connected" screen, we won't change it even when the device becomes
-        // disconnected afterwards. We keep the state unless a user explicitly cancel it
-        // (by pressing "back" button).
-        mScreenState = SCREEN_STATE_CONNECTED;
-
-        hideSoftwareKeyboard();
-        setPaddingVisibility(View.VISIBLE);
-
-        showConnectedTitle();
-        showConnectedProgressBar();
-
-        mWifiSettingsFragmentLayout.setVisibility(View.GONE);
-        mConnectingStatusLayout.setVisibility(View.VISIBLE);
-
-        mConnectingStatusView.setText(R.string.wifi_setup_description_connected);
-        mConnectButton.setVisibility(View.GONE);
-        mAddNetworkButton.setVisibility(View.GONE);
-        mRefreshButton.setVisibility(View.GONE);
-        mBackButton.setVisibility(View.VISIBLE);
-        mBackButton.setText(R.string.wifi_setup_back);
-        mSkipOrNextButton.setVisibility(View.VISIBLE);
-        mSkipOrNextButton.setEnabled(true);
-    }
-
-    private void showDefaultTitle() {
-        mTitleView.setText(getString(R.string.wifi_setup_title));
-    }
-
-    private void showAddNetworkTitle() {
-        mNetworkName = "";
-        mTitleView.setText(R.string.wifi_setup_title_add_network);
-    }
-
-    private void showEditingTitle() {
-        if (TextUtils.isEmpty(mNetworkName) && mWifiConfig != null) {
-            if (mWifiConfig.getController() != null &&
-                mWifiConfig.getController().getConfig() != null) {
-                mNetworkName = mWifiConfig.getController().getConfig().SSID;
-            } else {
-                Log.w(TAG, "Unexpected null found (WifiController or WifiConfig is null). " +
-                        "Ignore them.");
-            }
-        }
-        mTitleView.setText(getString(R.string.wifi_setup_title_editing_network, mNetworkName));
-    }
-
-    private void showConnectingTitle() {
-        if (TextUtils.isEmpty(mNetworkName) && mWifiConfig != null) {
-            if (mWifiConfig.getController() != null &&
-                    mWifiConfig.getController().getConfig() != null) {
-                mNetworkName = mWifiConfig.getController().getConfig().SSID;
-            } else {
-                Log.w(TAG, "Unexpected null found (WifiController or WifiConfig is null). " +
-                        "Ignore them.");
-            }
-        }
-        mTitleView.setText(getString(R.string.wifi_setup_title_connecting_network, mNetworkName));
-    }
-
-    private void showConnectedTitle() {
-        if (TextUtils.isEmpty(mNetworkName) && mWifiConfig != null) {
-            if (mWifiConfig.getController() != null &&
-                    mWifiConfig.getController().getConfig() != null) {
-                mNetworkName = mWifiConfig.getController().getConfig().SSID;
-            } else {
-                Log.w(TAG, "Unexpected null found (WifiController or WifiConfig is null). " +
-                        "Ignore them.");
-            }
-        }
-        mTitleView.setText(getString(R.string.wifi_setup_title_connected_network, mNetworkName));
-    }
-
-    /**
-     * Shows top divider with ProgressBar without defining the state of the ProgressBar.
-     *
-     * @see #showScanningProgressBar()
-     * @see #showConnectedProgressBar()
-     * @see #showConnectingProgressBar()
-     */
-    private void showTopDividerWithProgressBar() {
-        mProgressBar.setVisibility(View.VISIBLE);
-        mTopDividerNoProgress.setVisibility(View.GONE);
-        mBottomPadding.setVisibility(View.GONE);
-    }
-
-    private void showScanningState() {
-        setPaddingVisibility(View.VISIBLE);
-        mWifiSettingsFragmentLayout.setVisibility(View.GONE);
-        showScanningProgressBar();
-    }
-
-    private void onAddNetworkButtonPressed() {
-        mWifiSettings.onAddNetworkPressed();
-    }
-
-    /**
-     * Called when the screen enters wifi configuration UI. UI widget for configuring network
-     * (a.k.a. ConfigPreference) should be taken care of by caller side.
-     * This method should handle buttons' visibility/enabled.
-     * @param selectedAccessPoint AccessPoint object being selected. null when a user pressed
-     * "Add network" button, meaning there's no selected access point.
-     */
-    /* package */ void showConfigUi(AccessPoint selectedAccessPoint, boolean edit) {
-        mScreenState = SCREEN_STATE_EDITING;
-
-        if (selectedAccessPoint != null &&
-                (selectedAccessPoint.security == AccessPoint.SECURITY_WEP ||
-                        selectedAccessPoint.security == AccessPoint.SECURITY_PSK)) {
-            // We forcibly set edit as true so that users can modify every field if they want,
-            // while config UI doesn't allow them to edit some of them when edit is false
-            // (e.g. password field is hiden when edit==false).
-            edit = true;
-        }
-
-        // We don't want to keep scanning Wifi networks during users' configuring a network.
-        mWifiSettings.pauseWifiScan();
-
-        mWifiSettingsFragmentLayout.setVisibility(View.GONE);
-        mConnectingStatusLayout.setVisibility(View.GONE);
-        final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
-        parent.setVisibility(View.VISIBLE);
-        parent.removeAllViews();
-        mWifiConfig = new WifiConfigUiForSetupWizardXL(this, parent, selectedAccessPoint, edit);
-
-        if (selectedAccessPoint == null) {  // "Add network" flow
-            showAddNetworkTitle();
-            mConnectButton.setVisibility(View.VISIBLE);
-
-            showDisconnectedProgressBar();
-            showEditingButtonState();
-        } else if (selectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
-            mNetworkName = selectedAccessPoint.getTitle().toString();
-
-            // onConnectButtonPressed() will change visibility status.
-            mConnectButton.performClick();
-        } else {
-            mNetworkName = selectedAccessPoint.getTitle().toString();
-            showEditingTitle();
-            showDisconnectedProgressBar();
-            showEditingButtonState();
-            if (selectedAccessPoint.security == AccessPoint.SECURITY_EAP) {
-                onEapNetworkSelected();
-            } else {
-                mConnectButton.setVisibility(View.VISIBLE);
-
-                // WifiConfigController shows Connect button as "Save" when edit==true and a user
-                // tried to connect the network.
-                // In SetupWizard, we just show the button as "Connect" instead.
-                mConnectButton.setText(R.string.wifi_connect);
-                mBackButton.setText(R.string.wifi_setup_cancel);
-            }
-        }
-    }
-
-    /**
-     * Called before security fields are correctly set by {@link WifiConfigController}.
-     *
-     * @param view security field view
-     * @param accessPointSecurity type of security. e.g. AccessPoint.SECURITY_NONE
-     * @return true when it is ok for the caller to init security fields. false when
-     * all security fields are managed by this method, and thus the caller shouldn't touch them.
-     */
-    /* package */ boolean initSecurityFields(View view, int accessPointSecurity) {
-        // Reset all states tweaked below.
-        view.findViewById(R.id.eap_not_supported).setVisibility(View.GONE);
-        view.findViewById(R.id.eap_not_supported_for_add_network).setVisibility(View.GONE);
-        view.findViewById(R.id.ssid_text).setVisibility(View.VISIBLE);
-        view.findViewById(R.id.ssid_layout).setVisibility(View.VISIBLE);
-
-        if (accessPointSecurity == AccessPoint.SECURITY_EAP) {
-            setPaddingVisibility(View.VISIBLE);
-            hideSoftwareKeyboard();
-
-            // In SetupWizard for XLarge screen, we don't have enough space for showing
-            // configurations needed for EAP. We instead disable the whole feature there and let
-            // users configure those networks after the setup.
-            if (view.findViewById(R.id.type_ssid).getVisibility() == View.VISIBLE) {
-                view.findViewById(R.id.eap_not_supported_for_add_network)
-                        .setVisibility(View.VISIBLE);
-            } else {
-                view.findViewById(R.id.eap_not_supported).setVisibility(View.VISIBLE);
-            }
-            view.findViewById(R.id.security_fields).setVisibility(View.GONE);
-            view.findViewById(R.id.ssid_text).setVisibility(View.GONE);
-            view.findViewById(R.id.ssid_layout).setVisibility(View.GONE);
-            onEapNetworkSelected();
-
-            // This method did init security fields by itself. The caller must not do it.
-            return false;
-        }
-
-        mConnectButton.setVisibility(View.VISIBLE);
-        setPaddingVisibility(View.GONE);
-
-        // In "add network" flow, we'll see multiple initSecurityFields() calls with different
-        // accessPointSecurity variable. We want to show software keyboard conditionally everytime
-        // when this method is called.
-        if (mWifiConfig != null) {
-            if (accessPointSecurity == AccessPoint.SECURITY_PSK ||
-                    accessPointSecurity == AccessPoint.SECURITY_WEP) {
-                mWifiConfig.requestFocusAndShowKeyboard(R.id.password);
-            } else {
-                mWifiConfig.requestFocusAndShowKeyboard(R.id.ssid);
-            }
-        }
-
-        // Let the caller init security fields.
-        return true;
-    }
-
-    private void onEapNetworkSelected() {
-        mConnectButton.setVisibility(View.GONE);
-        mBackButton.setText(R.string.wifi_setup_back);
-    }
-
-    private void showEditingButtonState() {
-        mSkipOrNextButton.setVisibility(View.GONE);
-        mAddNetworkButton.setVisibility(View.GONE);
-        mRefreshButton.setVisibility(View.GONE);
-        mBackButton.setVisibility(View.VISIBLE);
-    }
-
-    // May be called when user press "connect" button in WifiDialog
-    /* package */ void onConnectButtonPressed() {
-        mScreenState = SCREEN_STATE_CONNECTING;
-
-        mWifiSettings.submit(mWifiConfig.getController());
-
-        // updateConnectionState() isn't called soon by the main Wifi module after the user's
-        // "connect" request, and the user still sees "not connected" message for a while, which
-        // looks strange for users though legitimate from the view of the module.
-        //
-        // We instead manually show "connecting" message before the system gets actual
-        // "connecting" message from Wifi module.
-        showConnectingState();
-
-        // Might be better to delay showing this button.
-        mBackButton.setVisibility(View.VISIBLE);
-        mBackButton.setText(R.string.wifi_setup_back);
-
-        final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
-        parent.setVisibility(View.GONE);
-        mConnectingStatusLayout.setVisibility(View.VISIBLE);
-        mConnectingStatusView.setText(R.string.wifi_setup_description_connecting);
-
-        mSkipOrNextButton.setVisibility(View.VISIBLE);
-        mSkipOrNextButton.setEnabled(false);
-        mConnectButton.setVisibility(View.GONE);
-        mAddNetworkButton.setVisibility(View.GONE);
-        mRefreshButton.setVisibility(View.GONE);
-    }
-
-    private void onBackButtonPressed() {
-
-        if (mScreenState == SCREEN_STATE_CONNECTING || mScreenState == SCREEN_STATE_CONNECTED) {
-            if (DEBUG) Log.d(TAG, "Back button pressed after connect action.");
-            mScreenState = SCREEN_STATE_DISCONNECTED;
-
-            // When a user press "Back" button after pressing "Connect" button, we want to cancel
-            // the "Connect" request and refresh the whole Wifi status.
-            restoreFirstVisibilityState();
-
-            mSkipOrNextButton.setEnabled(true);
-            changeNextButtonState(false);  // Skip
-
-            // Wifi list becomes empty for a moment. We show "scanning" effect to a user so that
-            // he/she won't be astonished there. This stops once the scan finishes.
-            showScanningState();
-
-            // Remembered networks may be re-used during SetupWizard, which confuse users.
-            // We force the module to forget them to reduce UX complexity
-            final List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();
-            for (WifiConfiguration config : configs) {
-                if (DEBUG) {
-                    Log.d(TAG, String.format("forgeting Wi-Fi network \"%s\" (id: %d)",
-                            config.SSID, config.networkId));
-                }
-                mWifiManager.forget(config.networkId, new WifiManager.ActionListener() {
-                        public void onSuccess() {
-                        }
-                        public void onFailure(int reason) {
-                            //TODO: Add failure UI
-                        }
-                        });
-            }
-
-            mWifiSettingsFragmentLayout.setVisibility(View.GONE);
-            refreshAccessPoints(true);
-        } else { // During user's Wifi configuration.
-            mScreenState = SCREEN_STATE_DISCONNECTED;
-            mWifiSettings.resumeWifiScan();
-
-            restoreFirstVisibilityState();
-
-            mAddNetworkButton.setEnabled(true);
-            mRefreshButton.setEnabled(true);
-            mSkipOrNextButton.setEnabled(true);
-            showDisconnectedProgressBar();
-            mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
-            mBottomPadding.setVisibility(View.GONE);
-        }
-
-        setPaddingVisibility(View.VISIBLE);
-        mConnectingStatusLayout.setVisibility(View.GONE);
-        final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
-        parent.removeAllViews();
-        parent.setVisibility(View.GONE);
-        mWifiConfig = null;
-    }
-
-    /**
-     * @param connected true when the device is connected to a specific network.
-     */
-    /* package */ void changeNextButtonState(boolean connected) {
-        if (connected) {
-            mSkipOrNextButton.setText(R.string.wifi_setup_next);
-        } else {
-            mSkipOrNextButton.setText(R.string.wifi_setup_skip);
-        }
-    }
-
-    /**
-     * Called when the list of AccessPoints are modified and this Activity needs to refresh
-     * the list.
-     * @param preferenceScreen
-     */
-    /* package */ void onAccessPointsUpdated(
-            PreferenceScreen preferenceScreen, Collection<AccessPoint> accessPoints) {
-        // If we already show some of access points but the bar still shows "scanning" state, it
-        // should be stopped.
-        if (mProgressBar.isIndeterminate() && accessPoints.size() > 0) {
-            showDisconnectedProgressBar();
-            if (mScreenState == SCREEN_STATE_DISCONNECTED) {
-                mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
-                mBottomPadding.setVisibility(View.GONE);
-            }
-            mAddNetworkButton.setEnabled(true);
-            mRefreshButton.setEnabled(true);
-        }
-
-        for (AccessPoint accessPoint : accessPoints) {
-            accessPoint.setLayoutResource(R.layout.custom_preference);
-            preferenceScreen.addPreference(accessPoint);
-        }
-    }
-
-    private void refreshAccessPoints(boolean disconnectNetwork) {
-        showScanningState();
-
-        if (disconnectNetwork) {
-            mWifiManager.disconnect();
-        }
-
-        mWifiSettings.refreshAccessPoints();
-    }
-
-    /**
-     * Called when {@link WifiSettings} received
-     * {@link WifiManager#SUPPLICANT_STATE_CHANGED_ACTION}.
-     */
-    /* package */ void onSupplicantStateChanged(Intent intent) {
-        final int errorCode = intent.getIntExtra(WifiManager.EXTRA_SUPPLICANT_ERROR, -1);
-        if (errorCode == WifiManager.ERROR_AUTHENTICATING) {
-            Log.i(TAG, "Received authentication error event.");
-            onAuthenticationFailure();
-        }
-    }
-
-    /**
-     * Called once when Authentication failed.
-     */
-    private void onAuthenticationFailure() {
-        mScreenState = SCREEN_STATE_EDITING;
-
-        mSkipOrNextButton.setVisibility(View.GONE);
-        mConnectButton.setVisibility(View.VISIBLE);
-        mConnectButton.setEnabled(true);
-
-        if (!TextUtils.isEmpty(mEditingTitle)) {
-            mTitleView.setText(mEditingTitle);
-        } else {
-            Log.w(TAG, "Title during editing/adding a network was empty.");
-            showEditingTitle();
-        }
-
-        final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
-        parent.setVisibility(View.VISIBLE);
-        mConnectingStatusLayout.setVisibility(View.GONE);
-
-        showDisconnectedProgressBar();
-        setPaddingVisibility(View.GONE);
-    }
-
-    // Used by WifiConfigUiForSetupWizardXL
-    /* package */ void setPaddingVisibility(int visibility) {
-        mTopPadding.setVisibility(visibility);
-        mContentPadding.setVisibility(visibility);
-    }
-
-    private void showDisconnectedProgressBar() {
-        // The device may report DISCONNECTED during connecting to a network, at which we don't
-        // want to lose bottom padding of top divider implicitly added by ProgressBar.
-        if (mScreenState == SCREEN_STATE_DISCONNECTED) {
-            mProgressBar.setVisibility(View.GONE);
-            mProgressBar.setIndeterminate(false);
-            mTopDividerNoProgress.setVisibility(View.VISIBLE);
-        } else {
-            mProgressBar.setVisibility(View.VISIBLE);
-            mProgressBar.setIndeterminate(false);
-            mProgressBar.setProgress(0);
-            mTopDividerNoProgress.setVisibility(View.GONE);
-        }
-    }
-
-    /**
-     * Shows top divider with ProgressBar, whose state is intermediate.
-     */
-    private void showScanningProgressBar() {
-        showTopDividerWithProgressBar();
-        mProgressBar.setIndeterminate(true);
-    }
-
-    /**
-     * Shows top divider with ProgressBar, showing "connecting" state.
-     */
-    private void showConnectingProgressBar() {
-        showTopDividerWithProgressBar();
-        mProgressBar.setIndeterminate(false);
-        mProgressBar.setProgress(1);
-    }
-
-    private void showConnectedProgressBar() {
-        showTopDividerWithProgressBar();
-        mProgressBar.setIndeterminate(false);
-        mProgressBar.setProgress(2);
-    }
-
-    /**
-     * Called when WifiManager is requested to save a network.
-     */
-    /* package */ void onSaveNetwork(WifiConfiguration config) {
-        // We want to both save and connect a network. connectNetwork() does both.
-        mWifiManager.connect(config, new WifiManager.ActionListener() {
-                public void onSuccess() {
-                }
-                public void onFailure(int reason) {
-                //TODO: Add failure UI
-                }
-                });
-    }
-}
diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
index a60945f..38fc32d 100644
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -35,11 +35,10 @@
 import com.android.settings.ButtonBarHandler;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
-import com.android.setupwizard.navigationbar.SetupWizardNavBar;
-import com.android.setupwizard.navigationbar.SetupWizardNavBar.NavigationBarListener;
+import com.android.setupwizardlib.view.NavigationBar;
 
 public class WifiSetupActivity extends WifiPickerActivity
-        implements ButtonBarHandler, NavigationBarListener {
+        implements ButtonBarHandler, NavigationBar.NavigationBarListener {
     private static final String TAG = "WifiSetupActivity";
 
     // this boolean extra specifies whether to auto finish when connection is established
@@ -72,7 +71,7 @@
     // Whether the device is connected to WiFi
     private boolean mWifiConnected;
 
-    private SetupWizardNavBar mNavigationBar;
+    private NavigationBar mNavigationBar;
 
     private IntentFilter mFilter = new IntentFilter();
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -125,7 +124,7 @@
         if (isWifiConnected()) {
             if (mAutoFinishOnConnection && mUserSelectedNetwork) {
                 Log.d(TAG, "Auto-finishing with connection");
-                finishOrNext(Activity.RESULT_OK);
+                finish(Activity.RESULT_OK);
                 // Require a user selection before auto-finishing next time we are here. The user
                 // can either connect to a different network or press "next" to proceed.
                 mUserSelectedNetwork = false;
@@ -180,7 +179,7 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        resid = SetupWizardUtils.getTheme(getIntent());
         super.onApplyThemeResource(theme, resid, first);
     }
 
@@ -195,24 +194,18 @@
     }
 
     /**
-     * Complete this activity and return the results to the caller. If using WizardManager, this
-     * will invoke the next scripted action; otherwise, we simply finish.
+     * Complete this activity and return the results to the caller.
      */
-    public void finishOrNext(int resultCode) {
-        Log.d(TAG, "finishOrNext resultCode=" + resultCode
-                + " isUsingWizardManager=" + SetupWizardUtils.isUsingWizardManager(this));
-        if (SetupWizardUtils.isUsingWizardManager(this)) {
-            SetupWizardUtils.sendResultsToSetupWizard(this, resultCode);
-        } else {
-            setResult(resultCode);
-            finish();
-        }
+    public void finish(int resultCode) {
+        Log.d(TAG, "finishing, resultCode=" + resultCode);
+        setResult(resultCode);
+        finish();
     }
 
-    @Override
-    public void onNavigationBarCreated(final SetupWizardNavBar bar) {
+    public void onNavigationBarCreated(final NavigationBar bar) {
         mNavigationBar = bar;
-        SetupWizardUtils.setImmersiveMode(this, bar);
+        bar.setNavigationBarListener(this);
+        SetupWizardUtils.setImmersiveMode(this);
     }
 
     @Override
@@ -223,7 +216,7 @@
     @Override
     public void onNavigateNext() {
         if (mWifiConnected) {
-            finishOrNext(RESULT_OK);
+            finish(RESULT_OK);
         } else {
             // Warn of possible data charges if there is a network connection, or lack of updates
             // if there is none.
@@ -263,24 +256,26 @@
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             int messageRes = getArguments().getInt("messageRes");
-            return new AlertDialog.Builder(getActivity())
+            final AlertDialog dialog = new AlertDialog.Builder(getActivity())
                     .setMessage(messageRes)
                     .setCancelable(false)
                     .setPositiveButton(R.string.wifi_skip_anyway,
                             new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int id) {
-                            WifiSetupActivity activity = (WifiSetupActivity) getActivity();
-                            activity.finishOrNext(RESULT_SKIP);
-                        }
-                    })
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                    WifiSetupActivity activity = (WifiSetupActivity) getActivity();
+                                    activity.finish(RESULT_SKIP);
+                                }
+                            })
                     .setNegativeButton(R.string.wifi_dont_skip,
                             new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int id) {
-                        }
-                    })
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                }
+                            })
                     .create();
+            SetupWizardUtils.applyImmersiveFlags(dialog);
+            return dialog;
         }
     }
 }
diff --git a/src/com/android/settings/wifi/WifiStatusTest.java b/src/com/android/settings/wifi/WifiStatusTest.java
index dbd8eec..269058c 100644
--- a/src/com/android/settings/wifi/WifiStatusTest.java
+++ b/src/com/android/settings/wifi/WifiStatusTest.java
@@ -17,14 +17,11 @@
 package com.android.settings.wifi;
 
 import com.android.settings.R;
+import com.android.settingslib.wifi.AccessPoint;
 
 import android.net.wifi.ScanResult;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.List;
 
 import android.app.Activity;
@@ -301,7 +298,8 @@
     private void handleNetworkStateChanged(NetworkInfo networkInfo) {
         if (mWifiManager.isWifiEnabled()) {
             WifiInfo info = mWifiManager.getConnectionInfo();
-            String summary = Summary.get(this, info.getSSID(), networkInfo.getDetailedState(),
+            String summary = AccessPoint.getSummary(this, info.getSSID(),
+                    networkInfo.getDetailedState(),
                     info.getNetworkId() == WifiConfiguration.INVALID_NETWORK_ID);
             mNetworkState.setText(summary);
         }
@@ -395,19 +393,22 @@
     }
 
     private void httpClientTest() {
-        HttpClient client = new DefaultHttpClient();
+        HttpURLConnection urlConnection = null;
         try {
             // TODO: Hardcoded for now, make it UI configurable
-            HttpGet request = new HttpGet("http://www.google.com");
-            HttpResponse response = client.execute(request);
-            if (response.getStatusLine().getStatusCode() == 200) {
+            URL url = new URL("https://www.google.com");
+            urlConnection = (HttpURLConnection) url.openConnection();
+            if (urlConnection.getResponseCode() == 200) {
                 mHttpClientTestResult = "Pass";
             } else {
-                mHttpClientTestResult = "Fail: Code: " + String.valueOf(response);
+                mHttpClientTestResult = "Fail: Code: " + urlConnection.getResponseMessage();
             }
-            request.abort();
         } catch (IOException e) {
             mHttpClientTestResult = "Fail: IOException";
+        } finally {
+            if (urlConnection != null) {
+                urlConnection.disconnect();
+            }
         }
     }
 
diff --git a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
index 2667e0b..97f45aa 100644
--- a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
+++ b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
@@ -34,17 +34,16 @@
 import android.text.InputType;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.android.settings.R;
+import com.android.settingslib.wifi.AccessPoint;
 
 import java.io.IOException;
 
@@ -121,7 +120,7 @@
 
         String password = mPasswordView.getText().toString();
         String wpsNfcConfigurationToken
-                = mWifiManager.getWpsNfcConfigurationToken(mAccessPoint.networkId);
+                = mWifiManager.getWpsNfcConfigurationToken(mAccessPoint.getConfig().networkId);
         String passwordHex = byteArrayToHexString(password.getBytes());
 
         String passwordLength = password.length() >= HEX_RADIX
@@ -224,9 +223,9 @@
     private void enableSubmitIfAppropriate() {
 
         if (mPasswordView != null) {
-            if (mAccessPoint.security == AccessPoint.SECURITY_WEP) {
+            if (mAccessPoint.getSecurity() == AccessPoint.SECURITY_WEP) {
                 mSubmitButton.setEnabled(mPasswordView.length() > 0);
-            } else if (mAccessPoint.security == AccessPoint.SECURITY_PSK) {
+            } else if (mAccessPoint.getSecurity() == AccessPoint.SECURITY_PSK) {
                 mSubmitButton.setEnabled(mPasswordView.length() >= 8);
             }
         } else {
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 879ebf8..72dca9e 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -51,6 +51,7 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -477,6 +478,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI_P2P;
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle outState) {
         if (mSelectedWifiPeer != null) {
             outState.putParcelable(SAVE_DIALOG_PEER, mSelectedWifiPeer.device);
diff --git a/tests/res/values-en-rAU/strings.xml b/tests/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..6aab4d0
--- /dev/null
+++ b/tests/res/values-en-rAU/strings.xml
@@ -0,0 +1,28 @@
+<?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="3169265480789026010">"Discoverable"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Start scan"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Stop scan"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hello Operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operator\'s hook that can be used to start activity of choice"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hello Manufacturer!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Manufacturer"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Manufacturer\'s hook that can be used to start activity of choice"</string>
+</resources>
diff --git a/tests/res/values-pa-rIN/strings.xml b/tests/res/values-pa-rIN/strings.xml
new file mode 100644
index 0000000..54b3468
--- /dev/null
+++ b/tests/res/values-pa-rIN/strings.xml
@@ -0,0 +1,36 @@
+<?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">
+    <!-- no translation found for discoverable (3169265480789026010) -->
+    <skip />
+    <!-- no translation found for start_scan (6035699220942169744) -->
+    <skip />
+    <!-- no translation found for stop_scan (527546916633745779) -->
+    <skip />
+    <!-- no translation found for operator_hello (292208161864910159) -->
+    <skip />
+    <!-- no translation found for operator_settings_title (1410094511974808567) -->
+    <skip />
+    <!-- no translation found for operator_settings_summary (5916597343019392258) -->
+    <skip />
+    <string name="manufacturer_hello" msgid="7525744633645544137">"ਹੈਲੋ ਨਿਰਮਾਤਾ!"</string>
+    <!-- no translation found for manufacturer_settings_title (2503105049808838612) -->
+    <skip />
+    <!-- no translation found for manufacturer_settings_summary (766746044826063472) -->
+    <skip />
+</resources>
diff --git a/tests/src/com/android/settings/vpn2/VpnTests.java b/tests/src/com/android/settings/vpn2/VpnTests.java
index 7d5961d..8300534 100644
--- a/tests/src/com/android/settings/vpn2/VpnTests.java
+++ b/tests/src/com/android/settings/vpn2/VpnTests.java
@@ -18,14 +18,13 @@
 
 import android.content.Context;
 import android.net.IConnectivityManager;
-import android.net.LinkAddress;
-import android.net.RouteInfo;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 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;
@@ -35,13 +34,11 @@
 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 org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.util.EntityUtils;
+import libcore.io.Streams;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -228,14 +225,28 @@
      */
     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 {
-            HttpClient httpClient = new DefaultHttpClient();
-            HttpGet httpGet = new HttpGet(EXTERNAL_SERVER);
-            HttpResponse httpResponse = httpClient.execute(httpGet);
-            Log.i(TAG, "Response from httpget: " + httpResponse.getStatusLine().toString());
+            URL url = new URL(EXTERNAL_SERVER);
+            urlConnection = (HttpURLConnection) url.openConnection();
+            Log.i(TAG, "Response from httpget: " + urlConnection.getResponseCode());
 
-            String entityStr = EntityUtils.toString(httpResponse.getEntity());
-            JSONObject json_data = new JSONObject(entityStr);
+            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) {
@@ -244,6 +255,11 @@
             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;
     }
diff --git a/wrap_alpha.py b/wrap_alpha.py
new file mode 100755
index 0000000..53db4eb
--- /dev/null
+++ b/wrap_alpha.py
@@ -0,0 +1,43 @@
+#!/usr/bin/python
+
+import os
+
+# assume everything needs alpha suffixes
+for root, dirs, files in os.walk('.'):
+    if "res/drawable-" not in root: continue
+
+    for before in files:
+        if "_alpha.png" in before: continue
+        if not before.startswith("ic_settings_"): continue
+
+        after = before.replace(".png", "_alpha.png")
+        os.rename(os.path.join(root, before), os.path.join(root, after))
+
+# build xml redirection
+for root, dirs, files in os.walk('.'):
+    if "res/drawable-" not in root: continue
+
+    for src in files:
+        if not src.endswith(".png"): continue
+        src = src[0:-4]
+
+        src_clause = '\n    android:src="@drawable/%s"' % (src)
+
+        alpha = src.endswith("_alpha")
+        if alpha:
+            src = src[0:-6]
+            alpha_clause = '\n    android:tint="?android:attr/colorAccent"'
+        else:
+            alpha_clause = ''
+
+        am = src.endswith("_am")
+        if am:
+            src = src[0:-3]
+            am_clause = '\n    android:autoMirrored="true"'
+        else:
+            am_clause = ''
+
+        with open("res/drawable/%s.xml" % (src), 'w') as xml:
+            xml.write("""<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"%s%s%s />
+""" % (src_clause, alpha_clause, am_clause))